spree_core 3.5.0 → 3.6.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: aea028c2069b49ee38182faa56c4818767b3d02d
-  data.tar.gz: 8b01d8133a9364ff70aec61baf693b0f466647c2
+SHA256:
+  metadata.gz: f3a62997dc364cc3ebb70bbb5ff1bffd6c663e0bce92f21ee0f8a1c6680f6c4c
+  data.tar.gz: 261701f37b5fd2f42ee790eb5f857be8cd23929d037d85ebd3c7251958f8c67a
 SHA512:
-  metadata.gz: 66f8a7892aa4010aada8c11280850eba132b600d33c1f0f51118ae082229c8c20226c8149e293447fa182681dec5ec8390f3c79b9ff9dbde027e6e81b1e20927
-  data.tar.gz: 77924f4682926e7d13a3e5dde1c142cdb31a1cb3f16fb139fc358791551b8357ff4cc916d4dc73a2fcf3e97ca009ec869ba9a36d41f043bd346ac7c4309f8756
+  metadata.gz: 1b7fe5bd4de04b1958a76e81c82ebb56c36fa20fa3e8b0152533aa1d19f6695269366a5e620911bf3fb06b769e5fe816a53785a664b3c68f17744b475334fbe0
+  data.tar.gz: 509928ad83be2095dfd50ef8d7d62fff6309801b796ce41b0b0ea2de0efd8c8832fb85d81467bcc58bb46cced38b6faab44514fae9cb8fc2ef8b22b2371b5e8c

data/app/helpers/spree/base_helper.rb

@@ -92,7 +92,7 @@ module Spree
 
     def create_product_image_tag(image, product, options, style)
       options.reverse_merge! alt: image.alt.blank? ? product.name : image.alt
-      image_tag image.attachment.url(style), options
+      image_tag main_app.url_for(image.url(style)), options
     end
 
     def define_image_method(style)
@@ -118,8 +118,7 @@ module Spree
     # Returns style of image or nil
     def image_style_from_method_name(method_name)
       if method_name.to_s.match(/_image$/) && style = method_name.to_s.sub(/_image$/, '')
-        possible_styles = Spree::Image.attachment_definitions[:attachment][:styles]
-        style if style.in? possible_styles.with_indifferent_access
+        style if style.in? Spree::Image.styles.with_indifferent_access
       end
     end
   end

data/app/helpers/spree/products_helper.rb

@@ -54,7 +54,7 @@ module Spree
     end
 
     def cache_key_for_product(product = @product)
-      (common_product_cache_keys + [product.cache_key, product.possible_promotions]).compact.join('/')
+      (common_product_cache_keys + [product.cache_key_with_version, product.possible_promotions]).compact.join('/')
     end
 
     def available_status(product) # will return a human readable string

data/app/models/concerns/spree/attachment_validation.rb

@@ -0,0 +1,10 @@
+module Spree
+  module AttachmentValidation
+    def check_attachment_content_type
+      if attachment.attached? && !attachment.content_type.in?(accepted_image_types)
+        attachment.purge
+        errors.add(:attachment, :not_allowed_content_type)
+      end
+    end
+  end
+end

data/app/models/spree/adjustable/adjustments_updater.rb

@@ -11,8 +11,7 @@ module Spree
       end
 
       def update
