spree_core 3.4.1 → 3.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 508053337b635915fb696f49b04db0c3bb130e4a
-  data.tar.gz: 97680b4cc76d9116e880d344b2218782db4ce073
+  metadata.gz: 68cb55c21ddd24f8248dca5549bc6cdb7ce2460c
+  data.tar.gz: b4ca12837622c5f82832b9e7e074e5b77a2fb294
 SHA512:
-  metadata.gz: 4cb99684ec20ce0b8cd4377156f6345745f8ded3a50d1561f7bd693358a42c948e34bb6e095fae5a1aeec2e3a3b10e0d86f4652e2f0184eda2d3510ae832ece4
-  data.tar.gz: 182782b5b2a6688cc2977dd6b0598c37a26fb88cf0103166e24d1299d9b98cbf551d327937c5065b6687e4c60302f93268918199c4262ade711facb0994a6e26
+  metadata.gz: 0eae5883047bcd05bae1feeb7f6cd1bea296466e28a2b12311f4dddb5c1d7c380e9a60844dfa91e017979bce09f4e85c1d689de4f104a4161b4d1c83acbc2a2f
+  data.tar.gz: a32117843440c4a5c6233bc52feac36293bdaf34ae3568c06df67901c2f4fa3b973d56346bb7a620ef4bef93a850fa517cbea09ff1a95fbf74eded59003a2007

data/app/models/spree/order.rb

@@ -268,8 +268,8 @@ module Spree
       self.user           = user
       self.email          = user.email if override_email
       self.created_by   ||= user
-      self.bill_address ||= user.bill_address
-      self.ship_address ||= user.ship_address
+      self.bill_address ||= user.bill_address.try(:clone)
+      self.ship_address ||= user.ship_address.try(:clone)
 
       changes = slice(:user_id, :email, :created_by_id, :bill_address_id, :ship_address_id)
 

data/app/models/spree/order_contents.rb

@@ -81,7 +81,6 @@ module Spree
     end
 
     def persist_totals
-      order_updater.update_item_count
       order_updater.update
     end
 

data/app/models/spree/order_inventory.rb

@@ -72,10 +72,10 @@ module Spree
       if variant.should_track_inventory?
         on_hand, back_order = shipment.stock_location.fill_status(variant, quantity)
 
-        on_hand.times { shipment.set_up_inventory('on_hand', variant, order, line_item) }
-        back_order.times { shipment.set_up_inventory('backordered', variant, order, line_item) }
+        shipment.set_up_inventory('on_hand', variant, order, line_item, on_hand)
+        shipment.set_up_inventory('backordered', variant, order, line_item, back_order)
       else
-        quantity.times { shipment.set_up_inventory('on_hand', variant, order, line_item) }
+        shipment.set_up_inventory('on_hand', variant, order, line_item, quantity)
       end
 
       # adding to this shipment, and removing from stock_location
@@ -103,6 +103,7 @@ module Spree
           end
           removed_quantity += 1
         end
+        inventory_unit.save! if inventory_unit.persisted?
       end
 
       shipment.destroy if shipment.inventory_units.sum(:quantity).zero?

data/app/models/spree/shipment.rb

@@ -219,6 +219,7 @@ module Spree
         selected_rate = shipping_rates.detect do |rate|
           rate.shipping_method_id == original_shipping_method_id
         end
+        save!
         self.selected_shipping_rate_id = selected_rate.id if selected_rate
       end
 
@@ -235,12 +236,14 @@ module Spree
       save!
     end
 
-    def set_up_inventory(state, variant, order, line_item)
+    def set_up_inventory(state, variant, order, line_item, quantity = 1)
+      return if quantity <= 0
       inventory_units.create(
         state: state,
         variant_id: variant.id,
         order_id: order.id,
-        line_item_id: line_item.id
+        line_item_id: line_item.id,
+        quantity: quantity
       )
     end
 
@@ -337,6 +340,7 @@ module Spree
 
         order.contents.remove(variant, quantity, shipment: self)
         order.contents.add(variant, quantity, shipment: new_shipment)
+        order.update_with_updater!
 
         refresh_rates
         save!
@@ -353,8 +357,9 @@ module Spree
       raise ArgumentError if quantity <= 0 || self == shipment_to_transfer_to
 
       transaction do
