spree_core 2.2.14 → 2.3.0

data/db/migrate/20140315053743_add_timestamps_to_spree_assets.rb

@@ -0,0 +1,6 @@
+class AddTimestampsToSpreeAssets < ActiveRecord::Migration
+  def change
+    add_column :spree_assets, :created_at, :datetime
+    add_column :spree_assets, :updated_at, :datetime
+  end
+end

data/db/migrate/20140331100557_add_additional_store_fields.rb

@@ -0,0 +1,8 @@
+class AddAdditionalStoreFields < ActiveRecord::Migration
+  def change
+    add_column :spree_stores, :code, :string unless column_exists?(:spree_stores, :code)
+    add_column :spree_stores, :default, :boolean, default: false, null: false unless column_exists?(:spree_stores, :default)
+    add_index :spree_stores, :code
+    add_index :spree_stores, :default
+  end
+end

data/db/migrate/20140410141842_add_many_missing_indexes.rb

@@ -0,0 +1,18 @@
+class AddManyMissingIndexes < ActiveRecord::Migration
+  def change
+    add_index :spree_adjustments, [:adjustable_id, :adjustable_type]
+    add_index :spree_adjustments, :eligible
+    add_index :spree_adjustments, :order_id
+    add_index :spree_promotions, :code
+    add_index :spree_promotions, :expires_at
+    add_index :spree_states, :country_id
+    add_index :spree_stock_items, :deleted_at
+    add_index :spree_option_types, :position
+    add_index :spree_option_values, :position
+    add_index :spree_product_option_types, :option_type_id
+    add_index :spree_product_option_types, :product_id
+    add_index :spree_products_taxons, :position
+    add_index :spree_promotions, :starts_at
+    add_index :spree_stores, :url
+  end
+end

data/db/migrate/20140410150358_correct_some_polymorphic_index_and_add_more_missing.rb

@@ -0,0 +1,66 @@
+class CorrectSomePolymorphicIndexAndAddMoreMissing < ActiveRecord::Migration
+  def change
+    add_index :spree_addresses, :country_id
+    add_index :spree_addresses, :state_id
+    remove_index :spree_adjustments, [:source_type, :source_id]
+    add_index :spree_adjustments, [:source_id, :source_type]
+    add_index :spree_credit_cards, :address_id
+    add_index :spree_gateways, :active
+    add_index :spree_gateways, :test_mode
+    add_index :spree_inventory_units, :return_authorization_id
+    add_index :spree_line_items, :tax_category_id
+    add_index :spree_log_entries, [:source_id, :source_type]
+    add_index :spree_orders, :approver_id
+    add_index :spree_orders, :bill_address_id
+    add_index :spree_orders, :confirmation_delivered
+    add_index :spree_orders, :considered_risky
+    add_index :spree_orders, :created_by_id
+    add_index :spree_orders, :ship_address_id
+    add_index :spree_orders, :shipping_method_id
+    add_index :spree_orders_promotions, [:order_id, :promotion_id]
+    add_index :spree_payments, [:source_id, :source_type]
+    add_index :spree_prices, :deleted_at
+    add_index :spree_product_option_types, :position
+    add_index :spree_product_properties, :position
+    add_index :spree_product_properties, :property_id
+    add_index :spree_products, :shipping_category_id
+    add_index :spree_products, :tax_category_id
+    add_index :spree_promotion_action_line_items, :promotion_action_id
+    add_index :spree_promotion_action_line_items, :variant_id
+    add_index :spree_promotion_rules, :promotion_id
+    add_index :spree_promotions, :advertise
+    add_index :spree_return_authorizations, :number
+    add_index :spree_return_authorizations, :order_id
+    add_index :spree_return_authorizations, :stock_location_id
+    add_index :spree_shipments, :address_id
+    add_index :spree_shipping_methods, :deleted_at
+    add_index :spree_shipping_methods, :tax_category_id
+    add_index :spree_shipping_rates, :selected
+    add_index :spree_shipping_rates, :tax_rate_id
+    add_index :spree_state_changes, [:stateful_id, :stateful_type]
+    add_index :spree_state_changes, :user_id
+    add_index :spree_stock_items, :backorderable
+    add_index :spree_stock_locations, :active
+    add_index :spree_stock_locations, :backorderable_default
+    add_index :spree_stock_locations, :country_id
+    add_index :spree_stock_locations, :propagate_all_variants
+    add_index :spree_stock_locations, :state_id
+    add_index :spree_tax_categories, :deleted_at
+    add_index :spree_tax_categories, :is_default
+    add_index :spree_tax_rates, :deleted_at
+    add_index :spree_tax_rates, :included_in_price
+    add_index :spree_tax_rates, :show_rate_in_label
+    add_index :spree_tax_rates, :tax_category_id
+    add_index :spree_tax_rates, :zone_id
+    add_index :spree_taxonomies, :position
+    add_index :spree_taxons, :position
+    add_index :spree_trackers, :active
+    add_index :spree_variants, :deleted_at
+    add_index :spree_variants, :is_master
+    add_index :spree_variants, :position
+    add_index :spree_variants, :track_inventory
+    add_index :spree_zone_members, :zone_id
+    add_index :spree_zone_members, [:zoneable_id, :zoneable_type]
+    add_index :spree_zones, :default_tax
+  end
+end

