merb-auth-more 1.1.0 → 1.1.1

data/lib/merb-auth-more/mixins/bcrypt_user.rb

@@ -4,7 +4,7 @@ require 'merb-auth-more/strategies/abstract_password'
 class Merb::Authentication
   module Mixins
     # This mixin provides basic salted user password encryption.
-    # 
+    #
     # Added properties:
     #  :crypted_password, String
     #
@@ -16,15 +16,15 @@ class Merb::Authentication
     # end
     #
     module BCryptUser
-      
+
       def self.included(base)
-        base.class_eval do 
+        base.class_eval do
           attr_accessor :password, :password_confirmation
 
-          
+
           include Merb::Authentication::Mixins::BCryptUser::InstanceMethods
 
-          
+
           path = File.expand_path(File.dirname(__FILE__)) / "salted_user"
           if defined?(DataMapper) && DataMapper::Resource > self
             require path / "dm_salted_user"
@@ -39,34 +39,34 @@ class Merb::Authentication
             require path / "relaxdb_salted_user"
             extend(Merb::Authentication::Mixins::SaltedUser::RDBClassMethods)
           end
-          
+
         end # base.class_eval
       end # self.included
-      
-      
+
+
       module InstanceMethods
-        
+
         def authenticated?(password)
           bcrypt_password == password
         end
-        
+
         def bcrypt_password
           @bcrypt_password ||=  BCrypt::Password.new(crypted_password)
         end
-        
+
         def password_required?
           crypted_password.blank? || !password.blank?
         end
-        
+
         def encrypt_password
           return if password.blank?
           cost =  Merb::Plugins.config[:"merb-auth"][:bcrypt_cost] || BCrypt::Engine::DEFAULT_COST
           self.crypted_password =  BCrypt::Password.create(password, :cost => cost)
         end
-        
+
       end # InstanceMethods
-      
-    end # SaltedUser    
+
+    end # SaltedUser
   end # Mixins
 end # Merb::Authentication
 

data/lib/merb-auth-more/mixins/redirect_back.rb

@@ -1,21 +1,21 @@
 # Impelments redirect_back_or.  i.e. remembers where you've come from on a failed login
 # and stores this inforamtion in the session.  When you're finally logged in you can use
 # the redirect_back_or helper to redirect them either back where they came from, or a pre-defined url.
-# 
+#
 # Here's some examples:
 #
 #  1. User visits login form and is logged in
 #     - redirect to the provided (default) url
 #
 #  2. User vists a page (/page) and gets kicked to login (raised Unauthenticated)
-#     - On successful login, the user may be redirect_back_or("/home") and they will 
+#     - On successful login, the user may be redirect_back_or("/home") and they will
 #       return to the /page url.  The /home  url is ignored
 #
 #
 
 #
 module Merb::AuthenticatedHelper
-  
+
   # Add a helper to do the redirect_back_or  for you.  Also tidies up the session afterwards
   # If there has been a failed login attempt on some page using this method
   # you'll be redirected back to that page.  Otherwise redirect to the default_url
@@ -33,21 +33,21 @@ module Merb::AuthenticatedHelper
     end
     "Redirecting to <a href='#{default_url}'>#{default_url}</a>"
   end
-  
+
 end
 
 # This mixin is mixed into the Exceptions controller to setup the correct methods
-# And filters.  It is implemented as a mixin so that it is completely overwritable in 
+# And filters.  It is implemented as a mixin so that it is completely overwritable in
 # your controllers
 module Merb::Authentication::Mixins
   module RedirectBack
     def self.included(base)
-      base.class_eval do  
+      base.class_eval do
         after  :_set_return_to,   :only => :unauthenticated
       end
     end
-    
-    private   
+
+    private
     def _set_return_to
       unless request.exceptions.blank?
         session[:return_to] ||= []
@@ -64,11 +64,11 @@ Merb::BootLoader.after_app_loads do
   Merb::Authentication.maintain_session_keys << :return_to
 end
 # class Merb::Authentication
-# 
+#
 #   def return_to_url
 #     @return_to_url ||= session[:return_to]
 #   end
-#   
+#
 #   def return_to_url=(return_url)
 #     @return_to_url = session[:return_to] = return_url
 #   end

data/lib/merb-auth-more/mixins/salted_user.rb

@@ -4,7 +4,7 @@ require 'merb-auth-more/strategies/abstract_password'
 class Merb::Authentication
   module Mixins
     # This mixin provides basic salted user password encryption.
