conform to app generated by template for Rails 3.1.0.rc4

svapna · Jul 10, 2011 · 249f27c · 249f27c
1 parent 4b21e05
commit 249f27c
Show file tree

Hide file tree

Showing 12 changed files with 162 additions and 127 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,16 +1,16 @@
 source 'http://rubygems.org'
-gem 'rails', '3.1.0.rc1'
-gem 'sass'
+gem 'rails', '3.1.0.rc4'
+gem 'sass-rails', "~> 3.1.0.rc"
 gem 'coffee-script'
 gem 'uglifier'
 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.2", :group => :test
-gem "factory_girl_rails", ">= 1.1.beta1", :group => :test
-gem "cucumber-rails", ">= 0.5.1", :group => :test
-gem "capybara", ">= 1.0.0.beta1", :group => :test
+gem "mongoid-rspec", ">= 1.4.4", :group => :test
+gem "factory_girl_rails", ">= 1.1.rc1", :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 "bson_ext", ">= 1.3.1"
 gem "mongoid", ">= 2.0.2"
-gem "devise", ">= 1.3.4"
+gem "devise", ">= 1.4.2"
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,89 +1,88 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.1.0.rc1)
-      actionpack (= 3.1.0.rc1)
+    actionmailer (3.1.0.rc4)
+      actionpack (= 3.1.0.rc4)
       mail (~> 2.3.0)
-    actionpack (3.1.0.rc1)
-      activemodel (= 3.1.0.rc1)
-      activesupport (= 3.1.0.rc1)
+    actionpack (3.1.0.rc4)
+      activemodel (= 3.1.0.rc4)
+      activesupport (= 3.1.0.rc4)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
-      i18n (~> 0.6.0beta1)
-      rack (~> 1.3.0.beta2)
+      i18n (~> 0.6)
+      rack (~> 1.3.0)
       rack-cache (~> 1.0.1)
       rack-mount (~> 0.8.1)
       rack-test (~> 0.6.0)
-      sprockets (~> 2.0.0.beta.5)
+      sprockets (~> 2.0.0.beta.10)
       tzinfo (~> 0.3.27)
-    activemodel (3.1.0.rc1)
-      activesupport (= 3.1.0.rc1)
+    activemodel (3.1.0.rc4)
+      activesupport (= 3.1.0.rc4)
       bcrypt-ruby (~> 2.1.4)
       builder (~> 3.0.0)
-      i18n (~> 0.6.0beta1)
-    activerecord (3.1.0.rc1)
-      activemodel (= 3.1.0.rc1)
-      activesupport (= 3.1.0.rc1)
+      i18n (~> 0.6)
+    activerecord (3.1.0.rc4)
+      activemodel (= 3.1.0.rc4)
+      activesupport (= 3.1.0.rc4)
       arel (~> 2.1.1)
       tzinfo (~> 0.3.27)
-    activeresource (3.1.0.rc1)
-      activemodel (= 3.1.0.rc1)
-      activesupport (= 3.1.0.rc1)
-    activesupport (3.1.0.rc1)
+    activeresource (3.1.0.rc4)
+      activemodel (= 3.1.0.rc4)
+      activesupport (= 3.1.0.rc4)
+    activesupport (3.1.0.rc4)
       multi_json (~> 1.0)
-    arel (2.1.1)
+    arel (2.1.3)
     bcrypt-ruby (2.1.4)
     bson (1.3.1)
     bson_ext (1.3.1)
     builder (3.0.0)
-    capybara (1.0.0.beta1)
+    capybara (1.0.0)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
-      selenium-webdriver (>= 0.0.27)
+      selenium-webdriver (~> 0.2.0)
       xpath (~> 0.1.4)
     childprocess (0.1.9)
       ffi (~> 1.0.6)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
     coffee-script-source (1.1.1)
