solidus_core 1.1.4 → 1.2.0.beta1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_core
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.2.0.beta1
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-12 00:00:00.000000000 Z
+date: 2016-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -80,20 +80,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
-- !ruby/object:Gem::Dependency
-  name: deface
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: ffaker
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.4
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.4
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
@@ -218,14 +204,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.1.4
 - !ruby/object:Gem::Dependency
   name: premailer-rails
   requirement: !ruby/object:Gem::Requirement
@@ -447,24 +433,27 @@ files:
 - app/models/spree/line_item_action.rb
 - app/models/spree/log_entry.rb
 - app/models/spree/option_type.rb
+- app/models/spree/option_type_prototype.rb
 - app/models/spree/option_value.rb
 - app/models/spree/option_values_variant.rb
 - app/models/spree/order.rb
 - app/models/spree/order/checkout.rb
-- app/models/spree/order/currency_updater.rb
 - app/models/spree/order/payments.rb
 - app/models/spree/order_cancellations.rb
 - app/models/spree/order_capturing.rb
 - app/models/spree/order_contents.rb
 - app/models/spree/order_inventory.rb
+- app/models/spree/order_merger.rb
 - app/models/spree/order_mutex.rb
 - app/models/spree/order_promotion.rb
 - app/models/spree/order_shipping.rb
 - app/models/spree/order_stock_location.rb
+- app/models/spree/order_update_attributes.rb
 - app/models/spree/order_updater.rb
 - app/models/spree/payment.rb
 - app/models/spree/payment/processing.rb
 - app/models/spree/payment_capture_event.rb
+- app/models/spree/payment_create.rb
 - app/models/spree/payment_method.rb
 - app/models/spree/payment_method/check.rb
 - app/models/spree/payment_method/store_credit.rb
@@ -509,8 +498,10 @@ files:
 - app/models/spree/promotion_handler/free_shipping.rb
 - app/models/spree/promotion_handler/page.rb
 - app/models/spree/promotion_rule.rb
+- app/models/spree/promotion_rule_taxon.rb
 - app/models/spree/promotion_rule_user.rb
 - app/models/spree/property.rb
+- app/models/spree/property_prototype.rb
 - app/models/spree/prototype.rb
 - app/models/spree/prototype_taxon.rb
 - app/models/spree/refund.rb
@@ -564,6 +555,8 @@ files:
 - app/models/spree/stock/packer.rb
 - app/models/spree/stock/prioritizer.rb
 - app/models/spree/stock/quantifier.rb
+- app/models/spree/stock/shipping_rate_selector.rb
+- app/models/spree/stock/shipping_rate_sorter.rb
 - app/models/spree/stock/splitter/backordered.rb
 - app/models/spree/stock/splitter/base.rb
 - app/models/spree/stock/splitter/shipping_category.rb
@@ -813,6 +806,8 @@ files:
 - db/migrate/20141101231208_fix_adjustment_order_presence.rb
 - db/migrate/20141105213646_update_classifications_positions.rb
 - db/migrate/20141120135441_add_guest_token_index_to_spree_orders.rb
+- db/migrate/20141215235502_remove_extra_products_slug_index.rb
+- db/migrate/20141217215630_update_product_slug_index.rb
 - db/migrate/20141231151320_add_default_column_to_price.rb
 - db/migrate/20150112194216_add_position_to_stock_location.rb
 - db/migrate/20150113002122_create_spree_promotion_codes.rb
@@ -895,6 +890,10 @@ files:
 - db/migrate/20151015203732_add_foreign_keys_for_product_promotion_rules.rb
 - db/migrate/20151021113730_add_sale_to_spree_promotions.rb
 - db/migrate/20151021163309_convert_sale_promotions.rb
+- db/migrate/20151117063249_convert_habtm_to_hmt_for_properties_prototypes.rb
+- db/migrate/20151124062500_convert_habtm_to_hmt_for_option_type_prototypes.rb
+- db/migrate/20151126063028_convert_habtm_to_hmt_for_taxons_promotion_rules.rb
+- db/migrate/20151219020209_add_stock_item_unique_index.rb
 - db/seeds.rb
 - lib/generators/spree/custom_user/custom_user_generator.rb
 - lib/generators/spree/custom_user/templates/authentication_helpers.rb.tt
@@ -941,6 +940,7 @@ files:
 - lib/spree/core/routes.rb
 - lib/spree/core/search/base.rb
 - lib/spree/core/search/variant.rb
+- lib/spree/core/stock_configuration.rb
 - lib/spree/core/unreturned_item_charger.rb
 - lib/spree/core/validators/email.rb
 - lib/spree/core/version.rb
