spree_core 3.3.6 → 3.4.0.rc1

data/lib/generators/spree/custom_user/custom_user_generator.rb

@@ -3,27 +3,26 @@ module Spree
     include Rails::Generators::ResourceHelpers
     include Rails::Generators::Migration
 
-
-    desc "Set up a Spree installation with a custom User class"
+    desc 'Set up a Spree installation with a custom User class'
 
     def self.source_paths
-      paths = self.superclass.source_paths
+      paths = superclass.source_paths
       paths << File.expand_path('../templates', __FILE__)
       paths.flatten
     end
 
     def check_for_constant
-      begin
-        klass
-      rescue NameError
-        @shell.say "Couldn't find #{class_name}. Are you sure that this class exists within your application and is loaded?", :red
-        exit(1)
-      end
+
+      klass
+    rescue NameError
+      @shell.say "Couldn't find #{class_name}. Are you sure that this class exists within your application and is loaded?", :red
+      exit(1)
+
     end
 
     def generate
-      migration_template 'migration.rb.tt', "db/migrate/add_spree_fields_to_custom_user_table.rb"
-      template 'authentication_helpers.rb.tt', "lib/spree/authentication_helpers.rb"
+      migration_template 'migration.rb.tt', 'db/migrate/add_spree_fields_to_custom_user_table.rb'
+      template 'authentication_helpers.rb.tt', 'lib/spree/authentication_helpers.rb'
 
       file_action = File.exist?('config/initializers/spree.rb') ? :append_file : :create_file
       send(file_action, 'config/initializers/spree.rb') do
@@ -37,9 +36,9 @@ module Spree
     def self.next_migration_number(dirname)
       if ApplicationRecord.timestamped_migrations
         sleep 1 # make sure to get a different migration every time
-        Time.new.utc.strftime("%Y%m%d%H%M%S")
+        Time.new.utc.strftime('%Y%m%d%H%M%S')
       else
-        "%.3d" % (current_migration_number(dirname) + 1)
+        format('%.3d', (current_migration_number(dirname) + 1))
       end
     end
 
@@ -50,7 +49,5 @@ module Spree
     def table_name
       klass.table_name
     end
-
   end
 end
-

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

@@ -3,12 +3,14 @@ require 'highline/import'
 require 'bundler'
 require 'bundler/cli'
 require 'active_support/core_ext/string/indent'
+require 'spree/core'
 
 module Spree
   class InstallGenerator < Rails::Generators::Base
     class_option :migrate, type: :boolean, default: true, banner: 'Run Spree migrations'
     class_option :seed, type: :boolean, default: true, banner: 'load seed data (migrations must be run)'
     class_option :sample, type: :boolean, default: true, banner: 'load sample data (migrations must be run)'
+    class_option :copy_views, type: :boolean, default: true, banner: 'copy frontend views from spree to your application for easy customization'
     class_option :auto_accept, type: :boolean
     class_option :user_class, type: :string
     class_option :admin_email, type: :string
@@ -17,7 +19,7 @@ module Spree
     class_option :enforce_available_locales, type: :boolean, default: nil
 
     def self.source_paths
-      paths = self.superclass.source_paths
+      paths = superclass.source_paths
       paths << File.expand_path('../templates', "../../#{__FILE__}")
       paths << File.expand_path('../templates', "../#{__FILE__}")
       paths << File.expand_path('../templates', __FILE__)
@@ -28,10 +30,11 @@ module Spree
       @run_migrations = options[:migrate]
       @load_seed_data = options[:seed]
       @load_sample_data = options[:sample]
+      @copy_views = options[:copy_views]
 
       unless @run_migrations
-         @load_seed_data = false
-         @load_sample_data = false
+        @load_seed_data = false
+        @load_sample_data = false
       end
     end
 
@@ -40,8 +43,8 @@ module Spree
     end
 
     def additional_tweaks
-      return unless File.exists? 'public/robots.txt'
-      append_file "public/robots.txt", <<-ROBOTS.strip_heredoc
+      return unless File.exist? 'public/robots.txt'
+      append_file 'public/robots.txt', <<-ROBOTS.strip_heredoc
         User-agent: *
         Disallow: /checkout
         Disallow: /cart
@@ -56,23 +59,33 @@ module Spree
     def setup_assets
       @lib_name = 'spree'
       %w{javascripts stylesheets images}.each do |path|