-        return unless @adjustable
-        return unless @adjustable.persisted?
+        return unless adjustable_still_exists?
 
         totals = {
           non_taxable_adjustment_total: 0,
@@ -43,6 +42,10 @@ module Spree
       def adjusters
         Rails.application.config.spree.adjusters
       end
+
+      def adjustable_still_exists?
+        @adjustable && @adjustable.class.exists?(@adjustable.id)
+      end
     end
   end
 end

data/app/models/spree/asset.rb

@@ -1,9 +1,18 @@
 module Spree
-  Paperclip.interpolates :viewable_id do |attachment, _style|
-    attachment.instance.viewable_id
+  if Rails.application.config.use_paperclip
+    ActiveSupport::Deprecation.warn(<<-EOS, caller)
+     Paperclip support is deprecated, and will be removed in Spree 4.0.
+     Please migrate to ActiveStorage, to avoid problems after update
+     https://github.com/thoughtbot/paperclip/blob/master/MIGRATING.md
+    EOS
+    Paperclip.interpolates :viewable_id do |attachment, _style|
+      attachment.instance.viewable_id
+    end
   end
 
   class Asset < Spree::Base
+    include Support::ActiveStorage unless Rails.application.config.use_paperclip
+
     belongs_to :viewable, polymorphic: true, touch: true
     acts_as_list scope: [:viewable_id, :viewable_type]
   end

data/app/models/spree/asset/support/active_storage.rb

@@ -0,0 +1,25 @@
+module Spree
+  class Asset < Spree::Base
+    module Support
+      module ActiveStorage
+        extend ActiveSupport::Concern
+
+        included do
+          def url(style)
+            return placeholder(style) unless attachment.attached?
+
+            attachment.variant(resize: dimensions_for_style(style))
+          end
+
+          def placeholder(style)
+            "noimage/#{style}.png"
+          end
+
+          def dimensions_for_style(style)
+            self.class.styles.with_indifferent_access[style] || default_style
+          end
+        end
+      end
+    end
+  end
+end

data/app/models/spree/image.rb

@@ -1,47 +1,5 @@
 module Spree
   class Image < Asset
-    validate :no_attachment_errors
-
-    def self.accepted_image_types
-      %w(image/jpeg image/jpg image/png image/gif)
-    end
-
-    has_attached_file :attachment,
-                      styles: { mini: '48x48>', small: '100x100>', product: '240x240>', large: '600x600>' },
-                      default_style: :product,
-                      url: '/spree/products/:id/:style/:basename.:extension',
-                      path: ':rails_root/public/spree/products/:id/:style/:basename.:extension',
-                      convert_options: { all: '-strip -auto-orient -colorspace sRGB' }
-    validates_attachment :attachment,
-                         presence: true,
-                         content_type: { content_type: accepted_image_types }
-
-    # save the w,h of the original image (from which others can be calculated)
-    # we need to look at the write-queue for images which have not been saved yet
-    before_save :find_dimensions, if: :attachment_updated_at_changed?
-
-    # used by admin products autocomplete
-    def mini_url
-      attachment.url(:mini, false)
-    end
-
-    def find_dimensions
-      temporary = attachment.queued_for_write[:original]
-      filename = temporary.path unless temporary.nil?
-      filename = attachment.path if filename.blank?
-      geometry = Paperclip::Geometry.from_file(filename)
-      self.attachment_width  = geometry.width
-      self.attachment_height = geometry.height
-    end
-
-    # if there are errors from the plugin, then add a more meaningful message
-    def no_attachment_errors
-      unless attachment.errors.empty?
-        # uncomment this to get rid of the less-than-useful interim messages
-        # errors.clear
-        errors.add :attachment, "Paperclip returned errors for file '#{attachment_file_name}' - check ImageMagick installation or image source file."
-        false
-      end
-    end
+    include Rails.application.config.use_paperclip ? Configuration::Paperclip : Configuration::ActiveStorage
   end
 end

data/app/models/spree/image/configuration/active_storage.rb

@@ -0,0 +1,41 @@
+module Spree
+  class Image < Asset
+    module Configuration
+      module ActiveStorage
+        extend ActiveSupport::Concern
+        include ::Spree::AttachmentValidation
+
+        included do
+          validate :check_attachment_presence
+          validate :check_attachment_content_type
+
+          has_one_attached :attachment
+
+          def self.styles
+            @styles ||= {
+              mini:    '48x48>',
+              small:   '100x100>',
+              product: '240x240>',
+              large:   '600x600>'
+            }
+          end
+
+          def default_style
+            :product
+          end
+
+          def accepted_image_types
+            %w(image/jpeg image/jpg image/png image/gif)
+          end
+
+          def check_attachment_presence
+            unless attachment.attached?
+              attachment.purge
+              errors.add(:attachment, :attachment_must_be_present)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/app/models/spree/image/configuration/paperclip.rb

@@ -0,0 +1,64 @@
+module Spree
+  class Image < Asset
+    module Configuration
+      module Paperclip
+        extend ActiveSupport::Concern
+
+        included do
+          validate :no_attachment_errors
+
+          def self.accepted_image_types
+            %w(image/jpeg image/jpg image/png image/gif)
+          end
+
+          def self.styles
+            attachment_definitions[:attachment][:styles]
+          end
+
+          has_attached_file :attachment,
+            styles: { mini: '48x48>', small: '100x100>', product: '240x240>', large: '600x600>' },
+            default_style: :product,
+            url: '/spree/products/:id/:style/:basename.:extension',
+            path: ':rails_root/public/spree/products/:id/:style/:basename.:extension',
+            convert_options: { all: '-strip -auto-orient -colorspace sRGB' }
+
+          validates_attachment :attachment,
+            presence: true,
+            content_type: { content_type: accepted_image_types }
+
+          # save the w,h of the original image (from which others can be calculated)
+          # we need to look at the write-queue for images which have not been saved yet
+          before_save :find_dimensions, if: :attachment_updated_at_changed?
+
+          delegate :url, to: :attachment
+
+          # used by admin products autocomplete
+          def mini_url
+            url(:mini, false)
+          end
+
+          def find_dimensions
+            temporary = attachment.queued_for_write[:original]
+            filename = temporary.path unless temporary.nil?
+            filename = attachment.path if filename.blank?
+            geometry = ::Paperclip::Geometry.from_file(filename)
+            self.attachment_width  = geometry.width
+            self.attachment_height = geometry.height
+          end
+
+          # if there are errors from the plugin, then add a more meaningful message
+          def no_attachment_errors
+            unless attachment.errors.empty?
+              # uncomment this to get rid of the less-than-useful interim messages
+              # errors.clear
+              errors.add :attachment,
+                "Paperclip returned errors for file '#{attachment_file_name}' - check ImageMagick installation or image source file."
+
+              false
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -6,6 +6,14 @@
 
 require 'singleton'
 
+DB_EXCEPTIONS = if defined? PG
+                  [PG::ConnectionBad, ActiveRecord::NoDatabaseError]
+                elsif defined? Mysql2
+                  [Mysql2::Error::ConnectionError, ActiveRecord::NoDatabaseError]
+                else
+                  [ActiveRecord::ConnectionNotEstablished, ActiveRecord::NoDatabaseError]
+                end
+
 module Spree::Preferences
   class StoreInstance
     attr_accessor :persistence
@@ -86,7 +94,7 @@ module Spree::Preferences
 
     def should_persist?
       @persistence && Spree::Preference.table_exists?
-    rescue PG::ConnectionBad, ActiveRecord::NoDatabaseError # this is fix to make Deploy To Heroku button work
+    rescue *DB_EXCEPTIONS # this is fix to make Deploy To Heroku button work
       false
     end
   end

data/app/models/spree/promotion.rb

@@ -128,7 +128,6 @@ module Spree
     def eligible_rules(promotable, options = {})
       # Promotions without rules are eligible by default.
       return [] if rules.none?
-      eligible = ->(r) { r.eligible?(promotable, options) }
       specific_rules = rules.select { |rule| rule.applicable?(promotable) }
       return [] if specific_rules.none?
 

data/app/models/spree/promotion_handler/coupon.rb

@@ -21,6 +21,24 @@ module Spree
         self
       end
 
+      def remove(coupon_code)
+        promotion = order.promotions.with_coupon_code(coupon_code)
+
+        if promotion.present?
+          # Order promotion has to be destroyed before line item removing
+          order.order_promotions.find_by!(promotion_id: promotion.id).destroy
+
+          remove_promotion_adjustments(promotion)
+          remove_promotion_line_items(promotion)
+          order.update_with_updater!
+
+          set_success_code :adjustments_deleted
+        else
+          set_error_code :coupon_code_not_found
+        end
+        self
+      end
+
       def set_success_code(c)
         @status_code = c
         @success = Spree.t(c)
@@ -43,6 +61,22 @@ module Spree
 
       private
 
+      def remove_promotion_adjustments(promotion)
+        promotion_actions_ids = promotion.actions.pluck(:id)
+        order.all_adjustments.where(source_id: promotion_actions_ids,
+                                    source_type: 'Spree::PromotionAction').destroy_all
+      end
+
+      def remove_promotion_line_items(promotion)
+        create_line_item_actions_ids = promotion.actions.where(type: 'Spree::Promotion::Actions::CreateLineItems').pluck(:id)
+
+        Spree::PromotionActionLineItem.where(promotion_action: create_line_item_actions_ids).find_each do |item|
+          line_item = order.find_line_item_by_variant(item.variant)
+          next if line_item.blank?
+          order.contents.remove(item.variant, item.quantity)
+        end
+      end
+
       def handle_present_promotion
         return promotion_usage_limit_exceeded if promotion.usage_limit_exceeded?(order)
         return promotion_applied if promotion_exists_on_order?

data/app/models/spree/return_item/eligibility_validator/default.rb

@@ -6,7 +6,7 @@ module Spree
                                               ReturnItem::EligibilityValidator::TimeSincePurchase,
                                               ReturnItem::EligibilityValidator::RMARequired,
                                               ReturnItem::EligibilityValidator::InventoryShipped,
-                                              ReturnItem::EligibilityValidator::NoReimbursements,
+                                              ReturnItem::EligibilityValidator::NoReimbursements
                                             ]
 
     def eligible_for_return?