data/db/migrate/20140508151342_change_spree_price_amount_precision.rb

@@ -1,7 +1,7 @@
 class ChangeSpreePriceAmountPrecision < ActiveRecord::Migration
   def change
     change_column :spree_prices, :amount,  :decimal, :precision => 10, :scale => 2
-    change_column :spree_line_items, :price,  :decimal, :precision => 10, :scale => 2, :null => false
+    change_column :spree_line_items, :price,  :decimal, :precision => 10, :scale => 2
     change_column :spree_line_items, :cost_price,  :decimal, :precision => 10, :scale => 2
     change_column :spree_variants, :cost_price, :decimal, :precision => 10, :scale => 2
   end

data/db/migrate/20140518174634_add_token_to_spree_orders.rb

@@ -0,0 +1,5 @@
+class AddTokenToSpreeOrders < ActiveRecord::Migration
+  def change
+    add_column :spree_orders, :guest_token, :string
+  end
+end

data/db/migrate/20140530024945_move_order_token_from_tokenized_permission.rb

@@ -0,0 +1,29 @@
+class MoveOrderTokenFromTokenizedPermission < ActiveRecord::Migration
+  class Spree::TokenizedPermission < Spree::Base
+    belongs_to :permissable, polymorphic: true
+  end
+
+  def up
+    case Spree::Order.connection.adapter_name
+    when 'SQLite'
+      Spree::Order.has_one :tokenized_permission, :as => :permissable
+      Spree::Order.includes(:tokenized_permission).each do |o|
+        o.update_column :guest_token, o.tokenized_permission.token
+      end
+    when 'Mysql2'
+      execute "UPDATE spree_orders, spree_tokenized_permissions
+               SET spree_orders.guest_token = spree_tokenized_permissions.token
+               WHERE spree_tokenized_permissions.permissable_id = spree_orders.id
+                  AND spree_tokenized_permissions.permissable_type = 'Spree::Order'"
+    else
+      execute "UPDATE spree_orders
+               SET guest_token = spree_tokenized_permissions.token
+               FROM spree_tokenized_permissions
+               WHERE spree_tokenized_permissions.permissable_id = spree_orders.id
+                  AND spree_tokenized_permissions.permissable_type = 'Spree::Order'"
+    end
+  end
+
+  def down
+  end
+end

data/db/migrate/20140601011216_set_shipment_total_for_users_upgrading.rb

@@ -3,8 +3,10 @@ class SetShipmentTotalForUsersUpgrading < ActiveRecord::Migration
     # NOTE You might not need this at all unless you're upgrading from Spree 2.1.x
     # or below. For those upgrading this should populate the Order#shipment_total
     # for legacy orders
