spree_auth_devise 3.3.1 → 3.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cfcdcf44851c015f6f95b9109c1f9c962da34b30
-  data.tar.gz: 29daaafa06f9be7e11e11ccd8120db03d51641fc
+  metadata.gz: e902c04485979a2fa5edef1ee2030009f72b7bdd
+  data.tar.gz: 1693dcc6df3d9d607141148bdf046d12d94e1486
 SHA512:
-  metadata.gz: 2e2912c801d9c5e1f647cdf6805cebb01b6880064f16434e9a84530ee7a870d4bae4b33ccfbeabb7dfb0c3c1d9ae03f78177a543653c6a1628e4ade0c299dded
-  data.tar.gz: fd819d69a5f6f28d233964dc6fcdccaf812083b53e8816593c2f46715e6f022dcee0fb506a31e65122c4b34a62d34d6227d2dab1e010336a5ca38f7d9820ca2f
+  metadata.gz: 62a8aa9e430c10648caa3ad8f0fc67ca7c34c2b5c5750004cbabf2fbaad9ded6d0c57f69d3ed2bcd1bbbf10c3a8011de9b9d1ac4631debe77a8ff66e17948ed4
+  data.tar.gz: 19dab7108baddae24a3d3f4acba1c0d5d07ae3f339a9b4e44eebe3bf03e0d403e4c588df0b47d5e58e70ac5ac20899a15a8c9f2403b31cafae1b1e1e225d976a

data/.travis.yml

@@ -12,6 +12,7 @@ env:
 language: ruby
 
 rvm:
+  - 2.4.2
   - 2.3.1
   - 2.2.7
 
@@ -20,5 +21,9 @@ gemfile:
   - gemfiles/spree_3_2.gemfile
   - gemfiles/spree_master.gemfile
 
+matrix:
+    allow_failures:
+          - gemfile: gemfiles/spree_master.gemfile
+
 before_install:
   - mysql -u root -e "GRANT ALL ON *.* TO 'travis'@'%';"

data/README.md

