devise 1.0.11 → 1.1.pre

data/test/support/{tests_helper.rb → helpers.rb}

@@ -7,15 +7,13 @@ class ActiveSupport::TestCase
 
   def store_translations(locale, translations, &block)
     begin
-      I18n.backend.store_translations locale, translations
+      I18n.backend.store_translations(locale, translations)
       yield
     ensure
       I18n.reload!
     end
   end
 
-  # Helpers for creating new users
-  #
   def generate_unique_email
     @@email_count ||= 0
     @@email_count += 1
@@ -36,4 +34,19 @@ class ActiveSupport::TestCase
   def create_user(attributes={})
     User.create!(valid_attributes(attributes))
   end
+
+  # Execute the block setting the given values and restoring old values after
+  # the block is executed.
+  def swap(object, new_values)
+    old_values = {}
+    new_values.each do |key, value|
+      old_values[key] = object.send key
+      object.send :"#{key}=", value
+    end
+    yield
+  ensure
+    old_values.each do |key, value|
+      object.send :"#{key}=", value
+    end
+  end
 end

data/test/support/{integration_tests_helper.rb → integration.rb}

@@ -14,7 +14,7 @@ class ActionController::IntegrationTest
         :created_at => Time.now.utc
       )
       user.confirm! unless options[:confirm] == false
-      user.lock_access! if options[:locked] == true
+      user.lock! if options[:locked] == true
       user
     end
   end
@@ -30,9 +30,9 @@ class ActionController::IntegrationTest
 
   def sign_in_as_user(options={}, &block)
     user = create_user(options)
-    visit new_user_session_path unless options[:visit] == false
+    get new_user_session_path unless options[:visit] == false
     fill_in 'email', :with => 'user@test.com'
-    fill_in 'password', :with => options[:password] || '123456'
+    fill_in 'password', :with => '123456'
     check 'remember me' if options[:remember_me] == true
     yield if block_given?
     click_button 'Sign In'
@@ -41,7 +41,7 @@ class ActionController::IntegrationTest
 
   def sign_in_as_admin(options={}, &block)
     admin = create_admin(options)
-    visit new_admin_session_path unless options[:visit] == false
+    get new_admin_session_path unless options[:visit] == false
     fill_in 'email', :with => 'admin@test.com'
     fill_in 'password', :with => '123456'
     yield if block_given?
@@ -49,6 +49,10 @@ class ActionController::IntegrationTest
     admin
   end
 
+  def assert_current_path(path)
+    assert_equal path, current_url
+  end
+
   # Fix assert_redirect_to in integration sessions because they don't take into
   # account Middleware redirects.
   #

data/test/support/webrat/integrations/rails.rb

@@ -0,0 +1,31 @@
+require 'webrat/core/elements/field'
+
+module Webrat
+  Field.class_eval do
+    def parse_rails_request_params(params)
+      Rack::Utils.parse_nested_query(params)
+    end
+  end
+end
+
+module ActionController #:nodoc:
+  IntegrationTest.class_eval do
+    include Webrat::Methods
+    include Webrat::Matchers
+ 
+    # The Rails version of within supports passing in a model and Webrat
+    # will apply a scope based on Rails' dom_id for that model.
+    #
+    # Example:
+    #   within User.last do
+    #     click_link "Delete"
+    #   end
+    def within(selector_or_object, &block)
+      if selector_or_object.is_a?(String)
+        super
+      else
+        super('#' + RecordIdentifier.dom_id(selector_or_object), &block)
+      end
+    end
+  end
+end

data/test/test_helper.rb

@@ -1,15 +1,12 @@
-require 'rubygems'
-
 ENV["RAILS_ENV"] = "test"
 DEVISE_ORM = (ENV["DEVISE_ORM"] || :active_record).to_sym
 
 puts "\n==> Devise.orm = #{DEVISE_ORM.inspect}"
-require File.join(File.dirname(__FILE__), 'orm', DEVISE_ORM.to_s)
 
-require 'webrat'
-require 'mocha'
+require File.expand_path('../rails_app/config/application', __FILE__)
+require File.expand_path("../orm/#{DEVISE_ORM}", __FILE__)
 
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
+require 'mocha'
 
 ActionMailer::Base.delivery_method = :test
 ActionMailer::Base.perform_deliveries = true