-        order.contents.remove(variant, quantity, shipment: self)
-        order.contents.add(variant, quantity, shipment: shipment_to_transfer_to)
+        order.contents.remove(variant, final_quantity, shipment: self)
+        order.contents.add(variant, final_quantity, shipment: shipment_to_transfer_to)
+        order.update_with_updater!
 
         refresh_rates
         save!

data/config/initializers/premailer_rails.rb

@@ -0,0 +1,3 @@
+if Gem.loaded_specs['premailer-rails'].version >= Gem::Version.create('1.10.0')
+  Premailer::Rails.config[:strategies] = [:filesystem, :network, :asset_pipeline]
+end

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    '3.4.1'
+    '3.4.2'
   end
 end

data/lib/spree/testing_support/factories.rb

@@ -1,8 +1,8 @@
-require 'factory_girl'
+require 'factory_bot'
 
 Spree::Zone.class_eval do
   def self.global
-    find_by(name: 'GlobalZone') || FactoryGirl.create(:global_zone)
+    find_by(name: 'GlobalZone') || FactoryBot.create(:global_zone)
   end
 end
 
@@ -10,7 +10,7 @@ Dir["#{File.dirname(__FILE__)}/factories/**"].each do |f|
   load File.expand_path(f)
 end
 
-FactoryGirl.define do
+FactoryBot.define do
   sequence(:random_string) { FFaker::Lorem.sentence }
   sequence(:random_description) { FFaker::Lorem.paragraphs(1 + Kernel.rand(5)).join("\n") }
   sequence(:random_email) { FFaker::Internet.email }

data/lib/spree/testing_support/factories/address_factory.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :address, aliases: [:bill_address, :ship_address], class: Spree::Address do
     firstname 'John'
     lastname 'Doe'

data/lib/spree/testing_support/factories/adjustment_factory.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :adjustment, class: Spree::Adjustment do
     association(:adjustable, factory: :order)
     amount 100.0

data/lib/spree/testing_support/factories/calculator_factory.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :calculator, class: Spree::Calculator::FlatRate do
     after(:create) { |c| c.set_preference(:amount, 10.0) }
   end

data/lib/spree/testing_support/factories/country_factory.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :country, class: Spree::Country do
     sequence(:iso_name) { |n| "ISO_NAME_#{n}" }
     sequence(:name) { |n| "NAME_#{n}" }

data/lib/spree/testing_support/factories/credit_card_factory.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :credit_card, class: Spree::CreditCard do
     verification_value 123
     month 12

data/lib/spree/testing_support/factories/customer_return_factory.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :customer_return, class: Spree::CustomerReturn do
     association(:stock_location, factory: :stock_location)
 

data/lib/spree/testing_support/factories/image_factory.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :image, class: Spree::Image do
     attachment { File.new(Spree::Core::Engine.root + 'spec/fixtures' + 'thinking-cat.jpg') }
   end

data/lib/spree/testing_support/factories/inventory_unit_factory.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :inventory_unit, class: Spree::InventoryUnit do
     variant
     order

data/lib/spree/testing_support/factories/line_item_factory.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :line_item, class: Spree::LineItem do
     quantity 1
     price { BigDecimal.new('10.00') }

data/lib/spree/testing_support/factories/options_factory.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :option_value, class: Spree::OptionValue do
     sequence(:name) { |n| "Size-#{n}" }
 

data/lib/spree/testing_support/factories/order_factory.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :order, class: Spree::Order do
     user
     bill_address

data/lib/spree/testing_support/factories/payment_factory.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :payment, class: Spree::Payment do
     amount 45.75
     association(:payment_method, factory: :credit_card_payment_method)

data/lib/spree/testing_support/factories/payment_method_factory.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :check_payment_method, class: Spree::PaymentMethod::Check do
     name 'Check'
   end

data/lib/spree/testing_support/factories/price_factory.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :price, class: Spree::Price do
     variant
     amount 19.99

data/lib/spree/testing_support/factories/product_factory.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :base_product, class: Spree::Product do
     sequence(:name) { |n| "Product ##{n} - #{Kernel.rand(9999)}" }
     description { generate(:random_description) }

data/lib/spree/testing_support/factories/product_option_type_factory.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :product_option_type, class: Spree::ProductOptionType do
     product
     option_type

data/lib/spree/testing_support/factories/product_property_factory.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :product_property, class: Spree::ProductProperty do
     product
     property