-        empty_directory "vendor/assets/#{path}/spree/frontend" if defined? Spree::Frontend || Rails.env.test?
-        empty_directory "vendor/assets/#{path}/spree/backend" if defined? Spree::Backend || Rails.env.test?
+        if Spree::Core::Engine.frontend_available? || Rails.env.test?
+          empty_directory "vendor/assets/#{path}/spree/frontend"
+        end
+        if Spree::Core::Engine.backend_available? || Rails.env.test?
+          empty_directory "vendor/assets/#{path}/spree/backend"
+        end
       end
 
-      if defined? Spree::Frontend || Rails.env.test?
-        template "vendor/assets/javascripts/spree/frontend/all.js"
-        template "vendor/assets/stylesheets/spree/frontend/all.css"
+      if Spree::Core::Engine.frontend_available? || Rails.env.test?
+        template 'vendor/assets/javascripts/spree/frontend/all.js'
+        template 'vendor/assets/stylesheets/spree/frontend/all.css'
       end
 
-      if defined? Spree::Backend || Rails.env.test?
-        template "vendor/assets/javascripts/spree/backend/all.js"
-        template "vendor/assets/stylesheets/spree/backend/all.css"
+      if Spree::Core::Engine.backend_available? || Rails.env.test?
+        template 'vendor/assets/javascripts/spree/backend/all.js'
+        template 'vendor/assets/stylesheets/spree/backend/all.css'
       end
     end
 
     def create_overrides_directory
-      empty_directory "app/overrides"
+      empty_directory 'app/overrides'
+    end
+
+    def copy_views
+      if @copy_views && Spree::Core::Engine.frontend_available?
+        generate 'spree:frontend:copy_views'
+      end
     end
 
     def configure_application
@@ -91,7 +104,7 @@ module Spree
         end
       APP
 
-      if !options[:enforce_available_locales].nil?
+      unless options[:enforce_available_locales].nil?
         application <<-APP.strip_heredoc.indent!(4)
           # Prevent this deprecation message: https://github.com/svenfuchs/i18n/commit/3b6e56e
           I18n.enforce_available_locales = #{options[:enforce_available_locales]}
@@ -100,7 +113,7 @@ module Spree
     end
 
     def include_seed_data
-      append_file "db/seeds.rb", <<-SEEDS.strip_heredoc
+      append_file 'db/seeds.rb', <<-SEEDS.strip_heredoc
 
         Spree::Core::Engine.load_seed if defined?(Spree::Core)
         Spree::Auth::Engine.load_seed if defined?(Spree::Auth)
@@ -108,14 +121,14 @@ module Spree
     end
 
     def install_migrations
-      say_status :copying, "migrations"
+      say_status :copying, 'migrations'
       silence_stream(STDOUT) do
         silence_warnings { rake 'railties:install:migrations' }
       end
     end
 
     def create_database
-      say_status :creating, "database"
+      say_status :creating, 'database'
       silence_stream(STDOUT) do
         silence_stream(STDERR) do
           silence_warnings { rake 'db:create' }
@@ -125,7 +138,7 @@ module Spree
 
     def run_migrations
       if @run_migrations
-        say_status :running, "migrations"
+        say_status :running, 'migrations'
         silence_stream(STDOUT) do
           silence_stream(STDERR) do
             silence_warnings { rake 'db:migrate' }
@@ -138,13 +151,13 @@ module Spree
 
     def populate_seed_data
       if @load_seed_data
-        say_status :loading,  "seed data"
-        rake_options=[]
-        rake_options << "AUTO_ACCEPT=1" if options[:auto_accept]
+        say_status :loading,  'seed data'
+        rake_options = []
+        rake_options << 'AUTO_ACCEPT=1' if options[:auto_accept]
         rake_options << "ADMIN_EMAIL=#{options[:admin_email]}" if options[:admin_email]
         rake_options << "ADMIN_PASSWORD=#{options[:admin_password]}" if options[:admin_password]
 
-        cmd = lambda { rake("db:seed #{rake_options.join(' ')}") }
+        cmd = -> { rake("db:seed #{rake_options.join(' ')}") }
         if options[:auto_accept] || (options[:admin_email] && options[:admin_password])
           silence_stream(STDOUT) do
             silence_stream(STDERR) do
@@ -155,20 +168,20 @@ module Spree
           cmd.call
         end
       else