@@ -67,6 +67,14 @@ Devise.setup do |config|
 end
 ```
 
+### Sign out after password change
+
+To disable signout after password change you must add this line to an initializer in your Rails project (typically `config/initializers/spree.rb`):
+
+```ruby
+Spree::Auth::Config[:signout_after_password_change] = false
+```
+
 ## Using in an existing Rails application
 
 If you are installing Spree inside of a host application in which you want your own permission setup, you can do this using spree_auth_devise's register_ability method.

data/config/locales/en.yml

@@ -3,6 +3,8 @@ en:
   spree:
     admin_login: "Admin Login"
     change_your_password: "Change your password"
+    store_credits:
+      credit_balance: Store Credit Balance
   devise:
     confirmations:
       confirmed: Your account was successfully confirmed. You are now signed in.

data/lib/assets/javascripts/spree/frontend/account.js

@@ -0,0 +1,8 @@
+Spree.fetch_account = function() {
+  return $.ajax({
+    url: Spree.pathFor("account_link"),
+    success: function(data) {
+      return $(data).insertBefore("li#search-bar");
+    }
+  });
+};

data/lib/controllers/frontend/spree/users_controller.rb

@@ -27,8 +27,12 @@ class Spree::UsersController < Spree::StoreController
     if @user.update_attributes(user_params)
       if params[:user][:password].present?
         # this logic needed b/c devise wants to log us out after password changes
-        user = Spree::User.reset_password_by_token(params[:user])
-        sign_in(@user, event: :authentication, bypass: !Spree::Auth::Config[:signout_after_password_change])
+        Spree::User.reset_password_by_token(params[:user])
+        if Spree::Auth::Config[:signout_after_password_change]
+          sign_in(@user, event: :authentication)
+        else
+          bypass_sign_in(@user)
+        end
       end
       redirect_to spree.account_url, notice: Spree.t(:account_updated)
     else

data/lib/views/frontend/spree/users/show.html.erb

@@ -4,6 +4,11 @@
   <dl id="user-info">
     <dt><%= Spree.t(:email) %></dt>
     <dd><%= @user.email %> (<%= link_to Spree.t(:edit), spree.edit_account_path %>)</dd>
+    <br />
+    <dt><%= Spree.t(:credit_balance, scope: [:store_credits])%></dt>
+    <dd>
+      <%= Spree::Money.new(spree_current_user.total_available_store_credit, currency: Spree::Config[:currency]) %>
+    </dd>
   </dl>
 </div>
 

data/spec/factories/confirmed_user.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :confirmed_user, parent: :user do
     confirmed_at { Time.now }
     confirmation_sent_at { Time.now }

data/spec/support/factory_girl.rb

@@ -1,5 +1,5 @@
-require 'factory_girl'
+require 'factory_bot'
 
 RSpec.configure do |config|
-  config.include FactoryGirl::Syntax::Methods
+  config.include FactoryBot::Syntax::Methods
 end

data/spree_auth_devise.gemspec

@@ -3,7 +3,7 @@
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'spree_auth_devise'
-  s.version     = '3.3.1'
+  s.version     = '3.3.3'
   s.summary     = 'Provides authentication and authorization services for use with Spree by using Devise and CanCan.'
   s.description = s.summary
 
@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
 
   s.author      = 'Sean Schofield'
   s.email       = 'sean@spreecommerce.com'
-  s.homepage    = 'http://spreecommerce.com'
+  s.homepage    = 'https://spreecommerce.org'
   s.license     = 'BSD-3-Clause'
 
   s.files        = `git ls-files`.split("\n")
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.require_path = 'lib'
   s.requirements << 'none'
 
-  s.add_dependency 'devise', '~> 4.3.0'
+  s.add_dependency 'devise', '~> 4.4.0'
   s.add_dependency 'devise-encryptable', '0.2.0'
 
   spree_version = '>= 3.1.0', '< 4.0'
@@ -31,11 +31,11 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'coffee-rails', '~> 4.2'
   s.add_development_dependency 'database_cleaner', '~> 1.5'
   s.add_development_dependency 'email_spec', '~> 2.1'
-  s.add_development_dependency 'factory_girl', '~> 4.7'
+  s.add_development_dependency 'factory_bot', '~> 4.7'
   s.add_development_dependency 'ffaker'
   s.add_development_dependency 'launchy'
   s.add_development_dependency 'mysql2'
-  s.add_development_dependency 'pg'
+  s.add_development_dependency 'pg', '~> 0.18'
   s.add_development_dependency 'poltergeist', '~> 1.6'
   s.add_development_dependency 'pry'
   s.add_development_dependency 'rspec-rails', '~> 3.5'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_auth_devise
 version: !ruby/object:Gem::Version
-  version: 3.3.1
+  version: 3.3.3
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-24 00:00:00.000000000 Z
+date: 2018-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.3.0
+        version: 4.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.3.0
+        version: 4.4.0
 - !ruby/object:Gem::Dependency
   name: devise-encryptable
   requirement: !ruby/object:Gem::Requirement
@@ -143,7 +143,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.1'
 - !ruby/object:Gem::Dependency
-  name: factory_girl
+  name: factory_bot
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -202,16 +202,16 @@ dependencies:
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.18'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.18'
 - !ruby/object:Gem::Dependency
   name: poltergeist
   requirement: !ruby/object:Gem::Requirement
@@ -401,7 +401,7 @@ files:
 - gemfiles/spree_3_2.gemfile
 - gemfiles/spree_master.gemfile
 - lib/assets/javascripts/spree/backend/spree_auth.js.erb
-- lib/assets/javascripts/spree/frontend/account.js.coffee
+- lib/assets/javascripts/spree/frontend/account.js
 - lib/assets/javascripts/spree/frontend/spree_auth.js.erb
 - lib/assets/stylesheets/spree/backend/spree_auth.css.erb
 - lib/assets/stylesheets/spree/frontend/spree_auth.css.erb
@@ -483,7 +483,7 @@ files:
 - spec/support/factory_girl.rb
 - spec/support/spree.rb
 - spree_auth_devise.gemspec
-homepage: http://spreecommerce.com
+homepage: https://spreecommerce.org
 licenses:
 - BSD-3-Clause
 metadata: {}
@@ -504,7 +504,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - none
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Provides authentication and authorization services for use with Spree by

data/lib/assets/javascripts/spree/frontend/account.js.coffee

@@ -1,5 +0,0 @@
-Spree.fetch_account = ->
-  $.ajax
-    url: Spree.pathFor("account_link"),
-    success: (data) ->
-      $(data).insertBefore("li#search-bar")