devise_custom_authenticatable 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5dc5774c65c328dcfa617054bf761c78e0d5d9c0
-  data.tar.gz: db9eae55f8650c0a47af5e5f33b567d32c66ff57
+  metadata.gz: 1e126cdae305f283e0598a29cf6c846b8c3eb06d
+  data.tar.gz: 9446a9ab199cece55d70a707b2512df695cd8a23
 SHA512:
-  metadata.gz: b33d874f8bc81ac725729af24354da1f687a3be9334407c41d1a71fa7397edcc162dd3bc4d9a46e63e4885ad8cd2883f1f5426b18529a1e39772fc7eae155543
-  data.tar.gz: 0593a3a5f6848671f483ba07d55162e4a4d7ebdd0148d77b048938cd3e22b9821058b0e7f76aeab6d70ce3175fa112e7d499ac9fb97ae4ab3bbd97ed5aa19449
+  metadata.gz: 3db096d6c13521718d224149c2a6fd98cca58698d3773d7109817dc3388febbf1be9e50dc8c129817cb0c30e438585ca3b2f2c90dd5eb71f3aae904e92d343ae
+  data.tar.gz: f086ae0c2460d26275903f83f36d5674e6c0b3008bed69d7574e84bbc4d5a86611a69a5cbb2980ea823787b5555b381ef045d69eb0ff61219801ee89e08311f6

data/CHANGELOG.md

@@ -22,3 +22,7 @@
 ## v0.3.0
 
 * works with devise 4.2
+
+## v0.3.1
+
+* Fix: conflict of password writer when used together with :database_authenticatable module

data/devise_custom_authenticatable.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "pry"
 
 
   if defined?(RUBY_VERSION) && RUBY_VERSION >= "2.1" || defined?(JRUBY_VERSION) && JRUBY_VERSION >= "9000"
@@ -31,6 +32,7 @@ Gem::Specification.new do |spec|
     spec.add_development_dependency "activemodel", "< 5"
     spec.add_development_dependency "activesupport", "< 5"
     spec.add_development_dependency "rack", "~> 1.6.4"
+    spec.add_development_dependency "nokogiri", "~> 1.6.8.1"
 
     spec.add_dependency "devise", ">= 2", "< 4"
   end

data/lib/devise/models/custom_authenticatable.rb

@@ -5,7 +5,12 @@ module Devise::Models
     extend ActiveSupport::Concern
 
     included do
-      attr_accessor :password
+      attr_reader :password
+    end
+
+    def password=(password)
+      @password = password
+      super if defined?(super)
     end
 
     def authenticated_by_any_custom_strategy?(password, *strategies)
@@ -21,9 +26,6 @@ module Devise::Models
     # A callback initiated after successfully authenticating. This can be
     # used to insert your own logic that is only run after the user successfully
     # authenticates.
-    def after_custom_authentication
-
-    end
-
+    def after_custom_authentication; end
   end
 end

data/lib/devise_custom_authenticatable/version.rb

@@ -1,3 +1,3 @@
 module DeviseCustomAuthenticatable
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/spec/devise/models/custom_authenticatable_spec.rb

@@ -1,38 +1,45 @@
 RSpec.describe Devise::Models::CustomAuthenticatable do
-  before(:each) do
-    @it = CustomAuthenticatableTestClass.new
+  subject(:resource) { CustomAuthenticatableTestClass.new }
+
+  it "defines password attribute accessors" do
+    resource.password = 'password'
+    expect(resource.password).to eq 'password'
   end
 
-  it "password attribute accessors should be defined" do
-    @it.password = 'password'
-    expect(@it.password).to eq 'password'
+  context "when password setter already defined for resource model" do
+    subject(:resource) { CustomAuthenticatableTestClassWithPasswordWriter.new }
+
+    it "preserves original setter" do
+      resource.password = 'password'
+      expect(resource.password).to eq 'password'
+      expect(resource.encrypted_password).to eq 'password_encrypted'
+    end
   end
 
   describe "#authenticated_by_any_custom_strategy? helper" do
     before(:each) do
-      allow(@it).to receive(:authenticated_by_test1_strategy?).and_return(true)
-      allow(@it).to receive(:authenticated_by_test2_strategy?).and_return(true)
+      allow(resource).to receive(:authenticated_by_test1_strategy?).and_return(true)
+      allow(resource).to receive(:authenticated_by_test2_strategy?).and_return(true)
     end
 
     context "should call all given strategy methods and" do
-      it "return false if all of them return false" do
-        expect(@it).to receive(:authenticated_by_test1_strategy?).with('password').and_return(false)
-        expect(@it).to receive(:authenticated_by_test2_strategy?).and_return(false)
+      it "returns false if all of them return false" do
+        expect(resource).to receive(:authenticated_by_test1_strategy?).with('password').and_return(false)
+        expect(resource).to receive(:authenticated_by_test2_strategy?).and_return(false)
 
-        expect(@it.authenticated_by_any_custom_strategy?('password', :test1, :test2)).to be_falsey
+        expect(resource.authenticated_by_any_custom_strategy?('password', :test1, :test2)).to be_falsey
       end
 
-      it "return true if any of them return true" do
-        expect(@it).to receive(:authenticated_by_test1_strategy?).with('password').and_return(false)
-        expect(@it).to receive(:authenticated_by_test2_strategy?).and_return(true)
+      it "returns true if any of them return true" do
+        expect(resource).to receive(:authenticated_by_test1_strategy?).with('password').and_return(false)
+        expect(resource).to receive(:authenticated_by_test2_strategy?).and_return(true)
 
-        expect(@it.authenticated_by_any_custom_strategy?('password', :test1, :test2)).to be_truthy
+        expect(resource.authenticated_by_any_custom_strategy?('password', :test1, :test2)).to be_truthy
       end
 
-      it "return true if all of them return true" do
-        expect(@it.authenticated_by_any_custom_strategy?('password', :test1, :test2)).to be_truthy
+      it "returns true if all of them return true" do
+        expect(resource.authenticated_by_any_custom_strategy?('password', :test1, :test2)).to be_truthy
       end
     end
   end
-
 end

data/spec/support/helpers.rb

@@ -6,6 +6,24 @@ class CustomAuthenticatableTestClass
   def authenticated_by_test2_strategy?(*args); end
 end
 
+module TestPasswordModule
+  extend ActiveSupport::Concern
+
+  included do
+    attr_accessor :encrypted_password
+  end
+
+  def password=(new_password)
+    @password = new_password
+    self.encrypted_password = "#{new_password}_encrypted" if @password.present?
+  end
+end
+
+class CustomAuthenticatableTestClassWithPasswordWriter
+  include TestPasswordModule
+  include Devise::Models::CustomAuthenticatable
+end
+
 def env_with_params(path = "/", params = {}, env = {})
   method = params.delete(:method) || "GET"
   env = { 'HTTP_VERSION' => '1.1', 'REQUEST_METHOD' => "#{method}" }.merge(env)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devise_custom_authenticatable
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Artūrs Mekšs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-06 00:00:00.000000000 Z
+date: 2016-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement