devise 1.5.3 → 2.0.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: devise
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 2.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-19 00:00:00.000000000 Z
+date: 2012-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: warden
-  requirement: &2151820240 !ruby/object:Gem::Requirement
+  requirement: &2152505840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *2151820240
+  version_requirements: *2152505840
 - !ruby/object:Gem::Dependency
   name: orm_adapter
-  requirement: &2151818600 !ruby/object:Gem::Requirement
+  requirement: &2152501920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 0.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *2151818600
+  version_requirements: *2152501920
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
-  requirement: &2151816740 !ruby/object:Gem::Requirement
+  requirement: &2152525080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,28 +44,37 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2151816740
+  version_requirements: *2152525080
+- !ruby/object:Gem::Dependency
+  name: railties
+  requirement: &2152523660 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: *2152523660
 description: Flexible authentication solution for Rails with Warden
 email: contact@plataformatec.com.br
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
 - CHANGELOG.rdoc
-- Gemfile
 - MIT-LICENSE
 - README.rdoc
-- Rakefile
 - app/controllers/devise/confirmations_controller.rb
 - app/controllers/devise/omniauth_callbacks_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/controllers/devise_controller.rb
 - app/helpers/devise_helper.rb
 - app/mailers/devise/mailer.rb
+- app/views/devise/_links.erb
 - app/views/devise/confirmations/new.html.erb
 - app/views/devise/mailer/confirmation_instructions.html.erb
 - app/views/devise/mailer/reset_password_instructions.html.erb
@@ -78,13 +87,9 @@ files:
 - app/views/devise/shared/_links.erb
 - app/views/devise/unlocks/new.html.erb
 - config/locales/en.yml
-- devise.gemspec
-- lib/devise.rb
 - lib/devise/controllers/helpers.rb
-- lib/devise/controllers/internal_helpers.rb
 - lib/devise/controllers/rememberable.rb
 - 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
@@ -101,7 +106,6 @@ files:
 - lib/devise/hooks/trackable.rb
 - lib/devise/mailers/helpers.rb
 - lib/devise/mapping.rb
-- lib/devise/models.rb
 - lib/devise/models/authenticatable.rb
 - lib/devise/models/confirmable.rb
 - lib/devise/models/database_authenticatable.rb
@@ -116,17 +120,18 @@ files:
 - lib/devise/models/token_authenticatable.rb
 - lib/devise/models/trackable.rb
 - lib/devise/models/validatable.rb
+- lib/devise/models.rb
 - lib/devise/modules.rb
-- lib/devise/omniauth.rb
 - lib/devise/omniauth/config.rb
 - lib/devise/omniauth/url_helpers.rb
+- lib/devise/omniauth.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
 - lib/devise/rails/warden_compat.rb
+- lib/devise/rails.rb
 - lib/devise/schema.rb
 - lib/devise/strategies/authenticatable.rb
 - lib/devise/strategies/base.rb
@@ -135,6 +140,7 @@ files:
 - lib/devise/strategies/token_authenticatable.rb
 - lib/devise/test_helpers.rb
 - lib/devise/version.rb
+- lib/devise.rb
 - lib/generators/active_record/devise_generator.rb
 - lib/generators/active_record/templates/migration.rb
 - lib/generators/active_record/templates/migration_existing.rb
@@ -143,11 +149,11 @@ files:
 - lib/generators/devise/orm_helpers.rb
 - lib/generators/devise/views_generator.rb
 - 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/README
 - 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
@@ -203,7 +209,6 @@ files:
 - test/orm/active_record.rb
 - test/orm/mongoid.rb
 - test/path_checker_test.rb
-- test/rails_app/Rakefile
 - test/rails_app/app/active_record/admin.rb
 - test/rails_app/app/active_record/shim.rb
 - test/rails_app/app/active_record/user.rb
@@ -231,7 +236,6 @@ files:
 - test/rails_app/app/views/users/index.html.erb
 - test/rails_app/app/views/users/mailer/confirmation_instructions.erb
 - test/rails_app/app/views/users/sessions/new.html.erb
