devise 1.1.rc2 → 1.1.0

data/test/routes_test.rb

@@ -1,25 +1,29 @@
 require 'test_helper'
 
-class MapRoutingTest < ActionController::TestCase
-
+class DefaultRoutingTest < ActionController::TestCase
   test 'map new user session' do
     assert_recognizes({:controller => 'devise/sessions', :action => 'new'}, {:path => 'users/sign_in', :method => :get})
+    assert_named_route "/users/sign_in", :new_user_session_path
   end
 
   test 'map create user session' do
     assert_recognizes({:controller => 'devise/sessions', :action => 'create'}, {:path => 'users/sign_in', :method => :post})
+    assert_named_route "/users/sign_in", :user_session_path
   end
 
   test 'map destroy user session' do
     assert_recognizes({:controller => 'devise/sessions', :action => 'destroy'}, {:path => 'users/sign_out', :method => :get})
+    assert_named_route "/users/sign_out", :destroy_user_session_path
   end
 
   test 'map new user confirmation' do
     assert_recognizes({:controller => 'devise/confirmations', :action => 'new'}, 'users/confirmation/new')
+    assert_named_route "/users/confirmation/new", :new_user_confirmation_path
   end
 
   test 'map create user confirmation' do
     assert_recognizes({:controller => 'devise/confirmations', :action => 'create'}, {:path => 'users/confirmation', :method => :post})
+    assert_named_route "/users/confirmation", :user_confirmation_path
   end
 
   test 'map show user confirmation' do
@@ -28,14 +32,17 @@ class MapRoutingTest < ActionController::TestCase
 
   test 'map new user password' do
     assert_recognizes({:controller => 'devise/passwords', :action => 'new'}, 'users/password/new')
+    assert_named_route "/users/password/new", :new_user_password_path
   end
 
   test 'map create user password' do
     assert_recognizes({:controller => 'devise/passwords', :action => 'create'}, {:path => 'users/password', :method => :post})
+    assert_named_route "/users/password", :user_password_path
   end
 
   test 'map edit user password' do
     assert_recognizes({:controller => 'devise/passwords', :action => 'edit'}, 'users/password/edit')
+    assert_named_route "/users/password/edit", :edit_user_password_path
   end
 
   test 'map update user password' do
@@ -44,10 +51,12 @@ class MapRoutingTest < ActionController::TestCase
 
   test 'map new user unlock' do
     assert_recognizes({:controller => 'devise/unlocks', :action => 'new'}, 'users/unlock/new')
+    assert_named_route "/users/unlock/new", :new_user_unlock_path
   end
 
   test 'map create user unlock' do
     assert_recognizes({:controller => 'devise/unlocks', :action => 'create'}, {:path => 'users/unlock', :method => :post})
+    assert_named_route "/users/unlock", :user_unlock_path
   end
 
   test 'map show user unlock' do
@@ -56,14 +65,17 @@ class MapRoutingTest < ActionController::TestCase
 
   test 'map new user registration' do
     assert_recognizes({:controller => 'devise/registrations', :action => 'new'}, 'users/sign_up')
+    assert_named_route "/users/sign_up", :new_user_registration_path
   end
 
   test 'map create user registration' do
     assert_recognizes({:controller => 'devise/registrations', :action => 'create'}, {:path => 'users', :method => :post})
+    assert_named_route "/users", :user_registration_path
   end
 
   test 'map edit user registration' do
     assert_recognizes({:controller => 'devise/registrations', :action => 'edit'}, {:path => 'users/edit', :method => :get})
+    assert_named_route "/users/edit", :edit_user_registration_path
   end
 
   test 'map update user registration' do
@@ -74,6 +86,14 @@ class MapRoutingTest < ActionController::TestCase
     assert_recognizes({:controller => 'devise/registrations', :action => 'destroy'}, {:path => 'users', :method => :delete})
   end
 
+  protected
+
+  def assert_named_route(result, name)
+    assert_equal result, @routes.url_helpers.send(name)
+  end
+end
+
+class CustomizedRoutingTest < ActionController::TestCase
   test 'map admin with :path option' do
     assert_recognizes({:controller => 'devise/registrations', :action => 'new'}, {:path => 'admin_area/sign_up', :method => :get})
   end
