solidus_auth_devise 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34bf236613b21c40c9b0532d382a64591d98535f
-  data.tar.gz: bddc8a37353b1bc5ac272056749dad53790ad72c
+  metadata.gz: 675e862ec8ab71a91e01f264e3129610da0451c4
+  data.tar.gz: 07953550240e0abc1db4788de29c4084efa8d64e
 SHA512:
-  metadata.gz: 91628c33c7858a70747284261561bbd22e70efcaf42a32a81b0ae06db0476272be59bd9ff86a76c2af91fc0831ea41cfc6d9397259f2866711379604b5383bc9
-  data.tar.gz: c9b39d7ccec95f652850de70b293757fb8e8066c394def7f0c8e60af95818b597714e1f11d1ce7ba470ee97006c090f1cc6bac68c1c8704b265b250e45bdc570
+  metadata.gz: 17f0524a70349a714c4a06cd1c736a11eb8587f0985aac5e63ac20f88efdf1d0f4da2b6a6c3730f1abdd034bc275a2eb0cac8268ed1b8047ac4429dfd3743d55
+  data.tar.gz: 39159f5664b93a5a9f0dd1a1268829b5689d96dfc2ae931b630e07fc3126fe94f583a734872416b62486a71e1d6624d9eb71450f826b2ecf32960a89293f1510

data/app/models/spree/user.rb

@@ -1,5 +1,5 @@
 module Spree
-  class User < ActiveRecord::Base
+  class User < Spree::Base
     include UserMethods
 
     devise :database_authenticatable, :registerable, :recoverable,
@@ -8,6 +8,7 @@ module Spree
 
     acts_as_paranoid
     after_destroy :scramble_email_and_password
+    before_update { generate_spree_api_key if encrypted_password_changed? && spree_api_key.present? }
 
     has_many :orders
 

data/solidus_auth_devise.gemspec

@@ -3,7 +3,7 @@
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = "solidus_auth_devise"
-  s.version     = "1.2.1"
+  s.version     = "1.2.2"
   s.summary     = "Provides authentication and authorization services for use with Solidus by using Devise and CanCan."
   s.description = s.summary
 
@@ -18,11 +18,12 @@ Gem::Specification.new do |s|
   s.require_path = "lib"
   s.requirements << "none"
 
-  solidus_version = [">= 1.0.0.pre2", "< 2"]
+  solidus_version = [">= 1.1.0.alpha", "< 2"]
 
   s.add_dependency "solidus_core", solidus_version
   s.add_dependency "devise", '~> 3.5.1'
   s.add_dependency "devise-encryptable", "0.1.2"
+  s.add_dependency 'deface', '~> 1.0.0'
 
   s.add_dependency "json"
   s.add_dependency "multi_json"

data/spec/models/user_spec.rb

@@ -7,11 +7,31 @@ RSpec.describe Spree::User, type: :model do
     expect(create(:user).admin?).to be false
   end
 
-  it 'generates the reset password token' do
-    user = create(:user)
-    expect(Spree::UserMailer).to receive(:reset_password_instructions).with(user, anything, {}).and_return(double(deliver: true))
-    user.send_reset_password_instructions
-    expect(user.reset_password_token).not_to be_nil
+  context "recoverable" do
+    let(:user) { create(:user) }
+
+    it 'generates the reset password token' do
+      expect(Spree::UserMailer).to receive(:reset_password_instructions).with(user, anything, {}).and_return(double(deliver: true))
+      expect { user.send_reset_password_instructions }.to change(user, :reset_password_token).to be_present
+    end
+
+    it "regenerates a spree api key on successful password change" do
+      user.generate_spree_api_key!
+
+      user.password = "123456678"
+      user.password_confirmation = "123456678"
+      expect { user.save! }.to change(user, :spree_api_key)
+      expect(user.spree_api_key).to be_present
+    end
+
+    it "does not generate a spree api key on password change if no key existed previously" do
+      user.clear_spree_api_key!
+
+      user.password = "123456678"
+      user.password_confirmation = "123456678"
+      expect { user.save! }.not_to change(user, :spree_api_key)
+      expect(user.reload.spree_api_key).to be_nil
+    end
   end
 
   context '#destroy' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_auth_devise
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-13 00:00:00.000000000 Z
+date: 2015-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_core
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0.pre2
+        version: 1.1.0.alpha
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0.pre2
+        version: 1.1.0.alpha
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
@@ -58,6 +58,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.1.2
+- !ruby/object:Gem::Dependency
+  name: deface
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -92,7 +106,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0.pre2
+        version: 1.1.0.alpha
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
@@ -102,7 +116,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0.pre2
+        version: 1.1.0.alpha
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
@@ -112,7 +126,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0.pre2
+        version: 1.1.0.alpha
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
@@ -122,7 +136,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0.pre2
+        version: 1.1.0.alpha
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
@@ -406,7 +420,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - none
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.5
 signing_key: 
 specification_version: 4
 summary: Provides authentication and authorization services for use with Solidus by
@@ -447,4 +461,3 @@ test_files:
 - spec/support/email.rb
 - spec/support/factory_girl.rb
 - spec/support/spree.rb
-has_rdoc: