spree_auth_devise 3.2.0.beta → 3.2.0

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

@@ -18,23 +18,24 @@ Spree::CheckoutController.class_eval do
   end
 
   private
-    def order_params
-      params[:order] ? params.require(:order).permit(:email) : {}
-    end
 
-    def skip_state_validation?
-      %w(registration update_registration).include?(params[:action])
-    end
+  def order_params
+    params[:order].present? ? params.require(:order).permit(:email) : {}
+  end
 
-    def check_authorization
-      authorize!(:edit, current_order, cookies.signed[:guest_token])
-    end
+  def skip_state_validation?
+    %w(registration update_registration).include?(params[:action])
+  end
 
-    # Introduces a registration step whenever the +registration_step+ preference is true.
-    def check_registration
-      return unless Spree::Auth::Config[:registration_step]
-      return if spree_current_user or current_order.email
-      store_location
-      redirect_to spree.checkout_registration_path
-    end
+  def check_authorization
+    authorize!(:edit, current_order, cookies.signed[:guest_token])
+  end
+
+  # Introduces a registration step whenever the +registration_step+ preference is true.
+  def check_registration
+    return unless Spree::Auth::Config[:registration_step]
+    return if spree_current_user || current_order.email
+    store_location
+    redirect_to spree.checkout_registration_path
+  end
 end

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

@@ -11,4 +11,8 @@ class Spree::UserConfirmationsController < Devise::ConfirmationsController
   def after_confirmation_path_for(resource_name, resource)
     signed_in?(resource_name) ? signed_in_root_path(resource) : spree.login_path
   end
+
+  def translation_scope
+    'devise.confirmations'
+  end
 end

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

@@ -18,7 +18,7 @@ class Spree::UserPasswordsController < Devise::PasswordsController
 
     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
@@ -40,6 +40,10 @@ class Spree::UserPasswordsController < Devise::PasswordsController
 
   protected
 
+  def translation_scope
+    'devise.user_passwords'
+  end
+
   def new_session_path(resource_name)
     spree.send("new_#{resource_name}_session_path")
   end

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

@@ -67,6 +67,10 @@ class Spree::UserRegistrationsController < Devise::RegistrationsController
     authorize!(:create, resource)
   end
 
+  def translation_scope
+    'devise.user_registrations'
+  end
+
   private
 
   def spree_user_params

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

@@ -16,9 +16,9 @@ class Spree::UserSessionsController < Devise::SessionsController
           redirect_back_or_default(after_sign_in_path_for(spree_current_user))
         }
         format.js {
-          render :json => {:user => spree_current_user,
-                           :ship_address => spree_current_user.ship_address,
-                           :bill_address => spree_current_user.bill_address}.to_json
+          render json: { user: spree_current_user,
+                           ship_address: spree_current_user.ship_address,
+                           bill_address: spree_current_user.bill_address }.to_json
         }
       end
     else
@@ -28,19 +28,26 @@ class Spree::UserSessionsController < Devise::SessionsController
           render :new
         }
         format.js {
-          render :json => { error: t('devise.failure.invalid') }, status: :unprocessable_entity
+          render json: { error: t('devise.failure.invalid') }, status: :unprocessable_entity
         }
       end
     end
   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 redirect_back_or_default(default)
+    redirect_to(session["spree_user_return_to"] || default)
+    session["spree_user_return_to"] = nil
+  end
 end

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

@@ -28,29 +28,30 @@ 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
   end
 
   private
-    def user_params
-      params.require(:user).permit(Spree::PermittedAttributes.user_attributes)
-    end
 
-    def load_object
-      @user ||= spree_current_user
-      authorize! params[:action].to_sym, @user
-    end
+  def user_params
+    params.require(:user).permit(Spree::PermittedAttributes.user_attributes)
+  end
 
-    def authorize_actions
-      authorize! params[:action].to_sym, Spree::User.new
-    end
+  def load_object
+    @user ||= spree_current_user
+    authorize! params[:action].to_sym, @user
+  end
 
-    def accurate_title
-      Spree.t(:my_account)
-    end
+  def authorize_actions
+    authorize! params[:action].to_sym, Spree::User.new
+  end
+
+  def accurate_title
+    Spree.t(:my_account)
+  end
 end

data/lib/generators/spree/auth/install/install_generator.rb

@@ -2,8 +2,10 @@ module Spree
   module Auth
     module Generators
       class InstallGenerator < Rails::Generators::Base
+        class_option :migrate, type: :boolean, default: true, banner: 'Migrate the database'
+
         def self.source_paths
-          paths = self.superclass.source_paths
+          paths = superclass.source_paths
           paths << File.expand_path('../templates', __FILE__)
           paths.flatten
         end
@@ -22,7 +24,11 @@ module Spree
         end
 
         def run_migrations
-          run 'bundle exec rake db:migrate'
+         if options[:migrate]
+           run 'bundle exec rake db:migrate VERBOSE=false'
+         else
+           puts "Skiping rake db:migrate, don't forget to run it!"
+         end
         end
       end
     end

data/lib/spree/auth/devise.rb

@@ -9,7 +9,7 @@ module Spree
   module Auth
     mattr_accessor :default_secret_key
 
-    def self.config(&block)
+    def self.config
       yield(Spree::Auth::Config)
     end
   end

data/lib/spree/auth/engine.rb

@@ -7,11 +7,11 @@ module Spree
       isolate_namespace Spree
       engine_name 'spree_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 "spree_auth_devise.set_user_class", :after => :load_config_initializers do
+      initializer "spree_auth_devise.set_user_class", after: :load_config_initializers do
         Spree.user_class = "Spree::User"
       end
 
@@ -20,7 +20,7 @@ module Spree
           puts "[WARNING] You are not setting Devise.secret_key within your application!"
           puts "You must set this in config/initializers/devise.rb. Here's an example:"
           puts " "
-          puts %Q{Devise.secret_key = "#{SecureRandom.hex(50)}"}
+          puts %{Devise.secret_key = "#{SecureRandom.hex(50)}"}
         end
       end
 
@@ -49,24 +49,24 @@ module Spree
         ApplicationController.send :include, Spree::AuthenticationHelpers
       end
 
-      def self.backend_available?
-        @@backend_available ||= ::Rails::Engine.subclasses.map(&:instance).map{ |e| e.class.to_s }.include?('Spree::Backend::Engine')
+      def self.api_available?
+        @@api_available ||= ::Rails::Engine.subclasses.map(&:instance).map{ |e| e.class.to_s }.include?('Spree::Api::Engine')
       end
 
-      def self.dash_available?
-        @@dash_available ||= ::Rails::Engine.subclasses.map(&:instance).map{ |e| e.class.to_s }.include?('Spree::Dash::Engine')
+      def self.backend_available?
+        @@backend_available ||= ::Rails::Engine.subclasses.map(&:instance).map{ |e| e.class.to_s }.include?('Spree::Backend::Engine')
       end
 
       def self.frontend_available?
         @@frontend_available ||= ::Rails::Engine.subclasses.map(&:instance).map{ |e| e.class.to_s }.include?('Spree::Frontend::Engine')
       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

data/lib/tasks/auth.rake

@@ -1,7 +1,7 @@
 namespace :spree_auth do
   namespace :admin do
     desc "Create admin username and password"
-    task :create => :environment do
+    task create: :environment do
       require File.join(File.dirname(__FILE__), '..', '..', 'db', 'default', 'users.rb')
       puts "Done!"
     end

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

@@ -27,7 +27,7 @@
         <tr>
           <td class="order-number"><%= link_to order.number, order_url(order) %></td>
           <td class="order-date"><%= l order.completed_at.to_date %></td>
-          <td class="order-status"><%= Spree.t("order_state.#{order.state}").titleize %></td>
+          <td class="order-status"><%= Spree.t("order_states.#{order.state}").titleize %></td>
           <td class="order-payment-state"><%= Spree.t("payment_states.#{order.payment_state}").titleize if order.payment_state %></td>
           <td class="order-shipment-state"><%= Spree.t("shipment_states.#{order.shipment_state}").titleize if order.shipment_state %></td>
           <td class="lead text-primary order-total"><%= order.display_total %></td>

data/spec/controllers/spree/checkout_controller_spec.rb

@@ -1,5 +1,4 @@
 RSpec.describe Spree::CheckoutController, type: :controller do