@@ -998,7 +998,8 @@ files:
 - lib/spree/testing_support/factories/image_factory.rb
 - lib/spree/testing_support/factories/inventory_unit_factory.rb
 - lib/spree/testing_support/factories/line_item_factory.rb
-- lib/spree/testing_support/factories/options_factory.rb
+- lib/spree/testing_support/factories/option_type_factory.rb
+- lib/spree/testing_support/factories/option_value_factory.rb
 - lib/spree/testing_support/factories/order_factory.rb
 - lib/spree/testing_support/factories/order_promotion_factory.rb
 - lib/spree/testing_support/factories/payment_factory.rb
@@ -1013,19 +1014,23 @@ files:
 - lib/spree/testing_support/factories/property_factory.rb
 - lib/spree/testing_support/factories/prototype_factory.rb
 - lib/spree/testing_support/factories/refund_factory.rb
+- lib/spree/testing_support/factories/refund_reason_factory.rb
 - lib/spree/testing_support/factories/reimbursement_factory.rb
 - lib/spree/testing_support/factories/reimbursement_type_factory.rb
 - lib/spree/testing_support/factories/return_authorization_factory.rb
 - lib/spree/testing_support/factories/return_item_factory.rb
+- lib/spree/testing_support/factories/return_reason_factory.rb
 - lib/spree/testing_support/factories/role_factory.rb
 - lib/spree/testing_support/factories/shipment_factory.rb
 - lib/spree/testing_support/factories/shipping_category_factory.rb
 - lib/spree/testing_support/factories/shipping_method_factory.rb
+- lib/spree/testing_support/factories/shipping_rate_factory.rb
 - lib/spree/testing_support/factories/state_factory.rb
-- lib/spree/testing_support/factories/stock_factory.rb
 - lib/spree/testing_support/factories/stock_item_factory.rb
 - lib/spree/testing_support/factories/stock_location_factory.rb
 - lib/spree/testing_support/factories/stock_movement_factory.rb
+- lib/spree/testing_support/factories/stock_package_factory.rb
+- lib/spree/testing_support/factories/stock_packer_factory.rb
 - lib/spree/testing_support/factories/stock_transfer_factory.rb
 - lib/spree/testing_support/factories/store_credit_category_factory.rb
 - lib/spree/testing_support/factories/store_credit_event_factory.rb
@@ -1048,6 +1053,7 @@ files:
 - lib/spree/testing_support/i18n.rb
 - lib/spree/testing_support/order_walkthrough.rb
 - lib/spree/testing_support/preferences.rb
+- lib/spree/testing_support/sequences.rb
 - lib/spree/testing_support/url_helpers.rb
 - lib/spree_core.rb
 - lib/tasks/core.rake
@@ -1078,8 +1084,72 @@ files:
 - spec/lib/spree/core/delegate_belongs_to_spec.rb
 - spec/lib/spree/core/importer/order_spec.rb
 - spec/lib/spree/core/role_configuration_spec.rb