@@ -112,3 +132,15 @@ class MapRoutingTest < ActionController::TestCase
     assert_recognizes({:controller => 'devise/registrations', :action => 'new', :locale => 'en'}, '/en/accounts/management/register')
   end
 end
+
+class ScopedRoutingTest < ActionController::TestCase
+  test 'map publisher account' do
+    assert_recognizes({:controller => 'publisher/registrations', :action => 'new'}, {:path => '/publisher/accounts/sign_up', :method => :get})
+    assert_equal '/publisher/accounts/sign_up', @routes.url_helpers.new_publisher_account_registration_path
+  end
+
+  test 'map publisher account merges path names' do
+    assert_recognizes({:controller => 'publisher/sessions', :action => 'new'}, {:path => '/publisher/accounts/get_in', :method => :get})
+    assert_equal '/publisher/accounts/get_in', @routes.url_helpers.new_publisher_account_session_path
+  end
+end

data/test/support/integration.rb

@@ -31,7 +31,7 @@ class ActionDispatch::IntegrationTest
 
   def sign_in_as_user(options={}, &block)
     user = create_user(options)
-    get new_user_session_path unless options[:visit] == false
+    visit_with_option options[:visit], new_user_session_path
     fill_in 'email', :with => 'user@test.com'
     fill_in 'password', :with => options[:password] || '123456'
     check 'remember me' if options[:remember_me] == true
@@ -42,7 +42,7 @@ class ActionDispatch::IntegrationTest
 
   def sign_in_as_admin(options={}, &block)
     admin = create_admin(options)
-    get new_admin_session_path unless options[:visit] == false
+    visit_with_option options[:visit], new_admin_session_path
     fill_in 'email', :with => 'admin@test.com'
     fill_in 'password', :with => '123456'
     yield if block_given?
@@ -57,16 +57,32 @@ class ActionDispatch::IntegrationTest
     assert [301, 302].include?(@integration_session.status),
            "Expected status to be 301 or 302, got #{@integration_session.status}"
 
-    url = prepend_host(url)
-    location = prepend_host(@integration_session.headers["Location"])
-    assert_equal url, location
+    assert_url url, @integration_session.headers["Location"]
+  end
+
+  def assert_current_url(expected)
+    assert_url expected, current_url
+  end
+
+  def assert_url(expected, actual)
+    assert_equal prepend_host(expected), prepend_host(actual)
   end
 
   protected
 
+    def visit_with_option(given, default)
+      case given
+      when String
+        visit given
+      when FalseClass
+        # Do nothing
+      else
+        visit default
+      end
+    end
+
     def prepend_host(url)
       url = "http://#{request.host}#{url}" if url[0] == ?/
       url
     end
-
 end

data/test/test_helpers_test.rb

@@ -10,14 +10,28 @@ class TestHelpersTest < ActionController::TestCase
     assert_equal "You need to sign in or sign up before continuing.", flash[:alert]
   end
 
-  test "redirects if attempting to access a page with a unconfirmed account" do
+  test "redirects if attempting to access a page with an unconfirmed account" do
     swap Devise, :confirm_within => 0 do
-      sign_in create_user
+      user = create_user
+      assert !user.active?
+
+      sign_in user
       get :index
       assert_redirected_to new_user_session_path
     end
   end
 
+  test "returns nil if accessing current_user with an unconfirmed account" do
+    swap Devise, :confirm_within => 0 do
+      user = create_user
+      assert !user.active?
+
+      sign_in user
+      get :accept, :id => user
+      assert_nil assigns(:current_user)
+    end
+  end
+
   test "does not redirect with valid user" do
     user = create_user
     user.confirm!

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: devise
 version: !ruby/object:Gem::Version 
-  hash: 977940499
-  prerelease: true
+  hash: 19
+  prerelease: false
   segments: 
   - 1
   - 1
-  - rc2
-  version: 1.1.rc2
+  - 0
+  version: 1.1.0
 platform: ruby
 authors: 
 - "Jos\xC3\xA9 Valim"
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-23 00:00:00 +02:00
+date: 2010-07-26 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -59,12 +59,14 @@ extensions: []
 
 extra_rdoc_files: 
 - CHANGELOG.rdoc
+- Gemfile.lock
 - MIT-LICENSE
 - README.rdoc
 - TODO
 files: 
 - CHANGELOG.rdoc
 - Gemfile
