spree_auth_devise 3.2.0.beta → 3.2.0

data/config/locales/it.yml

@@ -29,7 +29,7 @@ it:
     omniauth_callbacks:
       failure: Non è stato possibile autorizzarti da %{kind} perché "%{reason}".
       success: Autorizzato con successo dall'account %{kind}.
-    passwords:
+    user_passwords:
       no_token: Puoi accedere a questa pagina solamente dalla email di reset della password. Se vieni dalla email controlla di aver inserito l'url completo riportato nella email.
       send_instructions: Riceverai un messaggio email con le istruzioni per reimpostare la tua password entro qualche minuto.
       send_paranoid_instructions: Se la tua e-mail esiste nel nostro database, riceverai un messaggio email contentente un link per il ripristino della password
@@ -50,7 +50,7 @@ it:
       send_instructions: Riceverai un messaggio email con le istruzioni per sbloccare il tuo account entro qualche minuto.
       send_paranoid_instructions: Se la tua e-mail esiste nel nostro database, riceverai un messaggio email con le istruzioni per sbloccare il tuo account entro qualche minuto.
       unlocked: Il tuo account è stato correttamente sbloccato. Ora sei collegato.
-    passwords:
+    user_passwords:
       spree_user:
         cannot_be_blank: La tua password non può essere vuota.
         send_instructions: Riceverai un'email con le istruzioni per resettare la tua password entro qualche minuto.

data/config/locales/nl.yml

@@ -25,7 +25,7 @@ nl:
     unlocks:
       send_instructions: Binnen enkele minuten ontvang je een e-mail om je account te ontgrendelen.
       unlocked: Je account is succesvol ontgrendeld. Je bent nu ingelogd.
-    passwords:
+    user_passwords:
       spree_user:
         cannot_be_blank: Je wachtwoord kan niet leeg zijn.
         send_instructions: Binnen enkele minuten ontvang je een e-mail met instructies om je wachtwoord te resetten.

data/config/locales/pt-BR.yml

@@ -27,7 +27,7 @@ pt-BR:
     unlocks:
       send_instructions: Você receberá um e-mail com instruções sobre como desbloquear sua conta em poucos minutos.
       unlocked: Sua conta foi desbloqueada com sucesso. Agora você está conectado.
-    passwords:
+    user_passwords:
       spree_user:
         cannot_be_blank: Sua senha não pode estar em branco.
         send_instructions: Você receberá um e-mail com instruções sobre como redefinir sua senha em poucos minutos.

data/config/locales/pt.yml

@@ -28,7 +28,7 @@ pt:
     unlocks:
       send_instructions: Receberá um e-mail com as instruções de desbloqueio da sua conta em poucos minutos.
       unlocked: A sua conta foi desbloqueada com sucesso. Já se encontra conectado.
-    passwords:
+    user_passwords:
       spree_user:
         cannot_be_blank: A sua senha não pode estar em branco.
         send_instructions: Receberá um e-mail com as instruções de redefinição da sua senha em poucos minutos.

data/config/locales/tr.yml

@@ -25,7 +25,7 @@ tr:
     unlocks:
       send_instructions: Birkaç dakika içinde hesabınızın kilidini nasıl açacağınızı anlatan bir e-posta alacaksınız.
       unlocked: Hesabınızın kilidi başarıyla açıldı. Oturumunuz açıldı.
-    passwords:
+    user_passwords:
       spree_user:
         cannot_be_blank: Boş parola giremezsiniz.
         send_instructions: Birkaç dakika içinde şifrenizi nasıl yeniden ayarlayacağınızı anlatan bir e-posta alacaksınız.

data/config/routes.rb

@@ -1,15 +1,15 @@
 Spree::Core::Engine.add_routes do
   devise_for :spree_user,
-             :class_name => 'Spree::User',
-             :controllers => { :sessions => 'spree/user_sessions',
-                               :registrations => 'spree/user_registrations',
-                               :passwords => 'spree/user_passwords',
-                               :confirmations => 'spree/user_confirmations' },
-             :skip => [:unlocks, :omniauth_callbacks],
-             :path_names => { :sign_out => 'logout' },
-             :path_prefix => :user
+             class_name: 'Spree::User',
+             controllers: { sessions: 'spree/user_sessions',
+                               registrations: 'spree/user_registrations',
+                               passwords: 'spree/user_passwords',
+                               confirmations: 'spree/user_confirmations' },
+             skip: [:unlocks, :omniauth_callbacks],
+             path_names: { sign_out: 'logout' },
+             path_prefix: :user
 