-- test/rails_app/config.ru
 - test/rails_app/config/application.rb
 - test/rails_app/config/boot.rb
 - test/rails_app/config/database.yml
@@ -244,17 +248,20 @@ files:
 - test/rails_app/config/initializers/inflections.rb
 - test/rails_app/config/initializers/secret_token.rb
 - test/rails_app/config/routes.rb
+- test/rails_app/config.ru
 - test/rails_app/db/migrate/20100401102949_create_tables.rb
 - test/rails_app/db/schema.rb
 - test/rails_app/lib/shared_admin.rb
 - test/rails_app/lib/shared_user.rb
+- test/rails_app/log/development.log
+- test/rails_app/log/test.log
 - test/rails_app/public/404.html
 - test/rails_app/public/422.html
 - test/rails_app/public/500.html
 - test/rails_app/public/favicon.ico
+- test/rails_app/Rakefile
 - test/rails_app/script/rails
 - test/routes_test.rb
-- test/schema_test.rb
 - test/support/assertions.rb
 - test/support/helpers.rb
 - test/support/integration.rb
@@ -262,6 +269,28 @@ files:
 - test/support/webrat/integrations/rails.rb
 - test/test_helper.rb
 - test/test_helpers_test.rb
+- test/tmp/app/views/devise/_links.erb
+- test/tmp/app/views/devise/confirmations/new.html.erb
+- test/tmp/app/views/devise/mailer/confirmation_instructions.html.erb
+- test/tmp/app/views/devise/mailer/reset_password_instructions.html.erb
+- test/tmp/app/views/devise/mailer/unlock_instructions.html.erb
+- test/tmp/app/views/devise/passwords/edit.html.erb
+- test/tmp/app/views/devise/passwords/new.html.erb
+- test/tmp/app/views/devise/registrations/edit.html.erb
+- test/tmp/app/views/devise/registrations/new.html.erb
+- test/tmp/app/views/devise/sessions/new.html.erb
+- test/tmp/app/views/devise/unlocks/new.html.erb
+- test/tmp/app/views/users/_links.erb
+- test/tmp/app/views/users/confirmations/new.html.erb
+- test/tmp/app/views/users/mailer/confirmation_instructions.html.erb
+- test/tmp/app/views/users/mailer/reset_password_instructions.html.erb
+- test/tmp/app/views/users/mailer/unlock_instructions.html.erb
+- test/tmp/app/views/users/passwords/edit.html.erb
+- test/tmp/app/views/users/passwords/new.html.erb
+- test/tmp/app/views/users/registrations/edit.html.erb
+- test/tmp/app/views/users/registrations/new.html.erb
+- test/tmp/app/views/users/sessions/new.html.erb
+- test/tmp/app/views/users/unlocks/new.html.erb
 homepage: http://github.com/plataformatec/devise
 licenses: []
 post_install_message: 
@@ -335,7 +364,6 @@ test_files:
 - test/orm/active_record.rb
 - test/orm/mongoid.rb
 - test/path_checker_test.rb
-- test/rails_app/Rakefile
 - test/rails_app/app/active_record/admin.rb
 - test/rails_app/app/active_record/shim.rb
 - test/rails_app/app/active_record/user.rb
@@ -363,7 +391,6 @@ test_files:
 - test/rails_app/app/views/users/index.html.erb
 - test/rails_app/app/views/users/mailer/confirmation_instructions.erb
 - test/rails_app/app/views/users/sessions/new.html.erb
-- test/rails_app/config.ru
 - test/rails_app/config/application.rb
 - test/rails_app/config/boot.rb
 - test/rails_app/config/database.yml
@@ -376,17 +403,20 @@ test_files:
 - test/rails_app/config/initializers/inflections.rb
 - test/rails_app/config/initializers/secret_token.rb
 - test/rails_app/config/routes.rb
+- test/rails_app/config.ru
 - test/rails_app/db/migrate/20100401102949_create_tables.rb
 - test/rails_app/db/schema.rb
 - test/rails_app/lib/shared_admin.rb
 - test/rails_app/lib/shared_user.rb
+- test/rails_app/log/development.log
+- test/rails_app/log/test.log
 - test/rails_app/public/404.html
 - test/rails_app/public/422.html
 - test/rails_app/public/500.html
 - test/rails_app/public/favicon.ico
