merb-auth-more 1.1.0.rc1 → 1.1.0

data/lib/merb-auth-more.rb

@@ -1,26 +1,23 @@
-require 'merb-auth-core'
+require "merb-auth-core"
 
-# make sure we're running inside Merb
-if defined?(Merb::Plugins)
-  # Merb gives you a Merb::Plugins.config hash...feel free to put your stuff in your piece of it
-  Merb::Plugins.config[:"merb-auth_more"] = {
-    :chickens => false
-  }
-  
-  # Register the strategies so that plugins and apps may utilize them
-  basic_path = File.expand_path(File.dirname(__FILE__)) / "merb-auth-more" / "strategies" / "basic"
-  
-  Merb::Authentication.register(:default_basic_auth,    basic_path / "basic_auth.rb")
-  Merb::Authentication.register(:default_openid,        basic_path / "openid.rb")
-  Merb::Authentication.register(:default_password_form, basic_path / "password_form.rb")
-  
-  Merb::BootLoader.before_app_loads do
-    # require code that must be loaded before the application
-  end
-  
-  Merb::BootLoader.after_app_loads do
-    # code that can be required after the application loads
-  end
-  
-  Merb::Plugins.add_rakefiles "merb-auth-more/merbtasks"
+# Merb gives you a Merb::Plugins.config hash...feel free to put your stuff in your piece of it
+Merb::Plugins.config[:"merb-auth_more"] = {
+  :chickens => false
+}
+
+# Register the strategies so that plugins and apps may utilize them
+basic_path = File.expand_path(File.dirname(__FILE__)) / "merb-auth-more" / "strategies" / "basic"
+
+Merb::Authentication.register(:default_basic_auth,    basic_path / "basic_auth.rb")
+Merb::Authentication.register(:default_openid,        basic_path / "openid.rb")
+Merb::Authentication.register(:default_password_form, basic_path / "password_form.rb")
+
+Merb::BootLoader.before_app_loads do
+  # require code that must be loaded before the application
 end
+
+Merb::BootLoader.after_app_loads do
+  # code that can be required after the application loads
+end
+
+Merb::Plugins.add_rakefiles "merb-auth-more/merbtasks"

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

@@ -29,6 +29,9 @@ class Merb::Authentication
           if defined?(DataMapper) && DataMapper::Resource > self
             require "#{path}/dm_salted_user"
             extend(Merb::Authentication::Mixins::SaltedUser::DMClassMethods)
+          elsif defined?(Mongoid) && Mongoid::Document > self
+            require "#{path}/mongoid_salted_user"
+            extend(Merb::Authentication::Mixins::SaltedUser::MongoidClassMethods)
           elsif defined?(ActiveRecord) && ancestors.include?(ActiveRecord::Base)
             require "#{path}/ar_salted_user"
             extend(Merb::Authentication::Mixins::SaltedUser::ARClassMethods)

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

@@ -0,0 +1,29 @@
+class Merb::Authentication
+  module Mixins
+    module SaltedUser
+      module MongoidClassMethods
+        def self.extended(base)
+          base.class_eval do
+
+            field :crypted_password, :type => String
+
+            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 # SaltedUser
+  end # Mixins
+end # Merb::Authentication

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

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

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: merb-auth-more
 version: !ruby/object:Gem::Version 
-  prerelease: true
+  prerelease: false
   segments: 
   - 1
   - 1
   - 0
-  - rc1
-  version: 1.1.0.rc1
+  version: 1.1.0
 platform: ruby
 authors: 
 - Daniel Neighman
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-15 00:00:00 +00:00
+date: 2010-03-22 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -29,8 +28,7 @@ dependencies:
         - 1
         - 1
         - 0
-        - rc1
-        version: 1.1.0.rc1
+        version: 1.1.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -69,6 +67,7 @@ files:
 - lib/merb-auth-more/mixins/salted_user.rb
 - 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/mongoid_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/strategies/abstract_password.rb
@@ -102,13 +101,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: