shingara-devise 0.4.3 → 0.4.3.1

data/TODO

@@ -1,3 +1,4 @@
+* Allow authentication keys to be configured, so things like username and subdomain can be used
 * Devise::Timeoutable
 * Devise::TestHelper
 * Use request_ip in session cookies

data/lib/devise.rb

@@ -8,7 +8,7 @@ module Devise
     :confirmations => :confirmable
   }.freeze
 
-  STRATEGIES  = [:rememberable, :authenticatable].freeze
+  STRATEGIES  = [:authenticatable].freeze
   TRUE_VALUES = [true, 1, '1', 't', 'T', 'true', 'TRUE'].freeze
 
   # Maps the messages types that comes from warden to a flash type.
@@ -58,23 +58,9 @@ module Devise
   mattr_accessor :mappings
   @@mappings = {}
 
+  mattr_accessor :orm
   @@orm = 'active_record'
 
-  # ORM choice
-  def self.orm()
-    @@orm
-  end
-
-  def self.orm=(type_orm)
-    if type_orm == 'MongoMapper'
-      MongoMapper::Document::ClassMethods.send(:include, Devise::Models)
-      require 'devise/orm/mongo_mapper'
-      MongoMapper::Document::ClassMethods.send(:include, Devise::Orm::MongoMapper)
-    end
-    @@orm = type_orm
-  end
-
-
   class << self
     # Default way to setup Devise. Run script/generate devise_install to create
     # a fresh initializer with all configuration values.
@@ -123,6 +109,12 @@ module Devise
       # If the user provided a warden hook, call it now.
       @warden_config.try :call, manager
     end
+
+    ##
+    # The class to call with orm define
+    def model_orm
+      @@model_orm ||= "Devise::Orm::#{@@orm.camelize}".constantize
+    end
   end
 end
 

data/lib/devise/hooks/confirmable.rb

@@ -2,10 +2,10 @@
 # This is done by checking the time frame the user is able to sign in without
 # confirming it's account. If the user has not confirmed it's account during
 # this time frame, he/she will not able to sign in anymore.
-Warden::Manager.after_set_user do |record, auth, options|
+Warden::Manager.after_set_user do |record, warden, options|
   if record && record.respond_to?(:active?) && !record.active?
     scope = options[:scope]
-    auth.logout(scope)
+    warden.logout(scope)
     throw :warden, :scope => scope, :params => { :unconfirmed => true }
   end
 end

data/lib/devise/hooks/rememberable.rb

@@ -3,15 +3,17 @@
 # that specific user and adds a cookie with this user info to sign in this user
 # automatically without asking for credentials. Refer to rememberable strategy
 # for more info.
-Warden::Manager.after_authentication do |record, auth, options|
+Warden::Manager.after_authentication do |record, warden, options|
   scope = options[:scope]
-  remember_me = auth.params[scope].try(:fetch, :remember_me, nil)
+  remember_me = warden.params[scope].try(:fetch, :remember_me, nil)
 
   if Devise::TRUE_VALUES.include?(remember_me) && record.respond_to?(:remember_me!)
     record.remember_me!