@@ -18,4 +15,8 @@ ActionMailer::Base.default_url_options[:host] = 'test.com'
 Webrat.configure do |config|
   config.mode = :rails
   config.open_error_files = false
-end
+end
+
+# Add support to load paths so we can overwrite broken webrat setup
+$:.unshift File.expand_path('../support', __FILE__)
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }

data/test/test_helpers_test.rb

@@ -5,14 +5,14 @@ class TestHelpersTest < ActionController::TestCase
   include Devise::TestHelpers
 
   test "redirects if attempting to access a page unauthenticated" do
-    get :show
+    get :index
     assert_redirected_to "/users/sign_in?unauthenticated=true"
   end
 
   test "redirects if attempting to access a page with a unconfirmed account" do
     swap Devise, :confirm_within => 0 do
       sign_in create_user
-      get :show
+      get :index
       assert_redirected_to "/users/sign_in?unconfirmed=true"
     end
   end
@@ -22,7 +22,7 @@ class TestHelpersTest < ActionController::TestCase
     user.confirm!
 
     sign_in user
-    get :show
+    get :index
     assert_response :success
   end
 
@@ -31,10 +31,10 @@ class TestHelpersTest < ActionController::TestCase
     user.confirm!
 
     sign_in user
-    get :show
+    get :index
 
     sign_out user
-    get :show
+    get :index
     assert_redirected_to "/users/sign_in?unauthenticated=true"
   end
 
@@ -43,15 +43,15 @@ class TestHelpersTest < ActionController::TestCase
     first_user.confirm!
 
     sign_in first_user
-    get :show
-    assert_equal first_user.id.to_s, @response.body
+    get :index
+    assert_match /User ##{first_user.id}/, @response.body
     sign_out first_user
 
     second_user = create_user
     second_user.confirm!
 
     sign_in second_user
-    get :show
-    assert_equal second_user.id.to_s, @response.body
+    get :index
+    assert_match /User ##{second_user.id}/, @response.body
   end
 end

metadata

@@ -1,13 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: devise
 version: !ruby/object:Gem::Version 
-  hash: 1
-  prerelease: 
-  segments: 
-  - 1
-  - 0
-  - 11
-  version: 1.0.11
+  version: 1.1.pre
 platform: ruby
 authors: 
 - "Jos\xC3\xA9 Valim"
@@ -16,25 +10,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-11 00:00:00 +01:00
+date: 2010-02-17 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: warden
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 49
-        segments: 
-        - 0
-        - 10
-        - 3
-        version: 0.10.3
-  type: :runtime
-  version_requirements: *id001
+        version: 0.9.3
+    version: 
 description: Flexible authentication solution for Rails with Warden
 email: contact@plataformatec.com.br
 executables: []
@@ -42,45 +30,39 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
+- CHANGELOG.rdoc
+- MIT-LICENSE
 - README.rdoc
 - TODO
 files: 
 - CHANGELOG.rdoc
+- Gemfile
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
 - TODO