data/app/models/spree/taxon_icon.rb

@@ -1,13 +1,5 @@
 module Spree
   class TaxonIcon < Asset
-    has_attached_file :attachment,
-                      styles: { mini: '32x32>', normal: '128x128>' },
-                      default_style: :mini,
-                      url: '/spree/taxons/:viewable_id/:style/:basename.:extension',
-                      path: ':rails_root/public/spree/taxons/:viewable_id/:style/:basename.:extension',
-                      default_url: '/assets/default_taxon.png'
-
-    validates_attachment :attachment,
-                         content_type: { content_type: ['image/jpg', 'image/jpeg', 'image/png', 'image/gif'] }
+    include Rails.application.config.use_paperclip ? Configuration::Paperclip : Configuration::ActiveStorage
   end
 end

data/app/models/spree/taxon_icon/configuration/active_storage.rb

@@ -0,0 +1,27 @@
+module Spree
+  class TaxonIcon < Asset
+    module Configuration
+      module ActiveStorage
+        extend ActiveSupport::Concern
+        include Spree::AttachmentValidation
+
+        included do
+          validate :check_attachment_content_type
+
+          has_one_attached :attachment
+
+          def self.styles
+            @styles ||= {
+              mini:   '32x32>',
+              normal: '128x128>'
+            }
+          end
+
+          def default_style
+            :mini
+          end
+        end
+      end
+    end
+  end
+end

