sequel_password 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 536c42e3a0e81d54a1ede80ebf0d02384efb8e9d
-  data.tar.gz: 85510cee1cc2c043139dee879e7b5eef2519436a
+  metadata.gz: 35362ea38646639ac578a589a4d3165312474356
+  data.tar.gz: f2cc25b79d0a299e8f54705635404cfe707e1b9b
 SHA512:
-  metadata.gz: 4188cd381e1de2ed42f27881271bbdc385090cd4249c5b8ae7c67dc20f09fc7728285992e6fec3b5fc9b26cfce117a4db4446e0b6447dd9f19fa686ae8b524fb
-  data.tar.gz: 729291c54d8c8bdb03198ce58ddebc5909f9c16af68e5e0691c4dffee8063b1e5d856c5ba3a075c4e231f0ea3497a6af1da1d65d8100478ed0decdad11123ceb
+  metadata.gz: 06685b5e1e99c8b1688cf10b208c732ed3bfd46021ca824706d12e63921a797862d1105bb573f9268e975b1c75eebdb0a12361147e9b5e93bcd109a969963def
+  data.tar.gz: 1b4f6aefa06459f71bf315a350d104c1755c471a456969b238d377eb6c84a29cc52391add08f4f6187d4ad9975cc32645884a14fe3a9e8da333c7ec4cc999682

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sequel_password (0.1)
+    sequel_password (0.1.1)
       bcrypt (~> 3.1, >= 3.1.10)
       pbkdf2-ruby (~> 0.2.1)
       sequel (~> 4.21, >= 4.21.0)
@@ -27,7 +27,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.2.0)
     rspec-support (3.2.2)
-    sequel (4.21.0)
+    sequel (4.25.0)
     simplecov (0.9.2)
       docile (~> 1.1.0)
       multi_json (~> 1.0)
@@ -43,3 +43,6 @@ DEPENDENCIES
   sequel_password!
   simplecov (~> 0.9.2)
   sqlite3 (~> 1.3, >= 1.3.10)
+
+BUNDLED WITH
+   1.10.6

data/README.md

@@ -4,3 +4,9 @@ This sequel plugin adds authentication and password hashing to Sequel models.
 It supports pbkdf2 and bcrypt hashers.
 
 # Usage
+
+```ruby
+class User < Sequel::Model
+  plugin :password, column: :password
+end
+```

data/lib/sequel_password.rb

@@ -1,3 +1,4 @@
+require "sequel"
 require "securerandom"
 require "sequel_password/hashers"
 
@@ -8,7 +9,7 @@ module Sequel
 
       def self.configure(model, options = {})
         model.instance_eval do
-          @column = options.fetch(:column, :digest)
+          @column = options.fetch(:column, :password)
           @hashers = options.fetch(:hashers,
             pbkdf2_sha256: PBKDF2Hasher.new,
             bcrypt_sha256: BCryptSHA256Hasher.new,
@@ -62,15 +63,18 @@ module Sequel
       module InstanceMethods
         def authenticate(password)
           encoded = send(model.column)
-          model.check_password(password, encoded, setter: method(:"password="))
+          model.check_password(password, encoded, setter: method(:"#{model.column}="))
         end
 
-        def password=(password)
-          send("#{model.column}=", model.make_password(password))
+        def []=(attr, plain)
+          if attr == model.column
+            value = model.make_password(plain)
+          end
+          super(attr, value || plain)
         end
 
         def set_unusable_password
-          send("#{model.column}=", model.make_password(nil))
+          send("#{model.column}=", nil)
         end
       end
     end

data/lib/sequel_password/hashers.rb

@@ -52,13 +52,13 @@ module Sequel
         end
 
         def verify(password, encoded)
-          algorithm, iterations, salt, hash = encoded.split('$', 4)
+          _, iterations, salt, hash = encoded.split('$', 4)
           hash = encode(password, salt, iterations.to_i)
           constant_time_compare(encoded, hash)
         end
 
         def must_update(encoded)
-          algorithm, iterations, salt, hash = encoded.split('$', 4)
+          _, iterations, _, _ = encoded.split('$', 4)
           iterations.to_i != @iterations
         end
       end
@@ -81,7 +81,7 @@ module Sequel
         end
 
         def verify(password, encoded)
-          algorithm, data = encoded.split('$', 2)
+          _, data = encoded.split('$', 2)
           password = @digest.digest(password) unless @digest.nil?
           hash = BCrypt::Engine.hash_secret(password, data)
           constant_time_compare(data, hash)
@@ -108,7 +108,7 @@ module Sequel
         end
 
         def verify(password, encoded)
-          algorithm, salt, hash = encoded.split('$', 3)
+          _, salt, hash = encoded.split('$', 3)
           hash = encode(password, salt)
           constant_time_compare(encoded, hash)
         end

data/sequel_password.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "sequel_password"
   gem.require_paths = ["lib"]
-  gem.version       = '0.1.1'
+  gem.version       = '0.2.0'
 
   gem.add_runtime_dependency 'sequel', '~> 4.21', '>= 4.21.0'
   gem.add_runtime_dependency 'bcrypt', '~> 3.1', '>= 3.1.10'

data/spec/sequel_password_spec.rb

@@ -17,9 +17,9 @@ describe Sequel::Plugins::Password do
     before { user.password = secret }
 
     it "sets an unusable password" do
-      expect { user.set_unusable_password }.to change(user, :digest)
-      expect(user.digest).to match(/^!/)
-      expect(user.digest.length).to eq(41)
+      expect { user.set_unusable_password }.to change(user, :password)
+      expect(user.password).to match(/^!/)
+      expect(user.password.length).to eq(41)
     end
   end
 
@@ -35,18 +35,6 @@ describe Sequel::Plugins::Password do
     it "returns false when authentication fails" do
       expect(user.authenticate("")).to be_falsey
     end
-
-    it "upgrade to newest hasher" do
-      user.digest = "sha1$seasalt$cff36ea83f5706ce9aa7454e63e431fc726b2dc8"
-      expect { user.authenticate(secret) }.to change(user, :digest)
-      expect(user.digest).to match(/^pbkdf2_sha256\$/)
-    end
-
-    it "upgrade to new iterations values" do
-      user.digest = "pbkdf2_sha256$20000$seasalt$oBSd886ysm3AqYun62DOdin8YcfbU1z9cksZSuLP9r0="
-      expect { user.authenticate(secret) }.to change(user, :digest)
-      expect(user.digest).to match(/^pbkdf2_sha256\$24000\$/)
-    end
   end
 
   describe Sequel::Plugins::Password::PBKDF2Hasher do

data/spec/spec_helper.rb

@@ -19,7 +19,7 @@ RSpec.configure do |config|
     class DefaultUser < Sequel::Model
       set_schema do
         primary_key :id
-        varchar     :digest
+        varchar     :password
       end
 
       plugin :password
@@ -28,7 +28,7 @@ RSpec.configure do |config|
     class BCryptUser < Sequel::Model
       set_schema do
         primary_key :id
-        varchar     :digest
+        varchar     :password
       end
 
       plugin :password, hashers: { bcrypt: Sequel::Plugins::Password::BCryptHasher.new }
@@ -37,7 +37,7 @@ RSpec.configure do |config|
     class BCryptSHA256User < Sequel::Model
       set_schema do
         primary_key :id
-        varchar     :digest
+        varchar     :password
       end
 
       plugin :password, hashers: { bcrypt: Sequel::Plugins::Password::BCryptSHA256Hasher.new }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sequel_password
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Timothée Peignier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-05 00:00:00.000000000 Z
+date: 2015-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -156,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Add passwords hashing to sequel models.