solidus_core 1.3.0.beta1 → 1.3.0.rc1

data/db/migrate/20140410150358_correct_some_polymorphic_index_and_add_more_missing.rb

@@ -1,63 +1,65 @@
 class CorrectSomePolymorphicIndexAndAddMoreMissing < ActiveRecord::Migration
+  include Spree::MigrationHelpers
+
   def change
-    add_index :spree_addresses, :country_id
-    add_index :spree_addresses, :state_id
+    safe_add_index :spree_addresses, :country_id
+    safe_add_index :spree_addresses, :state_id
 
-    remove_index :spree_adjustments, [:source_type, :source_id]
-    add_index :spree_adjustments, [:source_id, :source_type]
+    safe_remove_index :spree_adjustments, [:source_type, :source_id]
+    safe_add_index :spree_adjustments, [:source_id, :source_type]
 
-    add_index :spree_inventory_units, :return_authorization_id
+    safe_add_index :spree_inventory_units, :return_authorization_id
 
-    add_index :spree_log_entries, [:source_id, :source_type]
+    safe_add_index :spree_log_entries, [:source_id, :source_type]
 
-    add_index :spree_orders, :approver_id
-    add_index :spree_orders, :created_by_id
-    add_index :spree_orders, :ship_address_id
-    add_index :spree_orders, :bill_address_id
-    add_index :spree_orders, :considered_risky
+    safe_add_index :spree_orders, :approver_id
+    safe_add_index :spree_orders, :created_by_id
+    safe_add_index :spree_orders, :ship_address_id
+    safe_add_index :spree_orders, :bill_address_id
+    safe_add_index :spree_orders, :considered_risky
 
-    add_index :spree_orders_promotions, [:order_id, :promotion_id]
+    safe_add_index :spree_orders_promotions, [:order_id, :promotion_id]
 
-    add_index :spree_payments, [:source_id, :source_type]
+    safe_add_index :spree_payments, [:source_id, :source_type]
 
-    add_index :spree_product_option_types, :position
+    safe_add_index :spree_product_option_types, :position
 
-    add_index :spree_product_properties, :position
-    add_index :spree_product_properties, :property_id
+    safe_add_index :spree_product_properties, :position
+    safe_add_index :spree_product_properties, :property_id
 
-    add_index :spree_promotion_action_line_items, :promotion_action_id
-    add_index :spree_promotion_action_line_items, :variant_id
+    safe_add_index :spree_promotion_action_line_items, :promotion_action_id
+    safe_add_index :spree_promotion_action_line_items, :variant_id
 
-    add_index :spree_promotion_rules, :promotion_id
+    safe_add_index :spree_promotion_rules, :promotion_id
 
-    add_index :spree_promotions, :advertise
+    safe_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
+    safe_add_index :spree_return_authorizations, :number
+    safe_add_index :spree_return_authorizations, :order_id
+    safe_add_index :spree_return_authorizations, :stock_location_id
 
-    add_index :spree_shipments, :address_id
+    safe_add_index :spree_shipments, :address_id
 
-    add_index :spree_shipping_methods, :tax_category_id
+    safe_add_index :spree_shipping_methods, :tax_category_id
 
-    add_index :spree_state_changes, [:stateful_id, :stateful_type]
-    add_index :spree_state_changes, :user_id
+    safe_add_index :spree_state_changes, [:stateful_id, :stateful_type]
+    safe_add_index :spree_state_changes, :user_id
 
-    add_index :spree_stock_locations, :country_id
-    add_index :spree_stock_locations, :state_id
+    safe_add_index :spree_stock_locations, :country_id
+    safe_add_index :spree_stock_locations, :state_id
 
-    add_index :spree_tax_rates, :deleted_at
-    add_index :spree_tax_rates, :tax_category_id
-    add_index :spree_tax_rates, :zone_id
+    safe_add_index :spree_tax_rates, :deleted_at
+    safe_add_index :spree_tax_rates, :tax_category_id
+    safe_add_index :spree_tax_rates, :zone_id
 
-    add_index :spree_taxonomies, :position
+    safe_add_index :spree_taxonomies, :position
 
-    add_index :spree_taxons, :position
+    safe_add_index :spree_taxons, :position
 
