From 3d22ef4d1c2d5a4189f5a332b943f713a6342b24 Mon Sep 17 00:00:00 2001
From: dinedine <didier.lafforgue@gmail.com>
Date: Fri, 4 Jun 2010 00:55:04 +0200
Subject: [PATCH] modify the way locomotive setups a mongo connection

---
 .gitignore                        |  2 ++
 Gemfile                           |  1 +
 Rakefile                          |  9 +++++----
 config/environments/production.rb |  2 +-
 config/initializers/mongoid.rb    | 12 +-----------
 lib/locomotive/engine.rb          | 18 +-----------------
 6 files changed, 11 insertions(+), 33 deletions(-)

diff --git a/.gitignore b/.gitignore
index dbf6f43d..2aad4fdd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,8 @@ uploads
 spec/tmp
 public/sites
 public/uploads
+public/stylesheets/all.css
+public/javascripts/all.js
 pkg
 *.gemspec
 rails_3_gems
diff --git a/Gemfile b/Gemfile
index 20744fb2..07b1fffa 100644
--- a/Gemfile
+++ b/Gemfile
@@ -13,6 +13,7 @@ gem "warden"
 gem "devise", ">= 1.1.rc0"
 gem "haml", '>= 3.0.1'
 gem "rmagick"
+gem "aws"
 gem "jeweler"
 gem "mimetype-fu", :require => "mimetype_fu"
 gem "formtastic-rails3", :require => "formtastic"
diff --git a/Rakefile b/Rakefile
index abc3e91f..73aef5a6 100644
--- a/Rakefile
+++ b/Rakefile
@@ -14,16 +14,16 @@ begin
   Jeweler::Tasks.new do |gem|
     gem.name = "locomotive_cms"
     gem.summary = "Locomotive cms engine"
-    gem.author = ['Didier Lafforgue']
-    gem.email = ["didier@nocoffee.fr"]  
+    gem.authors = ['Didier Lafforgue']
+    gem.email = ['didier@nocoffee.fr']
     gem.date = Date.today
     gem.description = "a brand new CMS system with super sexy UI and cool features"
     gem.homepage = %q{http://github.com/did/locomotive}
     gem.files = Dir[
       "Gemfile", 
-      "{lib}/**/*", 
       "{app}/**/*", 
-      "{config}/**/*", 
+      "{config}/**/*",
+      "{lib}/**/*",
       "{public}/stylesheets/**/*", "{public}/javascripts/**/*", "{public}/images/**/*", 
       "{vendor}/**/*"]
     # other fields that would normally go in your gemspec
@@ -35,6 +35,7 @@ begin
       end
     end    
   end
+  Jeweler::GemcutterTasks.new
 rescue
   puts "Jeweler or one of its dependencies is not installed."
 end
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 1d300072..df40dde6 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -30,4 +30,4 @@ Locomotive::Application.configure do
 
   # Enable threaded mode
   # config.threadsafe!
-end
+end
\ No newline at end of file
diff --git a/config/initializers/mongoid.rb b/config/initializers/mongoid.rb
index ceae9987..dee177fe 100644
--- a/config/initializers/mongoid.rb
+++ b/config/initializers/mongoid.rb
@@ -4,19 +4,9 @@ File.open(File.join(Rails.root, 'config/database.yml'), 'r') do |f|
   @settings = YAML.load(f)[Rails.env]
 end
 
-Mongoid.configure do |config|
-  name = @settings["database"]
-  host = @settings["host"]
-  config.master = Mongo::Connection.new.db(name)
-  # config.slaves = [
-  #   Mongo::Connection.new(host, @settings["slave_one"]["port"], :slave_ok => true).db(name),
-  #   Mongo::Connection.new(host, @settings["slave_two"]["port"], :slave_ok => true).db(name)
-  # ]
-end
+Mongoid::Config.instance.from_hash(@settings)
 
 ## various patches
-
-
 module Mongoid #:nodoc:
   
   # Enabling scope in validates_uniqueness_of validation
diff --git a/lib/locomotive/engine.rb b/lib/locomotive/engine.rb
index 500f2b5e..bb378a5a 100644
--- a/lib/locomotive/engine.rb
+++ b/lib/locomotive/engine.rb
@@ -7,7 +7,7 @@ require 'formtastic'
 require 'mongoid'
 require 'mongoid_acts_as_tree'
 
-require File.dirname(__FILE__) + '/../../vendor/plugins/custom_fields/init.rb'      
+require File.dirname(__FILE__) + '/../../vendor/plugins/custom_fields/init.rb'
 
 module Locomotive
   class Engine < Rails::Engine
@@ -16,22 +16,6 @@ module Locomotive
       path = [*ActionController::Base.helpers_path] << File.dirname(__FILE__) + "/../../app/helpers"
       ActionController::Base.helpers_path = path
     end
-    
-    # initializer "locomotive.require_dependencies", :after => :initialize_dependency_mechanism do
-    #   require 'bundler'
-    #   gemfile = Bundler::Definition.from_gemfile(root.join('Gemfile'))
-    #   
-    #   specs = gemfile.dependencies.select do |d|
-    #     !%w{jeweler rails}.include?(d.name) and (d.groups & [:default, :production]).any?
-    #   end
-    #   specs.collect { |s| s.autorequire || [s.name] }.flatten.each do |r|
-    #     puts "requiring #{r}"
-    #     require r
-    #   end
-    #   
-    #   # gemify it soon
-    #   require File.dirname(__FILE__) + '/../../vendor/plugins/custom_fields/init.rb'      
-    # end
         
   end
 end
\ No newline at end of file