devise 1.1.pre4 → 1.1.rc0

data/test/test_helpers_test.rb

@@ -1,4 +1,4 @@
-require 'test/test_helper'
+require 'test_helper'
 
 class TestHelpersTest < ActionController::TestCase
   tests UsersController
@@ -6,14 +6,14 @@ class TestHelpersTest < ActionController::TestCase
 
   test "redirects if attempting to access a page unauthenticated" do
     get :index
-    assert_redirected_to "/users/sign_in?unauthenticated=true"
+    assert_redirected_to new_user_session_path
   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 :index
-      assert_redirected_to "/users/sign_in?unconfirmed=true"
+      assert_redirected_to new_user_session_path
     end
   end
 
@@ -35,7 +35,7 @@ class TestHelpersTest < ActionController::TestCase
 
     sign_out user
     get :index
-    assert_redirected_to "/users/sign_in?unauthenticated=true"
+    assert_redirected_to new_user_session_path
   end
 
   test "allows to sign in with different users" do

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: devise
 version: !ruby/object:Gem::Version 
-  version: 1.1.pre4
+  prerelease: true
+  segments: 
+  - 1
+  - 1
+  - rc0
+  version: 1.1.rc0
 platform: ruby
 authors: 
 - "Jos\xC3\xA9 Valim"
@@ -10,19 +15,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-03 00:00:00 +01:00
+date: 2010-04-03 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: warden
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.4
-    version: 
+        segments: 
+        - 0
+        - 10
+        - 3
+        version: 0.10.3
+  type: :runtime
+  version_requirements: *id001
 description: Flexible authentication solution for Rails with Warden
 email: contact@plataformatec.com.br
 executables: []
@@ -81,7 +90,7 @@ files:
 - lib/devise/models/activatable.rb
 - lib/devise/models/authenticatable.rb
 - lib/devise/models/confirmable.rb
-- lib/devise/models/http_authenticatable.rb
+- lib/devise/models/database_authenticatable.rb
 - lib/devise/models/lockable.rb
 - lib/devise/models/recoverable.rb
 - lib/devise/models/registerable.rb
@@ -93,14 +102,14 @@ files:
 - lib/devise/modules.rb
 - lib/devise/orm/active_record.rb
 - lib/devise/orm/data_mapper.rb
-- lib/devise/orm/mongo_mapper.rb
+- lib/devise/orm/mongoid.rb
 - lib/devise/rails.rb
 - 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/http_authenticatable.rb
+- lib/devise/strategies/database_authenticatable.rb
 - lib/devise/strategies/rememberable.rb
 - lib/devise/strategies/token_authenticatable.rb
 - lib/devise/test_helpers.rb
@@ -124,18 +133,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
+      segments: 
+      - 1
+      - 3
+      - 1
       version: 1.3.1
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Flexible authentication solution for Rails with Warden
@@ -146,8 +159,8 @@ test_files:
 - 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/database_authenticatable_test.rb
 - test/integration/http_authenticatable_test.rb
 - test/integration/lockable_test.rb
 - test/integration/recoverable_test.rb
@@ -160,9 +173,8 @@ test_files:
 - 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/http_authenticatable_test.rb
+- test/models/database_authenticatable_test.rb
 - test/models/lockable_test.rb
 - test/models/recoverable_test.rb
 - test/models/rememberable_test.rb
@@ -172,7 +184,8 @@ test_files:
 - test/models/validatable_test.rb
 - test/models_test.rb
 - test/orm/active_record.rb
-- test/orm/mongo_mapper.rb
+- test/orm/data_mapper.rb
+- test/orm/mongoid.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
@@ -180,9 +193,11 @@ test_files:
 - 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/data_mapper/admin.rb
+- test/rails_app/app/data_mapper/user.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/app/mongoid/admin.rb
+- test/rails_app/app/mongoid/user.rb
 - test/rails_app/config/application.rb
 - test/rails_app/config/boot.rb
 - test/rails_app/config/environment.rb
@@ -190,11 +205,11 @@ test_files:
 - 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/session_store.rb
 - test/rails_app/config/routes.rb
+- test/rails_app/db/migrate/20100401102949_create_tables.rb
+- test/rails_app/db/schema.rb
 - test/routes_test.rb
 - test/support/assertions.rb
 - test/support/helpers.rb

data/lib/devise/models/http_authenticatable.rb

@@ -1,19 +0,0 @@
-require 'devise/strategies/http_authenticatable'
-
-module Devise
-  module Models
-    # Adds HttpAuthenticatable behavior to your model. It expects that your
-    # model class responds to authenticate and authentication_keys methods
-    # (which for example are defined in authenticatable).
-    module HttpAuthenticatable
-      extend ActiveSupport::Concern
-
-      module ClassMethods
-        # Authenticate an user using http.
-        def authenticate_with_http(username, password)
-          authenticate(authentication_keys.first => username, :password => password)
-        end
-      end
-    end
-  end
-end

data/lib/devise/orm/mongo_mapper.rb

