sequel_secure_password 0.2.14 → 0.2.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f782fba9202ca70da14d5d3df72bdda93b50d12
-  data.tar.gz: 3c5e554d0493c75e9774c80dee73e709ef49e6f9
+  metadata.gz: 49f624d3a015d6565492278ec5e5bd249beb3cb0
+  data.tar.gz: 2b94d0cf5df97b0ac4d68214c22f434f09d19ef0
 SHA512:
-  metadata.gz: 801bb73dc87429fb789d565ea30e9da14bb771b3ea5fc938bcae45c5ad872366197de4f175faad8f86d7876d864b5cc04d9137613f00eefe3511ed86a8953e62
-  data.tar.gz: 7c6586f236cc197e2fb0cfd9bf199863533ad09ff3178a8701dee3ef74032ed8808a70fc8a0ab0e1550278eee741e09368cc2db97bf241f1ebcb745e96539166
+  metadata.gz: '006899fdf56b909c44588d474d94584ba03165548f00d97c2f3eba284903b04a8b917421f2b39cafddf63de11fbff1ebc30cb8c9d730457ddb9766cc8daeff87'
+  data.tar.gz: 37026898cb3ece6eb738ca4b0aee0d08aacbd3e59620dbf21a0aa4624abf7c26a21ec70fbc67441506826f25d151e0bf1c5d0c98f8ab0bd406884b2d6dc33a39

data/.travis.yml

@@ -5,3 +5,6 @@ rvm:
   - 2.1
   - 2.2
   - 2.3
+  - 2.4
+  - ruby-head
+  - jruby-9.1.13.0

data/lib/sequel/plugins/secure_password.rb