-
   let(:order) { create(:order_with_totals, email: nil, user: nil) }
   let(:user)  { build(:user, spree_api_key: 'fake') }
   let(:token) { 'some_token' }
@@ -114,7 +113,7 @@ RSpec.describe Spree::CheckoutController, type: :controller do
       controller.stub :check_authorization
       order.stub update_attributes: true
       controller.should_not_receive :check_registration
-      spree_put :update_registration, { order: { } }
+      spree_put :update_registration, { order: {} }
     end
 
     it 'renders the registration view if unable to save' do

data/spec/controllers/spree/products_controller_spec.rb

@@ -1,5 +1,4 @@
 RSpec.describe Spree::ProductsController, type: :controller do
-
   let!(:product) { create(:product, available_on: 1.year.from_now) }
   let!(:user)    { build(:user, spree_api_key: 'fake') }
 

data/spec/controllers/spree/user_passwords_controller_spec.rb

@@ -1,5 +1,4 @@
 RSpec.describe Spree::UserPasswordsController, type: :controller do
-
   let(:token) { 'some_token' }
 
   before { @request.env['devise.mapping'] = Devise.mappings[:spree_user] }
@@ -16,7 +15,7 @@ RSpec.describe Spree::UserPasswordsController, type: :controller do
       it 'flashes an error' do
         spree_get :edit
         expect(flash[:alert]).to include(
-          "You can't access this page without coming from a password reset " +
+          "You can't access this page without coming from a password reset " \
           'email'
         )
       end
@@ -34,9 +33,9 @@ RSpec.describe Spree::UserPasswordsController, type: :controller do
     context 'when updating password with blank password' do
       it 'shows error flash message, sets spree_user with token and re-displays password edit form' do
         spree_put :update, { spree_user: { password: '', password_confirmation: '', reset_password_token: token } }
-        expect(assigns(:spree_user).kind_of?(Spree::User)).to eq true
+        expect(assigns(:spree_user).is_a?(Spree::User)).to eq true
         expect(assigns(:spree_user).reset_password_token).to eq token
-        expect(flash[:error]).to eq I18n.t(:cannot_be_blank, scope: [:devise, :passwords, :spree_user])
+        expect(flash[:error]).to eq I18n.t(:cannot_be_blank, scope: [:devise, :user_passwords, :spree_user])
         expect(response).to render_template :edit
       end
     end

data/spec/controllers/spree/user_registrations_controller_spec.rb

@@ -1,5 +1,4 @@
 RSpec.describe Spree::UserRegistrationsController, type: :controller do
-
   before { @request.env['devise.mapping'] = Devise.mappings[:spree_user] }
 
   context '#create' do

data/spec/controllers/spree/user_sessions_controller_spec.rb

@@ -1,5 +1,4 @@
 RSpec.describe Spree::UserSessionsController, type: :controller do
-
   let(:user) { create(:user) }
 
   before { @request.env['devise.mapping'] = Devise.mappings[:spree_user] }

data/spec/controllers/spree/users_controller_spec.rb

@@ -1,5 +1,4 @@
 RSpec.describe Spree::UsersController, type: :controller do
-
   let(:admin_user) { create(:user) }
   let(:user) { create(:user) }
   let(:role) { create(:role) }

data/spec/factories/confirmed_user.rb

@@ -4,4 +4,4 @@ FactoryGirl.define do
     confirmation_sent_at { Time.now }
     confirmation_token "12345"
   end
-end
+end

data/spec/features/account_spec.rb

@@ -1,5 +1,4 @@
 RSpec.feature 'Accounts', type: :feature do
-
   context 'editing' do
     scenario 'can edit an admin user', js: true do
       user = create(:admin_user, email: 'admin@person.com', password: 'password', password_confirmation: 'password')

data/spec/features/admin/orders_spec.rb

@@ -1,5 +1,4 @@
 RSpec.feature 'Admin orders', type: :feature do
-
   background do
     sign_in_as! create(:admin_user)
   end

data/spec/features/admin/password_reset_spec.rb

@@ -1,5 +1,4 @@
 RSpec.feature 'Admin - Reset Password', type: :feature do
-
   let!(:store) { create(:store) }
 
   background do