-  resources :users, :only => [:edit, :update]
+  resources :users, only: [:edit, :update]
 
   devise_scope :spree_user do
     get '/login' => 'user_sessions#new', :as => :login
@@ -28,22 +28,21 @@ Spree::Core::Engine.add_routes do
   put '/checkout/registration' => 'checkout#update_registration', :as => :update_checkout_registration
 
   get '/account_link' => 'store#account_link'
-  resource :account, :controller => 'users'
+  resource :account, controller: 'users'
 
   namespace :admin, path: Spree.admin_path do
     devise_for :spree_user,
-               :class_name => 'Spree::User',
-               :controllers => { :sessions => 'spree/admin/user_sessions',
-                                 :passwords => 'spree/admin/user_passwords' },
-               :skip => [:unlocks, :omniauth_callbacks, :registrations],
-               :path_names => { :sign_out => 'logout' },
-               :path_prefix => :user
+               class_name: 'Spree::User',
+               controllers: { sessions: 'spree/admin/user_sessions',
+                                 passwords: 'spree/admin/user_passwords' },
+               skip: [:unlocks, :omniauth_callbacks, :registrations],
+               path_names: { sign_out: 'logout' },
+               path_prefix: :user
     devise_scope :spree_user do
-      get '/authorization_failure', :to => 'user_sessions#authorization_failure', :as => :unauthorized
+      get '/authorization_failure', to: 'user_sessions#authorization_failure', as: :unauthorized
       get '/login' => 'user_sessions#new', :as => :login
       post '/login' => 'user_sessions#create', :as => :create_new_session
       get '/logout' => 'user_sessions#destroy', :as => :logout
     end
-
   end
 end

data/db/default/users.rb

@@ -39,15 +39,15 @@ def create_admin_user
     email = 'spree@example.com'
   else
     puts 'Create the admin user (press enter for defaults).'
-    #name = prompt_for_admin_name unless name
+    # name = prompt_for_admin_name unless name
     email = prompt_for_admin_email
     password = prompt_for_admin_password
   end
   attributes = {
-    :password => password,
-    :password_confirmation => password,
-    :email => email,
-    :login => email
+    password: password,
+    password_confirmation: password,
+    email: email,
+    login: email
   }
 
   load 'spree/user.rb'
@@ -60,7 +60,7 @@ def create_admin_user
       role = Spree::Role.find_or_create_by(name: 'admin')
       admin.spree_roles << role
       admin.save
-      admin.generate_spree_api_key!
+      admin.generate_spree_api_key! if Spree::Auth::Engine.api_available?
       say "Done!"
     else
       say "There was some problems with persisting new admin user:"

data/db/migrate/20101026184949_create_users.rb

@@ -1,17 +1,22 @@
-class CreateUsers < ActiveRecord::Migration
+if ActiveRecord.gem_version >= Gem::Version.new('5.0')
+  class CreateUsers < ActiveRecord::Migration[4.2]; end
+else
+  class CreateUsers < ActiveRecord::Migration; end
+end
+CreateUsers.class_eval do
   def up
-    unless table_exists?("spree_users")
-      create_table "spree_users", :force => true do |t|
-        t.string   "crypted_password",          :limit => 128
-        t.string   "salt",                      :limit => 128
+    unless data_source_exists?("spree_users")
+      create_table "spree_users", force: true do |t|
+        t.string   "crypted_password",          limit: 128
+        t.string   "salt",                      limit: 128
         t.string   "email"
         t.string   "remember_token"
         t.string   "remember_token_expires_at"
         t.string   "persistence_token"
         t.string   "single_access_token"
         t.string   "perishable_token"
-        t.integer  "login_count",                              :default => 0, :null => false
-        t.integer  "failed_login_count",                       :default => 0, :null => false
+        t.integer  "login_count",                              default: 0, null: false
+        t.integer  "failed_login_count",                       default: 0, null: false
         t.datetime "last_request_at"
         t.datetime "current_login_at"
         t.datetime "last_login_at"
@@ -20,8 +25,8 @@ class CreateUsers < ActiveRecord::Migration
         t.string   "login"
         t.integer  "ship_address_id"
         t.integer  "bill_address_id"
-        t.datetime "created_at",                                              :null => false
-        t.datetime "updated_at",                                              :null => false
+        t.datetime "created_at",                                              null: false
+        t.datetime "updated_at",                                              null: false
         t.string   "openid_identifier"
       end
     end

data/db/migrate/20101026184950_rename_columns_for_devise.rb