+- spec/lib/spree/core/stock_configuration_spec.rb
+- spec/lib/spree/core/testing_support/factories/address_factory_spec.rb
+- spec/lib/spree/core/testing_support/factories/adjustment_factory_spec.rb
+- spec/lib/spree/core/testing_support/factories/adjustment_reason_factory_spec.rb
+- spec/lib/spree/core/testing_support/factories/calculator_factory_spec.rb
+- spec/lib/spree/core/testing_support/factories/carton_factory_spec.rb
+- spec/lib/spree/core/testing_support/factories/country_factory_spec.rb
+- spec/lib/spree/core/testing_support/factories/credit_card_factory_spec.rb
+- spec/lib/spree/core/testing_support/factories/customer_return_factory_spec.rb
+- spec/lib/spree/core/testing_support/factories/image_factory_spec.rb
+- spec/lib/spree/core/testing_support/factories/inventory_unit_factory_spec.rb
+- spec/lib/spree/core/testing_support/factories/line_item_factory_spec.rb
+- spec/lib/spree/core/testing_support/factories/option_type_factory_spec.rb
+- spec/lib/spree/core/testing_support/factories/option_value_factory_spec.rb
+- spec/lib/spree/core/testing_support/factories/order_factory_spec.rb
+- spec/lib/spree/core/testing_support/factories/order_promotion_factory_spec.rb
+- spec/lib/spree/core/testing_support/factories/payment_factory_spec.rb
+- spec/lib/spree/core/testing_support/factories/payment_method_factory_spec.rb
+- spec/lib/spree/core/testing_support/factories/price_factory_spec.rb
+- spec/lib/spree/core/testing_support/factories/product_factory_spec.rb
+- spec/lib/spree/core/testing_support/factories/product_option_type_factory_spec.rb
+- spec/lib/spree/core/testing_support/factories/product_property_factory_spec.rb
+- spec/lib/spree/core/testing_support/factories/promotion_category_factory_spec.rb
+- spec/lib/spree/core/testing_support/factories/promotion_code_factory_spec.rb
+- spec/lib/spree/core/testing_support/factories/promotion_factory_spec.rb
+- spec/lib/spree/core/testing_support/factories/property_factory_spec.rb
+- spec/lib/spree/core/testing_support/factories/prototype_factory_spec.rb
+- spec/lib/spree/core/testing_support/factories/refund_factory_spec.rb
+- spec/lib/spree/core/testing_support/factories/refund_reason_factory_spec.rb
+- spec/lib/spree/core/testing_support/factories/reimbursement_factory_spec.rb
+- spec/lib/spree/core/testing_support/factories/reimbursement_type_factory_spec.rb
+- spec/lib/spree/core/testing_support/factories/return_authorization_factory_spec.rb
+- spec/lib/spree/core/testing_support/factories/return_item_factory_spec.rb
+- spec/lib/spree/core/testing_support/factories/return_reason_factory_spec.rb
+- spec/lib/spree/core/testing_support/factories/role_factory_spec.rb
+- spec/lib/spree/core/testing_support/factories/shipment_factory_spec.rb
+- spec/lib/spree/core/testing_support/factories/shipping_category_factory_spec.rb
+- spec/lib/spree/core/testing_support/factories/shipping_method_factory_spec.rb
+- spec/lib/spree/core/testing_support/factories/shipping_rate_factory_spec.rb
+- spec/lib/spree/core/testing_support/factories/state_factory_spec.rb
+- spec/lib/spree/core/testing_support/factories/stock_item_factory_spec.rb
+- spec/lib/spree/core/testing_support/factories/stock_location_factory_spec.rb
+- spec/lib/spree/core/testing_support/factories/stock_movement_factory_spec.rb
+- spec/lib/spree/core/testing_support/factories/stock_package_factory_spec.rb
+- spec/lib/spree/core/testing_support/factories/stock_packer_factory_spec.rb
+- spec/lib/spree/core/testing_support/factories/stock_transfer_factory_spec.rb
+- spec/lib/spree/core/testing_support/factories/store_credit_category_factory_spec.rb
+- spec/lib/spree/core/testing_support/factories/store_credit_event_factory_spec.rb
+- spec/lib/spree/core/testing_support/factories/store_credit_factory_spec.rb
+- spec/lib/spree/core/testing_support/factories/store_credit_type_factory_spec.rb
+- spec/lib/spree/core/testing_support/factories/store_credit_update_reason_factory_spec.rb
+- spec/lib/spree/core/testing_support/factories/store_factory_spec.rb
+- spec/lib/spree/core/testing_support/factories/tax_category_factory_spec.rb
+- spec/lib/spree/core/testing_support/factories/tax_rate_factory_spec.rb
+- spec/lib/spree/core/testing_support/factories/taxon_factory_spec.rb
+- spec/lib/spree/core/testing_support/factories/taxonomy_factory_spec.rb
+- spec/lib/spree/core/testing_support/factories/tracker_factory_spec.rb
+- spec/lib/spree/core/testing_support/factories/user_factory_spec.rb
+- spec/lib/spree/core/testing_support/factories/variant_factory_spec.rb
+- spec/lib/spree/core/testing_support/factories/variant_property_rule_condition_factory_spec.rb
+- spec/lib/spree/core/testing_support/factories/variant_property_rule_factory_spec.rb
+- spec/lib/spree/core/testing_support/factories/variant_property_rule_value_factory_spec.rb
+- spec/lib/spree/core/testing_support/factories/zone_factory_spec.rb
 - spec/lib/spree/core/unreturned_item_charger_spec.rb
 - spec/lib/spree/core/validators/email_spec.rb
+- spec/lib/spree/core/version_spec.rb
 - spec/lib/spree/localized_number_spec.rb
 - spec/lib/spree/migrations_spec.rb
 - spec/lib/spree/money_spec.rb
@@ -1132,7 +1202,6 @@ files:
 - spec/models/spree/order/adjustments_spec.rb
 - spec/models/spree/order/callbacks_spec.rb
 - spec/models/spree/order/checkout_spec.rb
-- spec/models/spree/order/currency_updater_spec.rb
 - spec/models/spree/order/finalizing_spec.rb
 - spec/models/spree/order/payment_spec.rb
 - spec/models/spree/order/risk_assessment_spec.rb
