spree_core 3.7.11 → 4.0.0.beta

data/lib/spree/testing_support/image_helpers.rb

@@ -2,17 +2,11 @@ module Spree
   module TestingSupport
     module ImageHelpers
       def create_image(attachable, file)
-        # user paperclip to attach an image
-        if Rails.application.config.use_paperclip
-          attachable.images.create!(attachment: file)
-        # use ActiveStorage (default)
-        else
-          image = attachable.images.new
-          image.attachment.attach(io: file, filename: File.basename(file))
-          image.save!
-          file.rewind
-          image
-        end
+        image = attachable.images.new
+        image.attachment.attach(io: file, filename: File.basename(file))
+        image.save!
+        file.rewind
+        image
       end
     end
   end

data/lib/tasks/exchanges.rake

@@ -15,50 +15,48 @@ namespace :exchanges do
     failed_orders = []
 
     unreturned_return_items.group_by(&:exchange_shipments).each do |shipments, return_items|
-      begin
-        original_order = shipments.first.order
-        order_attributes = {
-          bill_address: original_order.bill_address,
-          ship_address: original_order.ship_address,
-          email: original_order.email
-        }
-        order_attributes[:store_id] = original_order.store_id
-        order = Spree::Order.create!(order_attributes)
+      original_order = shipments.first.order
+      order_attributes = {
+        bill_address: original_order.bill_address,
+        ship_address: original_order.ship_address,
+        email: original_order.email
+      }
+      order_attributes[:store_id] = original_order.store_id
+      order = Spree::Order.create!(order_attributes)
 
-        order.associate_user!(original_order.user) if original_order.user
+      order.associate_user!(original_order.user) if original_order.user
 
-        return_items.group_by(&:exchange_variant).map do |variant, variant_return_items|
-          variant_inventory_units = variant_return_items.map(&:exchange_inventory_units).flatten
-          line_item = Spree::LineItem.create!(variant: variant, quantity: variant_return_items.count, order: order)
-          variant_inventory_units.each { |i| i.update_attributes!(line_item_id: line_item.id, order_id: order.id) }
-        end
+      return_items.group_by(&:exchange_variant).map do |variant, variant_return_items|
+        variant_inventory_units = variant_return_items.map(&:exchange_inventory_units).flatten
+        line_item = Spree::LineItem.create!(variant: variant, quantity: variant_return_items.count, order: order)
+        variant_inventory_units.each { |i| i.update!(line_item_id: line_item.id, order_id: order.id) }
+      end
 
-        order.reload.update_with_updater!
-        while order.state != order.checkout_steps[-2] && order.next; end
+      order.reload.update_with_updater!
+      while order.state != order.checkout_steps[-2] && order.next; end
 
-        unless order.payments.present?
-          card_to_reuse = original_order.valid_credit_cards.first
-          card_to_reuse = original_order.user.credit_cards.default.first if !card_to_reuse && original_order.user
-          Spree::Payment.create!(order: order,
-                                 payment_method_id: card_to_reuse.try(:payment_method_id),
-                                 source: card_to_reuse,
-                                 amount: order.total)
-        end
+      unless order.payments.present?
+        card_to_reuse = original_order.valid_credit_cards.first
+        card_to_reuse = original_order.user.credit_cards.default.first if !card_to_reuse && original_order.user
+        Spree::Payment.create!(order: order,
+                               payment_method_id: card_to_reuse.try(:payment_method_id),
+                               source: card_to_reuse,
+                               amount: order.total)
+      end
 
-        # the order builds a shipment on its own on transition to delivery, but we want
-        # 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')
+      # the order builds a shipment on its own on transition to delivery, but we want
+      # the original exchange shipment, not the built one
+      order.shipments.destroy_all
+      shipments.each { |shipment| shipment.update(order_id: order.id) }
+      order.update!(state: 'confirm')
 
-        order.reload.next!
-        order.update_with_updater!
-        order.finalize!
+      order.reload.next!
+      order.update_with_updater!
+      order.finalize!
 