data/app/models/spree/taxon_icon/configuration/paperclip.rb

@@ -0,0 +1,25 @@
+module Spree
+  class TaxonIcon < Asset
+    module Configuration
+      module Paperclip
+        extend ActiveSupport::Concern
+
+        included do
+          def self.styles
+            attachment_definitions[:attachment][:styles]
+          end
+
+          has_attached_file :attachment,
+            styles: { mini: '32x32>', normal: '128x128>' },
+            default_style: :mini,
+            url: '/spree/taxons/:viewable_id/:style/:basename.:extension',
+            path: ':rails_root/public/spree/taxons/:viewable_id/:style/:basename.:extension',
+            default_url: '/assets/default_taxon.png'
+
+          validates_attachment :attachment,
+            content_type: { content_type: ['image/jpg', 'image/jpeg', 'image/png', 'image/gif'] }
+        end
+      end
+    end
+  end
+end

data/config/initializers/active_storage.rb

@@ -0,0 +1,5 @@
+class ActiveStorage::PurgeJob < ActiveStorage::BaseJob
+  def perform(blob)
+    blob.purge unless blob.attachments.present?
+  end
+end

data/config/initializers/use_paperclip.rb

@@ -0,0 +1,3 @@
+Rails.application.configure do
+  config.use_paperclip = ActiveModel::Type::Boolean.new.cast ENV['USE_PAPERCLIP']
+end

data/config/locales/en.yml

@@ -361,7 +361,11 @@ en:
               cannot_destroy_if_attached_to_line_items: Cannot delete variants once they are attached to line items.
               no_master_variant_found_to_infer_price: No master variant found to infer price
               must_supply_price_for_variant_or_master: Must supply price for variant or master price for product.
-
+        spree/image:
+          attributes:
+            attachment:
+              not_allowed_content_type: has not allowed content type
+              attachment_must_be_present: must be present
   devise:
     confirmations:
       confirmed: Your account was successfully confirmed. You are now signed in.
@@ -502,6 +506,7 @@ en:
         order_num: "Order #"
         orders: Orders
         user_information: User Information
+        stores: Stores
         store_credits: Store Credits
         no_store_credit: User has no Store Credit available.
         available_store_credit: User has %{amount} in Store Credit available.
@@ -1363,6 +1368,8 @@ en:
     stock_transfers: Stock Transfers
     stop: Stop
     store: Store
+    stores: Stores
+    add_store: New Store
     store_credit_name: Store Credit
     store_credit:
       credit: "Credit"
@@ -1475,6 +1482,7 @@ en:
     unshippable_items: Unshippable Items
     update: Update
     updating: Updating
