devise 1.0.11 → 1.1.0

data/app/views/unlocks/new.html.erb

@@ -1,12 +0,0 @@
-<h2>Resend unlock instructions</h2>
-
-<% form_for resource_name, resource, :url => unlock_path(resource_name) do |f| %>
-  <%= f.error_messages %>
-
-  <p><%= f.label :email %></p>
-  <p><%= f.text_field :email %></p>
-
-  <p><%= f.submit "Resend unlock instructions" %></p>
-<% end %>
-
-<%= render :partial => "shared/devise_links" %>

data/generators/devise/USAGE

@@ -1,5 +0,0 @@
-To create a devise resource user:
-
-    script/generate devise User
-
-This will generate a model named User, a route map for devise called :users, and a migration file for table :users with all devise modules.

data/generators/devise/devise_generator.rb

@@ -1,15 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + "/lib/route_devise.rb")
-
-class DeviseGenerator < Rails::Generator::NamedBase
-
-  def manifest
-    record do |m|
-      m.directory(File.join('app', 'models', class_path))
-      m.template 'model.rb', File.join('app', 'models', "#{file_path}.rb")
-
-      m.migration_template 'migration.rb', 'db/migrate', :migration_file_name => "devise_create_#{table_name}"
-      m.route_devise table_name
-    end
-  end
-
-end

data/generators/devise/lib/route_devise.rb