@@ -1145,12 +1214,15 @@ files:
 - spec/models/spree/order_capturing_spec.rb
 - spec/models/spree/order_contents_spec.rb
 - spec/models/spree/order_inventory_spec.rb
+- spec/models/spree/order_merger_spec.rb
 - spec/models/spree/order_mutex_spec.rb
 - spec/models/spree/order_promotion_spec.rb
 - spec/models/spree/order_shipping_spec.rb
 - spec/models/spree/order_spec.rb
 - spec/models/spree/order_stock_location_spec.rb
+- spec/models/spree/order_update_attributes_spec.rb
 - spec/models/spree/order_updater_spec.rb
+- spec/models/spree/payment_create_spec.rb
 - spec/models/spree/payment_method/store_credit_spec.rb
 - spec/models/spree/payment_method_spec.rb
 - spec/models/spree/payment_spec.rb
@@ -1249,6 +1321,8 @@ files:
 - spec/models/spree/stock/packer_spec.rb
 - spec/models/spree/stock/prioritizer_spec.rb
 - spec/models/spree/stock/quantifier_spec.rb
+- spec/models/spree/stock/shipping_rate_selector_spec.rb
+- spec/models/spree/stock/shipping_rate_sorter_spec.rb
 - spec/models/spree/stock/splitter/backordered_spec.rb
 - spec/models/spree/stock/splitter/base_spec.rb
 - spec/models/spree/stock/splitter/shipping_category_spec.rb
@@ -1279,8 +1353,10 @@ files:
 - spec/spec_helper.rb
 - spec/support/big_decimal.rb
 - spec/support/concerns/default_price.rb
+- spec/support/concerns/working_factories.rb
 - spec/support/dummy_ability.rb
 - spec/support/test_gateway.rb
+- vendor/assets/javascripts/jquery-migrate-1.0.0.js
 - vendor/assets/javascripts/jquery.payment.js
 - vendor/assets/javascripts/jsuri.js
 - vendor/assets/stylesheets/normalize.css
@@ -1300,12 +1376,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Essential models, mailers, and classes for the Solidus e-commerce project.

data/app/models/spree/order/currency_updater.rb

@@ -1,40 +0,0 @@
-module Spree
-  class Order < Spree::Base
-    module CurrencyUpdater
-      extend ActiveSupport::Concern
-
-      included do
-
-        def homogenize_line_item_currencies
-          update_line_item_currencies!
-          update!
-        end
-
-      end
-
-      # Updates prices of order's line items
-      def update_line_item_currencies!
-        line_items.where('currency != ?', currency).each do |line_item|
-          update_line_item_price!(line_item)
-        end
-      end
-
-      # Returns the price object from given item
-      def price_from_line_item(line_item)
-        line_item.variant.prices.where(currency: currency).first
-      end
-
-      # Updates price from given line item
-      def update_line_item_price!(line_item)
-        price = price_from_line_item(line_item)
-
-        if price
-          line_item.update_attributes!(currency: price.currency, price: price.amount)
-        else
-          raise RuntimeError, "no #{currency} price found for #{line_item.product.name} (#{line_item.variant.sku})"
-        end
-      end
-
-    end
-  end
-end

data/spec/models/spree/order/currency_updater_spec.rb

@@ -1,32 +0,0 @@
-require 'spec_helper'
-
-describe Spree::Order, :type => :model do
-  context 'CurrencyUpdater' do
-    context "when changing order currency" do
-      let!(:line_item) { create(:line_item) }
-      let!(:euro_price) { create(:price, variant: line_item.variant, amount: 8, currency: 'EUR') }
-
-      context "#homogenize_line_item_currencies" do
-        it "succeeds without error" do
-          expect { line_item.order.update_attributes!(currency: 'EUR') }.to_not raise_error
-        end
-
-        it "changes the line_item currencies" do
-          expect { line_item.order.update_attributes!(currency: 'EUR') }.to change{ line_item.reload.currency }.from('USD').to('EUR')
-        end
-
-        it "changes the line_item amounts" do
-          expect { line_item.order.update_attributes!(currency: 'EUR') }.to change{ line_item.reload.amount }.to(8)
-        end
-
-        it "fails to change the order currency when no prices are available in that currency" do
-          expect { line_item.order.update_attributes!(currency: 'GBP') }.to raise_error RuntimeError
-        end
-
-        it "calculates the item total in the order.currency" do
-          expect { line_item.order.update_attributes!(currency: 'EUR') }.to change{ line_item.order.item_total }.to(8)
-        end
-      end
-    end
-  end
-end