locomotive_cms 0.0.1.3 → 0.0.1.4

data/Gemfile

@@ -11,20 +11,14 @@ gem "mongoid", ">= 2.0.0.beta6"
 gem "mongoid_acts_as_tree", ">= 0.1.2"
 gem "warden"
 gem "devise", ">= 1.1.rc0"
-gem "haml", '>= 3.0.1'
-# gem "rmagick"
+gem "haml", ">= 3.0.1"
+gem "rmagick", "2.12.2"
 gem "aws"
 gem "jeweler"
 gem "mimetype-fu", :require => "mimetype_fu"
 gem "formtastic-rails3", :require => "formtastic"
 gem "carrierwave-rails3", :require => "carrierwave"
 
-# gem 'formtastic-rails3', :require => 'formtastic', :path => 'rails_3_gems/formtastic'
-# gem "formtastic", :git => 'git://github.com/justinfrench/formtastic.git', :branch => 'rails3'
-# gem "carrierwave", :git => "http://github.com/jnicklas/carrierwave.git"
-# gem "carrierwave", :path => 'rails_3_gems/carrierwave'
-
-
 # Development environment
 group :development do
   # Using mongrel instead of webrick (default server)

data/config/application.rb

@@ -5,6 +5,7 @@ require File.expand_path('../boot', __FILE__)
 require "action_controller/railtie"
 require "action_mailer/railtie"
 require "active_resource/railtie"
+require "mongoid/railtie"
 
 # Auto-require default libraries and those for the current Rails environment.
 Bundler.require :default, Rails.env

data/config/environments/production.rb

@@ -30,16 +30,4 @@ Locomotive::Application.configure do
 
   # Enable threaded mode
   # config.threadsafe!
-end
-
-config.action_mailer.delivery_method = :smtp
-
-config.action_mailer.smtp_settings = {
-  :enable_starttls_auto => true, 
-  :address        => "smtp.gmail.com",
-  :port           => 587,
-  :domain         => "nocoffee.fr",
-  :authentication => :plain,
-  :user_name      => "didier@nocoffee.fr",
-  :password       => "pepscou"
-}
+end

data/config/initializers/mongoid.rb

@@ -1,11 +1,5 @@
 require 'mongoid'
 
-File.open(File.join(Rails.root, 'config/database.yml'), 'r') do |f|
-  @settings = YAML.load(f)[Rails.env]
-end
-
-Mongoid::Config.instance.from_hash(@settings)
-
 ## various patches
 module Mongoid #:nodoc:
   

data/config/mongoid.yml

@@ -0,0 +1,24 @@
+defaults: &defaults
+  host: localhost
+  # slaves:
+  #   - host: slave1.local
+  #     port: 27018
+  #   - host: slave2.local
+  #     port: 27019
+
+development:
+  <<: *defaults
+  database: locomotive_dev
+
+test:
+  <<: *defaults
+  database: locomotive_test
+
+# set these environment variables on your prod server
+production:
+  <<: *defaults
+  host: <%= ENV['MONGOID_HOST'] %>
+  port: <%= ENV['MONGOID_PORT'] %>
+  username: <%= ENV['MONGOID_USERNAME'] %>
+  password: <%= ENV['MONGOID_PASSWORD'] %>
+  database: <%= ENV['MONGOID_DATABASE'] %>

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 0
   - 1
-  - 3
-  version: 0.0.1.3
+  - 4
+  version: 0.0.1.4
 platform: ruby
 authors: 
 - Didier Lafforgue
@@ -142,19 +142,21 @@ dependencies:
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :runtime
-  name: aws
+  name: rmagick
   version_requirements: &id010 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
         segments: 
-        - 0
-        version: "0"
+        - 2
+        - 12
+        - 2
+        version: 2.12.2
   requirement: *id010
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :runtime
-  name: jeweler
+  name: aws
   version_requirements: &id011 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
@@ -166,7 +168,7 @@ dependencies:
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :runtime
-  name: mimetype-fu
+  name: jeweler
   version_requirements: &id012 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
@@ -178,7 +180,7 @@ dependencies:
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :runtime
-  name: formtastic-rails3
+  name: mimetype-fu
   version_requirements: &id013 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
@@ -190,7 +192,7 @@ dependencies:
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :runtime
-  name: carrierwave-rails3
+  name: formtastic-rails3
   version_requirements: &id014 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
@@ -200,6 +202,18 @@ dependencies:
         version: "0"
   requirement: *id014
   prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  name: carrierwave-rails3
+  version_requirements: &id015 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id015
+  prerelease: false
 description: a brand new CMS system with super sexy UI and cool features
 email: 
 - didier@nocoffee.fr
@@ -327,7 +341,6 @@ files:
 - config/application.rb
 - config/boot.rb
 - config/cucumber.yml
-- config/database.yml
 - config/environment.rb
 - config/environments/development.rb
 - config/environments/production.rb
@@ -348,6 +361,7 @@ files:
 - config/locales/default_en.yml
 - config/locales/default_fr.yml
 - config/locales/devise.en.yml
+- config/mongoid.yml
 - config/routes.rb
 - lib/core_ext.rb
 - lib/generators/locomotive_generator.rb

data/config/database.yml

@@ -1,20 +0,0 @@
-defaults: &defaults
-  host: localhost
-
-development:
-  <<: *defaults
-  database: locomotive_dev
-  
-test: &test
-  <<: *defaults
-  database: locomotive_test
-
-production:
-  <<: *defaults
-  host: db.mongohq.com
-  username: user
-  password: pass
-  database: fanboy
-
-cucumber:
-  <<: *test