+- test/rails_app/Rakefile
 - test/rails_app/script/rails
 - test/routes_test.rb
-- test/schema_test.rb
 - test/support/assertions.rb
 - test/support/helpers.rb
 - test/support/integration.rb
@@ -394,3 +424,25 @@ test_files:
 - test/support/webrat/integrations/rails.rb
 - test/test_helper.rb
 - test/test_helpers_test.rb
+- test/tmp/app/views/devise/_links.erb
+- test/tmp/app/views/devise/confirmations/new.html.erb
+- test/tmp/app/views/devise/mailer/confirmation_instructions.html.erb
+- test/tmp/app/views/devise/mailer/reset_password_instructions.html.erb
+- test/tmp/app/views/devise/mailer/unlock_instructions.html.erb
+- test/tmp/app/views/devise/passwords/edit.html.erb
+- test/tmp/app/views/devise/passwords/new.html.erb
+- test/tmp/app/views/devise/registrations/edit.html.erb
+- test/tmp/app/views/devise/registrations/new.html.erb
+- test/tmp/app/views/devise/sessions/new.html.erb
+- test/tmp/app/views/devise/unlocks/new.html.erb
+- test/tmp/app/views/users/_links.erb
+- test/tmp/app/views/users/confirmations/new.html.erb
+- test/tmp/app/views/users/mailer/confirmation_instructions.html.erb
+- test/tmp/app/views/users/mailer/reset_password_instructions.html.erb
+- test/tmp/app/views/users/mailer/unlock_instructions.html.erb
+- test/tmp/app/views/users/passwords/edit.html.erb
+- test/tmp/app/views/users/passwords/new.html.erb
+- test/tmp/app/views/users/registrations/edit.html.erb
+- test/tmp/app/views/users/registrations/new.html.erb
+- test/tmp/app/views/users/sessions/new.html.erb
+- test/tmp/app/views/users/unlocks/new.html.erb

data/.gitignore

