Permalink
Browse files

conform to app generated by template for Rails 3.1.0.rc6

  • Loading branch information...
1 parent 7c08a19 commit 143257feb0be3745208e227aa2604b5a1ba53d42 @DanielKehoe DanielKehoe committed Aug 25, 2011
Showing with 70 additions and 75 deletions.
  1. +5 −6 Gemfile
  2. +53 −58 Gemfile.lock
  3. +7 −4 config/application.rb
  4. +2 −2 config/environments/production.rb
  5. +3 −5 config/initializers/wrap_parameters.rb
View
11 Gemfile
@@ -1,18 +1,17 @@
source 'http://rubygems.org'
-gem 'rails', '3.1.0.rc5'
+gem 'rails', '3.1.0.rc6'
group :assets do
- gem 'sass-rails', "~> 3.1.0.rc"
+ gem 'sass-rails', " ~> 3.1.0.rc"
gem 'coffee-rails', "~> 3.1.0.rc"
gem 'uglifier'
end
gem 'jquery-rails'
gem "rspec-rails", ">= 2.6.1", :group => [:development, :test]
gem "database_cleaner", ">= 0.6.7", :group => :test
gem "mongoid-rspec", ">= 1.4.4", :group => :test
-gem "factory_girl_rails", ">= 1.1.rc1", :group => :test
+gem "factory_girl_rails", ">= 1.1.0", :group => :test
gem "cucumber-rails", ">= 1.0.2", :group => :test
-gem "capybara", ">= 1.0.0", :group => :test
-gem "launchy", ">= 0.4.0", :group => :test
+gem "capybara", ">= 1.0.1", :group => :test
gem "bson_ext", ">= 1.3.1"
-gem "mongoid", ">= 2.0.2"
+gem "mongoid", ">= 2.1.9"
gem "omniauth", ">= 0.2.6"
View
@@ -1,59 +1,57 @@
GEM
remote: http://rubygems.org/
specs:
- actionmailer (3.1.0.rc5)
- actionpack (= 3.1.0.rc5)
+ actionmailer (3.1.0.rc6)
+ actionpack (= 3.1.0.rc6)
mail (~> 2.3.0)
- actionpack (3.1.0.rc5)
- activemodel (= 3.1.0.rc5)
- activesupport (= 3.1.0.rc5)
+ actionpack (3.1.0.rc6)
+ activemodel (= 3.1.0.rc6)
+ activesupport (= 3.1.0.rc6)
builder (~> 3.0.0)
erubis (~> 2.7.0)
i18n (~> 0.6)
- rack (~> 1.3.1)
+ rack (~> 1.3.2)
rack-cache (~> 1.0.2)
rack-mount (~> 0.8.1)
rack-test (~> 0.6.0)
sprockets (~> 2.0.0.beta.12)
- activemodel (3.1.0.rc5)
- activesupport (= 3.1.0.rc5)
+ activemodel (3.1.0.rc6)
+ activesupport (= 3.1.0.rc6)
bcrypt-ruby (~> 2.1.4)
builder (~> 3.0.0)
i18n (~> 0.6)
- activerecord (3.1.0.rc5)
- activemodel (= 3.1.0.rc5)
- activesupport (= 3.1.0.rc5)
- arel (~> 2.1.4)
+ activerecord (3.1.0.rc6)
+ activemodel (= 3.1.0.rc6)
+ activesupport (= 3.1.0.rc6)
+ arel (~> 2.2.1)
tzinfo (~> 0.3.29)
- activeresource (3.1.0.rc5)
- activemodel (= 3.1.0.rc5)
- activesupport (= 3.1.0.rc5)
- activesupport (3.1.0.rc5)
+ activeresource (3.1.0.rc6)
+ activemodel (= 3.1.0.rc6)
+ activesupport (= 3.1.0.rc6)
+ activesupport (3.1.0.rc6)
multi_json (~> 1.0)
addressable (2.2.4)
- arel (2.1.4)
+ arel (2.2.1)
bcrypt-ruby (2.1.4)
bson (1.3.1)
bson_ext (1.3.1)
builder (3.0.0)
- capybara (1.0.0)
+ capybara (1.0.1)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
- selenium-webdriver (~> 0.2.0)
+ selenium-webdriver (~> 2.0)
xpath (~> 0.1.4)
- childprocess (0.2.0)
+ childprocess (0.2.1)
ffi (~> 1.0.6)
- coffee-rails (3.1.0.rc.5)
- actionpack (~> 3.1.0.rc1)
+ coffee-rails (3.1.0.rc.6)
coffee-script (>= 2.2.0)
railties (~> 3.1.0.rc1)
- sprockets (>= 2.0.0.beta.9)
coffee-script (2.2.0)
coffee-script-source
execjs
- coffee-script-source (1.1.1)
+ coffee-script-source (1.1.2)
cucumber (1.0.2)
builder (>= 2.1.2)
diff-lcs (>= 1.1.2)
@@ -67,9 +65,9 @@ GEM
database_cleaner (0.6.7)
diff-lcs (1.1.2)
erubis (2.7.0)
- execjs (1.2.1)
+ execjs (1.2.4)
multi_json (~> 1.0)
- factory_girl (2.0.2)
+ factory_girl (2.0.5)
factory_girl_rails (1.1.0)
factory_girl (~> 2.0.0)
railties (>= 3.0.0)
@@ -78,24 +76,23 @@ GEM
multipart-post (~> 1.1.0)
rack (< 2, >= 1.1.0)
ffi (1.0.9)
- gherkin (2.4.5)
+ gherkin (2.4.15)
json (>= 1.4.6)
- hike (1.2.0)
+ hike (1.2.1)
i18n (0.6.0)
- jquery-rails (1.0.12)
+ jquery-rails (1.0.13)
railties (~> 3.0)
thor (~> 0.14)
json (1.5.3)
json_pure (1.5.3)
- launchy (2.0.3)
mail (2.3.0)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.16)
mongo (1.3.1)
bson (>= 1.3.1)
- mongoid (2.0.2)
+ mongoid (2.1.9)
activemodel (~> 3.0)
mongo (~> 1.3)
tzinfo (~> 0.3.22)
@@ -149,7 +146,7 @@ GEM
rack (1.3.2)
rack-cache (1.0.2)
rack (>= 0.4)
- rack-mount (0.8.1)
+ rack-mount (0.8.2)
rack (>= 1.0.0)
rack-openid (1.3.1)
rack (>= 1.1.0)
@@ -158,24 +155,24 @@ GEM
rack
rack-test (0.6.1)
rack (>= 1.0)
- rails (3.1.0.rc5)
- actionmailer (= 3.1.0.rc5)
- actionpack (= 3.1.0.rc5)
- activerecord (= 3.1.0.rc5)
- activeresource (= 3.1.0.rc5)
- activesupport (= 3.1.0.rc5)
+ rails (3.1.0.rc6)
+ actionmailer (= 3.1.0.rc6)
+ actionpack (= 3.1.0.rc6)
+ activerecord (= 3.1.0.rc6)
+ activeresource (= 3.1.0.rc6)
+ activesupport (= 3.1.0.rc6)
bundler (~> 1.0)
- railties (= 3.1.0.rc5)
- railties (3.1.0.rc5)
- actionpack (= 3.1.0.rc5)
- activesupport (= 3.1.0.rc5)
+ railties (= 3.1.0.rc6)
+ railties (3.1.0.rc6)
+ actionpack (= 3.1.0.rc6)
+ activesupport (= 3.1.0.rc6)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (~> 0.14.6)
rake (0.9.2)
- rdoc (3.8)
- rest-client (1.6.3)
+ rdoc (3.9.3)
+ rest-client (1.6.7)
mime-types (>= 1.16)
rspec (2.6.0)
rspec-core (~> 2.6.0)
@@ -195,18 +192,17 @@ GEM
ruby-openid (>= 2.1.7)
rubyntlm (0.1.1)
rubyzip (0.9.4)
- sass (3.1.5)
- sass-rails (3.1.0.rc.5)
- actionpack (~> 3.1.0.rc1)
- railties (~> 3.1.0.rc1)
+ sass (3.1.7)
+ sass-rails (3.1.0.rc.6)
+ actionpack (~> 3.1.0.rc6)
+ railties (~> 3.1.0.rc6)
sass (>= 3.1.4)
- sprockets (>= 2.0.0.beta.9)
- selenium-webdriver (0.2.2)
- childprocess (>= 0.1.9)
+ selenium-webdriver (2.5.0)
+ childprocess (>= 0.2.1)
ffi (>= 1.0.7)
json_pure
rubyzip
- sprockets (2.0.0.beta.12)
+ sprockets (2.0.0.beta.14)
hike (~> 1.2)
rack (~> 1.0)
tilt (!= 1.3.0, ~> 1.1)
@@ -217,7 +213,7 @@ GEM
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.29)
- uglifier (1.0.0)
+ uglifier (1.0.1)
execjs (>= 0.3.0)
multi_json (>= 1.0.2)
xpath (0.1.4)
@@ -228,17 +224,16 @@ PLATFORMS
DEPENDENCIES
bson_ext (>= 1.3.1)
- capybara (>= 1.0.0)
+ capybara (>= 1.0.1)
coffee-rails (~> 3.1.0.rc)
cucumber-rails (>= 1.0.2)
database_cleaner (>= 0.6.7)
- factory_girl_rails (>= 1.1.rc1)
+ factory_girl_rails (>= 1.1.0)
jquery-rails
- launchy (>= 0.4.0)
- mongoid (>= 2.0.2)
+ mongoid (>= 2.1.9)
mongoid-rspec (>= 1.4.4)
omniauth (>= 0.2.6)
- rails (= 3.1.0.rc5)
+ rails (= 3.1.0.rc6)
rspec-rails (>= 2.6.1)
sass-rails (~> 3.1.0.rc)
uglifier
View
@@ -5,12 +5,15 @@
require "action_controller/railtie"
require "action_mailer/railtie"
require "active_resource/railtie"
+ require "sprockets/railtie"
# # require "rails/test_unit/railtie"
-# If you have a Gemfile, require the default gems, the ones in the
-# current environment and also include :assets gems if in development
-# or test environments.
-Bundler.require *Rails.groups(:assets) if defined?(Bundler)
+if defined?(Bundler)
+ # If you precompile assets before deploying to production, use this line
+ Bundler.require *Rails.groups(:assets => %w(development test))
+ # If you want your assets lazily compiled in production, use this line
+ # Bundler.require(:default, :assets, Rails.env)
+end
module Rails3MongoidOmniauth
class Application < Rails::Application
@@ -15,8 +15,8 @@
config.assets.compress = true
# Specifies the header that your server uses for sending files
- # (comment out if your front-end server doesn't support this)
- config.action_dispatch.x_sendfile_header = "X-Sendfile" # Use 'X-Accel-Redirect' for nginx
+ # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
+ # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
# Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
# config.force_ssl = true
@@ -4,9 +4,7 @@
# is enabled by default.
# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
-ActionController::Base.wrap_parameters format: [:json]
-
-# Disable root element in JSON by default.
-if defined?(ActiveRecord)
- ActiveRecord::Base.include_root_in_json = false
+ActiveSupport.on_load(:action_controller) do
+ wrap_parameters format: [:json]
end
+

0 comments on commit 143257f

Please sign in to comment.