solidus_auth_devise 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 069e3cf3d0b487a02fd0cd8f90229d91d21ee49c
-  data.tar.gz: 8c03169fd0298d4ddeeb75b82974fffcd97faf5c
+  metadata.gz: ed48bb8fc53ea89e494278ad2016e10fcfbd30bc
+  data.tar.gz: b761cf86babf945a3433d9aa1cf2b9279139e52c
 SHA512:
-  metadata.gz: b4cfbbb456e6a83241eb691cf1fa639bf30a8803ceb2a24cf2f18b7f36cd091ee20b16eb44cfe38c2e059afbe0f53ac23c0580b906f12265ca597845ce5b546a
-  data.tar.gz: f4caa243ed037ab7dfe34e629c36b43a5e0cce9d2b6ecc82d353917bd1e5389a0b1a42fc9c92ac5a95ab22481313a206559f39d559aecde8927e9a158b4c6734
+  metadata.gz: 8a8ecb33d6be656864477bcc7d55b7adb1b3a8ee19b3061c49e48e618fb21b098a0ab86cfdbba117fff817c0e4b87306dbf5caa7203e2d674b74e3adcd03d862
+  data.tar.gz: 035211966358072827219d129f5dece6b04bd7a5d47316dd5d7bc5d40cdd700b314774a434e7f288f50bd9f42a03acbc1ded8c381f925deed2cf1b038caef878

data/CHANGELOG.md