-        say_status :skipping, "seed data (you can always run rake db:seed)"
+        say_status :skipping, 'seed data (you can always run rake db:seed)'
       end
     end
 
     def load_sample_data
       if @load_sample_data
-        say_status :loading, "sample data"
+        say_status :loading, 'sample data'
         silence_stream(STDOUT) do
           silence_stream(STDERR) do
             silence_warnings { rake 'spree_sample:load' }
           end
         end
       else
-        say_status :skipping, "sample data (you can always run rake spree_sample:load)"
+        say_status :skipping, 'sample data (you can always run rake spree_sample:load)'
       end
     end
 
@@ -189,19 +202,19 @@ module Spree
       end
 
       unless options[:quiet]
-        puts "*" * 50
+        puts '*' * 50
         puts "We added the following line to your application's config/routes.rb file:"
-        puts " "
+        puts ' '
         puts "    mount Spree::Core::Engine, at: '/'"
       end
     end
 
     def complete
       unless options[:quiet]
-        puts "*" * 50
+        puts '*' * 50
         puts "Spree has been installed successfully. You're all ready to go!"
-        puts " "
-        puts "Enjoy!"
+        puts ' '
+        puts 'Enjoy!'
       end
     end
 
@@ -219,7 +232,7 @@ module Spree
 
     def file_exists?(extensions, filename)
       extensions.detect do |extension|
-        File.exists?("#{filename}#{extension}")
+        File.exist?("#{filename}#{extension}")
       end
     end
 

data/lib/spree/core/components.rb

@@ -2,15 +2,15 @@ module Spree
   module Core
     class Engine < ::Rails::Engine
       def self.api_available?
-        @@api_available ||= ::Rails::Engine.subclasses.map(&:instance).map{ |e| e.class.to_s }.include?('Spree::Api::Engine')
+        @@api_available ||= ::Rails::Engine.subclasses.map(&:instance).map { |e| e.class.to_s }.include?('Spree::Api::Engine')
       end
 
       def self.backend_available?
-        @@backend_available ||= ::Rails::Engine.subclasses.map(&:instance).map{ |e| e.class.to_s }.include?('Spree::Backend::Engine')
+        @@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')
+        @@frontend_available ||= ::Rails::Engine.subclasses.map(&:instance).map { |e| e.class.to_s }.include?('Spree::Frontend::Engine')
       end
     end
   end

data/lib/spree/core/controller_helpers/auth.rb

@@ -9,7 +9,7 @@ module Spree
           before_action :set_guest_token
           helper_method :try_spree_current_user
 
-          rescue_from CanCan::AccessDenied do |exception|
+          rescue_from CanCan::AccessDenied do |_exception|
             redirect_unauthorized_access
           end
         end
@@ -20,8 +20,8 @@ module Spree
         end
 
         def redirect_back_or_default(default)
-          redirect_to(session["spree_user_return_to"] || request.env["HTTP_REFERER"] || default)
-          session["spree_user_return_to"] = nil
+          redirect_to(session['spree_user_return_to'] || request.env['HTTP_REFERER'] || default)
+          session['spree_user_return_to'] = nil
         end
 
         def set_guest_token
@@ -35,12 +35,10 @@ module Spree
           authentication_routes = [:spree_signup_path, :spree_login_path, :spree_logout_path]
           disallowed_urls = []
           authentication_routes.each do |route|
-            if respond_to?(route)
-              disallowed_urls << send(route)
-            end
+            disallowed_urls << send(route) if respond_to?(route)
           end
 
-          disallowed_urls.map!{ |url| url[/\/\w+$/] }
+          disallowed_urls.map! { |url| url[/\/\w+$/] }
           unless disallowed_urls.include?(request.fullpath)
             session['spree_user_return_to'] = request.fullpath.gsub('//', '/')
           end
@@ -56,8 +54,6 @@ module Spree
           # This one will be defined by Devise
           elsif respond_to?(:current_spree_user)
             current_spree_user
-          else
-            nil
           end
         end
 
@@ -79,7 +75,6 @@ module Spree
             end
           end
         end
-
       end
     end
   end

data/lib/spree/core/controller_helpers/common.rb

@@ -40,9 +40,9 @@ module Spree
             current_store.seo_title
           end
 
-          def render_404(exception = nil)
+          def render_404(_exception = nil)
             respond_to do |type|