-        failed_orders << order unless order.completed? && order.valid?
-      rescue StandardError
-        failed_orders << order
-      end
+      failed_orders << order unless order.completed? && order.valid?
+    rescue StandardError
+      failed_orders << order
     end
     failure_message = failed_orders.map { |o| "#{o.number} - #{o.errors.full_messages}" }.join(', ')
     raise UnableToChargeForUnreturnedItems, failure_message if failed_orders.present?

data/spree_core.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.summary     = 'The bare bones necessary for Spree.'
   s.description = 'The bare bones necessary for Spree.'
 
-  s.required_ruby_version     = '>= 2.3.3'
+  s.required_ruby_version     = '>= 2.5.0'
   s.required_rubygems_version = '>= 1.8.23'
 
   s.author      = 'Sean Schofield'
@@ -22,29 +22,26 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'activemerchant', '~> 1.67'
   s.add_dependency 'acts_as_list', '~> 0.8'
-  s.add_dependency 'awesome_nested_set', '~> 3.2.0'
-  s.add_dependency 'carmen', '~> 1.0.0'
-  s.add_dependency 'cancancan', '~> 2.0'
-  s.add_dependency 'deface', '~> 1.0'
+  s.add_dependency 'awesome_nested_set', '>= 3.1.4', '< 3.3.0'
+  s.add_dependency 'carmen', '>= 1.0', '< 1.2'
+  s.add_dependency 'cancancan', '~> 3.0'
   s.add_dependency 'ffaker', '~> 2.9'
   s.add_dependency 'friendly_id', '~> 5.2.1'
   s.add_dependency 'highline', '~> 2.0.0' # Necessary for the install generator
-  s.add_dependency 'kaminari', '~> 1.0.1'
+  s.add_dependency 'kaminari', '>= 1.0.1', '< 1.2.0'
   s.add_dependency 'money', '~> 6.13'
   s.add_dependency 'monetize', '~> 1.9'
-  s.add_dependency 'paperclip', '~> 6.1.0'
-  s.add_dependency 'paranoia', '~> 2.4.1'
+  s.add_dependency 'paranoia', '~> 2.4.2'
   s.add_dependency 'premailer-rails'
-  s.add_dependency 'acts-as-taggable-on', '~> 6.0.0'
-  s.add_dependency 'rails', '~> 5.2.4', '>= 5.2.4'
-  s.add_dependency 'ransack', '~> 2.1.1'
+  s.add_dependency 'rails', '~> 6.0.0'
+  s.add_dependency 'ransack', '~> 2.3.0'
   s.add_dependency 'responders'
-  s.add_dependency 'state_machines-activerecord', '~> 0.5'
+  s.add_dependency 'state_machines-activerecord', '~> 0.6'
+  s.add_dependency 'state_machines-activemodel', '~> 0.7'
   s.add_dependency 'stringex'
   s.add_dependency 'twitter_cldr', '~> 4.3'
-  s.add_dependency 'sprockets', '~> 3.7'
   s.add_dependency 'sprockets-rails'
   s.add_dependency 'mini_magick', '~> 4.9.4'
 
-  s.add_development_dependency 'email_spec', '~> 1.6'
+  s.add_development_dependency 'email_spec', '~> 2.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 3.7.11
+  version: 4.0.0.beta
 platform: ruby
 authors:
 - Sean Schofield
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-15 00:00:00.000000000 Z
+date: 2019-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -42,58 +42,56 @@ dependencies:
   name: awesome_nested_set
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.1.4
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.1.4
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.3.0
 - !ruby/object:Gem::Dependency
   name: carmen
   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: cancancan
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+        version: '1.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: deface
+  name: cancancan
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: ffaker
   requirement: !ruby/object:Gem::Requirement
@@ -140,16 +138,22 @@ dependencies:
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: money
   requirement: !ruby/object:Gem::Requirement
@@ -178,34 +182,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.9'
-- !ruby/object:Gem::Dependency
-  name: paperclip
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 6.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 6.1.0
 - !ruby/object:Gem::Dependency
   name: paranoia
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.1
+        version: 2.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.1
+        version: 2.4.2
 - !ruby/object:Gem::Dependency
   name: premailer-rails
   requirement: !ruby/object:Gem::Requirement