data/lib/spree/testing_support/factories/promotion_category_factory.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :promotion_category, class: Spree::PromotionCategory do
     name 'Promotion Category'
   end

data/lib/spree/testing_support/factories/promotion_factory.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :promotion, class: Spree::Promotion do
     name 'Promo'
 

data/lib/spree/testing_support/factories/promotion_rule_factory.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :promotion_rule, class: Spree::PromotionRule do
     association :promotion
   end

data/lib/spree/testing_support/factories/property_factory.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :property, class: Spree::Property do
     name 'baseball_cap_color'
     presentation 'cap color'

data/lib/spree/testing_support/factories/prototype_factory.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :prototype, class: Spree::Prototype do
     name 'Baseball Cap'
     properties { [create(:property)] }

data/lib/spree/testing_support/factories/refund_factory.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   sequence(:refund_transaction_id) { |n| "fake-refund-transaction-#{n}" }
 
   factory :refund, class: Spree::Refund do

data/lib/spree/testing_support/factories/reimbursement_factory.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :reimbursement, class: Spree::Reimbursement do
     transient do
       return_items_count 1

data/lib/spree/testing_support/factories/reimbursement_type_factory.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :reimbursement_type, class: Spree::ReimbursementType do
     sequence(:name) { |n| "Reimbursement Type #{n}" }
     active true

data/lib/spree/testing_support/factories/return_authorization_factory.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :return_authorization, class: Spree::ReturnAuthorization do
     association(:order, factory: :shipped_order)
     association(:stock_location, factory: :stock_location)

data/lib/spree/testing_support/factories/return_item_factory.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :return_item, class: Spree::ReturnItem do
     association(:inventory_unit, factory: :inventory_unit, state: :shipped)
     association(:return_authorization, factory: :return_authorization)

data/lib/spree/testing_support/factories/role_factory.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :role, class: Spree::Role do
     sequence(:name) { |n| "Role ##{n}" }
 

data/lib/spree/testing_support/factories/shipment_factory.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :shipment, class: Spree::Shipment do
     tracking 'U10000'
     cost 100.00

data/lib/spree/testing_support/factories/shipping_category_factory.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :shipping_category, class: Spree::ShippingCategory do
     sequence(:name) { |n| "ShippingCategory ##{n}" }
   end

data/lib/spree/testing_support/factories/shipping_method_factory.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :base_shipping_method, class: Spree::ShippingMethod do
     zones { |_a| [Spree::Zone.global] }
     name 'UPS Ground'

data/lib/spree/testing_support/factories/state_factory.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :state, class: Spree::State do
     sequence(:name) { |n| "STATE_NAME_#{n}" }
     sequence(:abbr) { |n| "STATE_ABBR_#{n}" }

data/lib/spree/testing_support/factories/stock_factory.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   # must use build()
   factory :stock_packer, class: Spree::Stock::Packer do
     transient do

data/lib/spree/testing_support/factories/stock_item_factory.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :stock_item, class: Spree::StockItem do
     backorderable true
     stock_location

data/lib/spree/testing_support/factories/stock_location_factory.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :stock_location, class: Spree::StockLocation do
     name 'NY Warehouse'
     address1 '1600 Pennsylvania Ave NW'

data/lib/spree/testing_support/factories/stock_movement_factory.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :stock_movement, class: Spree::StockMovement do
     quantity 1
     action 'sold'

data/lib/spree/testing_support/factories/store_credit_category_factory.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :store_credit_category, class: Spree::StoreCreditCategory do
     name 'Exchange'
   end

data/lib/spree/testing_support/factories/store_credit_event_factory.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :store_credit_auth_event, class: Spree::StoreCreditEvent do
     store_credit       { create(:store_credit) }
     action             { Spree::StoreCredit::AUTHORIZE_ACTION }

data/lib/spree/testing_support/factories/store_credit_factory.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   sequence(:store_credits_order_number) { |n| "R1000#{n}" }
 
   factory :store_credit, class: Spree::StoreCredit do

data/lib/spree/testing_support/factories/store_credit_type_factory.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :primary_credit_type, class: Spree::StoreCreditType do
     name      Spree::StoreCreditType::DEFAULT_TYPE_NAME
     priority  { '1' }

data/lib/spree/testing_support/factories/store_factory.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :store, class: Spree::Store do
     sequence(:code) { |i| "spree_#{i}" }
     name 'Spree Test Store'

