devise 1.1.rc1 → 1.1.rc2

data/test/rails_app/config/application.rb

@@ -29,5 +29,7 @@ module RailsApp
 
     # Configure sensitive parameters which will be filtered from the log file.
     config.filter_parameters << :password
+
+    config.action_mailer.default_url_options = { :host => "localhost:3000" }
   end
 end

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

@@ -5,7 +5,7 @@ Devise.setup do |config|
   # the encrypted password. By default no pepper is used.
   # config.pepper = "rake secret output"
 
-  # Configure how many times you want the password is reencrypted. Default is 10.
+  # Configure how many times you want the password re-encrypted. Default is 10.
   # config.stretches = 10
 
   # Define which will be the encryption algorithm. Supported algorithms are :sha1
@@ -49,7 +49,7 @@ Devise.setup do |config|
 
   # Defines which strategy will be used to unlock an account.
   # :email = Sends an unlock link to the user email
-  # :time  = Reanables login after a certain ammount of time (see :unlock_in below)
+  # :time  = Re-enables login after a certain amount of time (see :unlock_in below)
   # :both  = enables both strategies
   # config.unlock_strategy = :both
 

data/test/rails_app/config/routes.rb

@@ -11,7 +11,8 @@ Rails::Application.routes.draw do
     :class_name => "User", :path_names => {
       :sign_in => "login", :sign_out => "logout",
       :password => "secret", :confirmation => "verification",
-      :unlock => "unblock", :sign_up => "register"
+      :unlock => "unblock", :sign_up => "register",
+      :registration => "management"
     }
 
   match "/admin_area/home", :to => "admins#index", :as => :admin_root
@@ -21,4 +22,8 @@ Rails::Application.routes.draw do
   match "/anywhere", :to => "foo#bar", :as => :new_admin_password
 
   root :to => "home#index"
+
+  authenticate(:admin) do
+    match "/private", :to => "home#private", :as => :private
+  end
 end

data/test/routes_test.rb

@@ -74,7 +74,7 @@ class MapRoutingTest < ActionController::TestCase
     assert_recognizes({:controller => 'devise/registrations', :action => 'destroy'}, {:path => 'users', :method => :delete})
   end
 
-  test 'map admin with :as option' do
+  test 'map admin with :path option' do
     assert_recognizes({:controller => 'devise/registrations', :action => 'new'}, {:path => 'admin_area/sign_up', :method => :get})
   end
 
@@ -109,6 +109,6 @@ class MapRoutingTest < ActionController::TestCase
   end
 
   test 'map account with custom path name for registration' do
-    assert_recognizes({:controller => 'devise/registrations', :action => 'new', :locale => 'en'}, '/en/accounts/register')
+    assert_recognizes({:controller => 'devise/registrations', :action => 'new', :locale => 'en'}, '/en/accounts/management/register')
   end
 end

data/test/test_helper.rb

@@ -11,10 +11,6 @@ require "orm/#{DEVISE_ORM}"
 I18n.load_path << File.expand_path("../support/locale/en.yml", __FILE__)
 require 'mocha'
 
-ActionMailer::Base.delivery_method = :test
-ActionMailer::Base.perform_deliveries = true
-ActionMailer::Base.default_url_options[:host] = 'test.com'
-
 Webrat.configure do |config|
   config.mode = :rails
   config.open_error_files = false

data/test/test_helpers_test.rb

@@ -7,6 +7,7 @@ class TestHelpersTest < ActionController::TestCase
   test "redirects if attempting to access a page unauthenticated" do
     get :index
     assert_redirected_to new_user_session_path
+    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

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: devise
 version: !ruby/object:Gem::Version 
+  hash: 977940499
   prerelease: true
   segments: 
   - 1
   - 1
-  - rc1
-  version: 1.1.rc1
+  - rc2
+  version: 1.1.rc2
 platform: ruby
 authors: 
 - "Jos\xC3\xA9 Valim"
@@ -15,23 +16,41 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-15 00:00:00 +02:00
+date: 2010-06-23 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: warden
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 57
         segments: 
         - 0
         - 10
-        - 3
-        version: 0.10.3
+        - 7
+        version: 0.10.7
   type: :runtime
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: bcrypt-ruby
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 2
+        - 1
+        - 2
+        version: 2.1.2
+  type: :runtime
+  version_requirements: *id002
 description: Flexible authentication solution for Rails with Warden
 email: contact@plataformatec.com.br
 executables: []
@@ -104,6 +123,7 @@ files:
 - 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
 - lib/devise/rails/routes.rb
 - lib/devise/rails/warden_compat.rb
@@ -115,12 +135,85 @@ files:
 - lib/devise/strategies/token_authenticatable.rb
 - lib/devise/test_helpers.rb
 - lib/devise/version.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