-    # 
+    #
     # Added properties:
     #  :crypted_password, String
     #  :salt,             String
@@ -17,14 +17,14 @@ class Merb::Authentication
     # end
     #
     module SaltedUser
-      
+
       def self.included(base)
-        base.class_eval do 
+        base.class_eval do
           attr_accessor :password, :password_confirmation
-          
+
           include Merb::Authentication::Mixins::SaltedUser::InstanceMethods
           extend  Merb::Authentication::Mixins::SaltedUser::ClassMethods
-          
+
           path = "merb-auth-more/mixins/salted_user"
           if defined?(DataMapper) && DataMapper::Resource > self
             require "#{path}/dm_salted_user"
@@ -42,40 +42,40 @@ class Merb::Authentication
             require "#{path}/relaxdb_salted_user"
             extend(Merb::Authentication::Mixins::SaltedUser::RDBClassMethods)
           end
-          
+
         end # base.class_eval
       end # self.included
-      
-      
+
+
       module ClassMethods
         # Encrypts some data with the salt.
         def encrypt(password, salt)
           Digest::SHA1.hexdigest("--#{salt}--#{password}--")
         end
-      end    
-      
+      end
+
       module InstanceMethods
         def authenticated?(password)
           crypted_password == encrypt(password)
         end
-        
+
         def encrypt(password)
           self.class.encrypt(password, salt)
         end
-        
+
         def password_required?
           crypted_password.blank? || !password.blank?
         end
-        
+
         def encrypt_password
           return if password.blank?
           self.salt = Digest::SHA1.hexdigest("--#{Time.now.to_s}--#{Merb::Authentication::Strategies::Basic::Base.login_param}--") if salt.blank?
           self.crypted_password = encrypt(password)
         end
-        
+
       end # InstanceMethods
-      
-    end # SaltedUser    
+
+    end # SaltedUser
   end # Mixins
 end # Merb::Authentication
 

data/lib/merb-auth-more/mixins/salted_user/ar_salted_user.rb

@@ -2,19 +2,19 @@ class Merb::Authentication
   module Mixins
     module SaltedUser
       module ARClassMethods
-        
+
         def self.extended(base)
           base.class_eval do
-            
+
             validates_presence_of     :password,                   :if => :password_required?
             validates_presence_of     :password_confirmation,      :if => :password_required?
             validates_confirmation_of :password,                   :if => :password_required?
-            
+
             before_save :encrypt_password
           end # base.class_eval
-                  
+
         end # self.extended
-        
+
         def authenticate(login, password)
           @u = find(:first, :conditions => ["#{Merb::Authentication::Strategies::Basic::Base.login_param} = ?", login])
           @u && @u.authenticated?(password) ? @u : nil
@@ -22,4 +22,4 @@ class Merb::Authentication
       end # ARClassMethods
     end # SaltedUser
   end # Mixins
-end # Merb::Authentication 
+end # Merb::Authentication

data/lib/merb-auth-more/mixins/salted_user/dm_salted_user.rb

@@ -10,20 +10,20 @@ class Merb::Authentication
             if Merb::Authentication::Mixins::SaltedUser > base
               property :salt, String
             end
-            
+
             validates_present        :password, :if => proc{|m| m.password_required?}
             validates_is_confirmed   :password, :if => proc{|m| m.password_required?}
-            
+
             before :save,   :encrypt_password
           end # base.class_eval
-          
+
         end # self.extended
-        
+
         def authenticate(login, password)
           @u = first(Merb::Authentication::Strategies::Basic::Base.login_param => login)
           @u && @u.authenticated?(password) ? @u : nil
         end
-      end # DMClassMethods      
+      end # DMClassMethods
     end # SaltedUser
   end # Mixins
 end # Merb::Authentication

data/lib/merb-auth-more/mixins/salted_user/mongoid_salted_user.rb

@@ -10,20 +10,20 @@ class Merb::Authentication
             if Merb::Authentication::Mixins::SaltedUser > base
               field :salt, :type => String
             end
-            
+
             validates_presence_of :password, :if => proc{|m| m.password_required?}
             validates_confirmation_of :password, :if => proc{|m| m.password_required?}
-            
+
             before_save   :encrypt_password
           end # base.class_eval
-          
+
         end # self.extended
-        
+
         def authenticate(login, password)
           @u = first(:conditions => { Merb::Authentication::Strategies::Basic::Base.login_param => login })
           @u && @u.authenticated?(password) ? @u : nil
         end
