merb-auth-more 0.9.9 → 0.9.10

data/README.textile

@@ -10,7 +10,7 @@ Strategies are really simple to implement, but we've made some basic ones availa
 
 The built in ones are basic but should be enough to get you going for most things.  
 
-To specify them, simply require them.  For example,in lib/auth-strategies.rb
+To specify them, simply require them.  For example,in Merb.root/merb/merb-auth/strategies.rb
 
 <pre><code>
 Merb::Authentication.activate!(:default_password_form)
@@ -33,7 +33,7 @@ h3. "User" mixins
 
 To assist with your authenticating needs, there is user mixins available to enhance your user model
 for basic cases.  These really are just for the basic case, so if you need something extra you should 
-overwrite the methods, or implement (and share ;) ;) ) your requirements.
+overwrite the methods, or implement your requirements.
 
 To use these, require the specific mixin, and then include it into your "User" class.
 

data/Rakefile

@@ -10,7 +10,9 @@ require 'rake/testtask'
 require File.join(File.dirname(__FILE__), "../../merb-core/lib/merb-core/version.rb")
 
 GEM_NAME = "merb-auth-more"
-GEM_VERSION = Merb::VERSION
+PKG_BUILD   = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
+GEM_VERSION = Merb::VERSION + PKG_BUILD
+
 AUTHOR = "Daniel Neighman"
 EMAIL = "has.sox@gmail.com"
 HOMEPAGE = "http://merbivore.com/"
@@ -28,7 +30,7 @@ spec = Gem::Specification.new do |s|
   s.author = AUTHOR
   s.email = EMAIL
   s.homepage = HOMEPAGE
-  s.add_dependency("merb-auth-core", "= #{Merb::VERSION}")
+  s.add_dependency("merb-auth-core", ">= #{Merb::VERSION}")
   s.require_path = 'lib'
   s.files = %w(LICENSE README.textile Rakefile TODO) + Dir.glob("{lib,spec}/**/*")
   

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

@@ -31,22 +31,31 @@ module Merb::AuthenticatedHelper
       redirect default_url, opts
     end
     session.authentication.return_to_url = nil
+    "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 
+# your controllers
+module Merb::Authentication::Mixins
+  module RedirectBack
+    def self.included(base)
+      base.class_eval do  
+        after  :_set_return_to,   :only => :unauthenticated
+      end
+    end
+    
+    private   
+    def _set_return_to
+      session.authentication.return_to_url ||= request.uri unless request.exceptions.blank?
+    end
 
-class Application < Merb::Controller; end
-
-class Exceptions < Application
-  after  :_set_return_to,   :only => :unauthenticated
-
-  private   
-  def _set_return_to
-    session.authentication.return_to_url ||= request.uri unless request.exceptions.blank?
-  end
-end
+  end # RedirectBack
+end # Merb::Authentication::Mixins
 
+# Adds required methods to  the Authentication object for redirection
 class Merb::Authentication
 
   def return_to_url
@@ -56,4 +65,9 @@ class Merb::Authentication
   def return_to_url=(return_url)
     @return_to_url = session[:return_to] = return_url
   end
+end
+
+# Mixin the RedirectBack mixin before the after_app_loads block (i.e. make sure there is an exceptions controller)
+Merb::Authentication.customize_default do
+  Exceptions.class_eval{ include Merb::Authentication::Mixins::RedirectBack }
 end

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

@@ -1,4 +1,6 @@
 require "digest/sha1"
+require File.expand_path(File.dirname(__FILE__) / "..") / "strategies" / "abstract_password"
+
 class Merb::Authentication
   module Mixins
     # This mixin provides basic salted user password encryption.
@@ -33,6 +35,9 @@ class Merb::Authentication
           elsif defined?(Sequel) && ancestors.include?(Sequel::Model)
             require path / "sq_salted_user"
             extend(Merb::Authentication::Mixins::SaltedUser::SQClassMethods)
+          elsif defined?(RelaxDB) && ancestors.include?(RelaxDB::Document)
+            require path / "relaxdb_salted_user"
+            extend(Merb::Authentication::Mixins::SaltedUser::RDBClassMethods)
           end
           
         end # base.class_eval

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

@@ -0,0 +1,34 @@
+class Merb::Authentication
+  module Mixins
+    module SaltedUser
+      module RDBClassMethods
+        
+        def self.extended(base)
+          base.class_eval do
+ 
+            property :crypted_password
+            property :salt
+ 
+            before_save :password_checks
+            
+            def password_checks
+              if password_required?
+                return false unless !password.blank? && password == password_confirmation
+              end
+              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 # RDBClassMethods
+    end # SaltedUser
+  end # Mixins
+end # Merb::Authentication

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

@@ -20,12 +20,16 @@ class Merb::Authentication
             user = user_class.authenticate(request.params[login_param], request.params[password_param])
             if !user
               request.session.authentication.errors.clear!
-              request.session.authentication.errors.add(login_param, "#{login_param.to_s.capitalize} or #{password_param.to_s.capitalize} were incorrect")
+              request.session.authentication.errors.add(login_param, strategy_error_message)
             end
             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/spec/mixins/redirect_back_spec.rb

@@ -15,15 +15,14 @@ describe "redirect_back" do
     
     class Application < Merb::Controller; end
     
-    class Exceptions < Application
+    class Exceptions < Merb::Controller
+      include Merb::Authentication::Mixins::RedirectBack
       def unauthenticated; end
     end
 
     class MyController < Application
       before :ensure_authenticated
-
       def index; "HERE!" end
-
     end
   end 
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb-auth-more
 version: !ruby/object:Gem::Version 
-  version: 0.9.9
+  version: 0.9.10
 platform: ruby
 authors: 
 - Daniel Neighman
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-13 00:00:00 -07:00
+date: 2008-10-21 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -18,9 +18,9 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.9
+        version: 0.9.10
     version: 
 description: Additional resources for use with the merb-auth-core authentication framework.
 email: has.sox@gmail.com
@@ -44,6 +44,7 @@ files:
 - lib/merb-auth-more/mixins/salted_user
 - lib/merb-auth-more/mixins/salted_user/ar_salted_user.rb
 - lib/merb-auth-more/mixins/salted_user/dm_salted_user.rb
+- lib/merb-auth-more/mixins/salted_user/relaxdb_salted_user.rb
 - lib/merb-auth-more/mixins/salted_user/sq_salted_user.rb
 - lib/merb-auth-more/mixins/salted_user.rb
 - lib/merb-auth-more/strategies
@@ -80,7 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: merb
-rubygems_version: 1.2.0
+rubygems_version: 1.3.0
 signing_key: 
 specification_version: 2
 summary: Additional resources for use with the merb-auth-core authentication framework.