-    configuration (1.2.0)
-    cucumber (0.10.3)
+    configuration (1.3.1)
+    cucumber (1.0.0)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
-      gherkin (>= 2.3.8)
+      gherkin (~> 2.4.1)
       json (>= 1.4.6)
       term-ansicolor (>= 1.0.5)
-    cucumber-rails (0.5.1)
-      capybara (>= 1.0.0.beta1)
-      cucumber (>= 0.10.3)
-      nokogiri (>= 1.4.4)
-      rack-test (>= 0.5.7)
+    cucumber-rails (1.0.2)
+      capybara (>= 1.0.0)
+      cucumber (~> 1.0.0)
+      nokogiri (>= 1.4.6)
     database_cleaner (0.6.7)
-    devise (1.3.4)
+    devise (1.4.2)
       bcrypt-ruby (~> 2.1.2)
       orm_adapter (~> 0.0.3)
       warden (~> 1.0.3)
     diff-lcs (1.1.2)
     erubis (2.7.0)
-    execjs (1.0.0)
+    execjs (1.2.0)
       multi_json (~> 1.0)
-    factory_girl (2.0.0.beta2)
-    factory_girl_rails (1.1.beta1)
-      factory_girl (~> 2.0.0.beta)
-      rails (>= 3.0.0)
+    factory_girl (2.0.0.rc4)
+    factory_girl_rails (1.1.rc1)
+      factory_girl (~> 2.0.0.rc)
+      railties (>= 3.0.0)
     ffi (1.0.9)
-    gherkin (2.3.10)
+    gherkin (2.4.3)
       json (>= 1.4.6)
-    hike (1.0.0)
+    hike (1.1.0)
     i18n (0.6.0)
-    jquery-rails (1.0.9)
+    jquery-rails (1.0.12)
       railties (~> 3.0)
       thor (~> 0.14)
-    json (1.5.1)
-    json_pure (1.5.1)
+    json (1.5.3)
+    json_pure (1.5.3)
     launchy (0.4.0)
       configuration (>= 0.0.5)
       rake (>= 0.8.1)
@@ -98,11 +97,11 @@ GEM
       activemodel (~> 3.0)
       mongo (~> 1.3)
       tzinfo (~> 0.3.22)
-    mongoid-rspec (1.4.2)
+    mongoid-rspec (1.4.4)
       mongoid (~> 2.0)
       rspec (~> 2)
     multi_json (1.0.3)
-    nokogiri (1.4.4)
+    nokogiri (1.5.0)
     orm_adapter (0.0.5)
     polyglot (0.3.1)
     rack (1.3.0)
@@ -114,26 +113,28 @@ GEM
       rack
     rack-test (0.6.0)
       rack (>= 1.0)
-    rails (3.1.0.rc1)
-      actionmailer (= 3.1.0.rc1)
-      actionpack (= 3.1.0.rc1)
-      activerecord (= 3.1.0.rc1)
-      activeresource (= 3.1.0.rc1)
-      activesupport (= 3.1.0.rc1)
+    rails (3.1.0.rc4)
+      actionmailer (= 3.1.0.rc4)
+      actionpack (= 3.1.0.rc4)
+      activerecord (= 3.1.0.rc4)
+      activeresource (= 3.1.0.rc4)
+      activesupport (= 3.1.0.rc4)
       bundler (~> 1.0)
-      railties (= 3.1.0.rc1)
-    railties (3.1.0.rc1)
-      actionpack (= 3.1.0.rc1)
-      activesupport (= 3.1.0.rc1)
+      railties (= 3.1.0.rc4)
+    railties (3.1.0.rc4)
+      actionpack (= 3.1.0.rc4)
+      activesupport (= 3.1.0.rc4)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
+      rdoc (~> 3.4)
       thor (~> 0.14.6)
-    rake (0.9.1)
+    rake (0.9.2)
+    rdoc (3.8)
     rspec (2.6.0)
       rspec-core (~> 2.6.0)
       rspec-expectations (~> 2.6.0)
       rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.3)