-- app/controllers/confirmations_controller.rb
-- app/controllers/passwords_controller.rb
-- app/controllers/registrations_controller.rb
-- app/controllers/sessions_controller.rb
-- app/controllers/unlocks_controller.rb
-- app/models/devise_mailer.rb
-- app/views/confirmations/new.html.erb
-- app/views/devise_mailer/confirmation_instructions.html.erb
-- app/views/devise_mailer/reset_password_instructions.html.erb
-- app/views/devise_mailer/unlock_instructions.html.erb
-- app/views/passwords/edit.html.erb
-- app/views/passwords/new.html.erb
-- app/views/registrations/edit.html.erb
-- app/views/registrations/new.html.erb
-- app/views/sessions/new.html.erb
-- app/views/shared/_devise_links.erb
-- app/views/unlocks/new.html.erb
-- generators/devise/USAGE
-- generators/devise/devise_generator.rb
-- generators/devise/lib/route_devise.rb
-- generators/devise/templates/migration.rb
-- generators/devise/templates/model.rb
-- generators/devise_install/USAGE
-- generators/devise_install/devise_install_generator.rb
-- generators/devise_install/templates/README
-- generators/devise_install/templates/devise.rb
-- generators/devise_views/USAGE
-- generators/devise_views/devise_views_generator.rb
+- app/controllers/devise/confirmations_controller.rb
+- app/controllers/devise/passwords_controller.rb
+- app/controllers/devise/registrations_controller.rb
+- app/controllers/devise/sessions_controller.rb
+- app/controllers/devise/unlocks_controller.rb
+- app/models/devise/mailer.rb
+- app/views/devise/confirmations/new.html.erb
+- app/views/devise/mailer/confirmation_instructions.html.erb
+- app/views/devise/mailer/reset_password_instructions.html.erb
+- app/views/devise/mailer/unlock_instructions.html.erb
+- app/views/devise/passwords/edit.html.erb
+- app/views/devise/passwords/new.html.erb
+- app/views/devise/registrations/edit.html.erb
+- app/views/devise/registrations/new.html.erb
+- app/views/devise/sessions/new.html.erb
+- app/views/devise/shared/_links.erb
+- app/views/devise/unlocks/new.html.erb
+- config/locales/en.yml
 - lib/devise.rb
 - lib/devise/controllers/helpers.rb
 - lib/devise/controllers/internal_helpers.rb
+- lib/devise/controllers/scoped_views.rb
 - lib/devise/controllers/url_helpers.rb
 - lib/devise/encryptors/authlogic_sha512.rb
 - lib/devise/encryptors/base.rb
@@ -94,12 +76,11 @@ files:
 - lib/devise/hooks/rememberable.rb
 - lib/devise/hooks/timeoutable.rb
 - lib/devise/hooks/trackable.rb
-- lib/devise/locales/en.yml
 - lib/devise/mapping.rb
 - lib/devise/models.rb
 - lib/devise/models/activatable.rb
+- lib/devise/models/authenticatable.rb
 - lib/devise/models/confirmable.rb
-- lib/devise/models/database_authenticatable.rb
 - lib/devise/models/http_authenticatable.rb
 - lib/devise/models/lockable.rb
 - lib/devise/models/recoverable.rb
@@ -116,104 +97,44 @@ files:
 - lib/devise/rails/routes.rb
 - lib/devise/rails/warden_compat.rb
 - lib/devise/schema.rb
+- lib/devise/strategies/authenticatable.rb
 - lib/devise/strategies/base.rb
-- lib/devise/strategies/database_authenticatable.rb
 - lib/devise/strategies/http_authenticatable.rb
 - lib/devise/strategies/rememberable.rb
 - lib/devise/strategies/token_authenticatable.rb
 - lib/devise/test_helpers.rb
 - lib/devise/version.rb