+    url: URL
     usage_limit: Usage Limit
     use_app_default: Use App Default
     use_billing_address: Use Billing Address

data/db/default/spree/promotions.rb

@@ -0,0 +1,23 @@
+Spree::Sample.load_sample('option_values')
+Spree::Sample.load_sample('products')
+
+product = Spree::Product.find_by(name: 'Ruby on Rails Baseball Jersey')
+size = Spree::OptionValue.find_by(name: 'Small')
+color = Spree::OptionValue.find_by(name: 'Red')
+eligible_values = "#{size.id},#{color.id}"
+
+promotion = Spree::Promotion.where(
+  name: 'free shipping',
+  usage_limit: nil,
+  path: nil,
+  match_policy: 'any',
+  description: ''
+).first_or_create
+
+Spree::PromotionRule.where(
+  promotion_id: promotion.id,
+  type: 'Spree::Promotion::Rules::OptionValue',
+  preferences: { match_policy: 'any', eligible_values: { product.id.to_s => eligible_values } }
+).first_or_create
+
+Spree::Promotion::Actions::FreeShipping.where(promotion_id: promotion.id).first_or_create

data/lib/generators/spree/dummy/dummy_generator.rb

@@ -86,6 +86,14 @@ module Spree
 
     end
 
+    def inject_content_security_policy
+      inside dummy_path do
+        inject_into_file 'config/initializers/content_security_policy.rb', %Q[
+  p.script_src  :self, :https, :unsafe_inline, :http, :unsafe_eval
+        ], before: /^end/, verbose: true
+      end
+    end
+
     attr :lib_name
     attr :database
 

data/lib/generators/spree/dummy/templates/rails/test.rb

@@ -28,7 +28,8 @@ Dummy::Application.configure do
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
   ActionMailer::Base.default from: "spree@example.com"
-
+  # Store uploaded files on the local file system in a temporary directory
+  config.active_storage.service = :test
 
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr

data/lib/spree/core.rb

@@ -9,6 +9,7 @@ require 'mail'
 require 'monetize'
 require 'paperclip'
 require 'paranoia'
+require 'mini_magick'
 require 'premailer/rails'
 require 'ransack'
 require 'responders'

data/lib/spree/core/engine.rb

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

data/lib/spree/testing_support/caching.rb

@@ -1,47 +1,47 @@
-module Spree
-  module TestingSupport
-    module Caching
-      def cache_writes
-        @cache_write_events
-      end
-
-      def assert_written_to_cache(key)
-        unless @cache_write_events.detect { |event| event[:key].starts_with?(key) }
-          raise %Q{Expected to find #{key} in the cache, but didn't.
-
-  Cache writes:
-  #{@cache_write_events.join("\n")}
-          }
-        end
-      end
-
-      def clear_cache_events
-        @cache_read_events = []
-        @cache_write_events = []
-      end
-    end
-  end
-end
-
-RSpec.configure do |config|
-  config.include Spree::TestingSupport::Caching, caching: true
-
-  config.before(:each, caching: true) do
-    ActionController::Base.perform_caching = true
-
-    ActiveSupport::Notifications.subscribe('read_fragment.action_controller') do |_event, _start_time, _finish_time, _, details|
-      @cache_read_events ||= []
-      @cache_read_events << details
-    end
-
-    ActiveSupport::Notifications.subscribe('write_fragment.action_controller') do |_event, _start_time, _finish_time, _, details|
-      @cache_write_events ||= []
-      @cache_write_events << details
-    end
-  end
-
-  config.after(:each, caching: true) do
-    ActionController::Base.perform_caching = false
-    Rails.cache.clear
-  end
-end
+# module Spree
+#   module TestingSupport
+#     module Caching
+      # def cache_writes
+      #   @cache_write_events
+      # end
+
+      # def assert_written_to_cache(key)
+      #   unless @cache_write_events.detect { |event| event[:key].starts_with?(key) }
+      #     raise %Q{Expected to find #{key} in the cache, but didn't.
+
+  # Cache writes:
+  # #{@cache_write_events.join("\n")}
+      #     }
+      #   end
+      # end
+
+      # def clear_cache_events
+      #   @cache_read_events = []
+      #   @cache_write_events = []
+      # end
+    # end
+  # end
+# end
+
+# RSpec.configure do |config|
+  # config.include Spree::TestingSupport::Caching, caching: true
+
+  # config.before(:each, caching: true) do
+    # ActionController::Base.perform_caching = true
+
+    # ActiveSupport::Notifications.subscribe('read_fragment.action_controller') do |_event, _start_time, _finish_time, _, details|
+    #   @cache_read_events ||= []
+    #   @cache_read_events << details
+    # end
+
+    # ActiveSupport::Notifications.subscribe('write_fragment.action_controller') do |_event, _start_time, _finish_time, _, details|
+    #   @cache_write_events ||= []
+    #   @cache_write_events << details
+    # end
+  # end
+
+  # config.after(:each, caching: true) do
+    # ActionController::Base.perform_caching = false
+    # Rails.cache.clear
+  # end
+# end