-      end # MongoidClassMethods      
+      end # MongoidClassMethods
     end # SaltedUser
   end # Mixins
 end # Merb::Authentication

data/lib/merb-auth-more/mixins/salted_user/relaxdb_salted_user.rb

@@ -2,10 +2,10 @@ class Merb::Authentication
   module Mixins
     module SaltedUser
       module RDBClassMethods
-        
+
         def self.extended(base)
           base.class_eval do
- 
+
             property :crypted_password
 
             if Merb::Authentication::Mixins::SaltedUser > base
@@ -13,7 +13,7 @@ class Merb::Authentication
             end
 
             before_save :password_checks
-            
+
             def password_checks
               if password_required?
                 return false unless !password.blank? && password == password_confirmation
@@ -21,16 +21,16 @@ class Merb::Authentication
               encrypt_password
               true
             end
-            
+
           end
         end
- 
+
         def authenticate(login, password)
           login_param = Merb::Authentication::Strategies::Basic::Base.login_param
           @u = all.sorted_by(login_param) { |q| q.key(login) }.first
           @u && @u.authenticated?(password) ? @u : nil
-        end 
-                 
+        end
+
       end # RDBClassMethods
     end # SaltedUser
   end # Mixins

data/lib/merb-auth-more/mixins/salted_user/sq_salted_user.rb

@@ -41,10 +41,10 @@ class Merb::Authentication
               validates_presence_of     :password_confirmation,      :if => :password_required?
               validates_confirmation_of :password,                   :if => :password_required?
             end
-            include Merb::Authentication::Mixins::SaltedUser::SQInstanceMethods 
+            include Merb::Authentication::Mixins::SaltedUser::SQInstanceMethods
           end
         end # self.extended
-        
+
         def authenticate(login, password)
           @u = find(Merb::Authentication::Strategies::Basic::Base.login_param => login)
           @u && @u.authenticated?(password) ? @u : nil
@@ -53,4 +53,4 @@ class Merb::Authentication
 
     end # SaltedUser
   end # Mixins
-end # Merb::Authentication 
+end # Merb::Authentication

data/lib/merb-auth-more/strategies/abstract_password.rb

@@ -4,28 +4,28 @@ class Merb::Authentication
     # an @authenticate@ method on your user class.  This should take two parameters
     # login, and password.  It should return nil or the user object.
     module Basic
-      
+
       class Base < Merb::Authentication::Strategy
         abstract!
-        
+
         # Overwrite this method to customize the field
         def self.password_param
           (Merb::Plugins.config[:"merb-auth"][:password_param] || :password).to_s.to_sym
         end
-        
+
         # Overwrite this method to customize the field
         def self.login_param
           (Merb::Plugins.config[:"merb-auth"][:login_param] || :login).to_s.to_sym
         end
-        
+
         def password_param
           @password_param ||= Base.password_param
         end
-        
+
         def login_param
           @login_param ||= Base.login_param
         end
-      end # Base      
+      end # Base
     end # Password
   end # Strategies
 end # Merb::Authentication

data/lib/merb-auth-more/strategies/basic/basic_auth.rb

@@ -11,11 +11,11 @@ class Merb::Authentication
   module Strategies
     module Basic
       class BasicAuth < Base
-        
+
         def run!
           if basic_authentication?
             basic_authentication do |login, password|
-              user = user_class.authenticate(login, password) 
+              user = user_class.authenticate(login, password)
               unless user
                 request_basic_auth!
               end
@@ -23,29 +23,29 @@ class Merb::Authentication
             end
           end
         end
-        
+
         def self.realm
           @realm ||= "Application"
         end
-        
+
         cattr_writer :realm
         def realm
           @realm ||= self.class.realm
         end
-        
+
         cattr_accessor :failure_message
         @@failure_message = "Login Required"
-        
+
         private
         def initialize(request, params)
           super
           @auth = Rack::Auth::Basic::Request.new(request.env)
         end
-        
+
         def basic_authentication?
           @auth.provided? and @auth.basic?
         end
-        
+
         def username
           basic_authentication? ? @auth.credentials.first : nil
         end
@@ -53,14 +53,14 @@ class Merb::Authentication
         def password
           basic_authentication? ? @auth.credentials.last : nil
         end