+- Gemfile.lock
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
@@ -121,7 +123,6 @@ files:
 - lib/devise/models/validatable.rb
 - lib/devise/modules.rb
 - lib/devise/orm/active_record.rb
-- lib/devise/orm/data_mapper.rb
 - lib/devise/orm/mongoid.rb
 - lib/devise/path_checker.rb
 - lib/devise/rails.rb
@@ -135,15 +136,17 @@ files:
 - lib/devise/strategies/token_authenticatable.rb
 - lib/devise/test_helpers.rb
 - lib/devise/version.rb
-- lib/generators/devise/devise/devise_generator.rb
-- lib/generators/devise/devise/templates/migration.rb
-- lib/generators/devise/install/install_generator.rb
-- lib/generators/devise/install/templates/README
-- lib/generators/devise/install/templates/devise.rb
-- lib/generators/devise/views/views_generator.rb
-- lib/generators/devise_generator.rb
+- lib/generators/active_record/devise_generator.rb
+- lib/generators/active_record/templates/migration.rb
+- lib/generators/devise/devise_generator.rb
+- lib/generators/devise/install_generator.rb
+- lib/generators/devise/orm_helpers.rb
+- lib/generators/devise/templates/README
+- lib/generators/devise/templates/devise.rb
+- lib/generators/devise/views_generator.rb
 - lib/generators/devise_install_generator.rb
 - lib/generators/devise_views_generator.rb
+- lib/generators/mongoid/devise_generator.rb
 - test/controllers/helpers_test.rb
 - test/controllers/internal_helpers_test.rb
 - test/controllers/url_helpers_test.rb
@@ -176,7 +179,6 @@ files:
 - test/models/validatable_test.rb
 - test/models_test.rb
 - test/orm/active_record.rb
-- test/orm/data_mapper.rb
 - test/orm/mongoid.rb
 - test/rails_app/app/active_record/admin.rb
 - test/rails_app/app/active_record/shim.rb
@@ -184,11 +186,10 @@ 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/publisher/registrations_controller.rb
+- test/rails_app/app/controllers/publisher/sessions_controller.rb
 - test/rails_app/app/controllers/sessions_controller.rb
 - test/rails_app/app/controllers/users_controller.rb
-- test/rails_app/app/data_mapper/admin.rb
-- test/rails_app/app/data_mapper/shim.rb
-- test/rails_app/app/data_mapper/user.rb
 - test/rails_app/app/helpers/application_helper.rb
 - test/rails_app/app/mongoid/admin.rb
 - test/rails_app/app/mongoid/shim.rb
@@ -235,14 +236,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: 
@@ -283,7 +282,6 @@ test_files:
 - test/models/validatable_test.rb
 - test/models_test.rb
 - test/orm/active_record.rb
-- test/orm/data_mapper.rb
 - test/orm/mongoid.rb
 - test/rails_app/app/active_record/admin.rb
 - test/rails_app/app/active_record/shim.rb
@@ -291,11 +289,10 @@ 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/publisher/registrations_controller.rb
+- test/rails_app/app/controllers/publisher/sessions_controller.rb
 - test/rails_app/app/controllers/sessions_controller.rb
 - test/rails_app/app/controllers/users_controller.rb
-- test/rails_app/app/data_mapper/admin.rb
-- test/rails_app/app/data_mapper/shim.rb
-- test/rails_app/app/data_mapper/user.rb
 - test/rails_app/app/helpers/application_helper.rb
 - test/rails_app/app/mongoid/admin.rb
 - test/rails_app/app/mongoid/shim.rb

data/lib/devise/orm/data_mapper.rb

