spree_core 3.3.6 → 3.4.0.rc1

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

@@ -1,4 +1,4 @@
-FactoryBot.define do
+FactoryGirl.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 @@
-FactoryBot.define do
+FactoryGirl.define do
   factory :stock_location, class: Spree::StockLocation do
     name 'NY Warehouse'
     address1 '1600 Pennsylvania Ave NW'
@@ -14,7 +14,7 @@ FactoryBot.define do
     end
 
     factory :stock_location_with_items do
-      after(:create) do |stock_location, evaluator|
+      after(:create) do |stock_location, _evaluator|
         # variant will add itself to all stock_locations in an after_create
         # creating a product will automatically create a master variant
         product_1 = create(:product)

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

@@ -1,4 +1,4 @@
-FactoryBot.define do
+FactoryGirl.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,6 +1,6 @@
-FactoryBot.define do
+FactoryGirl.define do
   factory :store_credit_category, class: Spree::StoreCreditCategory do
-    name "Exchange"
+    name 'Exchange'
   end
 
   factory :store_credit_gift_card_category, class: Spree::StoreCreditCategory do

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

@@ -1,4 +1,4 @@
-FactoryBot.define do
+FactoryGirl.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 @@
-FactoryBot.define do
+FactoryGirl.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 @@
-FactoryBot.define do
+FactoryGirl.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 @@
-FactoryBot.define do
+FactoryGirl.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 @@
-FactoryBot.define do
+FactoryGirl.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,6 +1,6 @@
-FactoryBot.define do
+FactoryGirl.define do
   factory :tax_category, class: Spree::TaxCategory do
-    name { "TaxCategory - #{rand(999999)}" }
+    name { "TaxCategory - #{rand(999_999)}" }
     description { generate(:random_string) }
   end
 end

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

@@ -1,4 +1,4 @@
-FactoryBot.define do
+FactoryGirl.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 @@
-FactoryBot.define do
+FactoryGirl.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 @@
-FactoryBot.define do
+FactoryGirl.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 @@
-FactoryBot.define do
+FactoryGirl.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 @@
-FactoryBot.define do
+FactoryGirl.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 @@
-FactoryBot.define do
+FactoryGirl.define do
   sequence(:random_float) { BigDecimal.new("#{rand(200)}.#{rand(99)}") }
 
   factory :base_variant, class: Spree::Variant do
@@ -34,6 +34,5 @@ FactoryBot.define do
         is_master 1
       end
     end
-
   end
 end

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

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

data/lib/spree/testing_support/factories.rb

@@ -1,8 +1,8 @@
-require 'factory_bot'
+require 'factory_girl'
 
 Spree::Zone.class_eval do
   def self.global
-    find_by(name: 'GlobalZone') || FactoryBot.create(:global_zone)
+    find_by(name: 'GlobalZone') || FactoryGirl.create(:global_zone)
   end
 end
 
@@ -10,7 +10,7 @@ Dir["#{File.dirname(__FILE__)}/factories/**"].each do |f|
   load File.expand_path(f)
 end
 
-FactoryBot.define do
+FactoryGirl.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/flash.rb

@@ -17,9 +17,7 @@ module Spree
       private
 
       def convert_flash(flash)
-        if flash.is_a?(Symbol)
-          flash = Spree.t(flash)
-        end
+        flash = Spree.t(flash) if flash.is_a?(Symbol)
         flash
       end
     end

data/lib/spree/testing_support/i18n.rb

@@ -11,7 +11,7 @@ module Spree
   class << self
     attr_accessor :used_translations, :missing_translation_messages,
                   :unused_translations, :unused_translation_messages
-    alias_method :normal_t, :t
+    alias normal_t t
   end
 
   def self.t(*args)
@@ -49,7 +49,7 @@ module Spree
     self.used_translations ||= []
     self.unused_translation_messages = []
     self.unused_translations = []
-    self.load_translations(translations)
+    load_translations(translations)
     translation_diff = unused_translations - used_translations
     translation_diff.each do |translation|
       Spree.unused_translation_messages << "#{translation} (#{I18n.locale})"
@@ -58,13 +58,13 @@ module Spree
 
   private
 
-  def self.load_translations(hash, root=[])
-    hash.each do |k,v|
+  def self.load_translations(hash, root = [])
+    hash.each do |k, v|
       if v.is_a?(Hash)
         load_translations(v, root.dup << k)
       else
         key = (root + [k]).join('.')