@@ -0,0 +1,117 @@
+## Solidus Auth Devise v1.6.0 (master, unreleased)
+
+## Solidus Auth Devise v1.5.0 (2016-07-18)
+
+* Add call to set_current_order on sign in. This replaces a before filter that
+  is being eliminated from Solidus controllers where set_current_order was
+  called excessively.
+
+* Update backend views to only reference backend routes (#57)
+
+* Devise dependency updates
+
+  The locked versions of Devise and Devise-Encryptable have been updated.
+  Devise, in particular, has been bumped to a new major version, which removes
+  support for the following:
+
+  - Rails 3.2. and 4.0
+  - Ruby 1.9 and 2.0
+
+  These losses are deemed acceptable, as Solidus' core itself does not
+  support any of these versions.
+
+  For more details on the changes, see the Devise changelog:
+  https://github.com/plataformatec/devise/blob/master/CHANGELOG.md
+
+  Similar changes in `devise-encryptable`, with details in the changelog:
+  https://github.com/plataformatec/devise-encryptable/blob/master/Changelog.md
+
+* Addition of Chinese translations (#64)
+
+## Solidus Auth Devise v1.4.0 (2016-05-16)
+
+* Update hash syntax for routes.rb
+* Make route syntax consistent and modern
+* Make devise_for routes conditional
+* Test against solidus 1.3
+* check_authorization first in CheckoutController
+* Ensure current_order exists checking registration
+* Add vendor to .gitignore
+* Revert "ChcktController checks auth and registration first"
+* ChcktController checks auth and registration first
+* Remove obsolete regression test
+* Remove superfluous call to associate_user
+* Test and fix order association
+* Re-add Solidus 1.0 compatability
+* Improve readability of check_registration
+* Force registration when guest checkout not allowed
+* Improve check_registration spec for guest case
+* Add pg and mysql2 to Gemfile
+* Also test against v1.1 and v1.2
+* Allow https instead of git in gemfile
+* Ignore pkg directory
+* Update .travis.yml
+* Update README testing section
+* Fix specs now that order's store is required
+* Moved the encryptor setting for the User model into the devise config, allowing it to be easily overridden from the local devise config.
+
+## Solidus Auth Devise v1.3.0 (2016-01-12)
+
+* Add capybara-screenshot
+* Remove restriction on sass-rails and coffee-rails
+* Remove the "Logged in as:" message
+* Correct use of font-awesome
+* Swap .inline-menu for specific hook
+* Add new template override
+* remove duplicate translation
+* add missing translations for German locale
+
+## Solidus Auth Devise v1.2.3 (2015-11-30)
+
+* Add an explicit require to deface
+* Check if front/backend are available before decorating the controllers
+* Rename spree@example.com to admin@example.com
+* Skip the confirmation spec
+* Permit editing email
+
+## Solidus Auth Devise v1.2.2 (2015-10-01)
+
+* Automatically regenerate a user's spree_api_key upon password change.
+* Inherit from Spree::Base
+* Explicitely add deface to gemfile
+* Remove some redundant includes
+* Remove unneeded monkey patching
+* Remove brittle spec
+* Pass store to from_address helper
+* Fix broken specs
+
+## Solidus Auth Devise v1.2.0 (2015-07-22)
+
+* Use new extension point for access denied.
+* Explicitly include UserMethods on Spree::User
+* Bump rspec to 3.3 and remove minor patch restriction.
+* We no longer redirect to admin/orders by default.
+* Skip adding devise.rb if it already exists.
+* Fix checkout spec
+* Bump to RSpec 3.2
+* Use non-deprecated `deliver_now` in mailer spec.
+* Fix generator name.
+
+## Solidus Auth Devise v1.1.0 (2015-06-03)
+
+* Updates for devise 3.5.1
+* Bump devise to ~> 3.5.1
+* Avoid stubbing to fix checkout spec
+* Minor update to README.md
+* Remove Spree::Core::ControllerHelpers::SSL
+* Add circle.yml
+* Use git+ssh for solidus gem
+* Remove dead code.
+* Refactor UserSessionsController and specs
+* Remove @user from UserRegistrationsController
+* Add specs for UserRegistrationsController
+* Remove empty overrides in registrations controller
+
+## Solidus Auth Devise v1.0.0 (2015-05-26)
+
+* Initial Release

data/README.md

@@ -7,22 +7,37 @@ Installation
 ------------
 
 Just add this line to your `Gemfile`:
+
 ```ruby
 gem "solidus_auth_devise"
 ```
 
-Then run `bundle install`.
+Then, run `bundle install`.
+
+After that's done, you can install and run the necessary migrations, then seed the database:
+
+```shell
+bundle exec rake solidus_auth:install:migration
+bundle exec rake db:migrate
+bundle exec rake db:seed
+```
+
+### Default Username/Password
+
+As part of running the above installation steps, you will be asked to set an admin email/password combination. The default values are `admin@example.com` and `test123`, respectively.
 
 ### Confirmable
 
 To enable Devise's Confirmable module, which will send the user an email with a link to confirm their account, you must do the following:
 
 * Add this line to an initializer in your Rails project (typically `config/initializers/spree.rb`):
+
 ```ruby
 Spree::Auth::Config[:confirmable] = true
 ```
 
 * Add a Devise initializer to your Rails project (typically `config/initializers/devise.rb`):
+
 ```ruby
 Devise.setup do |config|
   # Required so users don't lose their carts when they need to confirm.
@@ -57,11 +72,13 @@ end
 ```
 
 Then register your class in your spree initializer: config/initializers/spree.rb
+
 ```ruby
 Spree::Ability.register_ability(SuperAbilities)
 ```
 
 Inside of your host application you can then use CanCan like you normally would.
+
 ```erb
 <% if can? :stop Bullet %>
   ...

data/app/mailers/spree/user_mailer.rb

@@ -1,15 +1,15 @@
 module Spree
   class UserMailer < BaseMailer
     def reset_password_instructions(user, token, *args)
-      @edit_password_reset_url = spree.edit_spree_user_password_url(:reset_password_token => token, :host => Spree::Store.current.url)
-      @store = Spree::Store.current
-      mail to: user.email, from: from_address(@store), subject: "#{@store.name} #{I18n.t(:subject, :scope => [:devise, :mailer, :reset_password_instructions])}"
+      @store = Spree::Store.default
+      @edit_password_reset_url = spree.edit_spree_user_password_url(reset_password_token: token, host: @store.url)
+      mail to: user.email, from: from_address(@store), subject: "#{@store.name} #{I18n.t(:subject, scope: [:devise, :mailer, :reset_password_instructions])}"
     end
 
     def confirmation_instructions(user, token, opts={})
-      @confirmation_url = spree.spree_user_confirmation_url(:confirmation_token => token, :host => Spree::Store.current.url)
-      @store = Spree::Store.current
-      mail to: user.email, from: from_address(@store), subject: "#{@store.name} #{I18n.t(:subject, :scope => [:devise, :mailer, :confirmation_instructions])}"
+      @store = Spree::Store.default
+      @confirmation_url = spree.spree_user_confirmation_url(confirmation_token: token, host: @store.url)
+      mail to: user.email, from: from_address(@store), subject: "#{@store.name} #{I18n.t(:subject, scope: [:devise, :mailer, :confirmation_instructions])}"
     end
   end
 end

data/app/models/spree/auth_configuration.rb

@@ -1,7 +1,7 @@
 module Spree
   class AuthConfiguration < Preferences::Configuration
-    preference :registration_step, :boolean, :default => true
-    preference :signout_after_password_change, :boolean, :default => true
-    preference :confirmable, :boolean, :default => false
+    preference :registration_step, :boolean, default: true
+    preference :signout_after_password_change, :boolean, default: true
+    preference :confirmable, :boolean, default: false
   end
 end

data/app/overrides/auth_shared_login_bar.rb

@@ -1,6 +1,8 @@
-Deface::Override.new(:virtual_path => "spree/shared/_nav_bar",
-                     :name => "auth_shared_login_bar",
-                     :insert_before => "li#search-bar",
-                     :partial => "spree/shared/login_bar",
-                     :disabled => false,
-                     :original => 'eb3fa668cd98b6a1c75c36420ef1b238a1fc55ac')
+Deface::Override.new(
+  virtual_path: "spree/shared/_nav_bar",
+  name: "auth_shared_login_bar",
+  insert_before: "li#search-bar",
+  partial: "spree/shared/login_bar",
+  disabled: false,
+  original: 'eb3fa668cd98b6a1c75c36420ef1b238a1fc55ac'
+)

data/config/locales/zh-CN.yml

@@ -0,0 +1,53 @@
+---
+zh-CN:
+  spree:
+    admin_login:
+  devise:
+    confirmations:
+      confirmed: 账户确认成功，现已登录。
+      send_instructions: 稍后您将收到邮件，了解如何确认账户。
+    failure:
+      inactive: 您的账户尚未激活。
+      invalid: 邮箱或密码错误。
+      invalid_token: 验证凭证错误。
+      locked: 账户已锁定。
+      timeout: 账户闲置时间过长，请重新登录。
+      unauthenticated: 请注册或登录，然后继续。
+      unconfirmed: 请确认账户，然后继续。
+    mailer:
+      confirmation_instructions:
+        subject: 确认说明
+      reset_password_instructions:
+        subject: 密码重置说明
+      unlock_instructions:
+        subject: 解锁说明
+    oauth_callbacks:
+      failure: 无法从%{kind}授权，原因为 %{reason}。
+      success: 从%{kind}账户授权成功。
+    unlocks:
+      send_instructions: 稍后您将收到邮件，了解如何解锁账户。
+      unlocked: 账户解锁成功，现已登录。
+    user_passwords:
+      spree_user:
+        cannot_be_blank: 密码不能为空。
+        no_token: 若需访问本页面，请使用重置密码邮件中网址链接，并确保该网址完整。
+        send_instructions: 稍后您将收到邮件，了解如何重置密码。
+        updated: 密码修改成功，现已登录。
+    user_registrations:
+      destroyed: 账户已成功取消，再会啦，期待着您的早日回归！
+      inactive_signed_up: 注册成功！但暂时无法登录账户，原因为%{reason}。
+      signed_up: 祝贺您！注册成功。
+      updated: 账户更新成功。
+    user_sessions:
+      signed_in: 登录成功。
+      signed_out: 登出成功。
+      already_signed_in: 已登录。
+  errors:
+    messages:
+      already_confirmed: 已确认
+      email_is_invalid: 邮箱地址不能为空
+      not_found: 未找到
+      not_locked: 未锁定
+      not_saved:
+        one: '出现1处错误，%{resource}无法保存'
+        other: '出现%{count}处错误，%{resource}无法保存'

data/config/routes.rb

@@ -1,4 +1,4 @@
-Spree::Core::Engine.add_routes do
+Spree::Core::Engine.routes.draw do
   if Spree::Auth::Engine.frontend_available?
     devise_for(:spree_user, {
       class_name: 'Spree::User',

data/lib/controllers/backend/spree/admin/user_passwords_controller.rb

@@ -10,18 +10,18 @@ class Spree::Admin::UserPasswordsController < Devise::PasswordsController
   layout 'spree/layouts/admin'
 
   # Overridden due to bug in Devise.
-  #   respond_with resource, :location => new_session_path(resource_name)
+  #   respond_with resource, location: new_session_path(resource_name)
   # is generating bad url /session/new.user
   #
   # overridden to:
-  #   respond_with resource, :location => spree.login_path
+  #   respond_with resource, location: spree.login_path
   #
   def create
     self.resource = resource_class.send_reset_password_instructions(params[resource_name])
 
     if resource.errors.empty?
       set_flash_message(:notice, :send_instructions) if is_navigational_format?
-      respond_with resource, :location => spree.admin_login_path
+      respond_with resource, location: spree.admin_login_path
     else
       respond_with_navigational(resource) { render :new }
     end

data/lib/controllers/backend/spree/admin/user_sessions_controller.rb

@@ -20,7 +20,7 @@ class Spree::Admin::UserSessionsController < Devise::SessionsController
         }
         format.js {
           user = resource.record
-          render :json => {:ship_address => user.ship_address, :bill_address => user.bill_address}.to_json
+          render json: {ship_address: user.ship_address, bill_address: user.bill_address}.to_json
         }
       end
     else

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

@@ -12,7 +12,7 @@ Spree::CheckoutController.class_eval do
     if params[:order][:email] =~ Devise.email_regexp && current_order.update_attribute(:email, params[:order][:email])
       redirect_to spree.checkout_path
     else
-      flash[:registration_error] = t(:email_is_invalid, :scope => [:errors, :messages])
+      flash[:registration_error] = t(:email_is_invalid, scope: [:errors, :messages])
       @user = Spree::User.new
       render 'registration'
     end
@@ -20,7 +20,9 @@ Spree::CheckoutController.class_eval do
 
   private
     def order_params
-      params[:order] ? params.require(:order).permit(:email) : {}
+      params.
+        fetch(:order, {}).
+        permit(:email)
     end
 
     def skip_state_validation?

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

@@ -11,18 +11,18 @@ class Spree::UserPasswordsController < Devise::PasswordsController
   include Spree::Core::ControllerHelpers::Store
 
   # Overridden due to bug in Devise.
-  #   respond_with resource, :location => new_session_path(resource_name)
+  #   respond_with resource, location: new_session_path(resource_name)
   # is generating bad url /session/new.user
   #
   # overridden to:
-  #   respond_with resource, :location => spree.login_path
+  #   respond_with resource, location: spree.login_path
   #
   def create
     self.resource = resource_class.send_reset_password_instructions(params[resource_name])
 
     if resource.errors.empty?
       set_flash_message(:notice, :send_instructions) if is_navigational_format?
-      respond_with resource, :location => spree.login_path
+      respond_with resource, location: spree.login_path
     else
       respond_with_navigational(resource) { render :new }
     end

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

@@ -10,7 +10,7 @@ class Spree::UserRegistrationsController < Devise::RegistrationsController
   include Spree::Core::ControllerHelpers::Order
   include Spree::Core::ControllerHelpers::Store
 
-  before_filter :check_permissions, :only => [:edit, :update]
+  before_filter :check_permissions, only: [:edit, :update]
   skip_before_filter :require_no_authentication
 
   def create

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

@@ -9,6 +9,10 @@ class Spree::UserSessionsController < Devise::SessionsController
   include Spree::Core::ControllerHelpers::Order
   include Spree::Core::ControllerHelpers::Store
 
+  # This is included in ControllerHelpers::Order.  We just want to call
+  # it after someone has successfully logged in.
+  after_action :set_current_order, only: :create
+
   def create
     authenticate_spree_user!
 

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

@@ -1,7 +1,7 @@
 class Spree::UsersController < Spree::StoreController
-  skip_before_filter :set_current_order, :only => :show
-  prepend_before_filter :load_object, :only => [:show, :edit, :update]
-  prepend_before_filter :authorize_actions, :only => :new
+  skip_before_filter :set_current_order, only: :show
+  prepend_before_filter :load_object, only: [:show, :edit, :update]
+  prepend_before_filter :authorize_actions, only: :new
 
   include Spree::Core::ControllerHelpers
 
@@ -28,9 +28,9 @@ class Spree::UsersController < Spree::StoreController
       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])
+        sign_in(@user, event: :authentication, bypass: !Spree::Auth::Config[:signout_after_password_change])
       end
-      redirect_to spree.account_url, :notice => Spree.t(:account_updated)
+      redirect_to spree.account_url, notice: Spree.t(:account_updated)
     else
       render :edit
     end

data/lib/spree/auth/engine.rb

@@ -7,11 +7,11 @@ module Spree
       isolate_namespace Spree
       engine_name 'solidus_auth'
 
-      initializer "spree.auth.environment", :before => :load_config_initializers do |app|
+      initializer "spree.auth.environment", before: :load_config_initializers do |app|
         Spree::Auth::Config = Spree::AuthConfiguration.new
       end
 
-      initializer "solidus_auth_devise.set_user_class", :after => :load_config_initializers do
+      initializer "solidus_auth_devise.set_user_class", after: :load_config_initializers do
         Spree.user_class = "Spree::User"
       end
 
@@ -24,75 +24,78 @@ module Spree
         end
       end
 
-      def self.activate
-        if Spree::Auth::Engine.backend_available?
-          Rails.application.config.assets.precompile += [
-            'lib/assets/javascripts/spree/backend/solidus_auth.js',
-            'lib/assets/javascripts/spree/backend/solidus_auth.css'
-          ]
-          Dir.glob(File.join(File.dirname(__FILE__), "../../controllers/backend/*/*/*_decorator*.rb")) do |c|
-            Rails.configuration.cache_classes ? require(c) : load(c)
-          end
+      config.to_prepare do
+        auth = Spree::Auth::Engine
+
+        auth.prepare_backend if auth.backend_available?
+        auth.prepare_frontend if auth.frontend_available?
+
+        ApplicationController.send :include, Spree::AuthenticationHelpers
+      end
+
+      def self.prepare_backend
+        Rails.application.config.assets.precompile += %w[
+          lib/assets/javascripts/spree/backend/solidus_auth.js
+          lib/assets/javascripts/spree/backend/solidus_auth.css
+        ]
+
+        Dir.glob(File.join(File.dirname(__FILE__), "../../controllers/backend/*/*/*_decorator*.rb")) do |c|
+          Rails.configuration.cache_classes ? require(c) : load(c)
         end
-        if Spree::Auth::Engine.frontend_available?
-          Rails.application.config.assets.precompile += [
-            'lib/assets/javascripts/spree/frontend/solidus_auth.js',
-            'lib/assets/javascripts/spree/frontend/solidus_auth.css'
-          ]
-          Dir.glob(File.join(File.dirname(__FILE__), "../../controllers/frontend/*/*_decorator*.rb")) do |c|
-            Rails.configuration.cache_classes ? require(c) : load(c)
+
+        Spree::Admin::BaseController.unauthorized_redirect = -> do
+          if try_spree_current_user
+            flash[:error] = Spree.t(:authorization_failure)
+            redirect_to spree.admin_unauthorized_path
+          else
+            store_location
+            redirect_to spree.admin_login_path
           end
         end
-        ApplicationController.send :include, Spree::AuthenticationHelpers
+      end
 
-        if self.frontend_available?
-          Spree::BaseController.unauthorized_redirect = -> do
-            if try_spree_current_user
-              flash[:error] = Spree.t(:authorization_failure)
-              redirect_to spree.unauthorized_path
-            else
-              store_location
-              redirect_to spree.login_path
-            end
-          end
+      def self.prepare_frontend
+        Rails.application.config.assets.precompile += %w[
+          lib/assets/javascripts/spree/frontend/solidus_auth.js
+          lib/assets/javascripts/spree/frontend/solidus_auth.css
+        ]
+
+        Dir.glob(File.join(File.dirname(__FILE__), "../../controllers/frontend/*/*_decorator*.rb")) do |c|
+          Rails.configuration.cache_classes ? require(c) : load(c)
         end
 
-        if self.backend_available?
-          Spree::Admin::BaseController.unauthorized_redirect = -> do
-            if try_spree_current_user
-              flash[:error] = Spree.t(:authorization_failure)
-              redirect_to spree.admin_unauthorized_path
-            else
-              store_location
-              redirect_to spree.admin_login_path
-            end
+        Spree::BaseController.unauthorized_redirect = -> do
+          if try_spree_current_user
+            flash[:error] = Spree.t(:authorization_failure)
+            redirect_to spree.unauthorized_path
+          else
+            store_location
+            redirect_to spree.login_path
           end
         end
       end
 
       def self.backend_available?
-        @@backend_available ||= ::Rails::Engine.subclasses.map(&:instance).map{ |e| e.class.to_s }.include?('Spree::Backend::Engine')
+        defined?(Spree::Backend::Engine) == "constant"
       end
 
       def self.dash_available?
-        @@dash_available ||= ::Rails::Engine.subclasses.map(&:instance).map{ |e| e.class.to_s }.include?('Spree::Dash::Engine')
+        defined?(Spree::Dash::Engine) == "constant"
       end
 
       def self.frontend_available?
-        @@frontend_available ||= ::Rails::Engine.subclasses.map(&:instance).map{ |e| e.class.to_s }.include?('Spree::Frontend::Engine')
+        defined?(Spree::Frontend::Engine) == "constant"
       end
 
-      if self.backend_available?
+      if backend_available?
         paths["app/controllers"] << "lib/controllers/backend"
         paths["app/views"] << "lib/views/backend"
       end
 
-      if self.frontend_available?
+      if frontend_available?
         paths["app/controllers"] << "lib/controllers/frontend"
         paths["app/views"] << "lib/views/frontend"
       end
-
-      config.to_prepare &method(:activate).to_proc
     end
   end
 end

data/lib/spree/authentication_helpers.rb

@@ -2,25 +2,30 @@ module Spree
   module AuthenticationHelpers
     def self.included(receiver)
       receiver.send :helper_method, :spree_current_user
-      receiver.send :helper_method, :spree_login_path
-      receiver.send :helper_method, :spree_signup_path
-      receiver.send :helper_method, :spree_logout_path
+
+      if Spree::Auth::Engine.frontend_available?
+        receiver.send :helper_method, :spree_login_path
+        receiver.send :helper_method, :spree_signup_path
+        receiver.send :helper_method, :spree_logout_path
+      end
     end
 
     def spree_current_user
       current_spree_user
     end
 
-    def spree_login_path
-      spree.login_path
-    end
+    if Spree::Auth::Engine.frontend_available?
+      def spree_login_path
+        spree.login_path
+      end
 
-    def spree_signup_path
-      spree.signup_path
-    end
+      def spree_signup_path
+        spree.signup_path
+      end
 
-    def spree_logout_path
-      spree.logout_path
+      def spree_logout_path
+        spree.logout_path
+      end
     end
   end
 end

data/lib/views/backend/spree/admin/shared/_navigation_footer.html.erb

@@ -1,7 +1,7 @@
 <% if spree_current_user %>
   <ul id="login-nav" class="admin-login-nav">
     <li data-hook="user-account-link">
-      <%= link_to spree.edit_user_path(spree_current_user) do %>
+      <%= link_to spree.edit_admin_user_path(spree_current_user) do %>
         <i class='fa fa-user'></i>
         <%= spree_current_user.email %>
       <% end %>
@@ -15,7 +15,7 @@
 
     <% if spree.respond_to? :root_path %>
       <li data-hook="store-frontend-link">
-        <%= link_to spree.root_path, :target => '_blank' do %>
+        <%= link_to spree.root_path, target: '_blank' do %>
           <i class='fa fa-external-link'></i>
           <%= Spree.t(:back_to_store) %>
         <% end %>

data/lib/views/backend/spree/admin/user_passwords/edit.html.erb

@@ -1,7 +1,7 @@
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @spree_user } %>
+<%= render partial: 'spree/shared/error_messages', locals: { target: @spree_user } %>
 <h2><%= Spree.t(:change_my_password) %></h2>
 
-<%= form_for @spree_user, :as => :spree_user, :url => spree.update_password_path, :method => :put do |f| %>
+<%= form_for @spree_user, as: :spree_user, url: spree.update_password_path, method: :put do |f| %>
   <p>
     <%= f.label :password, Spree.t(:password) %><br />
     <%= f.password_field :password %><br />
@@ -11,5 +11,5 @@
     <%= f.password_field :password_confirmation %><br />
   </p>
   <%= f.hidden_field :reset_password_token %>
-  <%= f.submit Spree.t(:update), :class => 'button primary' %>
+  <%= f.submit Spree.t(:update), class: 'button primary' %>
 <% end %>

data/lib/views/backend/spree/admin/user_passwords/new.html.erb

@@ -1,17 +1,17 @@
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @spree_user } %>
+<%= render partial: 'spree/shared/error_messages', locals: { target: @spree_user } %>
 
 <div id="forgot-password">
   <h6><%= Spree.t(:forgot_password) %></h6>
 
   <p><%= Spree.t(:instructions_to_reset_password) %></p>
 
-  <%= form_for Spree::User.new, :as => :spree_user, :url => spree.reset_password_path do |f| %>
+  <%= form_for Spree::User.new, as: :spree_user, url: spree.reset_password_path do |f| %>
     <p>
       <%= f.label :email, Spree.t(:email) %><br />
       <%= f.email_field :email %>
     </p>
     <p>
-      <%= f.submit Spree.t(:reset_password), :class => 'button primary' %>
+      <%= f.submit Spree.t(:reset_password), class: 'button primary' %>
     </p>
   <% end %>
 </div>

data/lib/views/backend/spree/admin/user_sessions/new.html.erb

@@ -6,23 +6,23 @@
 <div id="existing-customer">
   <h6><%= Spree.t(:admin_login) %></h6>
   <div data-hook="login">
-    <%= form_for Spree::User.new, :as => :spree_user, :url => spree.admin_create_new_session_path do |f| %>
+    <%= form_for Spree::User.new, as: :spree_user, url: spree.admin_create_new_session_path do |f| %>
       <div id="password-credentials">
         <p>
           <%= f.label :email, Spree.t(:email) %><br />
-          <%= f.email_field :email, :class => 'title', :tabindex => 1 %>
+          <%= f.email_field :email, class: 'title', tabindex: 1 %>
         </p>
         <p>
           <%= f.label :password, Spree.t(:password) %><br />
-          <%= f.password_field :password, :class => 'title', :tabindex => 2 %>
+          <%= f.password_field :password, class: 'title', tabindex: 2 %>
         </p>
       </div>
       <p>
-        <%= f.check_box :remember_me, :tabindex => 3 %>
+        <%= f.check_box :remember_me, tabindex: 3 %>
         <%= f.label :remember_me, Spree.t(:remember_me) %>
       </p>
 
-      <p><%= f.submit Spree.t(:login), :class => 'button primary', :tabindex => 4 %></p>
+      <p><%= f.submit Spree.t(:login), class: 'button primary', tabindex: 4 %></p>
     <% end %>
     <%= Spree.t(:or) %>
     <%= link_to Spree.t(:forgot_password), spree.recover_password_path %>

data/lib/views/backend/spree/layouts/admin/_login_nav.html.erb

@@ -1,12 +1,12 @@
 <% if spree_current_user %>
   <ul id="login-nav" class="inline-menu">
     <li data-hook="user-logged-in-as"><%= Spree.t(:logged_in_as) %>: <%= spree_current_user.email %></li>
-    <li data-hook="user-account-link" class='fa fa-user'><%= link_to Spree.t(:account), spree.edit_user_path(spree_current_user) %></li>
+    <li data-hook="user-account-link" class='fa fa-user'><%= link_to Spree.t(:account), spree.edit_admin_user_path(spree_current_user) %></li>
     <li data-hook="user-logout-link" class='fa fa-sign-out'><%= link_to Spree.t(:logout), spree.admin_logout_path %></li>
 
     <% if spree.respond_to? :root_path %>
       <li data-hook="store-frontend-link" class='fa fa-external-link'>
-         <%= link_to Spree.t(:back_to_store), spree.root_path, :target => '_blank' %>
+         <%= link_to Spree.t(:back_to_store), spree.root_path, target: '_blank' %>
       </li>
     <% end %>
   </ul>

data/lib/views/frontend/spree/checkout/registration.html.erb

@@ -1,4 +1,4 @@
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @user } %>
+<%= render partial: 'spree/shared/error_messages', locals: { target: @user } %>
 <h1><%= Spree.t(:registration) %></h1>
 <div id="registration" data-hook>
   <div id="account" class="columns alpha eight">
@@ -10,12 +10,12 @@
       <% if flash[:registration_error] %>
         <div class='flash error'><%= flash[:registration_error] %></div>
       <% end %>
-      <%= form_for @order, :url => update_checkout_registration_path, :method => :put, :html => { :id => 'checkout_form_registration' } do |f| %>
+      <%= form_for @order, url: update_checkout_registration_path, method: :put, html: { id: 'checkout_form_registration' } do |f| %>
         <p>
           <%= f.label :email, Spree.t(:email) %><br />
-          <%= f.email_field :email, :class => 'title' %>
+          <%= f.email_field :email, class: 'title' %>
         </p>
-        <p><%= f.submit Spree.t(:continue), :class => 'button primary' %></p>
+        <p><%= f.submit Spree.t(:continue), class: 'button primary' %></p>
       <% end %>
     </div>
   <% end %>

data/lib/views/frontend/spree/shared/_login.html.erb

@@ -1,18 +1,18 @@
-<%= form_for Spree::User.new, :as => :spree_user, :url => spree.create_new_session_path do |f| %>
+<%= form_for Spree::User.new, as: :spree_user, url: spree.create_new_session_path do |f| %>
   <div id="password-credentials">
     <p>
       <%= f.label :email, Spree.t(:email) %><br />
-      <%= f.email_field :email, :class => 'title', :tabindex => 1, autofocus: true %>
+      <%= f.email_field :email, class: 'title', tabindex: 1, autofocus: true %>
     </p>
     <p>
       <%= f.label :password, Spree.t(:password) %><br />
-      <%= f.password_field :password, :class => 'title', :tabindex => 2 %>
+      <%= f.password_field :password, class: 'title', tabindex: 2 %>
     </p>
   </div>
   <p>
-    <%= f.check_box :remember_me, :tabindex => 3 %>
+    <%= f.check_box :remember_me, tabindex: 3 %>
     <%= f.label :remember_me, Spree.t(:remember_me) %>
   </p>
 
-  <p><%= f.submit Spree.t(:login), :class => 'button primary', :tabindex => 4 %></p>
+  <p><%= f.submit Spree.t(:login), class: 'button primary', tabindex: 4 %></p>
 <% end %>

data/lib/views/frontend/spree/shared/_user_form.html.erb

@@ -1,16 +1,16 @@
 <p>
   <%= f.label :email, Spree.t(:email) %><br />
-  <%= f.email_field :email, :class => 'title' %>
+  <%= f.email_field :email, class: 'title' %>
 </p>
 <div id="password-credentials">
   <p>
     <%= f.label :password, Spree.t(:password) %><br />
-    <%= f.password_field :password, :class => 'title' %>
+    <%= f.password_field :password, class: 'title' %>
   </p>
 
   <p>
     <%= f.label :password_confirmation, Spree.t(:confirm_password) %><br />
-    <%= f.password_field :password_confirmation, :class => 'title' %>
+    <%= f.password_field :password_confirmation, class: 'title' %>
   </p>
 </div>
 

data/lib/views/frontend/spree/user_passwords/edit.html.erb

@@ -1,8 +1,8 @@
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @spree_user } %>
+<%= render partial: 'spree/shared/error_messages', locals: { target: @spree_user } %>
 <div id="change-password">
   <h6><%= Spree.t(:change_my_password) %></h6>
-  
-  <%= form_for @spree_user, :as => :spree_user, :url => spree.update_password_path, :method => :put do |f| %>
+
+  <%= form_for @spree_user, as: :spree_user, url: spree.update_password_path, method: :put do |f| %>
     <p>
       <%= f.label :password, Spree.t(:password) %><br />
       <%= f.password_field :password %><br />
@@ -12,6 +12,6 @@
       <%= f.password_field :password_confirmation %><br />
     </p>
     <%= f.hidden_field :reset_password_token %>
-    <%= f.submit Spree.t(:update), :class => 'button primary' %>
+    <%= f.submit Spree.t(:update), class: 'button primary' %>
   <% end %>
 </div>

data/lib/views/frontend/spree/user_passwords/new.html.erb

@@ -1,17 +1,17 @@
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @spree_user } %>
+<%= render partial: 'spree/shared/error_messages', locals: { target: @spree_user } %>
 
 <div id="forgot-password">
   <h6><%= Spree.t(:forgot_password) %></h6>
 
   <p><%= Spree.t(:instructions_to_reset_password) %></p>
 
-  <%= form_for Spree::User.new, :as => :spree_user, :url => spree.reset_password_path do |f| %>
+  <%= form_for Spree::User.new, as: :spree_user, url: spree.reset_password_path do |f| %>
     <p>
       <%= f.label :email, Spree.t(:email) %><br />
       <%= f.email_field :email %>
     </p>
     <p>
-      <%= f.submit Spree.t(:reset_password), :class => 'button primary' %>
+      <%= f.submit Spree.t(:reset_password), class: 'button primary' %>
     </p>
   <% end %>
 </div>

data/lib/views/frontend/spree/user_registrations/new.html.erb

@@ -6,10 +6,10 @@
   <h6><%= Spree.t(:new_customer) %></h6>
 
   <div data-hook="signup">
-    <%= form_for resource, :as => :spree_user, :url => spree.registration_path(resource) do |f| %>
+    <%= form_for resource, as: :spree_user, url: spree.registration_path(resource) do |f| %>
       <div data-hook="signup_inside_form">
-        <%= render :partial => 'spree/shared/user_form', :locals => { :f => f } %>
-        <p><%= f.submit Spree.t(:create), :class => 'button primary' %></p>
+        <%= render partial: 'spree/shared/user_form', locals: { f: f } %>
+        <p><%= f.submit Spree.t(:create), class: 'button primary' %></p>
       </div>
     <% end %>
     <%= Spree.t(:or) %>&nbsp;<%= link_to Spree.t(:login_as_existing), spree.login_path %>

data/lib/views/frontend/spree/user_sessions/new.html.erb

@@ -6,7 +6,7 @@
 <div id="existing-customer">
   <h6><%= Spree.t(:login_as_existing) %></h6>
   <div data-hook="login">
-    <%= render :partial => 'spree/shared/login' %>
+    <%= render partial: 'spree/shared/login' %>
     <%= Spree.t(:or) %>&nbsp;<%= link_to Spree.t(:create_a_new_account), spree.signup_path %> | <%= link_to Spree.t(:forgot_password), spree.recover_password_path %>
   </div>
 </div>

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

@@ -1,13 +1,13 @@
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @user } %>
+<%= render partial: 'spree/shared/error_messages', locals: { target: @user } %>
 
 <div id="edit-account">
   <h1><%= Spree.t(:editing_user) %></h1>
-  
+
   <div data-hook="account_edit">
-    <%= form_for Spree::User.new, :as => @user, :url => spree.user_path(@user), :method => :put do |f| %>
-      <%= render :partial => 'spree/shared/user_form', :locals => { :f => f } %>
+    <%= form_for Spree::User.new, as: @user, url: spree.user_path(@user), method: :put do |f| %>
+      <%= render partial: 'spree/shared/user_form', locals: { f: f } %>
       <p>
-        <%= f.submit Spree.t(:update), :class => 'button primary' %>
+        <%= f.submit Spree.t(:update), class: 'button primary' %>
       </p>
     <% end %>
   </div>

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

@@ -14,7 +14,7 @@
     <table class="order-summary">
       <thead>
       <tr>
-        <th class="order-number"><%= I18n.t(:number, :scope => 'activerecord.attributes.spree/order') %></th>
+        <th class="order-number"><%= I18n.t(:number, scope: 'activerecord.attributes.spree/order') %></th>
         <th class="order-date"><%= Spree.t(:date) %></th>
         <th class="order-status"><%= Spree.t(:status) %></th>
         <th class="order-payment-state"><%= Spree.t(:payment_state) %></th>

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.4.0"
+  s.version     = "1.5.0"
   s.summary     = "Provides authentication and authorization services for use with Solidus by using Devise and CanCan."
   s.description = s.summary
 
@@ -21,8 +21,8 @@ Gem::Specification.new do |s|
   solidus_version = [">= 1.0.6", "< 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 "devise", '~> 4.1'
+  s.add_dependency "devise-encryptable", "0.2.0"
   s.add_dependency 'deface', '~> 1.0.0'
 
   s.add_dependency "json"
@@ -31,14 +31,14 @@ Gem::Specification.new do |s|
   s.add_development_dependency "solidus_backend", solidus_version
   s.add_development_dependency "solidus_frontend", solidus_version
   s.add_development_dependency "rspec-rails", "~> 3.3"
-  s.add_development_dependency "simplecov", "~> 0.9.0"
+  s.add_development_dependency "simplecov", "~> 0.11.2"
   s.add_development_dependency "sqlite3"
   s.add_development_dependency "sass-rails"
   s.add_development_dependency "coffee-rails"
-  s.add_development_dependency "shoulda-matchers", "~> 2.6.2"
+  s.add_development_dependency "shoulda-matchers", "~> 3.1.1"
   s.add_development_dependency "factory_girl", "~> 4.4"
-  s.add_development_dependency "capybara", "~> 2.4.1"
+  s.add_development_dependency "capybara", "~> 2.7.1"
   s.add_development_dependency "poltergeist", "~> 1.5"
-  s.add_development_dependency "database_cleaner", "~> 1.2.0"
+  s.add_development_dependency "database_cleaner", "~> 1.5.3"
   s.add_development_dependency "capybara-screenshot"
 end

data/spec/support/authentication_helpers.rb

@@ -9,6 +9,6 @@ end
 
 RSpec.configure do |config|
   config.include AuthenticationHelpers, type: :feature
-  config.include Devise::TestHelpers,   type: :controller
-  config.include Rack::Test::Methods,   type: :feature
+  config.include Devise::Test::ControllerHelpers, type: :controller
+  config.include Rack::Test::Methods, type: :feature
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_auth_devise
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-16 00:00:00.000000000 Z
+date: 2016-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_core
@@ -36,28 +36,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.1
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.1
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: devise-encryptable
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: deface
   requirement: !ruby/object:Gem::Requirement
@@ -160,14 +160,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.11.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.11.2
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -216,14 +216,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.2
+        version: 3.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.2
+        version: 3.1.1
 - !ruby/object:Gem::Dependency
   name: factory_girl
   requirement: !ruby/object:Gem::Requirement
@@ -244,14 +244,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.1
+        version: 2.7.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.1
+        version: 2.7.1
 - !ruby/object:Gem::Dependency
   name: poltergeist
   requirement: !ruby/object:Gem::Requirement
@@ -272,14 +272,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.5.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.5.3
 - !ruby/object:Gem::Dependency
   name: capybara-screenshot
   requirement: !ruby/object:Gem::Requirement
@@ -304,6 +304,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.md
 - README.md
@@ -325,6 +326,7 @@ files:
 - config/locales/nl.yml
 - config/locales/pt-BR.yml
 - config/locales/tr.yml
+- config/locales/zh-CN.yml
 - config/routes.rb
 - db/default/users.rb
 - db/migrate/20101026184949_create_users.rb
@@ -434,7 +436,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - none
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Provides authentication and authorization services for use with Solidus by