casino-activerecord_authenticator 3.0.0 → 4.0.0.pre.1

data/README.md

@@ -24,6 +24,8 @@ To use the ActiveRecord authenticator, configure it in your cas.yml:
             email: "email_database_column"
             fullname: "displayname_database_column"
 
+Configuration examples for the `connection` part for other databases can be found [here](https://gist.github.com/erichurst/961978).
+
 ## Contributing to casino-activerecord_authenticator
 
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.

data/casino-activerecord_authenticator.gemspec

@@ -26,6 +26,6 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'activerecord', '~> 4.1.0'
   s.add_runtime_dependency 'unix-crypt', '~> 1.1'
   s.add_runtime_dependency 'bcrypt', '~> 3.0'
-  s.add_runtime_dependency 'casino', '~> 3.0.0'
+  s.add_runtime_dependency 'casino', '>= 3.0.0', '< 5.0.0'
   s.add_runtime_dependency 'phpass-ruby', '~> 0.1'
 end

data/lib/casino/activerecord_authenticator.rb

@@ -16,13 +16,24 @@ class CASino::ActiveRecordAuthenticator
     end
     @options = options.deep_symbolize_keys
     raise ArgumentError, "Table name is missing" unless @options[:table]
+    if @options[:model_name]
+      model_name = @options[:model_name]
+    else
+      model_name = @options[:table]
+      if @options[:connection][:database]
+        model_name = "#{@options[:connection][:database].gsub(/[^a-zA-Z]+/, '')}_#{model_name}"
+      end
+      model_name = model_name.classify
+    end
+    model_class_name = "#{self.class.to_s}::#{model_name}"
     eval <<-END
-      class #{self.class.to_s}::#{@options[:table].classify} < AuthDatabase
+      class #{model_class_name} < AuthDatabase
         self.table_name = "#{@options[:table]}"
+        self.inheritance_column = :_type_disabled
       end
     END
 
-    @model = "#{self.class.to_s}::#{@options[:table].classify}".constantize
+    @model = model_class_name.constantize
     @model.establish_connection @options[:connection]
   end
 
@@ -31,7 +42,7 @@ class CASino::ActiveRecordAuthenticator
     password_from_database = user.send(@options[:password_column])
 
     if valid_password?(password, password_from_database)
-      { username: user.send(@options[:username_column]), extra_attributes: extra_attributes(user) }
+      user_data(user)
     else
       false
     end
@@ -40,7 +51,18 @@ class CASino::ActiveRecordAuthenticator
     false
   end
 
+  def load_user_data(username)
+    user = @model.send("find_by_#{@options[:username_column]}!", username)
+    user_data(user)
+  rescue ActiveRecord::RecordNotFound
+    nil
+  end
+
   private
+  def user_data(user)
+    { username: user.send(@options[:username_column]), extra_attributes: extra_attributes(user) }
+  end
+
   def valid_password?(password, password_from_database)
     return false if password_from_database.blank?
     magic = password_from_database.split('$')[1]

data/lib/casino/activerecord_authenticator/version.rb

@@ -1,5 +1,5 @@
 module CASino
   class ActiveRecordAuthenticator
-    VERSION = '3.0.0'
+    VERSION = '4.0.0.pre.1'
   end
 end

data/spec/casino_core/activerecord_authenticator_spec.rb

@@ -19,6 +19,7 @@ describe CASino::ActiveRecordAuthenticator do
     }
   end
   let(:faulty_options){ options.merge(table: nil) }
+  let(:user_class) { described_class::TmpcasinotestauthsqliteUser }
 
   subject { described_class.new(options) }
 
@@ -37,7 +38,7 @@ describe CASino::ActiveRecordAuthenticator do
       end
     end
 
-    described_class::User.create!(
+    user_class.create!(
       username: 'test',
       password: '$5$cegeasjoos$vPX5AwDqOTGocGjehr7k1IYp6Kt.U4FmMUa.1l6NrzD', # password: testpassword
       mail_address: 'mail@example.org')
@@ -51,6 +52,18 @@ describe CASino::ActiveRecordAuthenticator do
     end
   end
 
+  describe 'custom model name' do
+    let(:model_name) { 'DongerRaiser' }
+    before do
+      options[:model_name] = model_name
+    end
+
+    it 'should create the model with the name specified' do
+      described_class.new(options)
+      expect(described_class.const_get(model_name)).to be_a Class
+    end
+  end
+
   describe 'invalid yaml input' do
     context 'no hash input' do
       it 'throws an argument error if the supplied input was not hash' do
@@ -66,6 +79,25 @@ describe CASino::ActiveRecordAuthenticator do
       end
     end
   end
+
+  describe '#load_user_data' do
+    context 'valid username' do
+      it 'returns the username' do
+        subject.validate('test', 'testpassword')[:username].should eq('test')
+      end
+
+      it 'returns the extra attributes' do
+        subject.load_user_data('test')[:extra_attributes][:email].should eq('mail@example.org')
+      end
+    end
+
+    context 'invalid username' do
+      it 'returns nil' do
+        subject.load_user_data('does-not-exist').should eq(nil)
+      end
+    end
+  end
+
   describe '#validate' do
 
     context 'valid username' do
@@ -95,7 +127,7 @@ describe CASino::ActiveRecordAuthenticator do
 
       context 'NULL password field' do
         it 'returns false' do
-          user = described_class::User.first
+          user = user_class.first
           user.password = nil
           user.save!
 
@@ -105,7 +137,7 @@ describe CASino::ActiveRecordAuthenticator do
 
       context 'empty password field' do
         it 'returns false' do
-          user = described_class::User.first
+          user = user_class.first
           user.password = ''
           user.save!
 
@@ -122,7 +154,7 @@ describe CASino::ActiveRecordAuthenticator do
 
     context 'support for bcrypt' do
       before do
-        described_class::User.create!(
+        user_class.create!(
           username: 'test2',
           password: '$2a$10$dRFLSkYedQ05sqMs3b265e0nnJSoa9RhbpKXU79FDPVeuS1qBG7Jq', # password: testpassword2
           mail_address: 'mail@example.org')
@@ -137,7 +169,7 @@ describe CASino::ActiveRecordAuthenticator do
       let(:pepper) { 'abcdefg' }
 
       before do
-        described_class::User.create!(
+        user_class.create!(
           username: 'test3',
           password: '$2a$10$ndCGPWg5JFMQH/Kl6xKe.OGNaiG7CFIAVsgAOJU75Q6g5/FpY5eX6', # password: testpassword3, pepper: abcdefg
           mail_address: 'mail@example.org')
@@ -150,7 +182,7 @@ describe CASino::ActiveRecordAuthenticator do
 
     context 'support for phpass' do
       before do
-        described_class::User.create!(
+        user_class.create!(
           username: 'test4',
           password: '$P$9IQRaTwmfeRo7ud9Fh4E2PdI0S3r.L0', # password: test12345
           mail_address: 'mail@example.org')

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: casino-activerecord_authenticator
 version: !ruby/object:Gem::Version
-  version: 3.0.0
-  prerelease: 
+  version: 4.0.0.pre.1
+  prerelease: 6
 platform: ruby
 authors:
 - Nils Caspar
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-19 00:00:00.000000000 Z
+date: 2014-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -145,17 +145,23 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: phpass-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -213,9 +219,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23