-              type.html { render status: :not_found, file: "#{::Rails.root}/public/404", formats: [:html], layout: nil}
+              type.html { render status: :not_found, file: "#{::Rails.root}/public/404", formats: [:html], layout: nil }
               type.all  { head :not_found }
             end
           end
@@ -66,7 +66,6 @@ module Spree
           def get_layout
             layout ||= Spree::Config[:layout]
           end
-
         end
       end
     end

data/lib/spree/core/controller_helpers/order.rb

@@ -13,7 +13,6 @@ module Spree
 
         # Used in the link_to_cart helper.
         def simple_current_order
-
           return @simple_current_order if @simple_current_order
 
           @simple_current_order = find_order_by_token_or_user
@@ -67,14 +66,14 @@ module Spree
         private
 
         def last_incomplete_order
-          @last_incomplete_order ||= try_spree_current_user.last_incomplete_spree_order
+          @last_incomplete_order ||= try_spree_current_user.last_incomplete_spree_order(current_store)
         end
 
         def current_order_params
           { currency: current_currency, guest_token: cookies.signed[:guest_token], store_id: current_store.id, user_id: try_spree_current_user.try(:id) }
         end
 
-        def find_order_by_token_or_user(options={}, with_adjustments = false)
+        def find_order_by_token_or_user(options = {}, with_adjustments = false)
           options[:lock] ||= false
 
           # Find any incomplete orders for the guest_token
@@ -87,13 +86,10 @@ module Spree
                   end
 
           # Find any incomplete orders for the current user
-          if order.nil? && try_spree_current_user
-            order = last_incomplete_order
-          end
+          order = last_incomplete_order if order.nil? && try_spree_current_user
 
           order
         end
-
       end
     end
   end

data/lib/spree/core/controller_helpers/respond_with.rb

@@ -7,7 +7,7 @@ module ActionController
         # Checkout AS Array#extract_options! and original respond_with
         # implementation for a better picture of this hack
         if resources.last.is_a? Hash
-          resources.last.merge! action_name: action_name.to_sym
+          resources.last[:action_name] = action_name.to_sym
         else
           resources.push action_name: action_name.to_sym
         end
@@ -35,7 +35,7 @@ module Spree
             self.spree_responders = {}
           end
 
-          def respond_override(options={})
+          def respond_override(options = {})
             unless options.blank?
               action_name = options.keys.first
               action_value = options.values.first
@@ -52,10 +52,10 @@ module Spree
               end
 
               if format_value.is_a?(Proc)
-                options = {action_name.to_sym => {format_name.to_sym => {success: format_value}}}
+                options = { action_name.to_sym => { format_name.to_sym => { success: format_value } } }
               end
 
-              self.spree_responders.deep_merge!(self.name.to_sym => options)
+              spree_responders.deep_merge!(name.to_sym => options)
             end
           end
         end

data/lib/spree/core/engine.rb

@@ -116,12 +116,12 @@ module Spree
       end
 
       config.to_prepare do
-        # Ensure spree locale paths are present before decorators
-        I18n.load_path.unshift(*(Dir.glob(
+        # Load spree locales before decorators
+        I18n.load_path += Dir.glob(
           File.join(
             File.dirname(__FILE__), '../../../config/locales', '*.{rb,yml}'
           )
-        ) - I18n.load_path))
+        )
 
         # Load application's model / class decorators
         Dir.glob(File.join(File.dirname(__FILE__), '../../../app/**/*_decorator*.rb')) do |c|

data/lib/spree/core/environment/calculators.rb

@@ -9,4 +9,3 @@ module Spree
     end
   end
 end
-

data/lib/spree/core/environment_extension.rb

@@ -4,22 +4,22 @@ module Spree
       extend ActiveSupport::Concern
 
       def add_class(name)
-        self.instance_variable_set "@#{name}", Set.new
+        instance_variable_set "@#{name}", Set.new
 
-        create_method( "#{name}=".to_sym ) { |val|
-          instance_variable_set( "@" + name, val)
-        }
+        create_method("#{name}=".to_sym) do |val|
+          instance_variable_set('@' + name, val)
+        end
 
         create_method(name.to_sym) do
-          instance_variable_get( "@" + name )
+          instance_variable_get('@' + name)
         end
       end
 
       private
 
-        def create_method(name, &block)
-          self.class.send(:define_method, name, &block)
-        end
+      def create_method(name, &block)
+        self.class.send(:define_method, name, &block)
+      end
     end
   end
 end