sequel_secure_password 0.2.10 → 0.2.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44647915c05f69c4299469c020fb5b577f83597c
-  data.tar.gz: 2efcc0094cd07863ec10baa92a4847c8a0ade25c
+  metadata.gz: 2e49fcb8f21fc059c0314e08fd91c31f12b29664
+  data.tar.gz: 4867077e650776d13903fb2dd5e4af8e1eac373e
 SHA512:
-  metadata.gz: dc2f813eae387976c8eb19040f514689d52b594618f4f8c54d91a29f37a39a36bc6994762f4708cdc321f4031fced216c90cf96c27c694a10ae0937cd06ce198
-  data.tar.gz: 133eb36ec94d8a5b5e5c25c7a4cc76cfa5eab58490e76673f59a8b0bc90803bd3bb83426ca9c7cc538be224d04b029b0439b07ccfa2db7763b826aeacda454d9
+  metadata.gz: 8a1587e9ef51a0997539055434fec21d7a1dc5216c78fc552d5cfbfab587277b8e7ed63099fac75a63b53bcef6e298e5a4dd636573eaf2807b4c3571fabf2d65
+  data.tar.gz: 1d73d1e5e93854ac28cadf2f89b0b99ff47530f82993201ec16f7a4062f68d8455189b2649980b84f97a9e80b723b8f05d03f86bd83e9a4b86ce86736415bf2d

data/.travis.yml

@@ -3,4 +3,6 @@ script: bundle exec rspec
 rvm:
   - 1.9.3
   - 2.0.0
+  - 2.1
+  - 2.2
   - jruby-19mode

data/README.md

@@ -21,8 +21,7 @@ Or install it yourself as:
 
 ## Usage
 
-Plugin should be used in subclasses of `Sequel::Model`. The model should have
-`password_digest` attribute in database.
+Plugin should be used in subclasses of `Sequel::Model`.
 __Always__ call super in `validate` method of your model, otherwise password
 validations won't be executed.
 It __does not__ `set_allowed_columns` and mass assignment policy must be managed
@@ -45,6 +44,12 @@ Example model:
       plugin :secure_password, include_validations: false
     end
 
+    # digest_column option can be used to use an alternate database column.
+    # the default column is "password_digest"
+    class UserWithAlternateDigestColumn < Sequel::Model
+      plugin :secure_password, digest_column: :password_hash
+    end
+
     user = User.new
     user.password = "foo"
     user.password_confirmation = "bar"

data/lib/sequel_secure_password.rb

@@ -17,13 +17,15 @@ module Sequel
         model.instance_eval do
           @cost                = options.fetch(:cost, BCrypt::Engine::DEFAULT_COST)
           @include_validations = options.fetch(:include_validations, true)
+          @digest_column       = options.fetch(:digest_column, :password_digest)
         end
       end
 
       module ClassMethods
-        attr_reader :cost, :include_validations
+        attr_reader :cost, :include_validations, :digest_column
         Plugins.inherited_instance_variables(self, :@cost                => nil,
-                                                   :@include_validations => true)
+                                                   :@include_validations => true,
+                                                   :@digest_column       => :password_digest)
       end
 
       module InstanceMethods
@@ -33,12 +35,12 @@ module Sequel
         def password=(unencrypted)
           @password = unencrypted
           unless SecurePassword.blank_string? unencrypted
-            self.password_digest = BCrypt::Password.create(unencrypted, :cost => model.cost)
+            self.send "#{model.digest_column}=", BCrypt::Password.create(unencrypted, :cost => model.cost)
           end
         end
 
         def authenticate(unencrypted)
-          if BCrypt::Password.new(password_digest) == unencrypted
+          if BCrypt::Password.new(self.send(model.digest_column)) == unencrypted
             self
           end
         end
@@ -47,7 +49,7 @@ module Sequel
           super
 
           if model.include_validations
-            errors.add :password, 'is not present'              if SecurePassword.blank_string?(password_digest)
+            errors.add :password, 'is not present'              if SecurePassword.blank_string?(self.send(model.digest_column))
             errors.add :password, 'doesn\'t match confirmation' if password != password_confirmation
           end
         end

data/lib/sequel_secure_password/version.rb

@@ -1,3 +1,3 @@
 module SequelSecurePassword
-  VERSION = "0.2.10"
+  VERSION = "0.2.11"
 end

data/spec/sequel_secure_password_spec.rb

@@ -52,6 +52,10 @@ describe "model using Sequel::Plugins::SecurePassword" do
     expect( User.inherited_instance_variables ).to include(:@include_validations)
   end
 
+  it "has an inherited instance variable :@digest_column" do
+    expect( User.inherited_instance_variables ).to include(:@digest_column)
+  end
+
   context "when validations are disabled" do
     subject(:user_without_validations) { UserWithoutValidations.new }
     before do
@@ -86,4 +90,14 @@ describe "model using Sequel::Plugins::SecurePassword" do
       }
     end
   end
+
+  describe "with digest column option" do
+    subject(:digestcolumn_user) { UserWithAlternateDigestColumn.new }
+    context "having an alternate digest column" do
+      before { digestcolumn_user.password = "foo" }
+      it {
+        BCrypt::Password.new(digestcolumn_user.password_hash).should eq "foo"
+      }
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -39,9 +39,19 @@ RSpec.configure do |c|
       plugin :secure_password, include_validations: false
     end
 
+    class UserWithAlternateDigestColumn < Sequel::Model
+      set_schema do
+        primary_key :id
+        varchar     :password_hash
+      end
+
+      plugin :secure_password, digest_column: :password_hash
+    end
+
     User.create_table!
     HighCostUser.create_table!
     UserWithoutValidations.create_table!
+    UserWithAlternateDigestColumn.create_table!
   end
 
   c.around :each do |example|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sequel_secure_password
 version: !ruby/object:Gem::Version
-  version: 0.2.10
+  version: 0.2.11
 platform: ruby
 authors:
 - Mateusz Lenik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-19 00:00:00.000000000 Z
+date: 2015-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt
@@ -131,7 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Plugin adds BCrypt authentication and password hashing to Sequel models.