@@ -1,4 +1,9 @@
-class RenameColumnsForDevise < ActiveRecord::Migration
+if ActiveRecord.gem_version >= Gem::Version.new('5.0')
+  class RenameColumnsForDevise < ActiveRecord::Migration[4.2]; end
+else
+  class RenameColumnsForDevise < ActiveRecord::Migration; end
+end
+RenameColumnsForDevise.class_eval do
   def up
     return if column_exists?(:spree_users, :password_salt)
     rename_column :spree_users, :crypted_password, :encrypted_password

data/db/migrate/20101214150824_convert_user_remember_field.rb

@@ -1,4 +1,9 @@
-class ConvertUserRememberField < ActiveRecord::Migration
+if ActiveRecord.gem_version >= Gem::Version.new('5.0')
+  class ConvertUserRememberField < ActiveRecord::Migration[4.2]; end
+else
+  class ConvertUserRememberField < ActiveRecord::Migration; end
+end
+ConvertUserRememberField.class_eval do
   def up
     remove_column :spree_users, :remember_created_at
     add_column :spree_users, :remember_created_at, :datetime

data/db/migrate/20120203010234_add_reset_password_sent_at_to_spree_users.rb

@@ -1,4 +1,9 @@
-class AddResetPasswordSentAtToSpreeUsers < ActiveRecord::Migration
+if ActiveRecord.gem_version >= Gem::Version.new('5.0')
+  class AddResetPasswordSentAtToSpreeUsers < ActiveRecord::Migration[4.2]; end
+else
+  class AddResetPasswordSentAtToSpreeUsers < ActiveRecord::Migration; end
+end
+AddResetPasswordSentAtToSpreeUsers.class_eval do
   def change
     Spree::User.reset_column_information
     unless Spree::User.column_names.include?("reset_password_sent_at")

data/db/migrate/20120605211305_make_users_email_index_unique.rb

@@ -1,9 +1,14 @@
-class MakeUsersEmailIndexUnique < ActiveRecord::Migration
+if ActiveRecord.gem_version >= Gem::Version.new('5.0')
+  class MakeUsersEmailIndexUnique < ActiveRecord::Migration[4.2]; end
+else
+  class MakeUsersEmailIndexUnique < ActiveRecord::Migration; end
+end
+MakeUsersEmailIndexUnique.class_eval do
   def up
-    add_index "spree_users", ["email"], :name => "email_idx_unique", :unique => true
+    add_index "spree_users", ["email"], name: "email_idx_unique", unique: true
   end
 
   def down
-    remove_index "spree_users", :name => "email_idx_unique"
+    remove_index "spree_users", name: "email_idx_unique"
   end
 end

data/db/migrate/20140904000425_add_deleted_at_to_users.rb

@@ -1,4 +1,9 @@
-class AddDeletedAtToUsers < ActiveRecord::Migration
+if ActiveRecord.gem_version >= Gem::Version.new('5.0')
+  class AddDeletedAtToUsers < ActiveRecord::Migration[4.2]; end
+else
+  class AddDeletedAtToUsers < ActiveRecord::Migration; end
+end
+AddDeletedAtToUsers.class_eval do
   def change
     add_column :spree_users, :deleted_at, :datetime
     add_index :spree_users, :deleted_at

data/db/migrate/20141002154641_add_confirmable_to_users.rb

@@ -1,4 +1,9 @@
-class AddConfirmableToUsers < ActiveRecord::Migration
+if ActiveRecord.gem_version >= Gem::Version.new('5.0')
+  class AddConfirmableToUsers < ActiveRecord::Migration[4.2]; end
+else
+  class AddConfirmableToUsers < ActiveRecord::Migration; end
+end
+AddConfirmableToUsers.class_eval do
   def change
     add_column :spree_users, :confirmation_token, :string
     add_column :spree_users, :confirmed_at, :datetime

data/db/migrate/20150416152553_add_missing_indices_on_user.rb

@@ -1,4 +1,9 @@
-class AddMissingIndicesOnUser < ActiveRecord::Migration
+if ActiveRecord.gem_version >= Gem::Version.new('5.0')
+  class AddMissingIndicesOnUser < ActiveRecord::Migration[4.2]; end
+else
+  class AddMissingIndicesOnUser < ActiveRecord::Migration; end
+end
+AddMissingIndicesOnUser.class_eval do
   def change
     unless index_exists?(:spree_users, :bill_address_id)
       add_index :spree_users, :bill_address_id

data/gemfiles/spree_3_1.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "spree", "~> 3.1.0"
+
+gemspec :path => "../"

data/gemfiles/spree_3_2.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "spree", "~> 3.2.0"
+gem "rails-controller-testing"
+
+gemspec :path => "../"