@@ -221,7 +211,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: acts-as-taggable-on
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -235,67 +225,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 6.0.0
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: ransack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.4
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.2.4
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.4
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.2.4
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
-  name: ransack
+  name: responders
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: responders
+  name: state_machines-activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
-  name: state_machines-activerecord
+  name: state_machines-activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: stringex
   requirement: !ruby/object:Gem::Requirement
@@ -324,20 +308,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.3'
-- !ruby/object:Gem::Dependency
-  name: sprockets
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.7'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.7'
 - !ruby/object:Gem::Dependency
   name: sprockets-rails
   requirement: !ruby/object:Gem::Requirement
@@ -372,14 +342,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.2'
 description: The bare bones necessary for Spree.
 email: sean@spreecommerce.com
 executables: []
@@ -410,13 +380,13 @@ files:
 - app/mailers/spree/reimbursement_mailer.rb
 - app/mailers/spree/shipment_mailer.rb
 - app/mailers/spree/test_mailer.rb
-- app/models/concerns/spree/acts_as_taggable.rb
 - app/models/concerns/spree/adjustment_source.rb
 - app/models/concerns/spree/calculated_adjustments.rb
 - app/models/concerns/spree/default_price.rb
 - app/models/concerns/spree/display_money.rb
 - app/models/concerns/spree/named_type.rb
 - app/models/concerns/spree/number_as_param.rb
+- app/models/concerns/spree/product_scopes.rb
 - app/models/concerns/spree/ransackable_attributes.rb
 - app/models/concerns/spree/user_address.rb
 - app/models/concerns/spree/user_methods.rb
@@ -463,7 +433,6 @@ files:
 - app/models/spree/gateway/bogus_simple.rb
 - app/models/spree/image.rb
 - app/models/spree/image/configuration/active_storage.rb
-- app/models/spree/image/configuration/paperclip.rb
 - app/models/spree/inventory_unit.rb
 - app/models/spree/legacy_user.rb
 - app/models/spree/line_item.rb
@@ -473,11 +442,11 @@ files:
 - app/models/spree/option_value.rb
 - app/models/spree/option_value_variant.rb
 - app/models/spree/order.rb
+- app/models/spree/order/address_book.rb
 - app/models/spree/order/checkout.rb
 - app/models/spree/order/currency_updater.rb
 - app/models/spree/order/payments.rb
 - app/models/spree/order/store_credit.rb
-- app/models/spree/order_contents.rb
 - app/models/spree/order_inventory.rb
 - app/models/spree/order_merger.rb
 - app/models/spree/order_promotion.rb
@@ -497,7 +466,6 @@ files:
 - app/models/spree/preferences/store.rb
 - app/models/spree/price.rb
 - app/models/spree/product.rb
-- app/models/spree/product/scopes.rb
 - app/models/spree/product_option_type.rb
 - app/models/spree/product_promotion_rule.rb
 - app/models/spree/product_property.rb
@@ -552,7 +520,7 @@ files:
 - app/models/spree/return_item/eligibility_validator/inventory_shipped.rb
 - app/models/spree/return_item/eligibility_validator/no_reimbursements.rb
 - app/models/spree/return_item/eligibility_validator/order_completed.rb
-- app/models/spree/return_item/eligibility_validator/rma_required.rb
+- app/models/spree/return_item/eligibility_validator/r_m_a_required.rb
 - app/models/spree/return_item/eligibility_validator/time_since_purchase.rb
 - app/models/spree/return_item/exchange_variant_eligibility/same_option_value.rb
 - app/models/spree/return_item/exchange_variant_eligibility/same_product.rb
@@ -593,13 +561,11 @@ files:
 - app/models/spree/store_credit_category.rb
 - app/models/spree/store_credit_event.rb
 - app/models/spree/store_credit_type.rb
-- app/models/spree/tag.rb
 - app/models/spree/tax_category.rb
 - app/models/spree/tax_rate.rb
 - app/models/spree/taxon.rb
 - app/models/spree/taxon_image.rb
 - app/models/spree/taxon_image/configuration/active_storage.rb