+    rspec-core (2.6.4)
     rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.6.0)
@@ -143,13 +144,18 @@ GEM
       railties (~> 3.0)
       rspec (~> 2.6.0)
     rubyzip (0.9.4)
-    sass (3.1.2)
-    selenium-webdriver (0.2.1)
-      childprocess (>= 0.1.7)
+    sass (3.1.4)
+    sass-rails (3.1.0.rc.4)
+      actionpack (~> 3.1.0.rc1)
+      railties (~> 3.1.0.rc1)
+      sass (>= 3.1.4)
+      sprockets (>= 2.0.0.beta.9)
+    selenium-webdriver (0.2.2)
+      childprocess (>= 0.1.9)
       ffi (>= 1.0.7)
       json_pure
       rubyzip
-    sprockets (2.0.0.beta.9)
+    sprockets (2.0.0.beta.10)
       hike (~> 1.0)
       rack (~> 1.0)
       tilt (!= 1.3.0, ~> 1.1)
@@ -158,8 +164,8 @@ GEM
     tilt (1.3.2)
     treetop (1.4.9)
       polyglot (>= 0.3.1)
-    tzinfo (0.3.27)
-    uglifier (0.5.4)
+    tzinfo (0.3.29)
+    uglifier (1.0.0)
       execjs (>= 0.3.0)
       multi_json (>= 1.0.2)
     warden (1.0.4)
@@ -172,17 +178,17 @@ PLATFORMS
 
 DEPENDENCIES
   bson_ext (>= 1.3.1)
-  capybara (>= 1.0.0.beta1)
+  capybara (>= 1.0.0)
   coffee-script
-  cucumber-rails (>= 0.5.1)
+  cucumber-rails (>= 1.0.2)
   database_cleaner (>= 0.6.7)
-  devise (>= 1.3.4)
-  factory_girl_rails (>= 1.1.beta1)
+  devise (>= 1.4.2)
+  factory_girl_rails (>= 1.1.rc1)
   jquery-rails
   launchy (>= 0.4.0)
   mongoid (>= 2.0.2)
-  mongoid-rspec (>= 1.4.2)
-  rails (= 3.1.0.rc1)
+  mongoid-rspec (>= 1.4.4)
+  rails (= 3.1.0.rc4)
   rspec-rails (>= 2.6.1)
-  sass
+  sass-rails (~> 3.1.0.rc)
   uglifier
diff --git a/app/assets/stylesheets/home.css.scss b/app/assets/stylesheets/home.css.scss
@@ -1,5 +1,7 @@
-/* 
-  Place all the styles related to the matching controller here.
-  They will automatically be included in application.css.
-  You can use Sass (SCSS) here: http://sass-lang.com/
-*/
+// Place all the styles related to the home controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/
+
+body.home {
+  // Place scoped styles here
+}
diff --git a/app/assets/stylesheets/users.css.scss b/app/assets/stylesheets/users.css.scss
@@ -1,5 +1,7 @@
-/* 
-  Place all the styles related to the matching controller here.
-  They will automatically be included in application.css.
-  You can use Sass (SCSS) here: http://sass-lang.com/
-*/
+// Place all the styles related to the users controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/
+
+body.users {
+  // Place scoped styles here
+}
diff --git a/config/application.rb b/config/application.rb
@@ -42,13 +42,6 @@ class Application < Rails::Application
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
     # config.i18n.default_locale = :de
 
-    # Please note that JavaScript expansions are *ignored altogether* if the asset
-    # pipeline is enabled (see config.assets.enabled below). Put your defaults in
-    # app/assets/javascripts/application.js in that case.
-    #
-    # JavaScript files you want as :defaults (application.js is always included).
-    # config.action_view.javascript_expansions[:defaults] = %w(prototype prototype_ujs)
-
     # Configure the default encoding used in templates for Ruby 1.9.
     config.encoding = "utf-8"
 