-    add_index :spree_variants, :position
-    add_index :spree_variants, :track_inventory
+    safe_add_index :spree_variants, :position
+    safe_add_index :spree_variants, :track_inventory
 
-    add_index :spree_zone_members, :zone_id
-    add_index :spree_zone_members, [:zoneable_id, :zoneable_type]
+    safe_add_index :spree_zone_members, :zone_id
+    safe_add_index :spree_zone_members, [:zoneable_id, :zoneable_type]
   end
 end

data/db/migrate/20141217215630_update_product_slug_index.rb

@@ -1,6 +1,8 @@
 class UpdateProductSlugIndex < ActiveRecord::Migration
+  include Spree::MigrationHelpers
+
   def change
-    remove_index :spree_products, :slug
-    add_index :spree_products, :slug, unique: true
+    safe_remove_index :spree_products, :slug
+    safe_add_index :spree_products, :slug, unique: true
   end
 end

data/db/migrate/20150723224133_remove_unnecessary_indexes.rb

@@ -4,6 +4,8 @@
 # migration deletes any of the indexes left around in stores using the
 # out-dated version of that migration
 class RemoveUnnecessaryIndexes < ActiveRecord::Migration
+  include Spree::MigrationHelpers
+
   def up
     safe_remove_index :spree_credit_cards, :address_id
     safe_remove_index :spree_gateways, :active
@@ -59,14 +61,4 @@ class RemoveUnnecessaryIndexes < ActiveRecord::Migration
     safe_add_index :spree_variants, :deleted_at
     safe_add_index :spree_zones, :default_tax
   end
-
-  private
-
-  def safe_remove_index(table, column)
-    remove_index(table, column) if index_exists?(table, column)
-  end
-
-  def safe_add_index(table, column)
-    add_index(table, column) if column_exists?(table, column)
-  end
 end

data/db/migrate/20151219020209_add_stock_item_unique_index.rb

@@ -1,8 +1,8 @@
 class AddStockItemUniqueIndex < ActiveRecord::Migration
   def change
     # Add a database-level uniqueness constraint for databases that support it
-    # (postgres & sqlite)
-    if connection.adapter_name =~ /postgres|sqlite/i
+    # (postgres and sqlite > 3.8)
+    if connection.supports_partial_index?
       add_index 'spree_stock_items', ['variant_id', 'stock_location_id'], where: 'deleted_at is null', unique: true
     end
   end

data/db/migrate/20160509181311_add_country_iso_to_prices.rb

@@ -0,0 +1,8 @@
+class AddCountryIsoToPrices < ActiveRecord::Migration
+  def change
+    add_column :spree_prices, :country_iso, :string, null: true, limit: 2
+
+    add_index :spree_prices, :country_iso
+    add_index :spree_countries, :iso
+  end
+end

data/lib/spree/core/class_constantizer.rb

@@ -0,0 +1,31 @@
+module Spree
+  module Core
+    module ClassConstantizer
+      class Set
+        include Enumerable
+
+        def initialize
+          @collection = ::Set.new
+        end
+
+        def <<(klass)
+          @collection << klass.to_s
+        end
+
+        def concat(klasses)
+          klasses.each do |klass|
+            self << klass
+          end
+        end
+
+        delegate :clear, :empty?, to: :@collection
+
+        def each
+          @collection.each do |klass|
+            yield klass.constantize
+          end
+        end
+      end
+    end
+  end
+end

data/lib/spree/core/engine.rb

@@ -17,102 +17,98 @@ module Spree
         Spree::Config = app.config.spree.preferences # legacy access
       end
 
-      initializer "spree.default_permissions" do |_app|
+      initializer "spree.default_permissions", before: :load_config_initializers do |_app|
         Spree::RoleConfiguration.configure do |config|
           config.assign_permissions :default, [Spree::PermissionSets::DefaultCustomer]
           config.assign_permissions :admin, [Spree::PermissionSets::SuperUser]
         end
       end
 