@@ -1,12 +0,0 @@
-**/*/log/*
-**/*/tmp/*
-*~
-coverage/*
-*.sqlite3
-.bundle
-rdoc/*
-pkg
-log
-test/tmp/*
-Gemfile.lock
-

data/.travis.yml

@@ -1,13 +0,0 @@
-script: "bundle exec rake test"
-rvm:
-  - 1.8.7
-  - 1.9.2
-  - ree
-  - rbx
-  - rbx-2.0
-notifications:
-  recipients:
-    - jose.valim@plataformatec.com.br
-    - carlos@plataformatec.com.br
-    - rodrigo.flores@plataformatec.com.br
-    - rafael.franca@plataformatec.com.br

data/Gemfile

@@ -1,35 +0,0 @@
-source "http://rubygems.org"
-
-gemspec
-
-gem "rails", "~> 3.1.0"
-gem "omniauth", "~> 1.0.0"
-gem "omniauth-oauth2", "~> 1.0.0"
-gem "rdoc"
-
-group :test do
-  gem "omniauth-facebook"
-  gem "omniauth-openid", "~> 1.0.1"
-  gem "webrat", "0.7.2", :require => false
-  gem "mocha", :require => false
-
-  platforms :mri_18 do
-    gem "ruby-debug", ">= 0.10.3"
-  end
-end
-
-platforms :jruby do
-  gem "activerecord-jdbc-adapter"
-  gem "activerecord-jdbcsqlite3-adapter"
-  gem "jruby-openssl"
-end
-
-platforms :ruby do
-  gem "sqlite3-ruby"
-
-  group :mongoid do
-    gem "mongo", "~> 1.3.0"
-    gem "mongoid", "~> 2.0"
-    gem "bson_ext", "~> 1.3.0"
-  end
-end

data/Rakefile

@@ -1,34 +0,0 @@
-# encoding: UTF-8
-
-require 'rake/testtask'
-require 'rdoc/task'
-
-desc 'Default: run tests for all ORMs.'
-task :default => :test
-
-desc 'Run Devise tests for all ORMs.'
-task :pre_commit do
-  Dir[File.join(File.dirname(__FILE__), 'test', 'orm', '*.rb')].each do |file|
-    orm = File.basename(file).split(".").first
-    # "Some day, my son, rake's inner wisdom will reveal itself.  Until then,
-    # take this `system` -- may its brute force protect you well."
-    exit 1 unless system "rake test DEVISE_ORM=#{orm}"
-  end
-end
-
-desc 'Run Devise unit tests.'
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = true
-end
-
-desc 'Generate documentation for Devise.'
-Rake::RDocTask.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'Devise'
-  rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README.rdoc')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/devise.gemspec

@@ -1,25 +0,0 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "devise/version"
-
-Gem::Specification.new do |s|
-  s.name        = "devise"
-  s.version     = Devise::VERSION.dup
-  s.platform    = Gem::Platform::RUBY  
-  s.summary     = "Flexible authentication solution for Rails with Warden"
-  s.email       = "contact@plataformatec.com.br"
-  s.homepage    = "http://github.com/plataformatec/devise"
-  s.description = "Flexible authentication solution for Rails with Warden"
-  s.authors     = ['José Valim', 'Carlos Antônio']
-
-  s.rubyforge_project = "devise"
-
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
-
-  s.add_dependency("warden", "~> 1.1")
-  s.add_dependency("orm_adapter", "~> 0.0.3")
-  s.add_dependency("bcrypt-ruby", "~> 3.0")
-end

data/lib/devise/controllers/internal_helpers.rb

@@ -1,154 +0,0 @@
-module Devise
-  module Controllers
-    # Those helpers are used only inside Devise controllers and should not be
-    # included in ApplicationController since they all depend on the url being
-    # accessed.
-    module InternalHelpers #:nodoc:
-      extend ActiveSupport::Concern
-      include Devise::Controllers::ScopedViews
-      include Devise::Controllers::SharedHelpers
-
-      included do
-        helper DeviseHelper
-
-        helpers = %w(resource scope_name resource_name signed_in_resource
-                     resource_class devise_mapping devise_controller?)
-        hide_action *helpers
-        helper_method *helpers
-
-        prepend_before_filter :is_devise_resource?
-        respond_to *Mime::SET.map(&:to_sym) if mimes_for_respond_to.empty?
-      end
-
-      # Gets the actual resource stored in the instance variable
-      def resource
-        instance_variable_get(:"@#{resource_name}")
-      end
-
-      # Proxy to devise map name
-      def resource_name
-        devise_mapping.name
-      end
-      alias :scope_name :resource_name
-
-      # Proxy to devise map class
-      def resource_class
-        devise_mapping.to
-      end
-
-      # Returns a signed in resource from session (if one exists)
-      def signed_in_resource
-        warden.authenticate(:scope => resource_name)
-      end
-
-      # Attempt to find the mapped route for devise based on request path
-      def devise_mapping
-        @devise_mapping ||= request.env["devise.mapping"]
-      end
-
-      # Overwrites devise_controller? to return true
-      def devise_controller?
-        true
-      end
-
-    protected
-
-      # Checks whether it's a devise mapped resource or not.
-      def is_devise_resource? #:nodoc:
-        unknown_action! <<-MESSAGE unless devise_mapping
-Could not find devise mapping for path #{request.fullpath.inspect}.
-Maybe you forgot to wrap your route inside the scope block? For example:
-
-    devise_scope :user do
-      match "/some/route" => "some_devise_controller"
-    end
-MESSAGE
-      end
-
-      # Returns real navigational formats which are supported by Rails
-      def navigational_formats
-        @navigational_formats ||= Devise.navigational_formats.select{ |format| Mime::EXTENSION_LOOKUP[format.to_s] }
-      end
-
-      def unknown_action!(msg)
-        logger.debug "[Devise] #{msg}" if logger
-        raise ActionController::UnknownAction, msg
-      end
-
-      # Sets the resource creating an instance variable
-      def resource=(new_resource)
-        instance_variable_set(:"@#{resource_name}", new_resource)
-      end
-
-      # Build a devise resource.
-      def build_resource(hash=nil)
-        hash ||= params[resource_name] || {}
-        self.resource = resource_class.new(hash)
-      end
-
-      # Helper for use in before_filters where no authentication is required.
-      #
-      # Example:
-      #   before_filter :require_no_authentication, :only => :new
-      def require_no_authentication
-        return unless is_navigational_format?
-        no_input = devise_mapping.no_input_strategies
-        args = no_input.dup.push :scope => resource_name
-        if no_input.present? && warden.authenticate?(*args)
-          resource = warden.user(resource_name)
-          flash[:alert] = I18n.t("devise.failure.already_authenticated")
-          redirect_to after_sign_in_path_for(resource)
-        end
-      end
-
-      # Helper for use after calling send_*_instructions methods on a resource.
-      # If we are in paranoid mode, we always act as if the resource was valid
-      # and instructions were sent.
-      def successfully_sent?(resource)
-        notice = if Devise.paranoid
-          resource.errors.clear
-          :send_paranoid_instructions
-        elsif resource.errors.empty?
-          :send_instructions
-        end
-
-        if notice
-          set_flash_message :notice, notice if is_navigational_format?
-          true
-        end
-      end
-
-      # Sets the flash message with :key, using I18n. By default you are able
-      # to setup your messages using specific resource scope, and if no one is
-      # found we look to default scope.
-      # Example (i18n locale file):
-      #
-      #   en:
-      #     devise:
-      #       passwords:
-      #         #default_scope_messages - only if resource_scope is not found
-      #         user:
-      #           #resource_scope_messages
-      #
-      # Please refer to README or en.yml locale file to check what messages are
-      # available.
-      def set_flash_message(key, kind, options={}) #:nodoc:
-        options[:scope] = "devise.#{controller_name}"
-        options[:default] = Array(options[:default]).unshift(kind.to_sym)
-        options[:resource_name] = resource_name
-        message = I18n.t("#{resource_name}.#{kind}", options)
-        flash[key] = message if message.present?
-      end
-
-      def clean_up_passwords(object) #:nodoc:
-        object.clean_up_passwords if object.respond_to?(:clean_up_passwords)
-      end
-
-      def respond_with_navigational(*args, &block)
-        respond_with(*args) do |format|
-          format.any(*navigational_formats, &block)
-        end
-      end
-    end
-  end
-end

data/lib/devise/controllers/shared_helpers.rb

@@ -1,26 +0,0 @@
-module Devise
-  module Controllers
-    # Helpers used in both FailureApp and Devise controllers.
-    module SharedHelpers
-      MIME_REFERENCES = Mime::HTML.respond_to?(:ref)
-
-      protected
-
-      # Helper used by FailureApp and Devise controllers to retrieve proper formats.
-      def request_format
-        @request_format ||= if request.format.respond_to?(:ref)
-          request.format.ref
-        elsif MIME_REFERENCES
-          request.format
-        elsif request.format # Rails < 3.0.4
-          request.format.to_sym
-        end
-      end
-
-      # Check whether it's navigational format, such as :html or :iphone, or not.
-      def is_navigational_format?
-        Devise.navigational_formats.include?(request_format)
-      end
-    end
-  end
-end

data/test/schema_test.rb

@@ -1,33 +0,0 @@
-if DEVISE_ORM == :mongoid
-
-  require 'test_helper'
-
-  class User2
-    include Mongoid::Document
-    devise :database_authenticatable
-  end
-
-  class User3
-    include Mongoid::Document
-    devise :database_authenticatable, :authentication_keys => [:username, :email]
-   end
-
-  class User4
-    include Mongoid::Document
-    devise :database_authenticatable, :authentication_keys => [:username]
-  end
-
-  class SchemaTest < ActiveSupport::TestCase
-    test 'should create an email field if there are no custom authentication keys' do
-      assert_not_equal User2.fields['email'], nil
-    end
-
-    test 'should create an email field if there are custom authentication keys and they include email' do
-      assert_not_equal User3.fields['email'], nil
-    end
-
-    test 'should not create an email field if there are custom authentication keys they don\'t include email' do
-      assert_equal User4.fields['email'], nil
-    end
-  end
-end