spree_core 3.2.7 → 3.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b966f0b41c17b1b0397491803b4f3f475f472375
-  data.tar.gz: bf70f58208a09a564a5b337b3a2b84cad71e27d3
+  metadata.gz: 5784e0221c1f448f4682cf059247c3e9d01ad19b
+  data.tar.gz: dd80c5de85ebe27ba574f29e33d35c816c600b8d
 SHA512:
-  metadata.gz: acbd6dd076a001da65ed6bb6340e5670ff6169884ebb44941eebed7659dbbadea45589e568d6d7e0660a88b2272f77a50bb8543a933496772ecceda61f95bb67
-  data.tar.gz: 32694d53a8ef20c28199bc571e9a8ebd3b5a153a69b7fa4e5c87522e6aa0e1c9a59724c03e663ce0935d9a5bdda09ba945b909032358ac614f19feeaaf7a2c2f
+  metadata.gz: b7582fc9f404c240605ba0e75594a154c3318e3388fe4bf50bfb1c5d7474ecfd8021afa9cc182b1c2c07ecdf3c0eb9f87fe4e34ffde5155579a03947ca27410b
+  data.tar.gz: 647cdecd05511282ebbd7c8233cdc76e3abcc261492a1791f4799c38193f728b15bb89e4acd725b371b75e9d197abdb157ebb635e8599fd1de0e0a545383ced0

data/app/models/spree/payment/processing.rb

@@ -29,7 +29,7 @@ module Spree
       # a new pending payment record for the remaining amount to capture later.
       def capture!(amount = nil)
         return true if completed?
-        amount ||= money.money.cents
+        amount ||= money.amount_in_cents
         started_processing!
         protect_from_connection_error do
           # Standard ActiveMerchant capture usage
@@ -115,7 +115,7 @@ module Spree
 
       def gateway_action(source, action, success_state)
         protect_from_connection_error do
-          response = payment_method.send(action, money.money.cents,
+          response = payment_method.send(action, money.amount_in_cents,
                                          source,
                                          gateway_options)
           handle_response(response, success_state, :failure)

data/app/models/spree/promotion/rules/option_value.rb

@@ -31,20 +31,12 @@ module Spree
         end
 
         def actionable?(line_item)
-          pid = line_item.product.id
-          ovids = line_item.variant.option_values.pluck(:id)
+          product_id = line_item.product.id
+          option_values_ids = line_item.variant.option_value_ids
+          eligible_product_ids = preferred_eligible_values.keys
+          eligible_value_ids = preferred_eligible_values[product_id]
 
-          product_ids.include?(pid) && (value_ids(pid) - ovids).empty?
-        end
-
-        private
-
-        def product_ids
-          preferred_eligible_values.keys
-        end
-
-        def value_ids(product_id)
-          preferred_eligible_values[product_id]
+          eligible_product_ids.include?(product_id) && (eligible_value_ids & option_values_ids).present?
         end
       end
     end

data/app/models/spree/refund.rb

@@ -43,7 +43,7 @@ module Spree
     def perform!
       return true if transaction_id.present?
 
-      credit_cents = Spree::Money.new(amount.to_f, currency: payment.currency).money.cents
+      credit_cents = Spree::Money.new(amount.to_f, currency: payment.currency).amount_in_cents
 
       @response = process!(credit_cents)
 

data/app/validators/db_maximum_length_validator.rb

@@ -2,7 +2,11 @@
 # Validates a field based on the maximum length of the underlying DB field, if there is one.
 class DbMaximumLengthValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
-    limit = record.class.columns_hash[attribute.to_s].limit
+    if defined?(Globalize)
+      limit = record.class.translation_class.columns_hash[attribute.to_s].limit
+    else
+      limit = record.class.columns_hash[attribute.to_s].limit
+    end
     value = record[attribute.to_sym]
     if value && limit && value.to_s.length > limit
       record.errors.add(attribute.to_sym, :too_long, count: limit)

data/lib/spree/core/engine.rb

@@ -116,12 +116,12 @@ module Spree
       end
 
       config.to_prepare do
-        # Load spree locales before decorators
-        I18n.load_path += Dir.glob(
+        # Ensure spree locale paths are present before decorators
+        I18n.load_path.unshift(*(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/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "3.2.7"
+    "3.2.8"
   end
 end

data/lib/spree/money.rb

@@ -15,13 +15,17 @@ module Spree
 
     attr_reader :money
 
-    delegate :cents, to: :money
+    delegate :cents, :currency, to: :money
 
     def initialize(amount, options={})
       @money = Monetize.parse([amount, (options[:currency] || Spree::Config[:currency])].join)
       @options = Spree::Money.default_formatting_rules.merge(options)
     end
 
+    def amount_in_cents
+      (cents / currency.subunit_to_unit.to_f * 100).round
+    end
+
     def to_s
       @money.format(@options)
     end
@@ -40,6 +44,16 @@ module Spree
       to_s
     end
 
+    def decimal_mark
+      return @money.decimal_mark if @options[:decimal_mark].nil?
+      @options[:decimal_mark]
+    end
+
+    def thousands_separator
+      return @money.thousands_separator if @options[:thousands_separator].nil?
+      @options[:thousands_separator]
+    end
+
     def ==(obj)
       @money == obj.money
     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(999999)}" }
     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
     name 'Ruby on Rails'
     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
     name 'Brand'
   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

@@ -2,23 +2,23 @@ class OrderWalkthrough
   def self.up_to(state)
     # A default store must exist to provide store settings
     unless Spree::Store.exists?
-      FactoryGirl.create(:store)
+      FactoryBot.create(:store)
     end
 
     # 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
@@ -40,13 +40,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.2.7
+  version: 3.2.8
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-12 00:00:00.000000000 Z
+date: 2018-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -979,7 +979,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.23
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: The bare bones necessary for Spree.