-- rails/init.rb
-- test/controllers/helpers_test.rb
-- test/controllers/internal_helpers_test.rb
-- test/controllers/url_helpers_test.rb
-- test/devise_test.rb
-- test/encryptors_test.rb
-- test/failure_app_test.rb
-- test/integration/authenticatable_test.rb
-- test/integration/confirmable_test.rb
-- test/integration/http_authenticatable_test.rb
-- test/integration/lockable_test.rb
-- test/integration/rack_middleware_test.rb
-- test/integration/recoverable_test.rb
-- test/integration/registerable_test.rb
-- test/integration/rememberable_test.rb
-- test/integration/timeoutable_test.rb
-- test/integration/token_authenticatable_test.rb
-- test/integration/trackable_test.rb
-- test/mailers/confirmation_instructions_test.rb
-- test/mailers/reset_password_instructions_test.rb
-- test/mailers/unlock_instructions_test.rb
-- test/mapping_test.rb
-- test/models/authenticatable_test.rb
-- test/models/confirmable_test.rb
-- test/models/lockable_test.rb
-- test/models/recoverable_test.rb
-- test/models/rememberable_test.rb
-- test/models/timeoutable_test.rb
-- test/models/token_authenticatable_test.rb
-- test/models/trackable_test.rb
-- test/models/validatable_test.rb
-- test/models_test.rb
-- test/orm/active_record.rb
-- test/orm/mongo_mapper.rb
-- test/rails_app/app/active_record/admin.rb
-- test/rails_app/app/active_record/user.rb
-- test/rails_app/app/controllers/admins_controller.rb
-- test/rails_app/app/controllers/application_controller.rb
-- test/rails_app/app/controllers/home_controller.rb
-- test/rails_app/app/controllers/users_controller.rb
-- test/rails_app/app/helpers/application_helper.rb
-- test/rails_app/app/mongo_mapper/admin.rb
-- test/rails_app/app/mongo_mapper/user.rb
-- test/rails_app/config/boot.rb
-- test/rails_app/config/environment.rb
-- test/rails_app/config/environments/development.rb
-- test/rails_app/config/environments/production.rb
-- test/rails_app/config/environments/test.rb
-- test/rails_app/config/initializers/devise.rb
-- test/rails_app/config/initializers/inflections.rb
-- test/rails_app/config/initializers/new_rails_defaults.rb
-- test/rails_app/config/initializers/session_store.rb
-- test/rails_app/config/routes.rb
-- test/routes_test.rb
-- test/support/assertions_helper.rb
-- test/support/integration_tests_helper.rb
-- test/support/test_silencer.rb
-- test/support/tests_helper.rb
-- test/test_helper.rb
-- test/test_helpers_test.rb
+- lib/generators/devise/devise_generator.rb
+- lib/generators/devise/templates/migration.rb
+- lib/generators/devise_install/devise_install_generator.rb
+- lib/generators/devise_install/templates/README
+- lib/generators/devise_install/templates/devise.rb
+- lib/generators/devise_views/devise_views_generator.rb
 has_rdoc: true
 homepage: http://github.com/plataformatec/devise
 licenses: []
 
 post_install_message: 
-rdoc_options: []
-
+rdoc_options: 
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
+  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+      version: 1.3.1
+  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.3
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Flexible authentication solution for Rails with Warden
@@ -228,7 +149,6 @@ test_files:
 - test/integration/confirmable_test.rb
 - test/integration/http_authenticatable_test.rb
 - test/integration/lockable_test.rb
-- test/integration/rack_middleware_test.rb
 - test/integration/recoverable_test.rb
 - test/integration/registerable_test.rb
 - test/integration/rememberable_test.rb
@@ -241,6 +161,7 @@ test_files:
 - test/mapping_test.rb
 - test/models/authenticatable_test.rb
 - test/models/confirmable_test.rb
+- test/models/http_authenticatable_test.rb
 - test/models/lockable_test.rb
 - test/models/recoverable_test.rb
 - test/models/rememberable_test.rb
@@ -256,24 +177,28 @@ test_files:
 - test/rails_app/app/controllers/admins_controller.rb
 - test/rails_app/app/controllers/application_controller.rb
 - test/rails_app/app/controllers/home_controller.rb
+- test/rails_app/app/controllers/sessions_controller.rb
 - test/rails_app/app/controllers/users_controller.rb
 - test/rails_app/app/helpers/application_helper.rb
 - test/rails_app/app/mongo_mapper/admin.rb
 - test/rails_app/app/mongo_mapper/user.rb
+- test/rails_app/config/application.rb
 - test/rails_app/config/boot.rb
 - test/rails_app/config/environment.rb
 - test/rails_app/config/environments/development.rb
 - test/rails_app/config/environments/production.rb
 - test/rails_app/config/environments/test.rb
+- test/rails_app/config/initializers/backtrace_silencers.rb
+- test/rails_app/config/initializers/cookie_verification_secret.rb
 - test/rails_app/config/initializers/devise.rb
 - test/rails_app/config/initializers/inflections.rb
-- test/rails_app/config/initializers/new_rails_defaults.rb
 - test/rails_app/config/initializers/session_store.rb
 - test/rails_app/config/routes.rb
 - test/routes_test.rb
-- test/support/assertions_helper.rb
-- test/support/integration_tests_helper.rb
+- test/support/assertions.rb
+- test/support/helpers.rb
+- test/support/integration.rb
 - test/support/test_silencer.rb
-- test/support/tests_helper.rb
+- test/support/webrat/integrations/rails.rb
 - test/test_helper.rb
 - test/test_helpers_test.rb