letmein 0.1.2 → 0.1.3

data/README.md

@@ -1,5 +1,4 @@
-letmein
-=======
+# letmein [![Build Status](http://travis-ci.org/GBH/letmein.png)](http://travis-ci.org/GBH/letmein)
 
 **letmein** is a minimalistic authentication plugin for Rails 3 applications. It doesn't have anything other than the UserSession (or WhateverSession) object that you can use to authenticate logins.
 
@@ -85,13 +84,15 @@ Overriding Session Authentication
 By default user will be logged in if provided email and password match. If you need to add a bit more logic to that you'll need to create your own session object. In the following example we do an additional check to see if user is 'approved' before letting him in.
 
     class MySession < LetMeIn::Session
-      @model, @attribute = 'User', 'email' # need to know what model we're validating
+      # Model that is being authenticated is derived from the class name
+      # If you're authenticating multiple models you need to specify which one
+      @model = 'User'
       
       def authenticate
         super # need to authenticate with email/password first
         if user && user.is_approved?
           # adding a validation error will prevent login
-          errors.add :base, 'You are not approved yet' 
+          errors.add :base, "You are not approved yet, #{user.name}."
         end
       end
     end

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/letmein.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{letmein}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Oleg Khabarov"]
@@ -19,7 +19,6 @@ Gem::Specification.new do |s|
   s.files = [
     ".travis.yml",
     "Gemfile",
-    "Gemfile.lock",
     "LICENSE",
     "README.md",
     "Rakefile",

data/lib/letmein.rb

@@ -53,7 +53,9 @@ module LetMeIn
     validate :authenticate
     
     def initialize(params = { })
-      self.class.model      ||= self.class.to_s.gsub('Session', '') || LetMeIn.config.models.first
+      model = self.class.to_s.gsub('Session', '')
+      model = LetMeIn.config.models.member?(model) ? model : LetMeIn.config.models.first
+      self.class.model      ||= model
       self.class.attribute  ||= LetMeIn.accessor(:attribute, LetMeIn.config.models.index(self.class.model))
       self.login      = params[:login] || params[self.class.attribute.to_sym]
       self.password   = params[:password]

data/test/letmein_test.rb

@@ -11,20 +11,25 @@ class User  < ActiveRecord::Base ; end
 class Admin < ActiveRecord::Base ; end
 
 class OpenSession < LetMeIn::Session
-  @model, @attribute = 'User', 'email'
+  # @model, @attribute = 'User', 'email'
   def authenticate
     super
   end
 end
 
 class ClosedSession < LetMeIn::Session
-  @model, @attribute = 'User', 'email'
+  # @model, @attribute = 'User', 'email'
   def authenticate
     super
     errors.add :base, "You shall not pass #{user.email}"
   end
 end
 
+class CustomAdminSession < LetMeIn::Session
+  @model = 'Admin'
+  # ...
+end
+
 class LetMeInTest < Test::Unit::TestCase
   
   def setup
@@ -209,4 +214,12 @@ class LetMeInTest < Test::Unit::TestCase
     assert session.invalid?
     assert_equal 'You shall not pass test@test.test', session.errors[:base].first
   end
+  
+  def test_custom_admin_session
+    init_custom_configuration
+    admin = Admin.create!(:username => 'admin', :password => 'pass')
+    session = CustomAdminSession.new(:username => 'admin', :password => 'pass')
+    assert session.valid?
+    assert_equal admin, session.admin
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: letmein
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70224158884440 !ruby/object:Gem::Requirement
+  requirement: &70092744394500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70224158884440
+  version_requirements: *70092744394500
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
-  requirement: &70224158883640 !ruby/object:Gem::Requirement
+  requirement: &70092744393800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70224158883640
+  version_requirements: *70092744393800
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70224158882120 !ruby/object:Gem::Requirement
+  requirement: &70092744392980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70224158882120
+  version_requirements: *70092744392980
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70224158880380 !ruby/object:Gem::Requirement
+  requirement: &70092744391800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,7 +55,7 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *70224158880380
+  version_requirements: *70092744391800
 description: minimalistic authentication
 email: oleg@khabarov.ca
 executables: []
@@ -66,7 +66,6 @@ extra_rdoc_files:
 files:
 - .travis.yml
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -90,7 +89,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1283525767596471732
+      hash: 3220175875502170728
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/Gemfile.lock

@@ -1,97 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    actionmailer (3.1.0)
-      actionpack (= 3.1.0)
-      mail (~> 2.3.0)
-    actionpack (3.1.0)
-      activemodel (= 3.1.0)
-      activesupport (= 3.1.0)
-      builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      i18n (~> 0.6)
-      rack (~> 1.3.2)
-      rack-cache (~> 1.0.3)
-      rack-mount (~> 0.8.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.0.0)
-    activemodel (3.1.0)
-      activesupport (= 3.1.0)
-      bcrypt-ruby (~> 3.0.0)
-      builder (~> 3.0.0)
-      i18n (~> 0.6)
-    activerecord (3.1.0)
-      activemodel (= 3.1.0)
-      activesupport (= 3.1.0)
-      arel (~> 2.2.1)
-      tzinfo (~> 0.3.29)
-    activeresource (3.1.0)
-      activemodel (= 3.1.0)
-      activesupport (= 3.1.0)
-    activesupport (3.1.0)
-      multi_json (~> 1.0)
-    arel (2.2.1)
-    bcrypt-ruby (3.0.0)
-    builder (3.0.0)
-    erubis (2.7.0)
-    git (1.2.5)
-    hike (1.2.1)
-    i18n (0.6.0)
-    jeweler (1.5.2)
-      bundler (~> 1.0.0)
-      git (>= 1.2.5)
-      rake
-    mail (2.3.0)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.16)
-    multi_json (1.0.3)
-    polyglot (0.3.2)
-    rack (1.3.2)
-    rack-cache (1.0.3)
-      rack (>= 0.4)
-    rack-mount (0.8.3)
-      rack (>= 1.0.0)
-    rack-ssl (1.3.2)
-      rack
-    rack-test (0.6.1)
-      rack (>= 1.0)
-    rails (3.1.0)
-      actionmailer (= 3.1.0)
-      actionpack (= 3.1.0)
-      activerecord (= 3.1.0)
-      activeresource (= 3.1.0)
-      activesupport (= 3.1.0)
-      bundler (~> 1.0)
-      railties (= 3.1.0)
-    railties (3.1.0)
-      actionpack (= 3.1.0)
-      activesupport (= 3.1.0)
-      rack-ssl (~> 1.3.2)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (~> 0.14.6)
-    rake (0.9.2)
-    rdoc (3.9.4)
-    sprockets (2.0.0)
-      hike (~> 1.2)
-      rack (~> 1.0)
-      tilt (!= 1.3.0, ~> 1.1)
-    sqlite3 (1.3.4)
-    thor (0.14.6)
-    tilt (1.3.3)
-    treetop (1.4.10)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.29)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bcrypt-ruby
-  bundler (~> 1.0.0)
-  jeweler (~> 1.5.2)
-  rails (>= 3.0.0)
-  sqlite3