-        
+
         def request_basic_auth!
           self.status = Merb::Controller::Unauthorized.status
           self.headers['WWW-Authenticate'] = 'Basic realm="%s"' % realm
           self.body = self.class.failure_message
           halt!
         end
-        
+
         def basic_authentication(realm = nil, &authenticator)
           self.realm = realm if realm
           if basic_authentication?
@@ -69,8 +69,8 @@ class Merb::Authentication
             false
           end
         end
-        
-        
+
+
       end # BasicAuth
     end # Password
   end # Strategies

data/lib/merb-auth-more/strategies/basic/openid.rb

@@ -1,6 +1,6 @@
-# The openid strategy attempts to login users based on the OpenID protocol 
+# The openid strategy attempts to login users based on the OpenID protocol
 # http://openid.net/
-# 
+#
 # Overwrite the on_sucess!, on_failure!, on_setup_needed!, and on_cancel! to customize events.
 #
 # Overwite the required_reg_fields method to require different sreg fields.  Default is email and nickname
@@ -58,24 +58,24 @@ class Merb::Authentication
             end
           end
         end # run!
-        
-        
+
+
         # Overwrite this to add extra options to the OpenID request before it is made.
-        # 
+        #
         # @example request.return_to_args["remember_me"] = 1 # remember_me=1 is added when returning from the OpenID provider.
-        # 
+        #
         # @api overwritable
         def customize_openid_request!(openid_request)
         end
-        
+
         # Used to define the callback url for the openid provider.  By default it
         # is set to the named :openid route.
-        # 
+        #
         # @api overwritable
         def openid_callback_url
           "#{request.protocol}://#{request.host}#{Merb::Router.url(:openid)}"
         end
-        
+
         # Overwrite the on_success! method with the required behavior for successful logins
         #
         # @api overwritable
@@ -90,7 +90,7 @@ class Merb::Authentication
             redirect!(Merb::Router.url(:signup))
           end
         end
-        
+
         # Overwrite the on_failure! method with the required behavior for failed logins
         #
         # @api overwritable
@@ -99,7 +99,7 @@ class Merb::Authentication
           session.authentication.errors.add(:openid, 'OpenID verification failed, maybe the provider is down? Or the session timed out')
           nil
         end
-        
+
         #
         # @api overwritable
         def on_setup_needed!(response)
@@ -107,7 +107,7 @@ class Merb::Authentication
           request.session.authentication.errors.add(:openid, 'OpenID does not seem to be configured correctly')
           nil
         end
-        
+
          #
          # @api overwritable
         def on_cancel!(response)
@@ -115,38 +115,38 @@ class Merb::Authentication
           request.session.authentication.errors.add(:openid, 'OpenID rejected our request')
           nil
         end
-        
+
         #
         # @api overwritable
         def required_reg_fields
           ['nickname', 'email']
         end
-        
+
         #
         # @api overwritable
         def optional_reg_fields
           ['fullname']
         end
-        
+
         # Overwrite this to support an ORM other than DataMapper
         #
         # @api overwritable
         def find_user_by_identity_url(url)
           user_class.first(:identity_url => url)
         end
-        
+
         # Overwrite this method to set your store
         #
         # @api overwritable
         def openid_store
           ::OpenID::Store::Filesystem.new("#{Merb.root}/tmp/openid")
         end
-        
+
         private
         def consumer
           @consumer ||= ::OpenID::Consumer.new(request.session, openid_store)
         end
-              
+
       end # OpenID
     end # Basic
   end # Strategies

data/lib/merb-auth-more/strategies/basic/password_form.rb

@@ -3,7 +3,7 @@ require 'merb-auth-more/strategies/abstract_password'
 # This strategy uses a login  and password parameter.
 #
 # Overwrite the :password_param, and :login_param
-# to return the name of the field (on the form) that you're using the 
+# to return the name of the field (on the form) that you're using the
 # login with.  These can be strings or symbols
 #
 # == Required
@@ -15,7 +15,7 @@ class Merb::Authentication
   module Strategies
     module Basic
       class Form < Base
-        
+
         def run!
           if (login = request.params[login_param]) && (password = request.params[password_param])
             user = user_class.authenticate(login, password)
@@ -27,11 +27,11 @@ class Merb::Authentication
             user
           end
         end # run!
-        
+
         def strategy_error_message
           "#{login_param.to_s.capitalize} or #{password_param.to_s.capitalize} were incorrect"
         end
-        
+
       end # Form
     end # Password
   end # Strategies

data/lib/merb-auth-more/version.rb