@@ -1,97 +0,0 @@
-module Devise
-  module Orm
-    module DataMapper
-      module Hook
-        def devise_modules_hook!
-          extend Schema
-          include Compatibility
-          yield
-          return unless Devise.apply_schema
-          devise_modules.each { |m| send(m) if respond_to?(m, true) }
-        end
-      end
-
-      module Schema
-        include Devise::Schema
-
-        SCHEMA_OPTIONS = {
-          :null  => :required,
-          :limit => :length
-        }
-
-        # Tell how to apply schema methods. This automatically maps :limit to
-        # :length and :null to :required.
-        def apply_devise_schema(name, type, options={})
-          SCHEMA_OPTIONS.each do |old_key, new_key|
-            next unless options.key?(old_key)
-            options[new_key] = options.delete(old_key)
-          end
-
-          options.delete(:default) if options[:default].nil?
-          property name, type, options
-        end
-      end
-
-      module Compatibility
-        extend ActiveSupport::Concern
-
-        module ClassMethods
-          # Hooks for confirmable
-          def before_create(*args)
-            wrap_hook(:before, :create, *args)
-          end
-
-          def after_create(*args)
-            wrap_hook(:after, :create, *args)
-          end
-          
-          def before_save(*args)
-            wrap_hook(:before, :save, *args)
-          end
-
-          def wrap_hook(action, method, *args)
-            options = args.extract_options!
-
-            args.each do |callback|
-              send action, method, callback
-              class_eval <<-METHOD, __FILE__, __LINE__ + 1
-                def #{callback}
-                  super if #{options[:if] || true}
-                end
-              METHOD
-            end
-          end
-
-          # Add ActiveRecord like finder
-          def find(*args)
-            case args.first
-            when :first, :all
-              send(args.shift, *args)
-            else
-              get(*args)
-            end
-          end
-        end
-
-        def changed?
-          dirty?
-        end
-
-        def save(options=nil)
-          if options.is_a?(Hash) && options[:validate] == false
-            save!
-          else
-            super()
-          end
-        end
-
-        def update_attributes(*args)
-          update(*args)
-        end
-      end
-    end
-  end
-end
-
-DataMapper::Model.append_extensions(Devise::Models)
-DataMapper::Model.append_extensions(Devise::Orm::DataMapper::Hook)

data/lib/generators/devise/devise/devise_generator.rb

@@ -1,86 +0,0 @@
-require 'rails/generators/migration'
-
-module Devise
-  module Generators
-    class DeviseGenerator < Rails::Generators::NamedBase
-      include Rails::Generators::Migration
-
-      source_root File.expand_path("../templates", __FILE__)
-      namespace "devise"
-
-      desc "Generates a model with the given NAME (if one does not exist) with devise " <<
-           "configuration plus a migration file and devise routes."
-
-      def self.orm_has_migration?
-        Rails::Generators.options[:rails][:orm] == :active_record
-      end
-
-      def self.next_migration_number(path)
-        Time.now.utc.strftime("%Y%m%d%H%M%S")
-      end
-
-      class_option :orm
-      class_option :migration, :type => :boolean, :default => orm_has_migration?
-
-      def invoke_orm_model
-        return unless behavior == :invoke
-
-        if model_exists?
-          say "* Model already exists. Adding Devise behavior."
-        elsif options[:orm].present?
-          invoke "model", [name], :migration => false, :orm => options[:orm]
-
-          unless model_exists?
-            abort "Tried to invoke the model generator for '#{options[:orm]}' but could not find it.\n" <<
-              "Please create your model by hand before calling `rails g devise #{name}`."
-          end
-        else
-          abort "Cannot create a devise model because config.generators.orm is blank.\n" <<
-            "Please create your model by hand or configure your generators orm before calling `rails g devise #{name}`."
-        end
-      end
-
-      def inject_devise_config_into_model
-        devise_class_setup = <<-CONTENT
-
-  # Include default devise modules. Others available are:
-  # :token_authenticatable, :confirmable, :lockable and :timeoutable
-  devise :database_authenticatable, :registerable,
-         :recoverable, :rememberable, :trackable, :validatable
-
-CONTENT
-
-        case options[:orm].to_s
-        when "mongoid"
-          inject_into_file model_path, devise_class_setup, :after => "include Mongoid::Document\n"
-        when "data_mapper"
-          inject_into_file model_path, devise_class_setup, :after => "include DataMapper::Resource\n"
-        when "active_record"
-          inject_into_class model_path, class_name, devise_class_setup + <<-CONTENT
-  # Setup accessible (or protected) attributes for your model
-  attr_accessible :email, :password, :password_confirmation
-CONTENT
-        end
-      end
-
-      def copy_migration_template
-        return unless options.migration?
-        migration_template "migration.rb", "db/migrate/devise_create_#{table_name}"
-      end
-
-      def add_devise_routes
-        route "devise_for :#{table_name}"
-      end
-
-    protected
-
-      def model_exists?
-        File.exists?(File.join(destination_root, model_path))
-      end
-
-      def model_path
-        @model_path ||= File.join("app", "models", "#{file_path}.rb")
-      end
-    end
-  end
-end