+- 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/devise_install_generator.rb
+- lib/generators/devise_views_generator.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/database_authenticatable_test.rb
+- test/integration/http_authenticatable_test.rb
+- test/integration/lockable_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/confirmable_test.rb
+- test/models/database_authenticatable_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/data_mapper.rb
+- test/orm/mongoid.rb
+- test/rails_app/app/active_record/admin.rb
+- test/rails_app/app/active_record/shim.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/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
+- 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
+- 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/devise.rb
+- test/rails_app/config/initializers/inflections.rb
+- test/rails_app/config/initializers/secret_token.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
+- test/support/integration.rb
+- test/support/test_silencer.rb
+- 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: []
@@ -131,16 +224,20 @@ rdoc_options:
 require_paths: 
 - lib
 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 
+  none: false
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
+      hash: 25
       segments: 
       - 1
       - 3
@@ -149,7 +246,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Flexible authentication solution for Rails with Warden
@@ -160,6 +257,7 @@ 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
@@ -188,6 +286,7 @@ test_files:
 - 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
 - test/rails_app/app/active_record/user.rb
 - test/rails_app/app/controllers/admins_controller.rb
 - test/rails_app/app/controllers/application_controller.rb
@@ -195,9 +294,11 @@ test_files:
 - 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
 - test/rails_app/app/mongoid/user.rb
 - test/rails_app/config/application.rb
 - test/rails_app/config/boot.rb

data/lib/generators/devise/devise_generator.rb

@@ -1,67 +0,0 @@
-require 'rails/generators/migration'
-
-class DeviseGenerator < Rails::Generators::NamedBase
-  include Rails::Generators::Migration
-
-  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.source_root
-    @_devise_source_root ||= File.expand_path("../templates", __FILE__)
-  end
-
-  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
-    if model_exists?
-      say "* Model already exists. Adding Devise behavior."
-    else
-      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
-    end
-  end
-
-  def inject_devise_config_into_model
-    inject_into_class model_path, class_name, <<-CONTENT
-  # Include default devise modules. Others available are:
-  # :token_authenticatable, :lockable and :timeoutable
-  devise :database_authenticatable, :registerable, :confirmable,
-         :recoverable, :rememberable, :trackable, :validatable
-
-  # Setup accessible (or protected) attributes for your model
-  attr_accessible :email, :password, :password_confirmation
-CONTENT
-  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

data/lib/generators/devise_install/devise_install_generator.rb

@@ -1,25 +0,0 @@
-class DeviseInstallGenerator < Rails::Generators::Base
-  desc "Creates a Devise initializer and copy locale files to your application."
-
-  def self.source_root
-    @_devise_source_root ||= File.expand_path("../templates", __FILE__)
-  end
-
-  def copy_initializer
-    template "devise.rb", "config/initializers/devise.rb"
-  end
-
-  def copy_locale
-    copy_file "../../../../config/locales/en.yml", "config/locales/devise.en.yml"    
-  end
-
-  def show_readme
-    readme "README"
-  end
-
-  protected
-  
-  def readme(path)
-    say File.read(File.expand_path(path, self.class.source_root))
-  end
-end

data/lib/generators/devise_views/devise_views_generator.rb

@@ -1,62 +0,0 @@
-class DeviseViewsGenerator < Rails::Generators::Base
-  desc "Copies all Devise views to your application."
-  
-  argument :scope, :required => false, :default => nil,
-                   :desc => "The scope to copy views to"
-  
-  class_option :template_engine, :type => :string, :aliases => "-t", :default => "erb",
-                                 :desc => "Template engine for the views. Available options are 'erb' and 'haml'."
-  
-  def self.source_root
-    @_devise_source_root ||= File.expand_path("../../../../app/views", __FILE__)
-  end
-
-  def copy_views
-    case options[:template_engine]
-    when "haml"
-      verify_haml_existence
-      verify_haml_version
-      create_and_copy_haml_views
-    else
-      directory "devise", "app/views/#{scope || 'devise'}"
-    end
-  end
-  
-  protected
-  
-  def verify_haml_existence
-    begin
-      require 'haml'
-    rescue LoadError
-      say "HAML is not installed, or it is not specified in your Gemfile."
-      exit
-    end
-  end
-  
-  def verify_haml_version
-    unless Haml.version[:major] == 2 and Haml.version[:minor] >= 3 or Haml.version[:major] >= 3
-      say "To generate HAML templates, you need to install HAML 2.3 or above."
-      exit
-    end
-  end
-  
-  def create_and_copy_haml_views
-    require 'tmpdir'
-    html_root = "#{self.class.source_root}/devise"
-
-    Dir.mktmpdir("devise-haml.") do |haml_root|
-      Dir["#{html_root}/**/*"].each do |path|
-        relative_path = path.sub(html_root, "")
-        source_path   = (haml_root + relative_path).sub(/erb$/, "haml")
-
-        if File.directory?(path)
-          FileUtils.mkdir_p(source_path)
-        else
-          `html2haml -r #{path} #{source_path}`
-        end
-      end
-
-      directory haml_root, "app/views/#{scope || 'devise'}"
-    end
-  end
-end