diff --git a/config/environments/development.rb b/config/environments/development.rb
@@ -27,4 +27,7 @@
 
   # Only use best-standards-support built into browsers
   config.action_dispatch.best_standards_support = :builtin
+
+  # Do not compress assets
+  config.assets.compress = false
 end
diff --git a/config/environments/production.rb b/config/environments/production.rb
@@ -11,9 +11,11 @@
   # Disable Rails's static asset server (Apache or nginx will already do this)
   config.serve_static_assets = false
 
-  # Compress both stylesheets and JavaScripts
+  # Compress JavaScripts and CSS
+  config.assets.compress = true
+
+  # Specify the default JavaScript compressor
   config.assets.js_compressor  = :uglifier
-  config.assets.css_compressor = :scss
 
   # Specifies the header that your server uses for sending files
   # (comment out if your front-end server doesn't support this)

diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
@@ -36,6 +36,11 @@
   # to authenticate or find a user. Default is :email.
   config.case_insensitive_keys = [ :email ]
 
+  # Configure which authentication keys should have whitespace stripped.
+  # These keys will have whitespace before and after removed upon creating or
+  # modifying a user and when used to authenticate or find a user. Default is :email.
+  config.strip_whitespace_keys = [ :email ]
+
   # Tell if authentication through request.params is enabled. True by default.
   # config.params_authenticatable = true
 
@@ -48,6 +53,11 @@
   # The realm used in Http Basic Authentication. "Application" by default.
   # config.http_authentication_realm = "Application"
 
+  # It will change confirmation, password recovery and other workflows
+  # to behave the same regardless if the e-mail provided was right or wrong.
+  # Does not affect registerable.
+  # config.paranoid = true
+
   # ==> Configuration for :database_authenticatable
   # For bcrypt, this is the cost for hashing the password and defaults to 10. If
   # using other encryptors, it sets how many times you want the password re-encrypted.
@@ -174,8 +184,8 @@
   # Explorer requests.
   # config.navigational_formats = [:"*/*", "*/*", :html]
 
-  # The default HTTP method used to sign out a resource. Default is :get.
-  # config.sign_out_via = :get
+  # The default HTTP method used to sign out a resource. Default is :delete.
+  config.sign_out_via = :get
 
   # ==> OmniAuth
   # Add a new OmniAuth provider. Check the wiki for more information on setting

diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb
@@ -1,7 +1,7 @@
 # Be sure to restart your server when you modify this file.
 #
-# This file contains the settings for ActionController::ParametersWrapper
-# which will be enabled by default in the upcoming version of Ruby on Rails.
+# This file contains settings for ActionController::ParamsWrapper which
+# 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]

diff --git a/config/locales/devise.en.yml b/config/locales/devise.en.yml
@@ -27,8 +27,10 @@ en:
     passwords:
       send_instructions: 'You will receive an email with instructions about how to reset your password in a few minutes.'
       updated: 'Your password was changed successfully. You are now signed in.'
+      send_paranoid_instructions: "If your e-mail exists on our database, you will receive a password recovery link on your e-mail"
     confirmations:
       send_instructions: 'You will receive an email with instructions about how to confirm your account in a few minutes.'
+      send_paranoid_instructions: 'If your e-mail exists on our database, you will receive an email with instructions about how to confirm your account in a few minutes.'
       confirmed: 'Your account was successfully confirmed. You are now signed in.'
     registrations:
       signed_up: 'Welcome! You have signed up successfully.'
@@ -38,6 +40,7 @@ en:
     unlocks:
       send_instructions: 'You will receive an email with instructions about how to unlock your account in a few minutes.'
       unlocked: 'Your account was successfully unlocked. You are now signed in.'
+      send_paranoid_instructions: 'If your account exists, you will receive an email with instructions about how to unlock it in a few minutes.'
     omniauth_callbacks:
       success: 'Successfully authorized from %{kind} account.'
       failure: 'Could not authorize you from %{kind} because "%{reason}".'