@@ -1,49 +0,0 @@
-module Devise
-  module Orm
-    module MongoMapper
-      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
-
-        # Tell how to apply schema methods. This automatically converts DateTime
-        # to Time, since MongoMapper does not recognize the former.
-        def apply_schema(name, type, options={})
-          type = Time if type == DateTime
-          key name, type, options
-        end
-      end
-
-      module Compatibility
-        extend ActiveSupport::Concern
-
-        module ClassMethods
-          def find(*args)
-            case args.first
-            when :first, :all
-              send(args.shift, *args)
-            else
-              super
-            end
-          end
-        end
-      end
-
-    end
-  end
-end
-
-[MongoMapper::Document, MongoMapper::EmbeddedDocument].each do |mod|
-  mod::ClassMethods.class_eval do
-    include Devise::Models
-    include Devise::Orm::MongoMapper::Hook
-  end
-end

data/lib/devise/strategies/http_authenticatable.rb

@@ -1,47 +0,0 @@
-require 'devise/strategies/base'
-
-module Devise
-  module Strategies
-    # Sign in an user using HTTP authentication.
-    class HttpAuthenticatable < Base
-      def valid?
-        request.authorization && mapping.to.respond_to?(:authenticate_with_http)
-      end
-
-      def authenticate!
-        username, password = username_and_password
-
-        if resource = mapping.to.authenticate_with_http(username, password)
-          success!(resource)
-        else
-          custom!([401, custom_headers, [response_body]])
-        end
-      end
-
-    private
-
-      def username_and_password
-        decode_credentials(request).split(/:/, 2)
-      end
-
-      def decode_credentials(request)
-        ActiveSupport::Base64.decode64(request.authorization.split(' ', 2).last || '')
-      end
-
-      def response_body
-        body   = "HTTP Basic: Access denied."
-        method = :"to_#{request.format.to_sym}"
-        {}.respond_to?(method) ? { :error => body }.send(method) : body
-      end
-
-      def custom_headers
-        {
-          "Content-Type" => request.format.to_s,
-          "WWW-Authenticate" => %(Basic realm="#{Devise.http_authentication_realm.gsub(/"/, "")}")
-        }
-      end
-    end
-  end
-end
-
-Warden::Strategies.add(:http_authenticatable, Devise::Strategies::HttpAuthenticatable)

data/test/models/http_authenticatable_test.rb

@@ -1,19 +0,0 @@
-require 'test/test_helper'
-
-class HttpAuthenticatableTest < ActiveSupport::TestCase
-  test 'should authenticate a valid user with email and password and return it' do
-    user = create_user
-    user.confirm!
-
-    authenticated_user = User.authenticate_with_http(user.email, user.password)
-    assert_equal authenticated_user, user
-  end
-
-  test 'should return nil when authenticating an invalid user by email' do
-    user = create_user
-    user.confirm!
-
-    authenticated_user = User.authenticate_with_http('another.email@email.com', user.password)
-    assert_nil authenticated_user
-  end
-end

data/test/orm/mongo_mapper.rb

@@ -1,12 +0,0 @@
-MongoMapper.database = "devise-test-suite"
-MongoMapper.connection = Mongo::Connection.new('127.0.0.1', 27017)
-
-require File.expand_path('../../rails_app/config/environment', __FILE__)
-require 'rails/test_help'
-
-class ActiveSupport::TestCase
-  setup do
-    User.delete_all
-    Admin.delete_all
-  end
-end

data/test/rails_app/app/mongo_mapper/admin.rb

@@ -1,10 +0,0 @@
-class Admin
-  include MongoMapper::Document
-  include MongoMapper::Plugins::Callbacks
-
-  devise :authenticatable, :timeoutable, :registerable
-
-  def self.find_for_authentication(conditions)
-    last(:conditions => conditions, :order => "email")
-  end
-end

data/test/rails_app/app/mongo_mapper/user.rb

@@ -1,11 +0,0 @@
-class User
-  include MongoMapper::Document
-
-  key :created_at, DateTime
-
-  devise :authenticatable, :http_authenticatable, :confirmable, :lockable, :recoverable,
-         :registerable, :rememberable, :timeoutable, :token_authenticatable,
-         :trackable, :validatable
-
-  # attr_accessible :username, :email, :password, :password_confirmation
-end

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

@@ -1,7 +0,0 @@
-# Be sure to restart your server when you modify this file.
-
-# Your secret key for verifying the integrity of signed cookies.
-# If you change this key, all old signed cookies will become invalid!
-# Make sure the secret is at least 30 characters and all random, 
-# no regular words or you'll be exposed to dictionary attacks.
-ActionController::Base.cookie_verifier_secret = 'ea942c41850d502f2c8283e26bdc57829f471bb18224ddff0a192c4f32cdf6cb5aa0d82b3a7a7adbeb640c4b06f3aa1cd5f098162d8240f669b39d6b49680571'

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

@@ -1,15 +0,0 @@
-# Be sure to restart your server when you modify this file.
-
-# Your secret key for verifying cookie session data integrity.
-# If you change this key, all old sessions will become invalid!
-# Make sure the secret is at least 30 characters and all random, 
-# no regular words or you'll be exposed to dictionary attacks.
-ActionController::Base.session = {
-  :key    => '_rails_app_session',
-  :secret => '0c31f123b2bd4424ac366a7976aaa0696f0c82337c4073a5816a3abc6553293ad14f70cf23acb391954a8ce8cf08aaca3fab21e7642aa52ea212aefa19b7439d'
-}
-
-# Use the database for sessions instead of the cookie-based default,
-# which shouldn't be used to store highly confidential information
-# (create the session table with "rake db:sessions:create")
-# ActionController::Base.session_store = :active_record_store