@@ -1,7 +1,7 @@
 module Merb
   module Auth
     module More
-      VERSION = '1.1.0'.freeze
+      VERSION = '1.1.1'.freeze
     end
   end
 end

data/spec/mixins/dm_salted_user_spec.rb

@@ -6,16 +6,16 @@ require 'merb-auth-more/mixins/salted_user'
 describe "A DataMapper Salted User" do
 
   include UserHelper
-  
+
   before(:all) do
 
     DataMapper.setup(:default, "sqlite3::memory:")
-    
+
     class DataMapperSaltedUser
 
       include DataMapper::Resource
       include Merb::Authentication::Mixins::SaltedUser
-      
+
       property :id,    Serial
       property :email, String
       property :login, String

data/spec/mixins/redirect_back_spec.rb

@@ -40,7 +40,7 @@ describe "every call to redirect_back", :shared => true do
 end
 
 describe "redirect_back" do
-  
+
   before(:all) do
     Merb::Config[:exception_details] = true
     clear_strategies!
@@ -52,12 +52,12 @@ describe "redirect_back" do
       match("/").to(:controller => "my_controller")
       match("/logout", :method => :delete).to(:controller => "sessions", :action => "destroy")
     end
-    
+
     class Merb::Authentication
       def store_user(user); user; end
       def fetch_user(session_info); session_info; end
     end
-    
+
     # class MyStrategy < Merb::Authentication::Strategy; def run!; request.env["USER"]; end; end
     class MyStrategy < Merb::Authentication::Strategy
       def run!
@@ -65,25 +65,25 @@ describe "redirect_back" do
         params[:pass_auth]
       end
     end
-    
+
     class Application < Merb::Controller; end
-    
+
     class Exceptions < Merb::Controller
       include Merb::Authentication::Mixins::RedirectBack
-      
+
       def unauthenticated; end
 
     end
-    
+
     class Sessions < Merb::Controller
       before :ensure_authenticated
       def update
         redirect_back_or "/", :ignore => [url(:login)]
       end
-      
+
       def destroy
         session.abandon!
-      end      
+      end
     end
 
     class MyController < Application
@@ -93,8 +93,8 @@ describe "redirect_back" do
       end
     end
 
-  end 
-  
+  end
+
   def login
     request("/login", :method => "put", :params => {:pass_auth => true})
   end
@@ -114,5 +114,5 @@ describe "redirect_back" do
     end
     it_should_behave_like 'every call to redirect_back'
   end
-  
+
 end

data/spec/mixins/sq_bcrypt_user_spec.rb

@@ -6,9 +6,9 @@ require 'merb-auth-more/mixins/bcrypt_user'
 DB = Sequel.sqlite unless Object.const_defined?('DB')
 
 describe "A Sequel Bcrypt User" do
-  
+
   include UserHelper
-  
+
   before(:all) do
 
     DB.drop_table(:users) if DB.table_exists? :users

data/spec/mixins/sq_salted_user_spec.rb

@@ -6,9 +6,9 @@ require 'merb-auth-more/mixins/salted_user'
 DB = Sequel.sqlite unless Object.const_defined?('DB')
 
 describe "A Sequel Salted User" do
-  
+
   include UserHelper
-  
+
   before(:all) do
 
     DB.drop_table(:users) if DB.table_exists? :users

data/spec/shared_user_spec.rb

@@ -88,7 +88,7 @@ describe 'every salted user', :shared => true do
   it "should set the salt" do
     @new_user.salt.should be_nil
     @new_user.send(:encrypt_password)
-    @new_user.salt.should_not be_nil    
+    @new_user.salt.should_not be_nil
   end
 
   it "should set the salt even when user is not new record but salt is blank" do

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: merb-auth-more
 version: !ruby/object:Gem::Version 
+  hash: 17
   prerelease: false
   segments: 
   - 1
   - 1
-  - 0
-  version: 1.1.0
+  - 1
+  version: 1.1.1
 platform: ruby
 authors: 
 - Daniel Neighman
@@ -14,30 +15,34 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-22 00:00:00 +00:00
+date: 2010-06-15 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: merb-auth-core
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 17
         segments: 
         - 1
         - 1
-        - 0
-        version: 1.1.0
+        - 1
+        version: 1.1.1
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 13
         segments: 
         - 1
         - 2
@@ -93,23 +98,27 @@ 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: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Additional resources for use with the merb-auth-core authentication framework.