devise 1.4.9 → 1.5.0.rc1

data/test/models/database_authenticatable_test.rb

@@ -22,26 +22,9 @@ class DatabaseAuthenticatableTest < ActiveSupport::TestCase
     assert_equal email.strip, user.email
   end
 
-  test 'find_for_authentication and filter_auth_params should not modify the conditions hash' do
-    FilterAuthUser = Class.new(User) do
-      def self.filter_auth_params(conditions)
-        if conditions.is_a?(Hash) && login = conditions.delete('login')
-          key = login.include?('@') ? :email : :username
-          conditions[key] = login
-        end
-        super(conditions)
-      end
-    end
-
-    conditions = { 'login' => 'foo@bar.com' }
-    FilterAuthUser.find_for_authentication(conditions)
-
-    assert_equal({ 'login' => 'foo@bar.com' }, conditions)
-  end
-  
-  test "filter_auth_params should not convert booleans and integer to strings" do
+  test "param filter should not convert booleans and integer to strings" do
     conditions = { 'login' => 'foo@bar.com', "bool1" => true, "bool2" => false, "fixnum" => 123, "will_be_converted" => (1..10) }
-    conditions = User.__send__(:filter_auth_params, conditions)
+    conditions = Devise::ParamFilter.new([], []).filter(conditions)
     assert_equal( { 'login' => 'foo@bar.com', "bool1" => true, "bool2" => false, "fixnum" => 123, "will_be_converted" => "1..10" }, conditions)
   end
 

data/test/omniauth/config_test.rb

@@ -0,0 +1,56 @@
+require 'test_helper'
+
+class OmniAuthConfigTest < ActiveSupport::TestCase
+  setup do
+    $: << File.dirname(__FILE__)
+  end
+
+  test 'strategy_name returns provider if no options given' do
+    config = Devise::OmniAuth::Config.new :facebook, [{}]
+    assert_equal :facebook, config.strategy_name
+  end
+
+  test 'strategy_name returns provider if no name option are given' do
+    config = Devise::OmniAuth::Config.new :facebook, [{ :other => :option }]
+    assert_equal :facebook, config.strategy_name
+  end
+
+  test 'returns name option when have a name' do
+    config = Devise::OmniAuth::Config.new :facebook, [{ :name => :github }]
+    assert_equal :github, config.strategy_name
+  end
+
+  test "finds contrib strategies" do
+    config = Devise::OmniAuth::Config.new :facebook, [{}]
+    assert_equal OmniAuth::Strategies::Facebook, config.strategy_class
+  end
+
+  test "finds the strategy in OmniAuth's list by name" do
+    NamedTestStrategy = Class.new
+    NamedTestStrategy.send :include, OmniAuth::Strategy
+    NamedTestStrategy.option :name, :the_one
+
+    config = Devise::OmniAuth::Config.new :the_one, [{}]
+    assert_equal NamedTestStrategy, config.strategy_class
+  end
+
+  test "finds the strategy in OmniAuth's list by class name" do
+    UnNamedTestStrategy = Class.new
+    UnNamedTestStrategy.send :include, OmniAuth::Strategy
+
+    config = Devise::OmniAuth::Config.new :un_named_test_strategy, [{}]
+    assert_equal UnNamedTestStrategy, config.strategy_class
+  end
+
+  test 'attempts to load an as-yet not loaded plugin' do
+    config = Devise::OmniAuth::Config.new :my_strategy, [{}]
+    config_class = config.strategy_class
+    assert_equal MyStrategy, config_class
+  end
+
+  test 'allows the user to define a custom require path' do
+    config = Devise::OmniAuth::Config.new :my_other_strategy, [{:require => 'my_other_strategy'}]
+    config_class = config.strategy_class
+    assert_equal MyOtherStrategy, config_class
+  end
+end

data/test/omniauth/my_other_strategy.rb

@@ -0,0 +1,5 @@
+require 'omniauth'
+
+class MyOtherStrategy
+  include OmniAuth::Strategy
+end

data/test/omniauth/omniauth-my_strategy.rb

@@ -0,0 +1,5 @@
+require 'omniauth'
+
+class MyStrategy
+  include OmniAuth::Strategy
+end

data/test/omniauth/url_helpers_test.rb

@@ -40,13 +40,13 @@ class OmniAuthRoutesTest < ActionController::TestCase
   end
 
   test 'should generate authorization path with params' do