-- app/models/spree/taxon_image/configuration/paperclip.rb
 - app/models/spree/taxonomy.rb
 - app/models/spree/validations/db_maximum_length_validator.rb
 - app/models/spree/variant.rb
@@ -648,13 +614,11 @@ files:
 - app/views/spree/test_mailer/test_email.html.erb
 - app/views/spree/test_mailer/test_email.text.erb
 - config/initializers/active_storage.rb
-- config/initializers/acts_as_taggable_on.rb
 - config/initializers/assets.rb
 - config/initializers/friendly_id.rb
 - config/initializers/premailer_assets.rb
 - config/initializers/premailer_rails.rb
 - config/initializers/state_machine.rb
-- config/initializers/use_paperclip.rb
 - config/locales/en.yml
 - config/routes.rb
 - db/default/spree/countries.rb
@@ -887,9 +851,6 @@ files:
 - db/migrate/20160207191757_add_id_column_to_earlier_habtm_tables.rb
 - db/migrate/20160219165458_add_indexes.rb
 - db/migrate/20160509064646_remove_counter_cache_from_spree_variants_to_spree_stock_items.rb
-- db/migrate/20160511071954_acts_as_taggable_on_spree_migration.rb
-- db/migrate/20160511072249_change_collation_for_spree_tag_names.rb
-- db/migrate/20160511072335_add_missing_indexes_to_spree_taggings.rb
 - db/migrate/20160608090604_add_zipcode_required_to_spree_countries.rb
 - db/migrate/20161014145148_add_created_at_to_variant.rb
 - db/migrate/20161014152814_add_null_false_to_spree_variants_timestamps.rb
@@ -927,6 +888,8 @@ files:
 - db/migrate/20180613080857_rename_guest_token_to_token_in_orders.rb
 - db/migrate/20180915160001_add_timestamps_to_spree_prices.rb
 - db/migrate/20181024100754_add_deleted_at_to_spree_credit_cards.rb
+- db/migrate/20190305121659_add_iso_and_iso3_validation_on_presence_and_uniqueness.rb
+- db/migrate/20190523092729_add_user_id_and_deleted_at_to_spree_addresses.rb
 - db/seeds.rb
 - lib/friendly_id/slug_rails5_patch.rb
 - lib/generators/spree/custom_user/custom_user_generator.rb
@@ -955,7 +918,6 @@ files:
 - lib/spree/core/controller_helpers/auth.rb
 - lib/spree/core/controller_helpers/common.rb
 - lib/spree/core/controller_helpers/order.rb
-- lib/spree/core/controller_helpers/respond_with.rb
 - lib/spree/core/controller_helpers/search.rb
 - lib/spree/core/controller_helpers/store.rb
 - lib/spree/core/controller_helpers/strong_parameters.rb
@@ -983,7 +945,6 @@ files:
 - lib/spree/migrations.rb
 - lib/spree/money.rb
 - lib/spree/permitted_attributes.rb
-- lib/spree/responder.rb
 - lib/spree/service_module.rb
 - lib/spree/testing_support/ability_helpers.rb
 - lib/spree/testing_support/authorization_helpers.rb
@@ -1037,7 +998,6 @@ files:
 - lib/spree/testing_support/factories/store_credit_factory.rb
 - lib/spree/testing_support/factories/store_credit_type_factory.rb
 - lib/spree/testing_support/factories/store_factory.rb
-- lib/spree/testing_support/factories/tag_factory.rb
 - lib/spree/testing_support/factories/tax_category_factory.rb
 - lib/spree/testing_support/factories/tax_rate_factory.rb
 - lib/spree/testing_support/factories/taxon_factory.rb
@@ -1069,7 +1029,7 @@ homepage: http://spreecommerce.org
 licenses:
 - BSD-3-Clause
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -1077,15 +1037,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.3
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: 1.8.23
 requirements: []
-rubygems_version: 3.1.4
-signing_key:
+rubygems_version: 3.0.2
+signing_key: 
 specification_version: 4
 summary: The bare bones necessary for Spree.
 test_files: []