-        self.unused_translations << key
+        unused_translations << key
       end
     end
   end
@@ -94,4 +94,3 @@ RSpec.configure do |config|
     end
   end
 end
-

data/lib/spree/testing_support/kernel.rb

@@ -1,7 +1,6 @@
 module Spree
   module TestingSupport
     module Kernel
-
       private
 
       def silence_stream(stream)
@@ -15,4 +14,4 @@ module Spree
       end
     end
   end
-end
+end

data/lib/spree/testing_support/order_walkthrough.rb

@@ -1,31 +1,29 @@
 class OrderWalkthrough
   def self.up_to(state)
     # A default store must exist to provide store settings
-    unless Spree::Store.exists?
-      FactoryBot.create(:store)
-    end
+    FactoryGirl.create(:store) unless Spree::Store.exists?
 
     # A payment method must exist for an order to proceed through the Address state
     unless Spree::PaymentMethod.exists?
-      FactoryBot.create(:check_payment_method)
+      FactoryGirl.create(:check_payment_method)
     end
 
     # Need to create a valid zone too...
-    zone = FactoryBot.create(:zone)
-    country = FactoryBot.create(:country)
+    zone = FactoryGirl.create(:zone)
+    country = FactoryGirl.create(:country)
     zone.members << Spree::ZoneMember.create(zoneable: country)
-    country.states << FactoryBot.create(:state, country: country)
+    country.states << FactoryGirl.create(:state, country: country)
 
     # A shipping method must exist for rates to be displayed on checkout page
     unless Spree::ShippingMethod.exists?
-      FactoryBot.create(:shipping_method).tap do |sm|
+      FactoryGirl.create(:shipping_method).tap do |sm|
         sm.calculator.preferred_amount = 10
         sm.calculator.preferred_currency = Spree::Config[:currency]
         sm.calculator.save
       end
     end
 
-    order = Spree::Order.create!(email: "spree@example.com")
+    order = Spree::Order.create!(email: 'spree@example.com')
     add_line_item!(order)
     order.next!
 
@@ -40,13 +38,13 @@ class OrderWalkthrough
   private
 
   def self.add_line_item!(order)
-    FactoryBot.create(:line_item, order: order)
+    FactoryGirl.create(:line_item, order: order)
     order.reload
   end
 
   def self.address(order)
-    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.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.next!
   end
 
@@ -61,12 +59,11 @@ class OrderWalkthrough
     order.next!
   end
 
-  def self.complete(order)
-    #noop?
+  def self.complete(_order)
+    # noop?
   end
 
   def self.states
     [:address, :delivery, :payment, :complete]
   end
-
 end

data/lib/spree/testing_support/preferences.rb

@@ -28,4 +28,3 @@ module Spree
     end
   end
 end
-

data/lib/tasks/core.rake

@@ -4,86 +4,82 @@ namespace :db do
   desc %q{Loads a specified fixture file:
 use rake db:load_file[/absolute/path/to/sample/filename.rb]}
 
-  task :load_file , [:file, :dir] => :environment do |t, args|
+  task :load_file, [:file, :dir] => :environment do |_t, args|
     file = Pathname.new(args.file)
 
     puts "loading ruby #{file}"
     require file
   end
 
-  desc "Loads fixtures from the the dir you specify using rake db:load_dir[loadfrom]"
-  task :load_dir , [:dir] => :environment do |t, args|
+  desc 'Loads fixtures from the the dir you specify using rake db:load_dir[loadfrom]'
+  task :load_dir, [:dir] => :environment do |_t, args|
     dir = args.dir
-    dir = File.join(Rails.root, "db", dir) if Pathname.new(dir).relative?
+    dir = File.join(Rails.root, 'db', dir) if Pathname.new(dir).relative?
 
     ruby_files = {}
-    Dir.glob(File.join(dir , '**/*.{rb}')).each do |fixture_file|
+    Dir.glob(File.join(dir, '**/*.{rb}')).each do |fixture_file|
       ext = File.extname fixture_file
       ruby_files[File.basename(fixture_file, '.*')] = fixture_file
     end
-    ruby_files.sort.each do |fixture , ruby_file|
+    ruby_files.sort.each do |fixture, ruby_file|
       # If file exists within application it takes precendence.