@@ -0,0 +1,64 @@
+require "sequel"
+require "bcrypt"
+
+module Sequel
+  module Plugins
+    module SecurePassword
+      def self.blank_string?(string)
+        string.nil? or string =~ /\A\s*\z/
+      end
+
+      # Configure the plugin by setting the available options. Options:
+      # * :cost - the cost factor when creating password hash. Default:
+      # BCrypt::Engine::DEFAULT_COST(10)
+      # * :include_validations - when set to false, password present and
+      # confirmation validations won't be included. Default: true
+      def self.configure(model, options = {})
+        model.instance_eval do
+          @cost                = options.fetch(:cost, BCrypt::Engine.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, :digest_column
+
+        # NOTE: nil as a value means that the value of the instance variable
+        # will be assigned as is in the subclass.
+        Plugins.inherited_instance_variables(self, :@cost                => nil,
+                                                   :@include_validations => nil,
+                                                   :@digest_column       => nil)
+      end
+
+      module InstanceMethods
+        attr_accessor :password_confirmation
+        attr_reader   :password
+
+        def password=(unencrypted)
+          @password = unencrypted
+
+          unless SecurePassword.blank_string?(unencrypted)
+            self.send "#{model.digest_column}=", BCrypt::Password.create(unencrypted, :cost => model.cost)
+          end
+        end
+
+        def authenticate(unencrypted)
+          if BCrypt::Password.new(self.send(model.digest_column)) == unencrypted
+            self
+          end
+        end
+
+        def validate
+          super
+
+          if model.include_validations
+            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
+      end
+    end
+  end
+end
+

data/lib/sequel_secure_password.rb

@@ -1,65 +1 @@
-require "sequel_secure_password/version"
-require "sequel"
-require "bcrypt"
-
-module Sequel
-  module Plugins
-    module SecurePassword
-      def self.blank_string?(string)
-        string.nil? or string =~ /\A\s*\z/
-      end
-
-      # Configure the plugin by setting the available options. Options:
-      # * :cost - the cost factor when creating password hash. Default:
-      # BCrypt::Engine::DEFAULT_COST(10)
-      # * :include_validations - when set to false, password present and
-      # confirmation validations won't be included. Default: true
-      def self.configure(model, options = {})
-        model.instance_eval do
-          @cost                = options.fetch(:cost, BCrypt::Engine.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, :digest_column
-
-        # NOTE: nil as a value means that the value of the instance variable
-        # will be assigned as is in the subclass.
-        Plugins.inherited_instance_variables(self, :@cost                => nil,
-                                                   :@include_validations => nil,
-                                                   :@digest_column       => nil)
-      end
-
-      module InstanceMethods
-        attr_accessor :password_confirmation
-        attr_reader   :password
-
-        def password=(unencrypted)
-          @password = unencrypted
-
-          unless SecurePassword.blank_string?(unencrypted)
-            self.send "#{model.digest_column}=", BCrypt::Password.create(unencrypted, :cost => model.cost)
-          end
-        end
-
-        def authenticate(unencrypted)
-          if BCrypt::Password.new(self.send(model.digest_column)) == unencrypted
-            self
-          end
-        end
-
-        def validate
-          super
-
-          if model.include_validations
-            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
-      end
-    end
-  end
-end
-
+require 'sequel/plugins/secure_password'

data/lib/sequel_secure_password/version.rb

@@ -1,3 +1,3 @@
 module SequelSecurePassword
-  VERSION = "0.2.14"
+  VERSION = "0.2.15"
 end

data/sequel_secure_password.gemspec

@@ -23,7 +23,7 @@ EOF
   gem.require_paths = ["lib"]
 
   gem.add_dependency 'bcrypt',      ['>= 3.1', '< 4.0']
-  gem.add_dependency 'sequel',      ['>= 4.1.0', '< 5.0']
+  gem.add_dependency 'sequel',      ['>= 4.1.0', '< 6.0']
 
   gem.add_development_dependency 'rspec',          '~> 3.0'
   gem.add_development_dependency 'rake',           '~> 12'

data/spec/spec_helper.rb

@@ -3,60 +3,57 @@ require 'bundler'
 Bundler.setup
 
 require 'sequel'
-require 'sequel_secure_password'
+require 'sequel/extensions/migration'
+require 'sequel/plugins/secure_password'
 
-adapter = RUBY_PLATFORM == "java" ? 'jdbc:sqlite::memory:' : 'sqlite:/'
+adapter = RUBY_PLATFORM == 'java' ? 'jdbc:sqlite::memory:' : 'sqlite:/'
 
 RSpec.configure do |c|
   c.before :suite do
-    Sequel::Model.plugin(:schema)
-    Sequel.connect adapter
-
-    class User < Sequel::Model
-      set_schema do
-        primary_key :id
-        varchar     :password_digest
+    Sequel::Model.db = Sequel.connect(adapter)
+
+    Sequel.migration do
+      up do
+        create_table(:users) do
+          primary_key :id
+          varchar     :password_digest
+        end
+
+        create_table(:high_cost_users) do
+          primary_key :id
+          varchar     :password_digest
+        end
+
+        create_table(:user_without_validations) do
+          primary_key :id
+          varchar     :password_digest
+        end
+
+        create_table(:user_with_alternate_digest_columns) do
+          primary_key :id
+          varchar     :password_hash
+        end
       end
+    end.apply(Sequel::Model.db, :up)
 
+    class User < Sequel::Model
       plugin :secure_password
     end
 
     class HighCostUser < Sequel::Model
-      set_schema do
-        primary_key :id
-        varchar     :password_digest
-      end
-
       plugin :secure_password, cost: 12
     end
 
     class UserWithoutValidations < Sequel::Model
-      set_schema do
-        primary_key :id
-        varchar     :password_digest
-      end
-
       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|
-    Sequel::Model.db.transaction(:rollback => :always) { example.run }
+  c.around(:each) do |example|
+    Sequel::Model.db.transaction(rollback: :always) { example.run }
   end
 end
-
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sequel_secure_password
 version: !ruby/object:Gem::Version
-  version: 0.2.14
+  version: 0.2.15
 platform: ruby
 authors:
 - Mateusz Lenik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-24 00:00:00.000000000 Z
+date: 2017-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt
@@ -39,7 +39,7 @@ dependencies:
         version: 4.1.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
         version: 4.1.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -126,6 +126,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- lib/sequel/plugins/secure_password.rb
 - lib/sequel_secure_password.rb
 - lib/sequel_secure_password/version.rb
 - sequel_secure_password.gemspec
@@ -151,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Plugin adds BCrypt authentication and password hashing to Sequel models.