data/lib/spree/testing_support/factories/tag_factory.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :tag, class: Spree::Tag do
     sequence(:name) { |n| "Tag ##{n} - #{Kernel.rand(9999)}" }
   end

data/lib/spree/testing_support/factories/tax_category_factory.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :tax_category, class: Spree::TaxCategory do
     name { "TaxCategory - #{rand(999_999)}" }
     description { generate(:random_string) }

data/lib/spree/testing_support/factories/tax_rate_factory.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :tax_rate, class: Spree::TaxRate do
     zone
     amount 0.1

data/lib/spree/testing_support/factories/taxon_factory.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :taxon, class: Spree::Taxon do
     sequence(:name) { |n| "taxon_#{n}" }
     taxonomy

data/lib/spree/testing_support/factories/taxonomy_factory.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :taxonomy, class: Spree::Taxonomy do
     sequence(:name) { |n| "taxonomy_#{n}" }
   end

data/lib/spree/testing_support/factories/tracker_factory.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :tracker, class: Spree::Tracker do
     analytics_id 'A100'
     active true

data/lib/spree/testing_support/factories/user_factory.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   sequence :user_authentication_token do |n|
     "xxxx#{Time.current.to_i}#{rand(1000)}#{n}xxxxxxxxxxxxx"
   end

data/lib/spree/testing_support/factories/variant_factory.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   sequence(:random_float) { BigDecimal.new("#{rand(200)}.#{rand(99)}") }
 
   factory :base_variant, class: Spree::Variant do

data/lib/spree/testing_support/factories/zone_factory.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :global_zone, class: Spree::Zone do
     name 'GlobalZone'
     description { generate(:random_string) }

data/lib/spree/testing_support/factories/zone_member_factory.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :zone_member, class: Spree::ZoneMember do
     zone { |member| member.association(:zone) }
     zoneable { |member| member.association(:zoneable) }

data/lib/spree/testing_support/order_walkthrough.rb

@@ -1,22 +1,22 @@
 class OrderWalkthrough
   def self.up_to(state)
     # A default store must exist to provide store settings
-    FactoryGirl.create(:store) unless Spree::Store.exists?
+    FactoryBot.create(:store) unless Spree::Store.exists?
 
     # A payment method must exist for an order to proceed through the Address state
     unless Spree::PaymentMethod.exists?
-      FactoryGirl.create(:check_payment_method)
+      FactoryBot.create(:check_payment_method)
     end
 
     # Need to create a valid zone too...
-    zone = FactoryGirl.create(:zone)
-    country = FactoryGirl.create(:country)
+    zone = FactoryBot.create(:zone)
+    country = FactoryBot.create(:country)
     zone.members << Spree::ZoneMember.create(zoneable: country)
-    country.states << FactoryGirl.create(:state, country: country)
+    country.states << FactoryBot.create(:state, country: country)
 
     # A shipping method must exist for rates to be displayed on checkout page
     unless Spree::ShippingMethod.exists?
-      FactoryGirl.create(:shipping_method).tap do |sm|
+      FactoryBot.create(:shipping_method).tap do |sm|
         sm.calculator.preferred_amount = 10
         sm.calculator.preferred_currency = Spree::Config[:currency]
         sm.calculator.save
@@ -38,13 +38,13 @@ class OrderWalkthrough
   private
 
   def self.add_line_item!(order)
-    FactoryGirl.create(:line_item, order: order)
+    FactoryBot.create(:line_item, order: order)
     order.reload
   end
 
   def self.address(order)
-    order.bill_address = FactoryGirl.create(:address, country_id: Spree::Zone.global.members.first.zoneable.id)
-    order.ship_address = FactoryGirl.create(:address, country_id: Spree::Zone.global.members.first.zoneable.id)
+    order.bill_address = FactoryBot.create(:address, country_id: Spree::Zone.global.members.first.zoneable.id)
+    order.ship_address = FactoryBot.create(:address, country_id: Spree::Zone.global.members.first.zoneable.id)
     order.next!
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 3.4.1
+  version: 3.4.2
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-20 00:00:00.000000000 Z
+date: 2017-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -568,6 +568,7 @@ files:
 - config/initializers/assets.rb
 - config/initializers/friendly_id.rb
 - config/initializers/premailer_assets.rb
+- config/initializers/premailer_rails.rb
 - config/locales/en.yml
 - config/routes.rb
 - db/default/spree/countries.rb