@@ -1,32 +0,0 @@
-module Rails
-  module Generator
-    module Commands
-      class Create < Base
-
-        # Create devise route. Based on route_resources
-        def route_devise(*resources)
-          resource_list = resources.map { |r| r.to_sym.inspect }.join(', ')
-          sentinel = 'ActionController::Routing::Routes.draw do |map|'
-
-          logger.route "map.devise_for #{resource_list}"
-          unless options[:pretend]
-            gsub_file 'config/routes.rb', /(#{Regexp.escape(sentinel)})/mi do |match|
-              "#{match}\n  map.devise_for #{resource_list}\n"
-            end
-          end
-        end
-      end
-
-      class Destroy < RewindBase
-
-        # Destroy devise route. Based on route_resources
-        def route_devise(*resources)
-          resource_list = resources.map { |r| r.to_sym.inspect }.join(', ')
-          look_for = "\n  map.devise_for #{resource_list}\n"
-          logger.route "map.devise_for #{resource_list}"
-          gsub_file 'config/routes.rb', /(#{look_for})/mi, ''
-        end
-      end
-    end
-  end
-end

data/generators/devise/templates/model.rb

@@ -1,9 +0,0 @@
-class <%= class_name %> < ActiveRecord::Base
-  # Include default devise modules. Others available are:
-  # :http_authenticatable, :token_authenticatable, :confirmable, :lockable, :timeoutable and :activatable
-  devise :registerable, :database_authenticatable, :recoverable,
-         :rememberable, :trackable, :validatable
-
-  # Setup accessible (or protected) attributes for your model
-  attr_accessible :email, :password, :password_confirmation
-end

data/generators/devise_install/USAGE

@@ -1,3 +0,0 @@
-To copy a Devise initializer to your Rails App, with some configuration values, just do:
-
-    script/generate devise_install

data/generators/devise_install/devise_install_generator.rb

@@ -1,15 +0,0 @@
-class DeviseInstallGenerator < Rails::Generator::Base
-
-  def manifest
-    record do |m|
-      m.directory "config/initializers"
-      m.template  "devise.rb", "config/initializers/devise.rb"
-
-      m.directory "config/locales"
-      m.file      "../../../lib/devise/locales/en.yml", "config/locales/devise.en.yml"
-
-      m.readme "README"
-    end
-  end
-
-end

data/generators/devise_install/templates/devise.rb

@@ -1,105 +0,0 @@
-# Use this hook to configure devise mailer, warden hooks and so forth. The first
-# four configuration values can also be set straight in your models.
-Devise.setup do |config|
-  # Configure the e-mail address which will be shown in DeviseMailer.
-  config.mailer_sender = "please-change-me@config-initializers-devise.com"
-  
-  # Configure the content type of DeviseMailer mails (defaults to text/html")
-  # config.mailer_content_type = "text/plain"
-
-  # ==> Configuration for :authenticatable
-  # Invoke `rake secret` and use the printed value to setup a pepper to generate
-  # 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.
-  # config.stretches = 10
-
-  # Define which will be the encryption algorithm. Supported algorithms are :sha1
-  # (default), :sha512 and :bcrypt. Devise also supports encryptors from others
-  # authentication tools as :clearance_sha1, :authlogic_sha512 (then you should set
-  # stretches above to 20 for default behavior) and :restful_authentication_sha1
-  # (then you should set stretches to 10, and copy REST_AUTH_SITE_KEY to pepper)
-  # config.encryptor = :sha1
-
-  # Configure which keys are used when authenticating an user. By default is
-  # just :email. You can configure it to use [:username, :subdomain], so for
-  # authenticating an user, both parameters are required. Remember that those
-  # parameters are used only when authenticating and not when retrieving from
-  # session. If you need permissions, you should implement that in a before filter.
-  # config.authentication_keys = [ :email ]
-
-  # The realm used in Http Basic Authentication
-  # config.http_authentication_realm = "Application"
-
-  # ==> Configuration for :confirmable
-  # The time you want give to your user to confirm his account. During this time
-  # he will be able to access your application without confirming. Default is nil.
-  # config.confirm_within = 2.days
-
-  # ==> Configuration for :rememberable
-  # The time the user will be remembered without asking for credentials again.
-  # config.remember_for = 2.weeks
-
-  # ==> Configuration for :timeoutable
-  # The time you want to timeout the user session without activity. After this
-  # time the user will be asked for credentials again.
-  # config.timeout_in = 10.minutes
-
-  # ==> Configuration for :lockable
-  # Number of authentication tries before locking an account.
-  # config.maximum_attempts = 20
-
-  # 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)
-  # :both  = enables both strategies
-  # config.unlock_strategy = :both
-
-  # Time interval to unlock the account if :time is enabled as unlock_strategy.
-  # config.unlock_in = 1.hour
-
-  # ==> Configuration for :token_authenticatable
-  # Defines name of the authentication token params key
-  # config.token_authentication_key = :auth_token
-
-  # ==> General configuration
-  # Load and configure the ORM. Supports :active_record (default), :mongo_mapper
-  # (requires mongo_ext installed) and :data_mapper (experimental).
-  # require 'devise/orm/mongo_mapper'
-  # config.orm = :mongo_mapper
-
-  # Turn scoped views on. Before rendering "sessions/new", it will first check for
-  # "sessions/users/new". It's turned off by default because it's slower if you
-  # are using only default views.
-  # config.scoped_views = true
-
-  # By default, devise detects the role accessed based on the url. So whenever
-  # accessing "/users/sign_in", it knows you are accessing an User. This makes
-  # routes as "/sign_in" not possible, unless you tell Devise to use the default
-  # scope, setting true below.
-  # config.use_default_scope = true
-
-  # Configure the default scope used by Devise. By default it's the first devise
-  # role declared in your routes.
-  # config.default_scope = :user
-
-  # If you want to use other strategies, that are not (yet) supported by Devise,
-  # you can configure them inside the config.warden block. The example below
-  # allows you to setup OAuth, using http://github.com/roman/warden_oauth
-  #
-  # config.warden do |manager|
-  #   manager.oauth(:twitter) do |twitter|
-  #     twitter.consumer_secret = <YOUR CONSUMER SECRET>
-  #     twitter.consumer_key  = <YOUR CONSUMER KEY>
-  #     twitter.options :site => 'http://twitter.com'
-  #   end
-  #   manager.default_strategies.unshift :twitter_oauth
-  # end
-
-  # Configure default_url_options if you are using dynamic segments in :path_prefix
-  # for devise_for.
-  # config.default_url_options do
-  #   { :locale => I18n.locale }
-  # end
-end

data/generators/devise_views/USAGE

@@ -1,3 +0,0 @@
-To copy all session, password, confirmation and mailer views from devise to your app just run the following command:
-
-    script/generate devise_views

data/generators/devise_views/devise_views_generator.rb

@@ -1,21 +0,0 @@
-class DeviseViewsGenerator < Rails::Generator::Base
-
-  def initialize(*args)
-    super
-    @source_root = options[:source] || File.join(spec.path, '..', '..')
-  end
-
-  def manifest
-    record do |m|
-      m.directory "app/views"
-
-      Dir[File.join(@source_root, "app", "views", "**/*.erb")].each do |file|
-        file = file.gsub(@source_root, "")[1..-1]
-
-        m.directory  File.dirname(file)
-        m.file       file, file
-      end
-    end
-  end
-
-end

data/lib/devise/models/activatable.rb

@@ -1,16 +0,0 @@
-require 'devise/hooks/activatable'
-
-module Devise
-  module Models
-    # This module implements the default API required in activatable hook. 
-    module Activatable
-      def active?
-        true
-      end
-
-      def inactive_message
-        :inactive
-      end
-    end
-  end
-end

data/lib/devise/models/http_authenticatable.rb

@@ -1,23 +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 method
-    # (which for example is defined in authenticatable).
-    module HttpAuthenticatable
-      def self.included(base)
-        base.extend ClassMethods
-      end
-
-      module ClassMethods
-        Devise::Models.config(self, :authentication_keys)
-
-        # 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/data_mapper.rb

@@ -1,83 +0,0 @@
-module Devise
-  module Orm
-    module DataMapper
-      module InstanceMethods
-        def save(flag=nil)
-          if flag == false
-            save!
-          else
-            super()
-          end
-        end
-      end
-
-      def self.included_modules_hook(klass)
-        klass.send :extend,  self
-        klass.send :include, InstanceMethods
-
-        yield
-
-        klass.devise_modules.each do |mod|
-          klass.send(mod) if klass.respond_to?(mod)
-        end
-      end
-
-      include Devise::Schema
-
-      SCHEMA_OPTIONS = {
-        :null  => :nullable,
-        :limit => :length
-      }
-
-      # Hooks for confirmable
-      def before_create(*args)
-        wrap_hook(:before, *args)
-      end
-
-      def after_create(*args)
-        wrap_hook(:after, *args)
-      end
-
-      def wrap_hook(action, *args)
-        options = args.extract_options!
-
-        args.each do |callback|
-          send action, :create, 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)
-        options = args.extract_options!
-        case args.first
-          when :first
-            first(options)
-          when :all
-            all(options)
-          else
-            get(*args)
-        end
-      end
-
-      # Tell how to apply schema methods. This automatically maps :limit to
-      # :length and :null to :nullable.
-      def apply_schema(name, type, options={})
-        return unless Devise.apply_schema
-
-        SCHEMA_OPTIONS.each do |old_key, new_key|
-          next unless options.key?(old_key)
-          options[new_key] = options.delete(old_key)
-        end
-
-        property name, type, options
-      end
-    end
-  end
-end
-
-DataMapper::Model.send(:include, Devise::Models)

data/lib/devise/orm/mongo_mapper.rb

@@ -1,52 +0,0 @@
-module Devise
-  module Orm
-    module MongoMapper
-      module InstanceMethods
-        def save(options={})
-          if options == false
-            super(:validate => false)
-          else
-            super
-          end
-        end
-      end
-
-      def self.included_modules_hook(klass)
-        klass.send :extend,  self
-        klass.send :include, InstanceMethods
-        yield
-
-        klass.devise_modules.each do |mod|
-          klass.send(mod) if klass.respond_to?(mod)
-        end
-      end
-      
-      def find(*args)
-        case args.first
-        when :first, :all
-          send(args.shift, *args)
-        else
-          super
-        end
-      end
-      
-      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={})
-        return unless Devise.apply_schema
-        type = Time if type == DateTime
-        key name, type, options
-      end
-    end
-  end
-end
-
-if MongoMapper::Version >= "0.8.0"
-  MongoMapper::Plugins::Document::ClassMethods.send(:include, Devise::Models)
-  MongoMapper::Plugins::EmbeddedDocument::ClassMethods.send(:include, Devise::Models)
-else
-  MongoMapper::Document::ClassMethods.send(:include, Devise::Models)
-  MongoMapper::EmbeddedDocument::ClassMethods.send(:include, Devise::Models)
-end