-      if File.exists?(File.join(Rails.root, "db/default/spree", "#{fixture}.rb"))
-        ruby_file = File.expand_path(File.join(Rails.root, "db/default/spree", "#{fixture}.rb"))
+      if File.exist?(File.join(Rails.root, 'db/default/spree', "#{fixture}.rb"))
+        ruby_file = File.expand_path(File.join(Rails.root, 'db/default/spree', "#{fixture}.rb"))
       end
       # an invoke will only execute the task once
-      Rake::Task["db:load_file"].execute( Rake::TaskArguments.new([:file], [ruby_file]) )
+      Rake::Task['db:load_file'].execute(Rake::TaskArguments.new([:file], [ruby_file]))
     end
   end
 
-  desc "Migrate schema to version 0 and back up again. WARNING: Destroys all data in tables!!"
+  desc 'Migrate schema to version 0 and back up again. WARNING: Destroys all data in tables!!'
   task remigrate: :environment do
     require 'highline/import'
 
-    if ENV['SKIP_NAG'] or ENV['OVERWRITE'].to_s.downcase == 'true' or agree("This task will destroy any data in the database. Are you sure you want to \ncontinue? [y/n] ")
+    if ENV['SKIP_NAG'] || ENV['OVERWRITE'].to_s.casecmp('true').zero? || agree("This task will destroy any data in the database. Are you sure you want to \ncontinue? [y/n] ")
 
       # Drop all tables
       ActiveRecord::Base.connection.tables.each { |t| ActiveRecord::Base.connection.drop_table t }
 
       # Migrate upward
-      Rake::Task["db:migrate"].invoke
+      Rake::Task['db:migrate'].invoke
 
       # Dump the schema
-      Rake::Task["db:schema:dump"].invoke
+      Rake::Task['db:schema:dump'].invoke
     else
-      say "Task cancelled."
+      say 'Task cancelled.'
       exit
     end
   end
 
-  desc "Bootstrap is: migrating, loading defaults, sample data and seeding (for all extensions) and load_products tasks"
-  task :bootstrap  do
+  desc 'Bootstrap is: migrating, loading defaults, sample data and seeding (for all extensions) and load_products tasks'
+  task :bootstrap do
     require 'highline/import'
 
     # remigrate unless production mode (as saftey check)
     if %w[demo development test].include? Rails.env
-      if ENV['AUTO_ACCEPT'] or agree("This task will destroy any data in the database. Are you sure you want to \ncontinue? [y/n] ")
+      if ENV['AUTO_ACCEPT'] || agree("This task will destroy any data in the database. Are you sure you want to \ncontinue? [y/n] ")
         ENV['SKIP_NAG'] = 'yes'
-        Rake::Task["db:create"].invoke
-        Rake::Task["db:remigrate"].invoke
+        Rake::Task['db:create'].invoke
+        Rake::Task['db:remigrate'].invoke
       else
-        say "Task cancelled, exiting."
+        say 'Task cancelled, exiting.'
         exit
       end
     else
-      say "NOTE: Bootstrap in production mode will not drop database before migration"
-      Rake::Task["db:migrate"].invoke
+      say 'NOTE: Bootstrap in production mode will not drop database before migration'
+      Rake::Task['db:migrate'].invoke
     end
 
-    ActiveRecord::Base.send(:subclasses).each do |model|
-      model.reset_column_information
-    end
+    ActiveRecord::Base.send(:subclasses).each(&:reset_column_information)
 
-    load_defaults  = Spree::Country.count == 0
-    unless load_defaults    # ask if there are already Countries => default data hass been loaded
+    load_defaults = Spree::Country.count == 0
+    unless load_defaults # ask if there are already Countries => default data hass been loaded
       load_defaults = agree('Countries present, load sample data anyways? [y/n]: ')
     end
-    if load_defaults
-      Rake::Task["db:seed"].invoke
-    end
+    Rake::Task['db:seed'].invoke if load_defaults
 
-    if Rails.env.production? and Spree::Product.count > 0
-      load_sample = agree("WARNING: In Production and products exist in database, load sample data anyways? [y/n]:" )
+    if Rails.env.production? && Spree::Product.count > 0
+      load_sample = agree('WARNING: In Production and products exist in database, load sample data anyways? [y/n]:')
     else
       load_sample = true if ENV['AUTO_ACCEPT']
       load_sample = agree('Load Sample Data? [y/n]: ') unless load_sample