data/spec/fixtures/text-file.txt

@@ -0,0 +1 @@
+Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum.

data/spree_core.gemspec

@@ -31,17 +31,18 @@ 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', '~> 6.0.0'
+  s.add_dependency 'paperclip', '~> 5.2.0'
   s.add_dependency 'paranoia', '~> 2.4.1'
   s.add_dependency 'premailer-rails'
   s.add_dependency 'acts-as-taggable-on', '~> 5.0'
-  s.add_dependency 'rails', '~> 5.1.5'
+  s.add_dependency 'rails', '~> 5.2.0'
   s.add_dependency 'ransack', '~> 1.8.0'
   s.add_dependency 'responders'
   s.add_dependency 'state_machines-activerecord', '~> 0.5'
   s.add_dependency 'stringex'
   s.add_dependency 'twitter_cldr', '~> 4.3'
   s.add_dependency 'sprockets-rails'
+  s.add_dependency 'mini_magick', '~> 4.8.0'
 
   s.add_development_dependency 'email_spec', '~> 1.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 3.5.0
+  version: 3.6.0.rc1
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-12 00:00:00.000000000 Z
+date: 2018-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 5.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 5.2.0
 - !ruby/object:Gem::Dependency
   name: paranoia
   requirement: !ruby/object:Gem::Requirement
@@ -226,14 +226,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.5
+        version: 5.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.5
+        version: 5.2.0
 - !ruby/object:Gem::Dependency
   name: ransack
   requirement: !ruby/object:Gem::Requirement
@@ -318,6 +318,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mini_magick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.8.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.8.0
 - !ruby/object:Gem::Dependency
   name: email_spec
   requirement: !ruby/object:Gem::Requirement
@@ -357,6 +371,7 @@ files:
 - 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/attachment_validation.rb
 - app/models/concerns/spree/calculated_adjustments.rb
 - app/models/concerns/spree/default_price.rb
 - app/models/concerns/spree/display_money.rb
@@ -379,6 +394,7 @@ files:
 - app/models/spree/adjustment.rb
 - app/models/spree/app_configuration.rb
 - app/models/spree/asset.rb
+- app/models/spree/asset/support/active_storage.rb
 - app/models/spree/base.rb
 - app/models/spree/calculator.rb
 - app/models/spree/calculator/default_tax.rb
@@ -404,6 +420,8 @@ files:
 - app/models/spree/gateway/bogus.rb
 - 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
@@ -538,6 +556,8 @@ files:
 - app/models/spree/tax_rate.rb
 - app/models/spree/taxon.rb
 - app/models/spree/taxon_icon.rb
+- app/models/spree/taxon_icon/configuration/active_storage.rb
+- app/models/spree/taxon_icon/configuration/paperclip.rb
 - app/models/spree/taxonomy.rb
 - app/models/spree/validations/db_maximum_length_validator.rb
 - app/models/spree/variant.rb
@@ -565,15 +585,18 @@ files:
 - app/views/spree/shipment_mailer/shipped_email.text.erb
 - 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/use_paperclip.rb
 - config/locales/en.yml
 - config/routes.rb
 - db/default/spree/countries.rb
 - db/default/spree/default_reimbursement_type.rb
+- db/default/spree/promotions.rb
 - db/default/spree/roles.rb
 - db/default/spree/states.rb
 - db/default/spree/stores.rb
@@ -966,6 +989,7 @@ files:
 - lib/tasks/email.rake
 - lib/tasks/exchanges.rake
 - script/rails
+- spec/fixtures/text-file.txt
 - spec/fixtures/thinking-cat.jpg
 - spree_core.gemspec
 - vendor/assets/javascripts/jquery.payment.js
@@ -990,7 +1014,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.23
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: The bare bones necessary for Spree.