-    assert_match "/users/auth/open_id?openid_url=http%3A%2F%2Fyahoo.com",
-                  @controller.omniauth_authorize_path(:user, :open_id, :openid_url => "http://yahoo.com")
+    assert_match "/users/auth/openid?openid_url=http%3A%2F%2Fyahoo.com",
+                  @controller.omniauth_authorize_path(:user, :openid, :openid_url => "http://yahoo.com")
   end
 
   test 'should not add a "?" if no param was sent' do
-    assert_equal "/users/auth/open_id",
-                  @controller.omniauth_authorize_path(:user, :open_id)
+    assert_equal "/users/auth/openid",
+                  @controller.omniauth_authorize_path(:user, :openid)
   end
 
   test 'should set script name in the path if present' do

data/test/rails_app/config/environments/development.rb

@@ -11,7 +11,6 @@ RailsApp::Application.configure do
 
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
-  config.action_view.debug_rjs             = true
   config.action_controller.perform_caching = false
 
   # Don't care if the mailer can't send

data/test/rails_app/config/initializers/devise.rb

@@ -177,8 +177,8 @@ Devise.setup do |config|
 
   # ==> OmniAuth
   config.omniauth :facebook, 'APP_ID', 'APP_SECRET', :scope => 'email,offline_access'
-  config.omniauth :open_id
-  config.omniauth :open_id, :name => 'google', :identifier => 'https://www.google.com/accounts/o8/id'
+  config.omniauth :openid
+  config.omniauth :openid, :name => 'google', :identifier => 'https://www.google.com/accounts/o8/id'
 
   # ==> Warden configuration
   # If you want to use other strategies, that are not supported by Devise, or

data/test/rails_app/config/routes.rb

@@ -46,17 +46,17 @@ Rails.application.routes.draw do
 
   # Routes for constraints testing
   devise_for :headquarters_admin, :class_name => "Admin", :path => "headquarters", :constraints => {:host => /192\.168\.1\.\d\d\d/}
-  
+
   constraints(:host => /192\.168\.1\.\d\d\d/) do
     devise_for :homebase_admin, :class_name => "Admin", :path => "homebase"
   end
 
   devise_for :skip_admin, :class_name => "Admin", :skip => :all
-  
+
   # Routes for format=false testing
   devise_for :htmlonly_admin, :class_name => "Admin", :skip => [:confirmations, :unlocks], :path => "htmlonly_admin", :format => false, :skip_helpers => [:confirmations, :unlocks]
   devise_for :htmlonly_users, :class_name => "User", :only => [:confirmations, :unlocks], :path => "htmlonly_users", :format => false, :skip_helpers => true
-  
+
   # Other routes for routing_test.rb
   devise_for :reader, :class_name => "User", :only => :passwords
 
@@ -71,7 +71,7 @@ Rails.application.routes.draw do
         :password => "secret", :confirmation => "verification",
         :unlock => "unblock", :sign_up => "register",
         :registration => "management", :cancel => "giveup"
-      }
+      }, :failure_app => lambda { |env| [404, {"Content-Type" => "text/plain"}, ["Oops, not found"]] }
   end
 
   namespace :sign_out_via, :module => "devise" do

data/test/rails_app/lib/shared_admin.rb

@@ -6,4 +6,5 @@ module SharedAdmin
            :timeoutable, :recoverable, :rememberable, :lockable,
            :unlock_strategy => :time
   end
+
 end

data/test/support/helpers.rb

@@ -51,10 +51,37 @@ class ActiveSupport::TestCase
       old_values[key] = object.send key
       object.send :"#{key}=", value
     end
+    clear_cached_variables(new_values)
     yield
   ensure
+    clear_cached_variables(new_values)
     old_values.each do |key, value|
       object.send :"#{key}=", value
     end
   end
+
+  def clear_cached_variables(options)
+    if options.key?(:case_insensitive_keys) || options.key?(:strip_whitespace_keys)
+      Devise.mappings.each do |_, mapping|
+        mapping.to.instance_variable_set(:@devise_param_filter, nil)
+      end
+    end
+  end
+
+  def with_rails_version(constants)
+    saved_constants = {}
+
+    constants.each do |constant, val|
+      saved_constants[constant] = ::Rails::VERSION.const_get constant
+      Kernel::silence_warnings { ::Rails::VERSION.const_set(constant, val) }
+    end
+
+    begin
+      yield
+    ensure
+      constants.each do |constant, val|
+        Kernel::silence_warnings { ::Rails::VERSION.const_set(constant, saved_constants[constant]) }
+      end
+    end
+  end
 end