@@ -92,36 +88,34 @@ use rake db:load_file[/absolute/path/to/sample/filename.rb]}
     if load_sample
       # Reload models' attributes in case they were loaded in old migrations with wrong attributes
       ActiveRecord::Base.descendants.each(&:reset_column_information)
-      Rake::Task["spree_sample:load"].invoke
+      Rake::Task['spree_sample:load'].invoke
     end
 
     puts "Bootstrap Complete.\n\n"
   end
 
-
-
-  desc "Fix orphan line items after upgrading to Spree 3.1: only needed if you have line items attached to deleted records with Slug (product) and SKU (variant) duplicates of non-deleted records."
-  task fix_orphan_line_items: :environment do |t, args|
+  desc 'Fix orphan line items after upgrading to Spree 3.1: only needed if you have line items attached to deleted records with Slug (product) and SKU (variant) duplicates of non-deleted records.'
+  task fix_orphan_line_items: :environment do |_t, _args|
     def get_input
       STDOUT.flush
       input = STDIN.gets.chomp
       case input.upcase
-        when "Y"
-          return true
+      when 'Y'
+        return true
 
-        when "N"
-          puts "aborting ....."
-          return false
-        else
-          return true
+      when 'N'
+        puts 'aborting .....'
+        return false
+      else
+        return true
       end
     end
 
-    puts "WARNING: This task will re-associate any line_items associated with deleted variants to non-deleted variants with matching SKUs. Because other attributes and product associations may switch during the re-association, this may have unintended side-effects. If this task finishes successfully, line items for old order should no longer be orphaned from their varaints. You should run this task after you have already run the db migratoin AddDiscontinuedToProductsAndVariants. If the db migration did not warn you that it was leaving deleted records in place because of duplicate SKUs, then you do not need to run this rake task."
-    puts "Are you sure you want to continue? (Y/n):"
+    puts 'WARNING: This task will re-associate any line_items associated with deleted variants to non-deleted variants with matching SKUs. Because other attributes and product associations may switch during the re-association, this may have unintended side-effects. If this task finishes successfully, line items for old order should no longer be orphaned from their varaints. You should run this task after you have already run the db migratoin AddDiscontinuedToProductsAndVariants. If the db migration did not warn you that it was leaving deleted records in place because of duplicate SKUs, then you do not need to run this rake task.'
+    puts 'Are you sure you want to continue? (Y/n):'
 
     if get_input
-      puts "looping through all your deleted variants ..."
+      puts 'looping through all your deleted variants ...'
 
       # first verify that I can really fix all of your line items
 
@@ -130,9 +124,7 @@ use rake db:load_file[/absolute/path/to/sample/filename.rb]}
 
       Spree::Variant.deleted.each do |variant|
         # check if this variant has any line items at all
-        if !variant.line_items.any?
-          next
-        end
+        next if variant.line_items.none?
 
         variants_to_fix << variant
         dup_variant = Spree::Variant.find_by(sku: variant.sku)
@@ -143,8 +135,8 @@ use rake db:load_file[/absolute/path/to/sample/filename.rb]}
         end
       end
 
-      if !variants_to_fix.any?
-        abort(  "ABORT: You have no deleted variants that are associated to line items. You do not need to run this raks task.")
+      if variants_to_fix.none?
+        abort('ABORT: You have no deleted variants that are associated to line items. You do not need to run this raks task.')
       end
 
       if no_live_variants_found.any?
@@ -152,18 +144,17 @@ use rake db:load_file[/absolute/path/to/sample/filename.rb]}
         no_live_variants_found.each do |deleted_variant|
           puts "variant id #{deleted_variant.id} (sku is '#{deleted_variant.sku}') ... no match found"
         end
-        abort()
+        abort
       end
 
-
-      puts "Ready to fix..."
+      puts 'Ready to fix...'
       variants_to_fix.each do |variant|
         dup_variant = Spree::Variant.find_by(sku: variant.sku)
         puts "Changing all line items for #{variant.sku} variant id #{variant.id} (deleted) to variant id #{dup_variant.id} (not deleted) ..."
         Spree::LineItem.unscoped.where(variant_id: variant.id).update_all(variant_id: dup_variant.id)
       end
 
