spree_core 3.3.4 → 3.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef97b18bc947e484d5e2b6af1d3c79d1c4d3acc4
-  data.tar.gz: c544d43cc2f5699ec49ac9809de2b26ca987dfeb
+  metadata.gz: 1a2abd18d0a6f4ead4edb367efe9f60ea1cf3098
+  data.tar.gz: e1291c816e63476c91880dd5a5d1d4b02dc69f6d
 SHA512:
-  metadata.gz: 21b387e7572157536d6e520802fd4b9832022fd03d2b2ba2edf0be1bb3e84d305ecac88d2fef304253bdc37b67582b4fad6290796be9174c8ce97a6e82cdb591
-  data.tar.gz: a4b127e56df213db4d280012ecf086501619a71c3b8f4a1dc42a6143581b02a50621267f9b8d7322f62821725b99fcb6dd462cc79ce30ef92082569a656203ce
+  metadata.gz: 864321fd229b5100cf8871d6b69868f8de7ee488928ce881e02acb3b7c014e6f904303731e6677f5acf65e635ee297c034c342993e2699f06b1eb53b00693b66
+  data.tar.gz: 90a6e8778a862a3d3ec7e773cced3015737b7a5969e707f2b9b06b06bedcf4772ac64d749e28fd2519ad3fab0d56d5ccbfb1d6509b0e175f4a7e473cbf7929a9

data/app/models/spree/preferences/store.rb

@@ -87,6 +87,8 @@ module Spree::Preferences
 
     def should_persist?
       @persistence and Spree::Preference.table_exists?
+    rescue PG::ConnectionBad, ActiveRecord::NoDatabaseError
+      false
     end
 
   end

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "3.3.4"
+    "3.3.5"
   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(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
     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

@@ -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
 

data/spree_core.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'highline', '~> 1.6.18' # Necessary for the install generator
   s.add_dependency 'kaminari', '~> 1.0.1'
   s.add_dependency 'monetize', '~> 1.1'
-  s.add_dependency 'paperclip', '~> 5.1.0'
+  s.add_dependency 'paperclip', '~> 5.2.0'
   s.add_dependency 'paranoia', '~> 2.3.0'
   s.add_dependency 'premailer-rails'
   s.add_dependency 'acts-as-taggable-on', '~> 5.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 3.3.4
+  version: 3.3.5
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-12 00:00:00.000000000 Z
+date: 2018-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: 5.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: 5.2.0
 - !ruby/object:Gem::Dependency
   name: paranoia
   requirement: !ruby/object:Gem::Requirement