RubyGems - devise - Versions diffs - 1.1.3 → 1.2.0 - Mend

devise 1.1.3 → 1.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (157) hide show

data/.gitignore +10 -0
data/.travis.yml +1 -0
data/CHANGELOG.rdoc +94 -0
data/Gemfile +24 -13
data/Gemfile.lock +119 -75
data/MIT-LICENSE +1 -1
data/README.rdoc +144 -101
data/Rakefile +3 -24
data/app/controllers/devise/confirmations_controller.rb +1 -1
data/app/controllers/devise/omniauth_callbacks_controller.rb +26 -0
data/app/controllers/devise/passwords_controller.rb +1 -1
data/app/controllers/devise/registrations_controller.rb +60 -7
data/app/controllers/devise/sessions_controller.rb +6 -4
data/app/controllers/devise/unlocks_controller.rb +1 -1
data/app/helpers/devise_helper.rb +10 -2
data/app/mailers/devise/mailer.rb +27 -10
data/app/views/devise/confirmations/new.html.erb +1 -1
data/app/views/devise/passwords/edit.html.erb +2 -2
data/app/views/devise/passwords/new.html.erb +1 -1
data/app/views/devise/registrations/edit.html.erb +1 -1
data/app/views/devise/registrations/new.html.erb +1 -1
data/app/views/devise/sessions/new.html.erb +1 -1
data/app/views/devise/shared/_links.erb +6 -0
data/app/views/devise/unlocks/new.html.erb +1 -1
data/config/locales/en.yml +11 -2
data/devise.gemspec +25 -0
data/lib/devise/controllers/helpers.rb +119 -116
data/lib/devise/controllers/internal_helpers.rb +29 -8
data/lib/devise/controllers/rememberable.rb +52 -0
data/lib/devise/controllers/scoped_views.rb +4 -6
data/lib/devise/controllers/url_helpers.rb +3 -5
data/lib/devise/encryptors/authlogic_sha512.rb +1 -1
data/lib/devise/encryptors/base.rb +1 -1
data/lib/devise/encryptors/restful_authentication_sha1.rb +4 -4
data/lib/devise/failure_app.rb +46 -10
data/lib/devise/hooks/activatable.rb +2 -2
data/lib/devise/hooks/forgetable.rb +1 -3
data/lib/devise/hooks/rememberable.rb +5 -42
data/lib/devise/hooks/timeoutable.rb +1 -1
data/lib/devise/mapping.rb +18 -7
data/lib/devise/models/authenticatable.rb +73 -31
data/lib/devise/models/confirmable.rb +16 -20
data/lib/devise/models/database_authenticatable.rb +27 -37
data/lib/devise/models/encryptable.rb +72 -0
data/lib/devise/models/lockable.rb +27 -21
data/lib/devise/models/omniauthable.rb +23 -0
data/lib/devise/models/recoverable.rb +13 -3
data/lib/devise/models/registerable.rb +13 -0
data/lib/devise/models/rememberable.rb +39 -34
data/lib/devise/models/timeoutable.rb +20 -3
data/lib/devise/models/token_authenticatable.rb +22 -10
data/lib/devise/models/validatable.rb +16 -4
data/lib/devise/models.rb +4 -16
data/lib/devise/modules.rb +15 -8
data/lib/devise/omniauth/config.rb +18 -0
data/lib/devise/omniauth/url_helpers.rb +33 -0
data/lib/devise/omniauth.rb +32 -0
data/lib/devise/orm/active_record.rb +2 -0
data/lib/devise/orm/mongoid.rb +4 -2
data/lib/devise/rails/routes.rb +67 -20
data/lib/devise/rails/warden_compat.rb +101 -15
data/lib/devise/rails.rb +33 -44
data/lib/devise/schema.rb +16 -16
data/lib/devise/strategies/authenticatable.rb +48 -7
data/lib/devise/strategies/database_authenticatable.rb +1 -1
data/lib/devise/strategies/rememberable.rb +6 -5
data/lib/devise/strategies/token_authenticatable.rb +6 -2
data/lib/devise/test_helpers.rb +13 -3
data/lib/devise/version.rb +1 -1
data/lib/devise.rb +162 -50
data/lib/generators/active_record/devise_generator.rb +2 -2
data/lib/generators/active_record/templates/migration.rb +2 -0
data/lib/generators/devise/devise_generator.rb +3 -1
data/lib/generators/devise/orm_helpers.rb +1 -1
data/lib/generators/devise/views_generator.rb +8 -45
data/lib/generators/mongoid/devise_generator.rb +2 -2
data/lib/generators/templates/devise.rb +82 -39
data/test/controllers/helpers_test.rb +78 -72
data/test/controllers/internal_helpers_test.rb +29 -8
data/test/controllers/url_helpers_test.rb +2 -1
data/test/devise_test.rb +10 -0
data/test/failure_app_test.rb +86 -22
data/test/generators/active_record_generator_test.rb +24 -0
data/test/generators/devise_generator_test.rb +33 -0
data/test/generators/install_generator_test.rb +13 -0
data/test/generators/mongoid_generator_test.rb +22 -0
data/test/generators/views_generator_test.rb +35 -0
data/test/indifferent_hash.rb +33 -0
data/test/integration/authenticatable_test.rb +165 -62
data/test/integration/database_authenticatable_test.rb +22 -0
data/test/integration/http_authenticatable_test.rb +12 -2
data/test/integration/omniauthable_test.rb +138 -0
data/test/integration/recoverable_test.rb +39 -20
data/test/integration/registerable_test.rb +60 -4
data/test/integration/rememberable_test.rb +72 -29
data/test/integration/timeoutable_test.rb +10 -1
data/test/integration/token_authenticatable_test.rb +55 -6
data/test/mailers/confirmation_instructions_test.rb +4 -0
data/test/mailers/reset_password_instructions_test.rb +4 -0
data/test/mailers/unlock_instructions_test.rb +4 -0
data/test/mapping_test.rb +37 -3
data/test/models/confirmable_test.rb +32 -15
data/test/models/database_authenticatable_test.rb +14 -71
data/test/models/encryptable_test.rb +65 -0
data/test/models/lockable_test.rb +48 -11
data/test/models/recoverable_test.rb +28 -2
data/test/models/rememberable_test.rb +186 -125
data/test/models/token_authenticatable_test.rb +19 -1
data/test/models_test.rb +12 -5
data/test/omniauth/url_helpers_test.rb +54 -0
data/test/orm/mongoid.rb +3 -2
data/test/rails_app/Rakefile +10 -0
data/test/rails_app/app/active_record/admin.rb +4 -1
data/test/rails_app/app/active_record/user.rb +5 -4
data/test/rails_app/app/controllers/{sessions_controller.rb → admins/sessions_controller.rb} +1 -1
data/test/rails_app/app/controllers/application_controller.rb +0 -1
data/test/rails_app/app/controllers/home_controller.rb +9 -0
data/test/rails_app/app/controllers/users/omniauth_callbacks_controller.rb +14 -0
data/test/rails_app/app/mongoid/admin.rb +4 -1
data/test/rails_app/app/mongoid/shim.rb +16 -3
data/test/rails_app/app/mongoid/user.rb +5 -5
data/test/rails_app/app/views/admins/index.html.erb +1 -0
data/test/rails_app/app/views/admins/sessions/new.html.erb +2 -0
data/test/rails_app/app/views/home/index.html.erb +1 -0
data/test/rails_app/app/views/home/private.html.erb +1 -0
data/test/rails_app/app/views/layouts/application.html.erb +24 -0
data/test/rails_app/app/views/users/index.html.erb +1 -0
data/test/rails_app/app/views/users/mailer/confirmation_instructions.erb +1 -0
data/test/rails_app/app/views/users/sessions/new.html.erb +1 -0
data/test/rails_app/config/application.rb +5 -0
data/test/rails_app/config/boot.rb +2 -2
data/test/rails_app/config/database.yml +18 -0
data/test/rails_app/config/initializers/devise.rb +71 -31
data/test/rails_app/config/routes.rb +14 -6
data/test/rails_app/config.ru +4 -0
data/test/rails_app/db/migrate/20100401102949_create_tables.rb +21 -17
data/test/rails_app/db/schema.rb +17 -51
data/test/rails_app/lib/shared_admin.rb +9 -0
data/test/rails_app/lib/shared_user.rb +23 -0
data/test/rails_app/public/404.html +26 -0
data/test/rails_app/public/422.html +26 -0
data/test/rails_app/public/500.html +26 -0
data/test/rails_app/public/favicon.ico +0 -0
data/test/rails_app/script/rails +10 -0
data/test/routes_test.rb +42 -9
data/test/schema_test.rb +33 -0
data/test/support/integration.rb +4 -4
data/test/support/locale/en.yml +4 -0
data/test/support/webrat/integrations/rails.rb +11 -19
data/test/test_helper.rb +8 -2
data/test/test_helpers_test.rb +64 -2
metadata +106 -30
data/TODO +0 -3
data/lib/devise/encryptors/bcrypt.rb +0 -19
data/lib/generators/devise_install_generator.rb +0 -4
data/lib/generators/devise_views_generator.rb +0 -4
data/test/support/test_silencer.rb +0 -5

