letmein 0.1.3 → 0.1.4

data/README.md

@@ -15,7 +15,7 @@ If you want to authenticate *User* with database fields *email*, *password_hash*
       conf.model      = 'Account'
       conf.attribute  = 'username'
       conf.password   = 'password_crypt'
-      conf.salt       = 'salty_salt
+      conf.salt       = 'salty_salt'
     end
     
 When creating/updating a record you have access to *password* accessor.
@@ -90,7 +90,7 @@ By default user will be logged in if provided email and password match. If you n
       
       def authenticate
         super # need to authenticate with email/password first
-        if user && user.is_approved?
+        unless user && user.is_approved?
           # adding a validation error will prevent login
           errors.add :base, "You are not approved yet, #{user.name}."
         end

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/letmein.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{letmein}
-  s.version = "0.1.3"
+  s.name = "letmein"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Oleg Khabarov"]
-  s.date = %q{2011-09-09}
-  s.description = %q{minimalistic authentication}
-  s.email = %q{oleg@khabarov.ca}
+  s.date = "2011-10-11"
+  s.description = "minimalistic authentication"
+  s.email = "oleg@khabarov.ca"
   s.extra_rdoc_files = [
     "LICENSE",
     "README.md"
@@ -27,11 +27,11 @@ Gem::Specification.new do |s|
     "lib/letmein.rb",
     "test/letmein_test.rb"
   ]
-  s.homepage = %q{http://github.com/GBH/letmein}
+  s.homepage = "http://github.com/GBH/letmein"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{minimalistic authentication}
+  s.rubygems_version = "1.8.10"
+  s.summary = "minimalistic authentication"
   s.test_files = [
     "test/letmein_test.rb"
   ]

data/lib/letmein.rb

@@ -90,7 +90,7 @@ module LetMeIn
       p = LetMeIn.accessor(:password, LetMeIn.config.models.index(self.class.model))
       s = LetMeIn.accessor(:salt, LetMeIn.config.models.index(self.class.model))
       
-      object = self.class.model.constantize.send("find_by_#{self.class.attribute}", self.login)
+      object = self.class.model.constantize.where("#{self.class.attribute}" => self.login).first
       self.object = if object && !object.send(p).blank? && object.send(p) == BCrypt::Engine.hash_secret(self.password, object.send(s))
         object
       else
@@ -139,7 +139,12 @@ module LetMeIn
     self.config.models.each do |model|
       klass = model.constantize rescue next
       klass.send :include, LetMeIn::Model
-      Object.const_set("#{model.to_s.camelize}Session", Class.new(LetMeIn::Session))
+      
+      session_model = "#{model.to_s.camelize}Session"
+      
+      # remove the constant if it's defined, so that we don't get spammed with warnings.
+      Object.send(:remove_const, session_model) if (Object.const_get(session_model) rescue nil) 
+      Object.const_set(session_model, Class.new(LetMeIn::Session))
     end
   end
 end

data/test/letmein_test.rb

@@ -107,16 +107,16 @@ class LetMeInTest < Test::Unit::TestCase
   def test_model_integration
     assert User.new.respond_to?(:password)
     user = User.create!(:email => 'test@test.test', :password => 'pass')
-    assert_match /.{60}/, user.password_hash
-    assert_match /.{29}/, user.password_salt
+    assert_match /^.{60}$/, user.password_hash
+    assert_match /^.{29}$/, user.password_salt
   end
   
   def test_model_integration_custom
     init_custom_configuration
     assert Admin.new.respond_to?(:password)
     user = Admin.create!(:username => 'test', :password => 'pass')
-    assert_match /.{60}/, user.pass_hash
-    assert_match /.{29}/, user.pass_salt
+    assert_match /^.{60}$/, user.pass_hash
+    assert_match /^.{29}$/, user.pass_salt
   end
   
   def test_session_initialization

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: letmein
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-09 00:00:00.000000000 -04:00
-default_executable: 
+date: 2011-10-11 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70092744394500 !ruby/object:Gem::Requirement
+  requirement: &70209998866600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +21,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70092744394500
+  version_requirements: *70209998866600
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
-  requirement: &70092744393800 !ruby/object:Gem::Requirement
+  requirement: &70209998865920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70092744393800
+  version_requirements: *70209998865920
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70092744392980 !ruby/object:Gem::Requirement
+  requirement: &70209998864780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70092744392980
+  version_requirements: *70209998864780
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70092744391800 !ruby/object:Gem::Requirement
+  requirement: &70209998864040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,7 +54,7 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *70092744391800
+  version_requirements: *70209998864040
 description: minimalistic authentication
 email: oleg@khabarov.ca
 executables: []
@@ -73,7 +72,6 @@ files:
 - letmein.gemspec
 - lib/letmein.rb
 - test/letmein_test.rb
-has_rdoc: true
 homepage: http://github.com/GBH/letmein
 licenses:
 - MIT
@@ -89,7 +87,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3220175875502170728
+      hash: 3289023029845343075
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -98,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: minimalistic authentication