-    Spree::Order.complete.where('shipment_total = ?', 0).includes(:shipments).find_each do |order|
-      order.update_column(:shipment_total, order.shipments.sum(:cost))
-    end
+    execute "UPDATE spree_orders
+             SET shipment_total = (SELECT SUM(spree_shipments.cost) AS sum_id
+                                   FROM spree_shipments
+                                   WHERE spree_shipments.order_id = spree_orders.id)
+             WHERE spree_orders.completed_at IS NOT NULL AND spree_orders.shipment_total = 0"
   end
 end

data/db/migrate/20140604135309_drop_credit_card_first_name_and_last_name.rb

@@ -0,0 +1,6 @@
+class DropCreditCardFirstNameAndLastName < ActiveRecord::Migration
+  def change
+    remove_column :spree_credit_cards, :first_name, :string
+    remove_column :spree_credit_cards, :last_name, :string
+  end
+end

data/lib/generators/spree/dummy/dummy_generator.rb

@@ -48,6 +48,7 @@ module Spree
       template "rails/test.rb", "#{dummy_path}/config/environments/test.rb", :force => true
       template "rails/script/rails", "#{dummy_path}/spec/dummy/script/rails", :force => true
       template "initializers/custom_user.rb", "#{dummy_path}/config/initializers/custom_user.rb", :force => true
+      template "initializers/devise.rb", "#{dummy_path}/config/initializers/devise.rb", :force => true
     end
 
     def test_dummy_inject_extension_requirements

data/lib/generators/spree/dummy/templates/initializers/devise.rb

@@ -0,0 +1,3 @@
+if Object.const_defined?("Devise")
+  Devise.secret_key = "<%= SecureRandom.hex(50) %>"
+end

data/lib/generators/spree/dummy/templates/rails/routes.rb

@@ -1,3 +1,2 @@
 Rails.application.routes.draw do
-  <%= 'mount Spree::Core::Engine => "/"' if defined?(Spree::Core) %>
 end

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

@@ -13,7 +13,6 @@ module Spree
     class_option :admin_email, :type => :string
     class_option :admin_password, :type => :string
     class_option :lib_name, :type => :string, :default => 'spree'
-    class_option :enforce_available_locales, :type => :boolean, :default => nil
 
     def self.source_paths
       paths = self.superclass.source_paths
@@ -46,10 +45,6 @@ module Spree
       end
     end
 
-    def remove_unneeded_files
-      remove_file "public/index.html"
-    end
-
     def additional_tweaks
       return unless File.exists? 'public/robots.txt'
       append_file "public/robots.txt", <<-ROBOTS
@@ -57,10 +52,14 @@ User-agent: *
 Disallow: /checkout
 Disallow: /cart
 Disallow: /orders
-Disallow: /user
+Disallow: /countries
+Disallow: /line_items
+Disallow: /password_resets
+Disallow: /states
+Disallow: /user_sessions
+Disallow: /user_registrations
+Disallow: /users
 Disallow: /account
-Disallow: /api
-Disallow: /password
       ROBOTS
     end
 
@@ -101,13 +100,6 @@ Disallow: /password
       end
     end
       APP
-
-      if !options[:enforce_available_locales].nil?
-        application <<-APP
-    # Prevent this deprecation message: https://github.com/svenfuchs/i18n/commit/3b6e56e
-    I18n.enforce_available_locales = #{options[:enforce_available_locales]}
-        APP
-      end
     end
 
     def include_seed_data
@@ -172,7 +164,7 @@ Spree::Auth::Engine.load_seed if defined?(Spree::Auth)
     end
 
     def notify_about_routes