data/.gitignore ADDED Viewed

@@ -0,0 +1,10 @@
+**/*/log/*
+**/*/tmp/*
+*~
+coverage/*
+*.sqlite3
+.bundle
+rdoc/*
+pkg
+log
+test/tmp/*

data/.travis.yml ADDED Viewed

	@@ -0,0 +1 @@
1	+ script: "rake test"

data/CHANGELOG.rdoc CHANGED Viewed

@@ -1,3 +1,97 @@
+== 1.2.0
+* bug fix
+  * Properly ignore path prefix on omniauthable
+  * Faster uniqueness queries
+  * Rename active? to active_for_authentication? to avoid conflicts
+== 1.2.rc2
+* enhancements
+  * Make friendly_token 20 chars long
+  * Use secure_compare
+* bug fix
+  * Fix an issue causing infinite redirects in production
+  * rails g destroy works properly with devise generators (by github.com/andmej)
+  * before_failure callbacks should work on test helpers (by github.com/twinge)
+  * rememberable cookie now is httponly by default (by github.com/JamesFerguson)
+  * Add missing confirmation_keys (by github.com/JohnPlummer)
+  * Ensure after_* hooks are called on RegistrationsController
+  * When using database_authenticatable Devise will now only create an email field when appropriate (if using default authentication_keys or custom authentication_keys with email included)
+  * Ensure stateless token does not trigger timeout (by github.com/pixelauthority)
+  * Implement handle_unverified_request for Rails 3.0.4 compatibility and improve FailureApp reliance on symbols
+  * Consider namespaces while generating routes
+  * Custom failure apps no longer ignored in test mode (by github.com/jaghion)
+  * Do not depend on ActiveModel::Dirty
+  * Manual sign_in now triggers remember token
+  * Be sure to halt strategies on failures
+  * Consider SCRIPT_NAME on Omniauth paths
+  * Reset failed attempts when lock is expired
+  * Ensure there is no Mongoid injection
+* deprecations
+  * Deprecated anybody_signed_in? in favor of signed_in? (by github.com/gavinhughes)
+  * Removed --haml and --slim view templates
+  * Devise::OmniAuth helpers were deprecated and removed in favor of Omniauth.config.test_mode
+== 1.2.rc
+* deprecations
+  * cookie_domain is deprecated in favor of cookie_options
+  * after_update_path_for can no longer be defined in ApplicationController
+* enhancements
+  * Added OmniAuth support
+  * Added ORM adapter to abstract ORM iteraction
+  * sign_out_via is available in the router to configure the method used for sign out (by github.com/martinrehfeld)
+  * Improved Ajax requests handling in failure app (by github.com/spastorino)
+  * Added request_keys to easily use request specific values (like subdomain) in authentication
+  * Increased the size of friendly_token to 60 characters (reduces the chances of a successful brute attack)
+  * Ensure the friendly token does not include "_" or "-" since some e-mails may not autolink it properly (by github.com/rymai)
+  * Extracted encryptors into :encryptable for better bcrypt support
+  * :rememberable is now able to use salt as token if no remember_token is provided
+  * Store the salt in session and expire the session if the user changes his password
+  * Allow :stateless_token to be set to true avoiding users to be stored in session through token authentication
+  * cookie_options uses session_options values by default
+  * Sign up now check if the user is active or not and redirect him accordingly setting the inactive_signed_up message
+  * Use ActiveModel#to_key instead of #id
+  * sign_out_all_scopes now destroys the whole session
+  * Added case_insensitive_keys that automatically downcases the given keys, by default downcases only e-mail (by github.com/adahl)
+* default behavior changes
+  * sign_out_all_scopes defaults to true as security measure
+  * http authenticatable is disabled by default
+  * Devise does not intercept 401 returned from applications
+* bugfix
+  * after_sign_in_path_for always receives a resource
+  * Do not execute Warden::Callbacks on Devise::TestHelpers (by github.com/sgronblo)
+  * Allow password recovery and account unlocking to change used keys (by github.com/RStankov)
+  * FailureApp now properly handles nil request.format
+  * Fix a bug causing FailureApp to return with HTTP Auth Headers for IE7
+  * Ensure namespaces has proper scoped views
+  * Ensure Devise does not set empty flash messages (by github.com/sxross)
+== 1.1.6
+* Use a more secure e-mail regexp
+* Implement Rails 3.0.4 handle unverified request
+* Use secure_compare to compare passwords
+== 1.1.5
+* bugfix
+  * Ensure to convert keys on indifferent hash
+* defaults
+  * Set config.http_authenticatable to false to avoid confusion
+== 1.1.4
+* bugfix
+  * Avoid session fixation attacks
 == 1.1.3
 * bugfix

data/Gemfile CHANGED Viewed

@@ -1,18 +1,29 @@
 source "http://rubygems.org"
-gem "rails", "3.0.0"
-gem "warden", "0.10.7"
-gem "sqlite3-ruby"
-gem "webrat", "0.7.0"
-gem "mocha", :require => false
-gem "bcrypt-ruby", :require => "bcrypt"
+gemspec
-if RUBY_VERSION < '1.9'
-  gem "ruby-debug", ">= 0.10.3"
+gem "rails", "~> 3.0.4"
+gem "oa-oauth", '~> 0.2.0', :require => "omniauth/oauth"
+gem "oa-openid", '~> 0.2.0', :require => "omniauth/openid"
+group :test do
+  gem "webrat", "0.7.2", :require => false
+  gem "mocha", :require => false
+end
+platforms :jruby do
+  gem 'activerecord-jdbcsqlite3-adapter'
 end
-group :mongoid do
-  gem "mongo"
-  gem "mongoid", :git => "git://github.com/mongoid/mongoid.git"
-  gem "bson_ext"
-end
+platforms :ruby do
+  group :test do
+    gem "sqlite3-ruby"
+    gem "ruby-debug", ">= 0.10.3" if RUBY_VERSION < '1.9'
+  end
+  group :mongoid do
+    gem "mongo", "1.1.2"
+    gem "mongoid", "2.0.0.beta.20"
+    gem "bson_ext", "1.2.1"
+  end
+end

data/Gemfile.lock CHANGED Viewed

@@ -1,114 +1,158 @@
-GIT
-  remote: git://github.com/mongoid/mongoid.git
-  revision: f38e3ef
+PATH
+  remote: .
   specs:
-    mongoid (2.0.0.beta.16)
-      activemodel (~> 3.0.0)
-      bson (= 1.0.4)
-      mongo (= 1.0.7)
-      tzinfo (~> 0.3.22)
-      will_paginate (~> 3.0.pre)
+    devise (1.2.rc2)
+      bcrypt-ruby (~> 2.1.2)
+      orm_adapter (~> 0.0.3)
+      warden (~> 1.0.3)
 GEM
   remote: http://rubygems.org/
   specs:
     abstract (1.0.0)
-    actionmailer (3.0.0)
-      actionpack (= 3.0.0)
-      mail (~> 2.2.5)
-    actionpack (3.0.0)
-      activemodel (= 3.0.0)
-      activesupport (= 3.0.0)
+    actionmailer (3.0.4)
+      actionpack (= 3.0.4)
+      mail (~> 2.2.15)
+    actionpack (3.0.4)
+      activemodel (= 3.0.4)
+      activesupport (= 3.0.4)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
-      i18n (~> 0.4.1)
+      i18n (~> 0.4)
       rack (~> 1.2.1)
-      rack-mount (~> 0.6.12)
-      rack-test (~> 0.5.4)
+      rack-mount (~> 0.6.13)
+      rack-test (~> 0.5.7)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.0)
-      activesupport (= 3.0.0)
+    activemodel (3.0.4)
+      activesupport (= 3.0.4)
       builder (~> 2.1.2)
-      i18n (~> 0.4.1)
-    activerecord (3.0.0)
-      activemodel (= 3.0.0)
-      activesupport (= 3.0.0)
-      arel (~> 1.0.0)
+      i18n (~> 0.4)
+    activerecord (3.0.4)
+      activemodel (= 3.0.4)
+      activesupport (= 3.0.4)
+      arel (~> 2.0.2)
       tzinfo (~> 0.3.23)
-    activeresource (3.0.0)
-      activemodel (= 3.0.0)
-      activesupport (= 3.0.0)
-    activesupport (3.0.0)
-    arel (1.0.1)
-      activesupport (~> 3.0.0)
-    bcrypt-ruby (2.1.2)
-    bson (1.0.4)
-    bson_ext (1.0.7)
+    activerecord-jdbc-adapter (1.1.1)
+    activerecord-jdbcsqlite3-adapter (1.1.1)
+      activerecord-jdbc-adapter (= 1.1.1)
+      jdbc-sqlite3 (~> 3.6.0)
+    activeresource (3.0.4)
+      activemodel (= 3.0.4)
+      activesupport (= 3.0.4)
+    activesupport (3.0.4)
+    addressable (2.2.4)
+    arel (2.0.8)
+    bcrypt-ruby (2.1.4)
+    bson (1.2.1)
+    bson_ext (1.2.1)
     builder (2.1.2)
-    columnize (0.3.1)
+    columnize (0.3.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    i18n (0.4.1)
+    faraday (0.5.7)
+      addressable (~> 2.2.4)
+      multipart-post (~> 1.1.0)
+      rack (>= 1.1.0, < 2)
+    i18n (0.5.0)
+    jdbc-sqlite3 (3.6.14.2.056-java)
     linecache (0.43)
-    mail (2.2.5)
+    mail (2.2.15)
       activesupport (>= 2.3.6)
-      mime-types
-      treetop (>= 1.4.5)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
     mime-types (1.16)
-    mocha (0.9.8)
-      rake
-    mongo (1.0.7)
-      bson (>= 1.0.4)
-    nokogiri (1.4.3.1)
+    mocha (0.9.12)
+    mongo (1.1.2)
+      bson (>= 1.1.1)
+    mongoid (2.0.0.beta.20)
+      activemodel (~> 3.0)
+      mongo (~> 1.1)
+      tzinfo (~> 0.3.22)
+      will_paginate (~> 3.0.pre)
+    multi_json (0.0.5)
+    multipart-post (1.1.0)
+    nokogiri (1.4.4)
+    nokogiri (1.4.4-java)
+      weakling (>= 0.0.3)
+    oa-core (0.2.0)
+      rack (~> 1.1)
+    oa-oauth (0.2.0)
+      multi_json (~> 0.0.2)
+      nokogiri (~> 1.4.2)
+      oa-core (= 0.2.0)
+      oauth (~> 0.4.0)
+      oauth2 (~> 0.1.1)
+    oa-openid (0.2.0)
+      oa-core (= 0.2.0)
+      rack-openid (~> 1.2.0)
+      ruby-openid-apps-discovery
+    oauth (0.4.4)
+    oauth2 (0.1.1)
+      faraday (~> 0.5.0)
+      multi_json (~> 0.0.4)
+    orm_adapter (0.0.4)
     polyglot (0.3.1)
     rack (1.2.1)
-    rack-mount (0.6.12)
+    rack-mount (0.6.13)
       rack (>= 1.0.0)
-    rack-test (0.5.4)
+    rack-openid (1.2.0)
+      rack (>= 1.1.0)
+      ruby-openid (>= 2.1.8)
+    rack-test (0.5.7)
       rack (>= 1.0)
-    rails (3.0.0)
-      actionmailer (= 3.0.0)
-      actionpack (= 3.0.0)
-      activerecord (= 3.0.0)
-      activeresource (= 3.0.0)
-      activesupport (= 3.0.0)
-      bundler (~> 1.0.0)
-      railties (= 3.0.0)
-    railties (3.0.0)
-      actionpack (= 3.0.0)
-      activesupport (= 3.0.0)
-      rake (>= 0.8.4)
-      thor (~> 0.14.0)
+    rails (3.0.4)
+      actionmailer (= 3.0.4)
+      actionpack (= 3.0.4)
+      activerecord (= 3.0.4)
+      activeresource (= 3.0.4)
+      activesupport (= 3.0.4)
+      bundler (~> 1.0)
+      railties (= 3.0.4)
+    railties (3.0.4)
+      actionpack (= 3.0.4)
+      activesupport (= 3.0.4)
+      rake (>= 0.8.7)
+      thor (~> 0.14.4)
     rake (0.8.7)
-    ruby-debug (0.10.3)
+    ruby-debug (0.10.4)
       columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.3.0)
-    ruby-debug-base (0.10.3)
+      ruby-debug-base (~> 0.10.4.0)
+    ruby-debug-base (0.10.4)
       linecache (>= 0.3)
-    sqlite3-ruby (1.3.1)
-    thor (0.14.0)
-    treetop (1.4.8)
+    ruby-openid (2.1.8)
+    ruby-openid-apps-discovery (1.2.0)
+      ruby-openid (>= 2.1.7)
+    sqlite3 (1.3.3)
+    sqlite3-ruby (1.3.3)
+      sqlite3 (>= 1.3.3)
+    thor (0.14.6)
+    treetop (1.4.9)
       polyglot (>= 0.3.1)
-    tzinfo (0.3.23)
-    warden (0.10.7)
+    tzinfo (0.3.24)
+    warden (1.0.3)
       rack (>= 1.0.0)
-    webrat (0.7.0)
+    weakling (0.0.4-java)
+    webrat (0.7.2)
       nokogiri (>= 1.2.0)
       rack (>= 1.0)
       rack-test (>= 0.5.3)
     will_paginate (3.0.pre2)
 PLATFORMS
+  java
   ruby
 DEPENDENCIES
-  bcrypt-ruby
-  bson_ext
+  activerecord-jdbcsqlite3-adapter
+  bson_ext (= 1.2.1)
+  devise!
   mocha
-  mongo
-  mongoid!
-  rails (= 3.0.0)
+  mongo (= 1.1.2)
+  mongoid (= 2.0.0.beta.20)
+  oa-oauth (~> 0.2.0)
+  oa-openid (~> 0.2.0)
+  rails (~> 3.0.4)
   ruby-debug (>= 0.10.3)
   sqlite3-ruby
-  warden (= 0.10.7)
-  webrat (= 0.7.0)
+  webrat (= 0.7.2)

data/MIT-LICENSE CHANGED Viewed

@@ -1,4 +1,4 @@
-Copyright 2009 Plataforma Tecnologia. http://blog.plataformatec.com.br
+Copyright 2009-2011 Plataforma Tecnologia. http://blog.plataformatec.com.br
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the