-      initializer "spree.register.calculators" do |app|
-        app.config.spree.calculators.shipping_methods = [
-            Spree::Calculator::Shipping::FlatPercentItemTotal,
-            Spree::Calculator::Shipping::FlatRate,
-            Spree::Calculator::Shipping::FlexiRate,
-            Spree::Calculator::Shipping::PerItem,
-            Spree::Calculator::Shipping::PriceSack]
+      initializer "spree.register.calculators", before: :load_config_initializers do |app|
+        app.config.spree.calculators.shipping_methods = %w[
+          Spree::Calculator::Shipping::FlatPercentItemTotal
+          Spree::Calculator::Shipping::FlatRate
+          Spree::Calculator::Shipping::FlexiRate
+          Spree::Calculator::Shipping::PerItem
+          Spree::Calculator::Shipping::PriceSack
+        ]
 
-        app.config.spree.calculators.tax_rates = [
-           Spree::Calculator::DefaultTax]
+        app.config.spree.calculators.tax_rates = %w[
+          Spree::Calculator::DefaultTax
+        ]
       end
 
-      initializer "spree.register.stock_splitters" do |app|
-        app.config.spree.stock_splitters = [
-          Spree::Stock::Splitter::ShippingCategory,
+      initializer "spree.register.stock_splitters", before: :load_config_initializers do |app|
+        app.config.spree.stock_splitters = %w[
+          Spree::Stock::Splitter::ShippingCategory
           Spree::Stock::Splitter::Backordered
         ]
       end
 
-      initializer "spree.register.payment_methods" do |app|
-        app.config.spree.payment_methods = [
-            Spree::Gateway::Bogus,
-            Spree::Gateway::BogusSimple,
-            Spree::PaymentMethod::StoreCredit,
-            Spree::PaymentMethod::Check]
+      initializer "spree.register.payment_methods", before: :load_config_initializers do |app|
+        app.config.spree.payment_methods = %w[
+          Spree::Gateway::Bogus
+          Spree::Gateway::BogusSimple
+          Spree::PaymentMethod::StoreCredit
+          Spree::PaymentMethod::Check
+        ]
       end
 
       # We need to define promotions rules here so extensions and existing apps
       # can add their custom classes on their initializer files
-      initializer 'spree.promo.environment' do |app|
-        app.config.spree.add_class('promotions')
+      initializer 'spree.promo.environment', before: :load_config_initializers do |app|
         app.config.spree.promotions = Spree::Promo::Environment.new
         app.config.spree.promotions.rules = []
       end
 
-      initializer 'spree.promo.register.promotion.calculators' do |app|
-        app.config.spree.calculators.add_class('promotion_actions_create_adjustments')
-        app.config.spree.calculators.promotion_actions_create_adjustments = [
-          Spree::Calculator::FlatPercentItemTotal,
-          Spree::Calculator::FlatRate,
-          Spree::Calculator::FlexiRate,
-          Spree::Calculator::TieredPercent,
+      initializer 'spree.promo.register.promotion.calculators', before: :load_config_initializers do |app|
+        app.config.spree.calculators.promotion_actions_create_adjustments = %w[
+          Spree::Calculator::FlatPercentItemTotal
+          Spree::Calculator::FlatRate
+          Spree::Calculator::FlexiRate
+          Spree::Calculator::TieredPercent
           Spree::Calculator::TieredFlatRate
         ]
 
-        app.config.spree.calculators.add_class('promotion_actions_create_item_adjustments')
-        app.config.spree.calculators.promotion_actions_create_item_adjustments = [
-          Spree::Calculator::PercentOnLineItem,
-          Spree::Calculator::FlatRate,
-          Spree::Calculator::FlexiRate,
+        app.config.spree.calculators.promotion_actions_create_item_adjustments = %w[
+          Spree::Calculator::PercentOnLineItem
+          Spree::Calculator::FlatRate
+          Spree::Calculator::FlexiRate
           Spree::Calculator::TieredPercent
         ]
 
-        app.config.spree.calculators.add_class('promotion_actions_create_quantity_adjustments')
-        app.config.spree.calculators.promotion_actions_create_quantity_adjustments = [
-          Spree::Calculator::PercentOnLineItem,
+        app.config.spree.calculators.promotion_actions_create_quantity_adjustments = %w[
+          Spree::Calculator::PercentOnLineItem
           Spree::Calculator::FlatRate
         ]
       end
 
-      # Promotion rules need to be evaluated on after initialize otherwise
-      # Spree.user_class would be nil and users might experience errors related
-      # to malformed model associations (Spree.user_class is only defined on
-      # the app initializer)
-      config.after_initialize do
-        Rails.application.config.spree.promotions.rules.concat [
-          Spree::Promotion::Rules::ItemTotal,
-          Spree::Promotion::Rules::Product,
-          Spree::Promotion::Rules::User,
-          Spree::Promotion::Rules::FirstOrder,
-          Spree::Promotion::Rules::UserLoggedIn,
-          Spree::Promotion::Rules::OneUsePerUser,
-          Spree::Promotion::Rules::Taxon,
-          Spree::Promotion::Rules::NthOrder,
-          Spree::Promotion::Rules::OptionValue,
+      initializer 'spree.promo.register.promotion.rules', before: :load_config_initializers do |app|
+        app.config.spree.promotions.rules = %w[
+          Spree::Promotion::Rules::ItemTotal
+          Spree::Promotion::Rules::Product
+          Spree::Promotion::Rules::User
+          Spree::Promotion::Rules::FirstOrder
+          Spree::Promotion::Rules::UserLoggedIn
+          Spree::Promotion::Rules::OneUsePerUser
+          Spree::Promotion::Rules::Taxon
+          Spree::Promotion::Rules::NthOrder
+          Spree::Promotion::Rules::OptionValue
           Spree::Promotion::Rules::FirstRepeatPurchaseSince
         ]
       end
 
-      initializer 'spree.promo.register.promotions.actions' do |app|
-        app.config.spree.promotions.actions = [
-          Promotion::Actions::CreateAdjustment,
-          Promotion::Actions::CreateItemAdjustments,
-          Promotion::Actions::CreateQuantityAdjustments,
-          Promotion::Actions::FreeShipping]
+      initializer 'spree.promo.register.promotions.actions', before: :load_config_initializers do |app|
+        app.config.spree.promotions.actions = %w[
+          Spree::Promotion::Actions::CreateAdjustment
+          Spree::Promotion::Actions::CreateItemAdjustments
+          Spree::Promotion::Actions::CreateQuantityAdjustments
+          Spree::Promotion::Actions::FreeShipping
+        ]
       end
 
       # filter sensitive information during logging
-      initializer "spree.params.filter" do |app|
+      initializer "spree.params.filter", before: :load_config_initializers do |app|
         app.config.filter_parameters += [
           :password,
           :password_confirmation,
@@ -120,7 +116,7 @@ module Spree
           :verification_value]
       end
 
-      initializer "spree.core.checking_migrations" do |_app|
+      initializer "spree.core.checking_migrations", before: :load_config_initializers do |_app|
         Migrations.new(config, engine_name).check
       end
     end

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

@@ -4,7 +4,12 @@ module Spree
       class Calculators
         include EnvironmentExtension
 
-        attr_accessor :shipping_methods, :tax_rates
+        add_class_set :shipping_methods
+        add_class_set :tax_rates
+
+        add_class_set :promotion_actions_create_adjustments
+        add_class_set :promotion_actions_create_item_adjustments
+        add_class_set :promotion_actions_create_quantity_adjustments
       end
     end
   end

data/lib/spree/core/environment.rb

@@ -3,12 +3,15 @@ module Spree
     class Environment
       include EnvironmentExtension
 
-      attr_accessor :calculators, :payment_methods, :preferences,
-                    :stock_splitters
+      add_class_set :payment_methods
+      add_class_set :stock_splitters
+
+      attr_accessor :calculators, :preferences, :promotions
 
       def initialize
         @calculators = Calculators.new
         @preferences = Spree::AppConfiguration.new
+        @promotions = Spree::Promo::Environment.new
       end
     end
   end

data/lib/spree/core/environment_extension.rb

@@ -1,24 +1,28 @@
+require 'spree/core/class_constantizer'
+
 module Spree
   module Core
     module EnvironmentExtension
       extend ActiveSupport::Concern
 
-      def add_class(name)
-        instance_variable_set "@#{name}", Set.new
-
-        create_method( "#{name}=".to_sym ) { |val|
-          instance_variable_set( "@" + name, val)
-        }
+      class_methods do
+        def add_class_set(name)
+          define_method(name) do
+            set = instance_variable_get("@#{name}")
+            set = send("#{name}=", []) unless set
+            set
+          end
 
-        create_method(name.to_sym) do
-          instance_variable_get( "@" + name )
+          define_method("#{name}=") do |klasses|
+            set = ClassConstantizer::Set.new
+            set.concat(klasses)
+            instance_variable_set("@#{name}", set)
+          end
         end
       end
 
-      private
-
-      def create_method(name, &block)
-        self.class.send(:define_method, name, &block)
+      def add_class(name)
+        singleton_class.send(:add_class_set, name)
       end
     end
   end

data/lib/spree/core/price_migrator.rb

@@ -0,0 +1,32 @@
+module Spree
+  # This class performs a data migration. It's usually run from
+  # the `solidus:migrations:create_vat_prices` rake task.
+  class PriceMigrator
+    # Migrate all variant's prices.
+    def self.migrate_default_vat_prices
+      # We need to tag the exisiting prices as "default", so that the VatPriceGenerator knows
+      # that they include the default zone's VAT.
+      Spree::Config.admin_vat_country_iso = Spree::Zone.default_tax.countries.first.iso
+      # If we don't remove this ivar, the above line stays without effect because of caching.
+      Spree::Config.remove_instance_variable(:@default_pricing_options)
+      Spree::Variant.find_each do |variant|
+        new(variant).migrate_vat_prices
+      end
+      # This line stops all weird code paths that generate refunds from happening.
+      Spree::Zone.default_tax.update(default_tax: false)
+    end
+
+    attr_reader :variant
+
+    def initialize(variant)
+      @variant = variant
+    end
+
+    def migrate_vat_prices
+      # With a default tax zone, all prices include VAT by default. Let's tell them which one!
+      variant.prices.update_all(country_iso: Spree::Config.admin_vat_country_iso)
+      Spree::Variant::VatPriceGenerator.new(variant).run
+      variant.save
+    end
+  end
+end

data/lib/spree/core/search/base.rb

@@ -30,7 +30,7 @@ module Spree
           curr_page = page || 1
 
           unless Spree::Config.show_products_without_price
-            @products = @products.joins(:prices).merge(Spree::Price.where(pricing_options.desired_attributes)).uniq
+            @products = @products.joins(:prices).merge(Spree::Price.where(pricing_options.search_arguments)).uniq
           end
           @products = @products.page(curr_page).per(per_page)
         end
@@ -70,7 +70,7 @@ module Spree
           # separate queries most of the time but opt for a join as soon as any
           # `where` constraints affecting joined tables are added to the search;
           # which is the case as soon as a taxon is added to the base scope.
-          scope = scope.preload(master: :prices)
+          scope = scope.preload(master: :currently_valid_prices)
           scope = scope.preload(master: :images) if include_images
           scope
         end

data/lib/spree/core/version.rb

@@ -5,7 +5,7 @@ module Spree
   end
 
   def self.solidus_version
-    "1.3.0.beta1"
+    "1.3.0.rc1"
   end
 
   def self.solidus_gem_version

data/lib/spree/core.rb

@@ -63,11 +63,13 @@ end
 
 require 'spree/core/version'
 
+require 'spree/core/class_constantizer'
 require 'spree/core/environment_extension'
 require 'spree/core/environment/calculators'
 require 'spree/core/environment'
 require 'spree/promo/environment'
 require 'spree/migrations'
+require 'spree/migration_helpers'
 require 'spree/core/engine'
 
 require 'spree/i18n'
@@ -97,3 +99,5 @@ require 'spree/deprecation'
 
 require 'spree/mailer_previews/order_preview'
 require 'spree/mailer_previews/carton_preview'
+
+require 'spree/core/price_migrator'

data/lib/spree/migration_helpers.rb

@@ -0,0 +1,19 @@
+module Spree
+  module MigrationHelpers
+    def safe_remove_index(table, column)
+      remove_index(table, column) if index_exists?(table, column)
+    end
+
+    def safe_add_index(table, column, options = {})
+      if columns_exist?(table, column) && !index_exists?(table, column, options)
+        add_index(table, column, options)
+      end
+    end
+
+    private
+
+    def columns_exist?(table, columns)
+      Array.wrap(columns).all? { |column| column_exists?(table, column) }
+    end
+  end
+end

data/lib/spree/money.rb

@@ -6,11 +6,18 @@ module Spree
   # Spree::Money is a relatively thin wrapper around Monetize which handles
   # formatting via Spree::Config.
   class Money
+    RUBY_NUMERIC_STRING = /\A-?\d+(\.\d+)?\z/
+
     class <<self
       attr_accessor :default_formatting_rules
 
-      def from_money(money)
-        new(money.to_d, currency: money.currency.iso_code)
+      def parse(amount, currency = Spree::Config[:currency])
+        new(parse_to_money(amount, currency))
+      end
+
+      # @api private
+      def parse_to_money(amount, currency)
+        ::Monetize.parse(amount, currency)
       end
     end
     self.default_formatting_rules = {
@@ -23,9 +30,33 @@ module Spree
 
     delegate :cents, :currency, :to_d, :zero?, to: :money
 
-    # @param amount [#to_s] the value of the money object
-    # @param options [Hash] the options for creating the money object
-    # @option options [String] currency the currency for the money object
+    # @param amount [Money, #to_s] the value of the money object
+    # @param options [Hash] the default options for formatting the money object See #format
+    def initialize(amount, options = {})
+      if amount.is_a?(::Money)
+        @money = amount
+      else
+        currency = (options[:currency] || Spree::Config[:currency])
+        if amount.to_s =~ RUBY_NUMERIC_STRING
+          @money = Monetize.from_string(amount, currency)
+        else
+          @money = Spree::Money.parse_to_money(amount, currency)
+          Spree::Deprecation.warn <<-WARN.squish, caller
+            Spree::Money was initialized with #{amount.inspect}, which will not be supported in the future.
+            Instead use Spree::Money.new(#{@money.to_s.inspect}, options) or Spree::Money.parse(#{amount.inspect})
+          WARN
+        end
+      end
+      @options = Spree::Money.default_formatting_rules.merge(options)
+    end
+
+    # @return [String] the value of this money object formatted according to
+    #   its options
+    def to_s
+      format
+    end
+
+    # @param options [Hash, String] the options for formatting the money object
     # @option options [Boolean] with_currency when true, show the currency
     # @option options [Boolean] no_cents when true, round to the closest dollar
     # @option options [String] decimal_mark the mark for delimiting the
@@ -36,15 +67,10 @@ module Spree
     #   value comes before the currency symbol
     # @option options [:before, :after] symbol_position the position of the
     #   currency symbol
-    def initialize(amount, options = {})
-      @money = Monetize.parse([amount, (options[:currency] || Spree::Config[:currency])].join)
-      @options = Spree::Money.default_formatting_rules.merge(options)
-    end
-
     # @return [String] the value of this money object formatted according to
     #   its options
-    def to_s
-      @money.format(@options)
+    def format(options = {})
+      @money.format(@options.merge(options))
     end
 
     # @note If you pass in options, ensure you pass in the html: true as well.
@@ -52,7 +78,7 @@ module Spree
     # @return [String] the value of this money object formatted according to
     #   its options and any additional options, by default as html.
     def to_html(options = { html: true })
-      output = @money.format(@options.merge(options))
+      output = format(options)
       if options[:html]
         # 1) prevent blank, breaking spaces
         # 2) prevent escaping of HTML character entities
@@ -76,12 +102,12 @@ module Spree
 
     def -(other)
       raise TypeError, "Can't subtract #{other.class} to Spree::Money" if !other.respond_to?(:money)
-      self.class.from_money(@money - other.money)
+      self.class.new(@money - other.money)
     end
 
     def +(other)
       raise TypeError, "Can't add #{other.class} to Spree::Money" if !other.respond_to?(:money)
-      self.class.from_money(@money + other.money)
+      self.class.new(@money + other.money)
     end
   end
 end

data/lib/spree/promo/environment.rb

@@ -3,7 +3,8 @@ module Spree
     class Environment
       include Core::EnvironmentExtension
 
-      attr_accessor :rules, :actions
+      add_class_set :rules
+      add_class_set :actions
     end
   end
 end