-      insert_into_file File.join('config', 'routes.rb'), :after => "Application.routes.draw do\n" do
+      insert_into_file File.join('config', 'routes.rb'), :after => "Rails.application.routes.draw do\n" do
         %Q{
   # This line mounts Spree's routes at the root of your application.
   # This means, any requests to URLs such as /products, will go to Spree::ProductsController.
@@ -199,6 +191,5 @@ Spree::Auth::Engine.load_seed if defined?(Spree::Auth)
         puts "Enjoy!"
       end
     end
-
   end
 end

data/lib/generators/spree/install/templates/config/initializers/spree.rb

@@ -7,8 +7,8 @@
 # config.setting_name = 'new value'
 Spree.config do |config|
   # Example:
-  # Uncomment to override the default site name.
-  # config.site_name = "Spree Demo Site"
+  # Uncomment to stop tracking inventory levels in the application
+  # config.track_inventory_levels = false
 end
 
 Spree.user_class = <%= (options[:user_class].blank? ? "Spree::LegacyUser" : options[:user_class]).inspect %>

data/lib/spree/core.rb

@@ -30,7 +30,7 @@ module Spree
   # Example:
   #
   #   Spree.config do |config|
-  #     config.site_name = "An awesome Spree site"
+  #     config.track_inventory_levels = false
   #   end
   #
   # This method is defined within the core gem on purpose.
@@ -49,10 +49,6 @@ end
 
 require 'spree/core/version'
 
-require 'spree/core/ransackable_attributes'
-require 'spree/core/mail_interceptor'
-require 'spree/core/mail_method'
-require 'spree/core/mail_settings'
 require 'spree/core/environment_extension'
 require 'spree/core/environment/calculators'
 require 'spree/core/environment'
@@ -68,13 +64,21 @@ require 'spree/core/user_address'
 require 'spree/core/user_payment_source'
 require 'spree/core/delegate_belongs_to'
 require 'spree/core/permalinks'
-require 'spree/core/token_resource'
 require 'spree/core/calculated_adjustments'
-require 'spree/core/adjustment_source'
 require 'spree/core/product_duplicator'
 require 'spree/core/controller_helpers'
-require 'spree/core/controller_helpers/strong_parameters'
-require 'spree/core/controller_helpers/ssl'
 require 'spree/core/controller_helpers/search'
+require 'spree/core/controller_helpers/ssl'
+require 'spree/core/controller_helpers/store'
+require 'spree/core/controller_helpers/strong_parameters'
 
 require 'spree/core/importer'
+
+# Hack waiting on https://github.com/pluginaweek/state_machine/pull/275
+module StateMachine
+  module Integrations
+    module ActiveModel
+      public :around_validation
+    end
+  end
+end

data/lib/spree/core/calculated_adjustments.rb

@@ -3,7 +3,7 @@ module Spree
     module CalculatedAdjustments
       def self.included(klass)
         klass.class_eval do
-          has_one   :calculator, :class_name => "Spree::Calculator", :as => :calculable, :dependent => :destroy
+          has_one   :calculator, class_name: "Spree::Calculator", as: :calculable, inverse_of: :calculable, dependent: :destroy, autosave: true
           accepts_nested_attributes_for :calculator
           validates :calculator, :presence => true
 

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

@@ -5,10 +5,11 @@ module Spree
         extend ActiveSupport::Concern
 
         included do
+          before_filter :set_guest_token
           helper_method :try_spree_current_user
 
           rescue_from CanCan::AccessDenied do |exception|
-            redirect_unauthorized_access
+            unauthorized
           end
         end
 
@@ -17,20 +18,15 @@ module Spree
           @current_ability ||= Spree::Ability.new(try_spree_current_user)
         end
 
-        # 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.
-        def redirect_unauthorized_access
-          if try_spree_current_user
-            flash[:error] = Spree.t(:authorization_failure)
-            redirect_to '/unauthorized'
-          else
-            store_location
-            if respond_to?(:spree_login_path)
-              redirect_to spree_login_path
-            else
-              redirect_to spree.respond_to?(:root_path) ? spree.root_path : root_path
-            end
+
+        def redirect_back_or_default(default)
+          redirect_to(session["spree_user_return_to"] || default)
+          session["spree_user_return_to"] = nil
+        end
+
+        def set_guest_token
+          unless cookies.signed[:guest_token].present?
+            cookies.permanent.signed[:guest_token] = SecureRandom.urlsafe_base64(nil, false)
           end
         end
 
@@ -65,10 +61,23 @@ module Spree
           end
         end
 
-        def redirect_back_or_default(default)
-          redirect_to(session["spree_user_return_to"] || default)
-          session["spree_user_return_to"] = nil
+        # 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.
+        def unauthorized
+          if try_spree_current_user
+            flash[:error] = Spree.t(:authorization_failure)
+            redirect_to '/unauthorized'
+          else
+            store_location
+            if respond_to?(:spree_login_path)
+              redirect_to spree_login_path
+            else
+              redirect_to spree.respond_to?(:root_path) ? spree.root_path : root_path
+            end
+          end
         end
+
       end
     end
   end

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

@@ -39,12 +39,12 @@ module Spree
           end
 
           def default_title
-            Spree::Config[:site_name]
+            current_store.name
           end
 
           # this is a hook for subclasses to provide title
           def accurate_title
-            Spree::Config[:default_seo_title]
+            current_store.seo_title
           end
 
           def render_404(exception = nil)

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

@@ -2,48 +2,41 @@ module Spree
   module Core
     module ControllerHelpers
       module Order
-        def self.included(base)
-          base.class_eval do
-            helper_method :simple_current_order
-            helper_method :current_order
-            helper_method :current_currency
-            before_filter :set_current_order
-          end
+        extend ActiveSupport::Concern
+
+        included do
+          before_filter :set_current_order
+
+          helper_method :current_currency
+          helper_method :current_order
+          helper_method :simple_current_order
         end
 
         # Used in the link_to_cart helper.
         def simple_current_order
-          @simple_current_order ||= Spree::Order.find_by(id: session[:order_id], currency: current_currency)
+          @order ||= Spree::Order.find_by(completed_at: nil, currency: current_currency, guest_token: cookies.signed[:guest_token])
         end
 
-        # The current incomplete order from the session for use in cart and during checkout
+        # The current incomplete order from the guest_token for use in cart and during checkout
         def current_order(options = {})
           options[:create_order_if_necessary] ||= false
           options[:lock] ||= false
 
           return @current_order if @current_order
 
-          if session[:order_id]
-            current_order = Spree::Order.includes(:adjustments).lock(options[:lock]).find_by(id: session[:order_id], currency: current_currency)
-            @current_order = current_order unless current_order.try(:completed?)
-          end
+          # Find any incomplete orders for the guest_token
+          @current_order = Spree::Order.includes(:adjustments).lock(options[:lock]).find_by(completed_at: nil, currency: current_currency, guest_token: cookies.signed[:guest_token])
 
           if options[:create_order_if_necessary] and (@current_order.nil? or @current_order.completed?)
-            @current_order = Spree::Order.new(currency: current_currency)
+            @current_order = Spree::Order.new(currency: current_currency, guest_token: cookies.signed[:guest_token])
             @current_order.user ||= try_spree_current_user
             # See issue #3346 for reasons why this line is here
             @current_order.created_by ||= try_spree_current_user
             @current_order.save!
-
-            # make sure the user has permission to access the order (if they are a guest)
-            if try_spree_current_user.nil?
-              session[:access_token] = @current_order.token
-            end
           end
 
           if @current_order
             @current_order.last_ip_address = ip_address
-            session[:order_id] = @current_order.id
             return @current_order
           end
         end
@@ -53,15 +46,13 @@ module Spree
           if try_spree_current_user && @order
             @order.associate_user!(try_spree_current_user) if @order.user.blank? || @order.email.blank?
           end
-
-          session[:guest_token] = nil
         end
 
         def set_current_order
           if user = try_spree_current_user
             last_incomplete_order = user.last_incomplete_spree_order
-            if session[:order_id].nil? && last_incomplete_order
-              session[:order_id] = last_incomplete_order.id
+            if last_incomplete_order
+              cookies.permanent.signed[:guest_token] = last_incomplete_order.guest_token
             elsif current_order && last_incomplete_order && current_order != last_incomplete_order
               current_order.merge!(last_incomplete_order, user)
             end