metadata

@@ -1,80 +1,56 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: devise
-version: !ruby/object:Gem::Version 
-  hash: 21
-  prerelease: 
-  segments: 
-  - 1
-  - 4
-  - 9
-  version: 1.4.9
+version: !ruby/object:Gem::Version
+  version: 1.5.0.rc1
+  prerelease: 6
 platform: ruby
-authors: 
-- "Jos\xC3\xA9 Valim"
-- "Carlos Ant\xC3\xB4nio"
+authors:
+- José Valim
+- Carlos Antônio
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-20 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-11-10 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: warden
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70284288014020 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 17
-        segments: 
-        - 1
-        - 0
-        - 3
-        version: 1.0.3
+      - !ruby/object:Gem::Version
+        version: '1.1'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: orm_adapter
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70284288014020
+- !ruby/object:Gem::Dependency
+  name: orm_adapter
+  requirement: &70284288012200 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 0
-        - 3
+      - !ruby/object:Gem::Version
         version: 0.0.3
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: bcrypt-ruby
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70284288012200
+- !ruby/object:Gem::Dependency
+  name: bcrypt-ruby
+  requirement: &70284288011500 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: *70284288011500
 description: Flexible authentication solution for Rails with Warden
 email: contact@plataformatec.com.br
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .travis.yml
 - CHANGELOG.rdoc
@@ -110,6 +86,7 @@ files:
 - lib/devise/controllers/scoped_views.rb
 - lib/devise/controllers/shared_helpers.rb
 - lib/devise/controllers/url_helpers.rb
+- lib/devise/delegator.rb
 - lib/devise/encryptors/authlogic_sha512.rb
 - lib/devise/encryptors/base.rb
 - lib/devise/encryptors/clearance_sha1.rb
@@ -145,6 +122,7 @@ files:
 - lib/devise/omniauth/url_helpers.rb
 - lib/devise/orm/active_record.rb
 - lib/devise/orm/mongoid.rb
+- lib/devise/param_filter.rb
 - lib/devise/path_checker.rb
 - lib/devise/rails.rb
 - lib/devise/rails/routes.rb
@@ -167,6 +145,9 @@ files:
 - lib/generators/mongoid/devise_generator.rb
 - lib/generators/templates/README
 - lib/generators/templates/devise.rb
+- lib/generators/templates/markerb/confirmation_instructions.markerb
+- lib/generators/templates/markerb/reset_password_instructions.markerb
+- lib/generators/templates/markerb/unlock_instructions.markerb
 - lib/generators/templates/simple_form_for/confirmations/new.html.erb
 - lib/generators/templates/simple_form_for/passwords/edit.html.erb
 - lib/generators/templates/simple_form_for/passwords/new.html.erb
@@ -216,6 +197,9 @@ files:
 - test/models/trackable_test.rb
 - test/models/validatable_test.rb
 - test/models_test.rb
+- test/omniauth/config_test.rb
+- test/omniauth/my_other_strategy.rb
+- test/omniauth/omniauth-my_strategy.rb
 - test/omniauth/url_helpers_test.rb
 - test/orm/active_record.rb
 - test/orm/mongoid.rb
@@ -278,41 +262,31 @@ files:
 - test/support/webrat/integrations/rails.rb
 - test/test_helper.rb
 - test/test_helpers_test.rb
-has_rdoc: true
 homepage: http://github.com/plataformatec/devise
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
+      version: 1.3.1
 requirements: []
-
 rubyforge_project: devise
-rubygems_version: 1.5.3
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Flexible authentication solution for Rails with Warden
-test_files: 
+test_files:
 - test/controllers/helpers_test.rb
 - test/controllers/internal_helpers_test.rb
 - test/controllers/sessions_controller_test.rb
@@ -355,6 +329,9 @@ test_files:
 - test/models/trackable_test.rb
 - test/models/validatable_test.rb
 - test/models_test.rb
+- test/omniauth/config_test.rb
+- test/omniauth/my_other_strategy.rb
+- test/omniauth/omniauth-my_strategy.rb
 - test/omniauth/url_helpers_test.rb
 - test/orm/active_record.rb
 - test/orm/mongoid.rb