data/lib/devise/strategies/http_authenticatable.rb

@@ -1,59 +0,0 @@
-require 'devise/strategies/base'
-
-module Devise
-  module Strategies
-    # Sign in an user using HTTP authentication.
-    class HttpAuthenticatable < Base
-      def valid?
-        http_authentication? && 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 response_body
-        body   = "HTTP Basic: Access denied."
-        method = :"to_#{request_format.to_sym}"
-        {}.respond_to?(method) ? { :error => body }.send(method) : body
-      end
-
-      def http_authentication
-        request.env['HTTP_AUTHORIZATION']   ||
-        request.env['X-HTTP_AUTHORIZATION'] ||
-        request.env['X_HTTP_AUTHORIZATION'] ||
-        request.env['REDIRECT_X_HTTP_AUTHORIZATION']
-      end
-      alias :http_authentication? :http_authentication
-
-      def decode_credentials(request)
-        ActiveSupport::Base64.decode64(http_authentication.split(' ', 2).last || '')
-      end
-
-      def custom_headers
-        {
-          "Content-Type" => request_format.to_s,
-          "WWW-Authenticate" => %(Basic realm="#{Devise.http_authentication_realm.gsub(/"/, "")}")
-        }
-      end
-
-      def request_format
-        @request_format ||= Mime::Type.lookup_by_extension(request.template_format.to_s)
-      end
-    end
-  end
-end
-
-Warden::Strategies.add(:http_authenticatable, Devise::Strategies::HttpAuthenticatable)