-    auth.cookies['remember_token'] = {
+
+    warden.response.set_cookie "remember_#{scope}_token", {
       :value => record.class.serialize_into_cookie(record),
-      :expires => record.remember_expires_at
+      :expires => record.remember_expires_at,
+      :path => "/"
     }
   end
 end
@@ -19,9 +21,9 @@ end
 # Before logout hook to forget the user in the given scope, only if rememberable
 # is activated for this scope. Also clear remember token to ensure the user
 # won't be remembered again.
-Warden::Manager.before_logout do |record, auth, scope|
+Warden::Manager.before_logout do |record, warden, scope|
   if record.respond_to?(:forget_me!)
     record.forget_me!
-    auth.cookies.delete('remember_token')
+    warden.response.delete_cookie "remember_#{scope}_token"
   end
 end

data/lib/devise/mapping.rb

@@ -22,7 +22,7 @@ module Devise
   #   # is the modules included in the class
   #
   class Mapping #:nodoc:
-    attr_reader :name, :as, :path_names, :path_prefix
+    attr_reader :name, :as, :path_names, :path_prefix, :route_options
 
     # Loop through all mappings looking for a map that matches with the requested
     # path (ie /users/sign_in). If a path prefix is given, it's taken into account.
@@ -40,14 +40,13 @@ module Devise
     end
 
     def initialize(name, options) #:nodoc:
-      options.assert_valid_keys(:class_name, :as, :path_names, :singular, :path_prefix)
-
-      @as    = (options[:as] || name).to_sym
-      @klass = (options[:class_name] || name.to_s.classify).to_s
-      @name  = (options[:singular] || name.to_s.singularize).to_sym
-      @path_names  = options[:path_names] || {}
-      @path_prefix = options[:path_prefix] || ""
+      @as    = (options.delete(:as) || name).to_sym
+      @klass = (options.delete(:class_name) || name.to_s.classify).to_s
+      @name  = (options.delete(:singular) || name.to_s.singularize).to_sym
+      @path_names  = options.delete(:path_names) || {}
+      @path_prefix = options.delete(:path_prefix) || ""
       @path_prefix << "/" unless @path_prefix[-1] == ?/
+      @route_options = options || {}
 
       setup_path_names
     end

data/lib/devise/middlewares/rememberable.rb

@@ -0,0 +1,35 @@
+module Devise
+  module Middlewares
+    class Rememberable
+      def initialize(app)
+        @app = app
+      end
+
+      def call(env)
+        auth = env['warden']
+        scopes = select_cookies(auth.request)
+        scopes.each do |scope, token|
+          mapping = Devise.mappings[scope]
+          next unless mapping && mapping.for.include?(:rememberable)
+          user = mapping.to.serialize_from_cookie(token)
+          auth.set_user(user, :scope => scope) if user
+        end
+
+        @app.call(env)
+      end
+
+      protected
+
+        def select_cookies(request)
+          scopes = {}
+          matching = /remember_(#{Devise.mappings.keys.join("|")})_token/
+          request.cookies.each do |key, value|
+            if key.to_s =~ matching
+              scopes[$1.to_sym] = value
+            end
+          end
+          scopes
+        end
+    end
+  end
+end

data/lib/devise/models.rb

@@ -92,13 +92,8 @@ module Devise
 
       # Convert new keys to methods which overwrites Devise defaults
       options.each { |key, value| send(:"#{key}=", value) }
-
-      if Devise.orm == 'MongoMapper'
-        modules.each do |mod|
-          send(mod)
-        end
-      end
-
+      send :include, Devise.model_orm
+      add_fields(modules)
     end
 
     # Stores all modules included inside the model, so we are able to verify

data/lib/devise/models/rememberable.rb

@@ -1,6 +1,6 @@
 require 'digest/sha1'
 require 'devise/hooks/rememberable'
-require 'devise/strategies/rememberable'
+require 'devise/middlewares/rememberable'
 
 module Devise
   module Models

data/lib/devise/orm/active_record.rb

@@ -0,0 +1,17 @@
+module Devise
+  module Orm
+    module ActiveRecord
+      include Devise::Orm::Base
+    end
+  end
+end
+
+
+# Include alld devise definition about ActiveRecord
+Rails.configuration.after_initialize do
+  if defined?(ActiveRecord)
+    ActiveRecord::Base.extend Devise::Models
+    ActiveRecord::Base.extend Devise::Orm::ActiveRecord
+    ActiveRecord::ConnectionAdapters::TableDefinition.send :include, Devise::Migrations
+  end
+end

data/lib/devise/orm/base.rb

@@ -0,0 +1,9 @@
+module Devise
+  module Orm
+    module Base
+      def add_fields(modules)
+        # Nothing happen because no modules
+      end
+    end
+  end
+end

data/lib/devise/orm/mongo_mapper.rb

@@ -1,6 +1,9 @@
 module Devise
   module Orm
     module MongoMapper
+
+      include Devise::Orm::Base
+
       def authenticatable
         key :email, String
         key :encrypted_password, String
@@ -21,6 +24,17 @@ module Devise
         key :remember_token, String
         key :remember_created_at, DateTime
       end
+
+      ##
+      # Add all keys
+      def add_fields(modules)
+        modules.each do |mod|
+          send(mod)
+        end
+      end
     end
   end
 end
+
+MongoMapper::Document::ClassMethods.send(:include, Devise::Models)
+MongoMapper::Document::ClassMethods.send(:include, Devise::Orm::MongoMapper)

data/lib/devise/rails.rb

@@ -2,16 +2,16 @@ require 'devise/rails/routes'
 require 'devise/rails/warden_compat'
 
 Rails.configuration.after_initialize do
-  if defined?(ActiveRecord)
-    ActiveRecord::Base.extend Devise::Models
-    ActiveRecord::ConnectionAdapters::TableDefinition.send :include, Devise::Migrations
-  end
-
   # Adds Warden Manager to Rails middleware stack, configuring default devise
   # strategy and also the failure app.
   Rails.configuration.middleware.use Warden::Manager do |manager|
     Devise.configure_warden_manager(manager)
   end
 
+  # If using a rememberable module, include the middleware that log users.
+  Rails.configuration.middleware.use Devise::Middlewares::Rememberable
+
   I18n.load_path.unshift File.expand_path(File.join(File.dirname(__FILE__), 'locales', 'en.yml'))
+
+  require "devise/orm/#{Devise.orm}"
 end

data/lib/devise/rails/routes.rb

@@ -64,6 +64,10 @@ module ActionController::Routing
       #
       #    map.devise_for :users, :path_prefix => "/:locale"
       #
+      #  Any other options will be passed to route definition. If you need conditions for your routes, just map:
+      #
+      #    map.devise_for :users, :conditions => { :subdomain => /.+/ }
+      #
       #  If you are using a dynamic prefix, like :locale above, you need to configure default_url_options through Devise. You can do that in config/initializers/devise.rb or setting a Devise.default_url_options:
       #
       #    Devise.default_url_options do
@@ -75,10 +79,12 @@ module ActionController::Routing
 
         resources.map!(&:to_sym)
         resources.each do |resource|
-          mapping = Devise::Mapping.new(resource, options)
+          mapping = Devise::Mapping.new(resource, options.dup)
           Devise.mappings[mapping.name] = mapping
 
-          with_options(:path_prefix => mapping.raw_path, :name_prefix => "#{mapping.name}_") do |routes|
+          route_options = mapping.route_options.merge(:path_prefix => mapping.raw_path, :name_prefix => "#{mapping.name}_")
+
+          with_options(route_options) do |routes|
             mapping.for.each do |strategy|
               send(strategy, routes, mapping) if self.respond_to?(strategy, true)
             end

data/lib/devise/rails/warden_compat.rb

@@ -1,6 +1,5 @@
 # Taken from RailsWarden, thanks to Hassox. http://github.com/hassox/rails_warden
 module Warden::Mixins::Common
-  # Gets the rails request object by default if it's available
   def request
     return @request if @request
     if env['action_controller.rescue.request']
@@ -19,8 +18,12 @@ module Warden::Mixins::Common
     raw_session.clear
   end
 
-  # Proxy to request cookies
-  def cookies
-    request.cookies
+  def response
+    return @response if @response
+    if env['action_controller.rescue.response']
+      @response = env['action_controller.rescue.response']
+    else
+      Rack::Response.new(env)
+    end
   end
 end

data/lib/devise/version.rb

@@ -1,3 +1,3 @@
 module Devise
-  VERSION = "0.4.3".freeze
+  VERSION = "0.4.3.1".freeze
 end

data/test/devise_test.rb

@@ -50,7 +50,7 @@ class DeviseTest < ActiveSupport::TestCase
     Devise.configure_warden_manager(manager)
 
     assert_equal Devise::Failure, manager.failure_app
-    assert_equal [:rememberable, :authenticatable], manager.default_strategies
+    assert_equal [:authenticatable], manager.default_strategies
     assert manager.silence_missing_strategies
   end
 

data/test/integration/rememberable_test.rb

@@ -6,19 +6,17 @@ class RememberMeTest < ActionController::IntegrationTest
     Devise.remember_for = 1
     user = create_user
     user.remember_me!
-    cookies['remember_token'] = User.serialize_into_cookie(user) + add_to_token
+    cookies['remember_user_token'] = User.serialize_into_cookie(user) + add_to_token
     user
   end
 
   test 'do not remember the user if he has not checked remember me option' do
     user = sign_in_as_user
-
     assert_nil user.reload.remember_token
   end
 
   test 'generate remember token after sign in' do
     user = sign_in_as_user :remember_me => true
-
     assert_not_nil user.reload.remember_token
   end
 

data/test/mapping_test.rb

@@ -85,6 +85,14 @@ class MappingTest < ActiveSupport::TestCase
     end
   end
 
+  test 'should have default route options' do
+    assert_equal({}, Devise.mappings[:user].route_options)
+  end
+
+  test 'should allow passing route options to devise routes' do
+    assert_equal({ :requirements => { :extra => 'value' } }, Devise.mappings[:manager].route_options)
+  end
+
   test 'magic predicates' do
     mapping = Devise.mappings[:user]
     assert mapping.authenticatable?

data/test/rails_app/config/routes.rb

@@ -4,7 +4,9 @@ ActionController::Routing::Routes.draw do |map|
   map.devise_for :account, :path_names => {
     :sign_in => 'login', :sign_out => 'logout', :password => 'secret', :confirmation => 'verification'
   }
-  map.devise_for :organizers, :singular => 'manager', :path_prefix => '/:locale'
+  map.devise_for :organizers, :singular => 'manager',
+                              :path_prefix => '/:locale',
+                              :requirements => { :extra => 'value' }
 
   map.resources :users, :only => :index
   map.resources :admins, :only => :index

data/test/routes_test.rb

@@ -69,11 +69,14 @@ class MapRoutingTest < ActionController::TestCase
   end
 
   test 'map organizer with custom singular name' do
-    assert_recognizes({:controller => 'passwords', :action => 'new', :locale => "en"}, '/en/organizers/password/new')
+    assert_recognizes({:controller => 'passwords', :action => 'new', :locale => "en", :extra => 'value'}, '/en/organizers/password/new')
   end
 
   test 'map organizer with path prefix' do
-    assert_recognizes({:controller => 'sessions', :action => 'new', :locale => "en"}, '/en/organizers/sign_in')
+    assert_recognizes({:controller => 'sessions', :action => 'new', :locale => "en", :extra => 'value'}, '/en/organizers/sign_in')
   end
 
+  test 'map organizer with additional route options' do
+    assert_recognizes({:controller => 'passwords', :action => 'new', :locale => "en", :extra => 'value'}, '/en/organizers/password/new')
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: shingara-devise
 version: !ruby/object:Gem::Version 
-  version: 0.4.3
+  version: 0.4.3.1
 platform: ruby
 authors: 
 - "Jos\xC3\xA9 Valim"
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-11 00:00:00 +01:00
+date: 2009-11-13 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -73,6 +73,7 @@ files:
 - lib/devise/hooks/rememberable.rb
 - lib/devise/locales/en.yml
 - lib/devise/mapping.rb
+- lib/devise/middlewares/rememberable.rb
 - lib/devise/migrations.rb
 - lib/devise/models.rb
 - lib/devise/models/authenticatable.rb
@@ -80,13 +81,14 @@ files:
 - lib/devise/models/recoverable.rb
 - lib/devise/models/rememberable.rb
 - lib/devise/models/validatable.rb
+- lib/devise/orm/active_record.rb
+- lib/devise/orm/base.rb
 - lib/devise/orm/mongo_mapper.rb
 - lib/devise/rails.rb
 - lib/devise/rails/routes.rb
 - lib/devise/rails/warden_compat.rb
 - lib/devise/strategies/authenticatable.rb
 - lib/devise/strategies/base.rb
-- lib/devise/strategies/rememberable.rb
 - lib/devise/version.rb
 - lib/devise/warden.rb
 has_rdoc: true

data/lib/devise/strategies/rememberable.rb

@@ -1,35 +0,0 @@
-module Devise
-  module Strategies
-    # Remember the user through the remember token. This strategy is responsible
-    # to verify whether there is a cookie with the remember token, and to
-    # recreate the user from this cookie if it exists.  Must be called *before*
-    # authenticatable.
-    class Rememberable < Devise::Strategies::Base
-
-      # A valid strategy for rememberable needs a remember token in the cookies.
-      def valid?
-        super && remember_me_cookie.present?
-      end
-
-      # To authenticate a user we deserialize the cookie and attempt finding
-      # the record in the database. If the attempt fails, we pass to another
-      # strategy handle the authentication.
-      def authenticate!
-        if resource = mapping.to.serialize_from_cookie(remember_me_cookie)
-          success!(resource)
-        else
-          pass
-        end
-      end
-
-      private
-
-        # Accessor for remember cookie
-        def remember_me_cookie
-          cookies['remember_token']
-        end
-    end
-  end
-end
-
-Warden::Strategies.add(:rememberable, Devise::Strategies::Rememberable)