data/spec/features/admin/products_spec.rb

@@ -1,5 +1,4 @@
 RSpec.feature 'Admin products', type: :feature do
-
   context 'as anonymous user' do
     # Regression test for #1250
     scenario 'redirects to login page when attempting to access product listing' do

data/spec/features/admin/sign_in_spec.rb

@@ -1,5 +1,4 @@
 RSpec.feature 'Admin - Sign In', type: :feature do
-
   background do
     @user = create(:user, email: 'email@person.com')
     visit spree.admin_login_path

data/spec/features/admin/sign_out_spec.rb

@@ -1,5 +1,4 @@
 RSpec.feature 'Admin - Sign Out', type: :feature do
-
   given!(:user) do
    create :user, email: 'email@person.com'
   end

data/spec/features/admin_permissions_spec.rb

@@ -1,5 +1,4 @@
 RSpec.feature 'Admin Permissions', type: :feature do
-
   context 'orders' do
     background do
       user = create(:admin_user, email: 'admin@person.com', password: 'password', password_confirmation: 'password')

data/spec/features/change_email_spec.rb

@@ -1,5 +1,4 @@
 RSpec.feature 'Change email', type: :feature do
-
   background do
     user = create(:user)
     visit spree.root_path

data/spec/features/checkout_spec.rb

@@ -47,9 +47,9 @@ RSpec.feature 'Checkout', :js, type: :feature do
       str_addr = 'bill_address'
       select 'United States', from: "order_#{str_addr}_attributes_country_id"
       %w(firstname lastname address1 city zipcode phone).each do |field|
-        fill_in "order_#{str_addr}_attributes_#{field}", with: "#{address.send(field)}"
+        fill_in "order_#{str_addr}_attributes_#{field}", with: address.send(field).to_s
       end
-      select "#{address.state.name}", from: "order_#{str_addr}_attributes_state_id"
+      select address.state.name.to_s, from: "order_#{str_addr}_attributes_state_id"
       check 'order_use_billing'
 
       click_button 'Save and Continue'
@@ -77,9 +77,9 @@ RSpec.feature 'Checkout', :js, type: :feature do
       str_addr = 'bill_address'
       select 'United States', from: "order_#{str_addr}_attributes_country_id"
       %w(firstname lastname address1 city zipcode phone).each do |field|
-        fill_in "order_#{str_addr}_attributes_#{field}", with: "#{address.send(field)}"
+        fill_in "order_#{str_addr}_attributes_#{field}", with: address.send(field).to_s
       end
-      select "#{address.state.name}", from: "order_#{str_addr}_attributes_state_id"
+      select address.state.name.to_s, from: "order_#{str_addr}_attributes_state_id"
       check 'order_use_billing'
 
       click_button 'Save and Continue'
@@ -118,9 +118,9 @@ RSpec.feature 'Checkout', :js, type: :feature do
       str_addr = 'bill_address'
       select 'United States', from: "order_#{str_addr}_attributes_country_id"
       %w(firstname lastname address1 city zipcode phone).each do |field|
-        fill_in "order_#{str_addr}_attributes_#{field}", with: "#{address.send(field)}"
+        fill_in "order_#{str_addr}_attributes_#{field}", with: address.send(field).to_s
       end
-      select "#{address.state.name}", from: "order_#{str_addr}_attributes_state_id"
+      select address.state.name.to_s, from: "order_#{str_addr}_attributes_state_id"
       check 'order_use_billing'
 
       click_button 'Save and Continue'
@@ -145,9 +145,9 @@ RSpec.feature 'Checkout', :js, type: :feature do
       str_addr = 'bill_address'
       select 'United States', from: "order_#{str_addr}_attributes_country_id"
       %w(firstname lastname address1 city zipcode phone).each do |field|
-        fill_in "order_#{str_addr}_attributes_#{field}", with: "#{address.send(field)}"
+        fill_in "order_#{str_addr}_attributes_#{field}", with: address.send(field).to_s
       end
-      select "#{address.state.name}", from: "order_#{str_addr}_attributes_state_id"
+      select address.state.name.to_s, from: "order_#{str_addr}_attributes_state_id"
       check 'order_use_billing'
 
       click_button 'Save and Continue'