data/rails/init.rb

@@ -1,2 +0,0 @@
-# We need to load devise here to ensure routes extensions are loaded.
-require 'devise'

data/test/integration/rack_middleware_test.rb

@@ -1,47 +0,0 @@
-require "test/test_helper"
-require "rack/test"
-
-class RackMiddlewareTest < Test::Unit::TestCase
-  include Rack::Test::Methods
-
-  def app
-    ActionController::Dispatcher.new
-  end
-
-  def warden
-    last_request.env['warden']
-  end
-
-  def with_custom_strategy
-    get '/'
-
-    Warden::Strategies.add(:custom_test) do
-      def valid?
-        true
-      end
-
-      def authenticate!
-        custom! [599, {
-            "X-Custom-Response" => "Custom response test",
-            "Content-type" => "text/plain"
-          }, "Custom response test"]
-      end
-    end
-
-    #ActionController::Dispatcher.middleware.use CustomStrategyInterceptor
-    default_strategies = warden.manager.config.default_strategies
-    warden.manager.config.default_strategies :custom_test
-    yield
-    warden.manager.config.default_strategies default_strategies
-  end
-
-  def test_custom_strategy_response
-    with_custom_strategy do
-      post('/users/sign_in')
-
-      assert_equal 599, last_response.status
-      assert_equal "Custom response test", last_response.body
-      assert_equal "Custom response test", last_response.headers["X-Custom-Response"]
-    end
-  end
-end

data/test/orm/mongo_mapper.rb

@@ -1,20 +0,0 @@
-require 'mongo_mapper'
-MongoMapper.database = "devise-test-suite"
-MongoMapper.connection = Mongo::Connection.new('127.0.0.1', 27017)
-
-require File.join(File.dirname(__FILE__), '..', 'rails_app', 'config', 'environment')
-require 'test_help'
-
-module MongoMapper::Document
-  # TODO This should not be required
-  def invalid?
-    !valid?
-  end
-end
-
-class ActiveSupport::TestCase
-  setup do
-    User.delete_all
-    Admin.delete_all
-  end
-end

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

@@ -1,13 +0,0 @@
-class Admin
-  include MongoMapper::Document
-  devise :authenticatable, :registerable, :timeoutable
-
-  def self.find_for_authentication(conditions)
-    last(:conditions => conditions)
-  end
-
-  def self.last(options={})
-    options.merge!(:order => 'email')
-    super options
-  end
-end

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

@@ -1,14 +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
-
-  def self.last(options={})
-    options.merge!(:order => 'email')
-    super options
-  end
-
-end

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

@@ -1,24 +0,0 @@
-# Be sure to restart your server when you modify this file.
-
-# These settings change the behavior of Rails 2 apps and will be defaults
-# for Rails 3. You can remove this initializer when Rails 3 is released.
-
-if defined?(ActiveRecord)
-  # Include Active Record class name as root for JSON serialized output.
-  ActiveRecord::Base.include_root_in_json = true
-
-  # Store the full class name (including module namespace) in STI type column.
-  ActiveRecord::Base.store_full_sti_class = true
-end
-
-ActionController::Routing.generate_best_match = false
-
-# Use ISO 8601 format for JSON serialized times and dates.
-ActiveSupport.use_standard_json_time_format = true
-
-# Don't escape HTML entities in JSON, leave that for the #json_escape helper.
-# if you're including raw json in an HTML page.
-ActiveSupport.escape_html_entities_in_json = false
-
-# Clean up silencers
-Rails.backtrace_cleaner.remove_silencers!

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      => '89e8147901a0d7c221ac130e0ded3eeab6dab4a97127255909f08fedaae371918b41dec9d4d75c5b27a55c3772d43c2b6a3cbac232c5cc2ce4b8ec22242f5e60'
-}
-
-# 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