data/gemfiles/spree_master.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "spree", :github => "spree/spree", :branch => "master"
+gem "rails-controller-testing"
+
+gemspec :path => "../"

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

@@ -1,5 +1,4 @@
 Spree::Admin::BaseController.class_eval do
-
   # Redirect as appropriate when an access request fails.  The default action is to redirect to the login screen.
   # Override this method in your controllers if you want to have special behavior in case the user is not authorized
   # to access the requested action.  For example, a popup window might simply close itself.
@@ -15,12 +14,11 @@ Spree::Admin::BaseController.class_eval do
 
   protected
 
-    def model_class
-      const_name = controller_name.classify
-      if Spree.const_defined?(const_name, false)
-        return "Spree::#{const_name}".constantize
-      end
-      nil
+  def model_class
+    const_name = controller_name.classify
+    if Spree.const_defined?(const_name, false)
+      return "Spree::#{const_name}".constantize
     end
-
+    nil
+  end
 end

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

@@ -2,19 +2,20 @@ Spree::Admin::OrdersController.class_eval do
   before_action :check_authorization
 
   private
-    def load_order_action
-      [:edit, :update, :cancel, :resume, :approve, :resend, :open_adjustments, :close_adjustments, :cart]
-    end
-  
-    def check_authorization
-      action = params[:action].to_sym
-      if load_order_action.include?(action)
-        load_order
-        session[:access_token] ||= params[:token]
-        resource = @order || Spree::Order.new
-        authorize! action, resource, session[:access_token]
-      else
-        authorize! :index, Spree::Order
-      end
+
+  def load_order_action
+    [:edit, :update, :cancel, :resume, :approve, :resend, :open_adjustments, :close_adjustments, :cart]
+  end
+
+  def check_authorization
+    action = params[:action].to_sym
+    if load_order_action.include?(action)
+      load_order
+      session[:access_token] ||= params[:token]
+      resource = @order || Spree::Order.new
+      authorize! action, resource, session[:access_token]
+    else
+      authorize! :index, Spree::Order
     end
+  end
 end

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

@@ -1,3 +1,3 @@
 Spree::Admin::ResourceController.class_eval do
-  rescue_from CanCan::AccessDenied, :with => :unauthorized
+  rescue_from CanCan::AccessDenied, with: :unauthorized
 end

data/lib/controllers/backend/spree/admin/orders/customer_details_controller_decorator.rb

@@ -2,14 +2,15 @@ Spree::Admin::Orders::CustomerDetailsController.class_eval do
   before_action :check_authorization
 
   private
-    def check_authorization
-      load_order
-      session[:access_token] ||= params[:token]
 
-      resource = @order
-      action = params[:action].to_sym
-      action = :edit if action == :show # show route renders :edit for this controller
+  def check_authorization
+    load_order
+    session[:access_token] ||= params[:token]
 
-      authorize! action, resource, session[:access_token]
-    end
+    resource = @order
+    action = params[:action].to_sym
+    action = :edit if action == :show # show route renders :edit for this controller
+
+    authorize! action, resource, session[:access_token]
+  end
 end

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

@@ -20,7 +20,7 @@ class Spree::Admin::UserPasswordsController < Devise::PasswordsController
 
     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
@@ -38,4 +38,9 @@ class Spree::Admin::UserPasswordsController < Devise::PasswordsController
     end
   end
 
+  protected
+
+  def translation_scope
+    'devise.user_passwords'
+  end
 end

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

@@ -19,7 +19,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
@@ -28,25 +28,31 @@ class Spree::Admin::UserSessionsController < Devise::SessionsController
     end
   end
 
-  def authorization_failure
+  def authorization_failure; end
+
+  protected
+
+  def translation_scope
+    'devise.user_sessions'
   end
 
   private
-    def accurate_title
-      Spree.t(:login)
-    end
 
-    def redirect_back_or_default(default)
-      redirect_to(session["spree_user_return_to"] || default)
-      session["spree_user_return_to"] = nil
-    end
+  def accurate_title
+    Spree.t(:login)
+  end
 
-    def resolve_layout
-      case action_name
-      when "new", "create"
-        "spree/layouts/login"
-      else
-        "spree/layouts/admin"
-      end
+  def redirect_back_or_default(default)
+    redirect_to(session["spree_user_return_to"] || default)
+    session["spree_user_return_to"] = nil
+  end
+
+  def resolve_layout
+    case action_name
+    when "new", "create"
+      "spree/layouts/login"
+    else
+      "spree/layouts/admin"
     end
+  end
 end