-      puts "DONE !   Your database should no longer have line items that are associated with deleted variants."
+      puts 'DONE !   Your database should no longer have line items that are associated with deleted variants.'
     end
   end
 end

data/lib/tasks/email.rake

@@ -2,8 +2,8 @@ namespace :email do
   desc 'Sends test email to specified address - Example: EMAIL=spree@example.com bundle exec rake email:test'
   task test: :environment do
     unless ENV['EMAIL'].present?
-      raise ArgumentError, "Must pass EMAIL environment variable. " \
-                           "Example: EMAIL=spree@example.com bundle exec rake email:test"
+      raise ArgumentError, 'Must pass EMAIL environment variable. ' \
+                           'Example: EMAIL=spree@example.com bundle exec rake email:test'
     end
     Spree::TestMailer.test_email(ENV['EMAIL']).deliver_now
   end

data/lib/tasks/exchanges.rake

@@ -4,8 +4,8 @@ namespace :exchanges do
   task charge_unreturned_items: :environment do
     unreturned_return_items_scope = Spree::ReturnItem.awaiting_return.exchange_processed
     unreturned_return_items = unreturned_return_items_scope.joins(:exchange_inventory_units).where([
-      "spree_inventory_units.created_at < :days_ago AND spree_inventory_units.state = :iu_state",
-      days_ago: Spree::Config[:expedited_exchanges_days_window].days.ago, iu_state: "shipped"
+      'spree_inventory_units.created_at < :days_ago AND spree_inventory_units.state = :iu_state',
+      days_ago: Spree::Config[:expedited_exchanges_days_window].days.ago, iu_state: 'shipped'
     ]).distinct.to_a
 
     # Determine that a return item has already been deemed unreturned and therefore charged
@@ -49,7 +49,7 @@ namespace :exchanges do
         # the original exchange shipment, not the built one
         order.shipments.destroy_all
         shipments.each { |shipment| shipment.update_attributes!(order_id: order.id) }
-        order.update_attributes!(state: "confirm")
+        order.update_attributes!(state: 'confirm')
 
         order.reload.next!
         order.update_with_updater!
@@ -60,8 +60,8 @@ namespace :exchanges do
         failed_orders << order
       end
     end
-    failure_message = failed_orders.map { |o| "#{o.number} - #{o.errors.full_messages}" }.join(", ")
-    raise UnableToChargeForUnreturnedItems.new(failure_message) if failed_orders.present?
+    failure_message = failed_orders.map { |o| "#{o.number} - #{o.errors.full_messages}" }.join(', ')
+    raise UnableToChargeForUnreturnedItems, failure_message if failed_orders.present?
   end
 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.2.0'
+  s.add_dependency 'paperclip', '~> 5.1.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.6
+  version: 3.4.0.rc1
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-12 00:00:00.000000000 Z
+date: 2017-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 5.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 5.1.0
 - !ruby/object:Gem::Dependency
   name: paranoia
   requirement: !ruby/object:Gem::Requirement
@@ -386,7 +386,6 @@ files:
 - app/models/spree/calculator/flat_rate.rb
 - app/models/spree/calculator/flexi_rate.rb
 - app/models/spree/calculator/percent_on_line_item.rb
-- app/models/spree/calculator/percent_per_item.rb
 - app/models/spree/calculator/price_sack.rb
 - app/models/spree/calculator/returns/default_refund_amount.rb
 - app/models/spree/calculator/shipping/flat_percent_item_total.rb
@@ -568,7 +567,6 @@ 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
@@ -865,7 +863,6 @@ files:
 - lib/spree/core/controller_helpers/search.rb
 - lib/spree/core/controller_helpers/store.rb
 - lib/spree/core/controller_helpers/strong_parameters.rb
-- lib/spree/core/delegate_belongs_to.rb
 - lib/spree/core/engine.rb
 - lib/spree/core/environment.rb
 - lib/spree/core/environment/calculators.rb
@@ -953,7 +950,6 @@ files:
 - lib/spree/testing_support/flash.rb
 - lib/spree/testing_support/i18n.rb
 - lib/spree/testing_support/kernel.rb
-- lib/spree/testing_support/microdata.rb
 - lib/spree/testing_support/order_walkthrough.rb
 - lib/spree/testing_support/preferences.rb
 - lib/spree/testing_support/url_helpers.rb
@@ -986,7 +982,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.23
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: The bare bones necessary for Spree.