spree_core 3.6.0.rc1 → 3.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3a62997dc364cc3ebb70bbb5ff1bffd6c663e0bce92f21ee0f8a1c6680f6c4c
-  data.tar.gz: 261701f37b5fd2f42ee790eb5f857be8cd23929d037d85ebd3c7251958f8c67a
+  metadata.gz: b1f1c2be6be02be7358b264b3e1348773dc1bf3e55ab97a86859ba4a4f9c0d77
+  data.tar.gz: 7771528437b9fe095548206692af4bd7d8ebb1bb0fa43582fc983b9afe0e5854
 SHA512:
-  metadata.gz: 1b7fe5bd4de04b1958a76e81c82ebb56c36fa20fa3e8b0152533aa1d19f6695269366a5e620911bf3fb06b769e5fe816a53785a664b3c68f17744b475334fbe0
-  data.tar.gz: 509928ad83be2095dfd50ef8d7d62fff6309801b796ce41b0b0ea2de0efd8c8832fb85d81467bcc58bb46cced38b6faab44514fae9cb8fc2ef8b22b2371b5e8c
+  metadata.gz: 86217abb1a7a7dc22e57e725bea6c48f613eafb603228c21242ef602b4bff113dc90b1824c5f2b6ccad263662e03b7963d8fc4bd0b138f735543e974d385f369
+  data.tar.gz: 57afdf87e4bdb190a23256692f773071c0f476b08994e2f45f7d565f178592493ce16af70f5ef4dabdf5c4a85f9297a4e9d147349835b1b0c30a1d854d144df1

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

@@ -3,7 +3,6 @@ module Spree
     module Configuration
       module ActiveStorage
         extend ActiveSupport::Concern
-        include ::Spree::AttachmentValidation
 
         included do
           validate :check_attachment_presence
@@ -34,6 +33,13 @@ module Spree
               errors.add(:attachment, :attachment_must_be_present)
             end
           end
+
+          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
     end

data/app/models/spree/taxon.rb

@@ -21,6 +21,7 @@ module Spree
 
     validates :name, presence: true, uniqueness: { scope: [:parent_id, :taxonomy_id], allow_blank: true }
     validates :permalink, uniqueness: { case_sensitive: false }
+    validates_associated :icon
     validate :check_for_root, on: :create
     with_options length: { maximum: 255 }, allow_blank: true do
       validates :meta_keywords

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

@@ -3,7 +3,6 @@ module Spree
     module Configuration
       module ActiveStorage
         extend ActiveSupport::Concern
-        include Spree::AttachmentValidation
 
         included do
           validate :check_attachment_content_type
@@ -20,6 +19,16 @@ module Spree
           def default_style
             :mini
           end
+
+          def accepted_image_types
+            %w(image/jpeg image/jpg image/png image/gif)
+          end
+
+          def check_attachment_content_type
+            if attachment.attached? && !attachment.content_type.in?(accepted_image_types)
+              errors.add(:attachment, :not_allowed_content_type)
+            end
+          end
         end
       end
     end

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

@@ -9,6 +9,8 @@ module Spree
             attachment_definitions[:attachment][:styles]
           end
 
+          delegate :url, to: :attachment
+
           has_attached_file :attachment,
             styles: { mini: '32x32>', normal: '128x128>' },
             default_style: :mini,

data/config/initializers/use_paperclip.rb

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

data/config/locales/en.yml

@@ -366,6 +366,10 @@ en:
             attachment:
               not_allowed_content_type: has not allowed content type
               attachment_must_be_present: must be present
+        spree/taxon_icon:
+          attributes:
+            attachment:
+              not_allowed_content_type: has not allowed content type
   devise:
     confirmations:
       confirmed: Your account was successfully confirmed. You are now signed in.

data/lib/spree/core/engine.rb

@@ -116,12 +116,12 @@ module Spree
       end
 
       config.to_prepare do
-        # Load spree locales before decorators
-        I18n.load_path += Dir.glob(
+        # Ensure spree locale paths are present before decorators
+        I18n.load_path.unshift(*(Dir.glob(
           File.join(
             File.dirname(__FILE__), '../../../config/locales', '*.{rb,yml}'
           )
-        )
+        ) - I18n.load_path))
 
         # Load application's model / class decorators
         Dir.glob(File.join(File.dirname(__FILE__), '../../../app/**/*_decorator*.rb')) do |c|

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    '3.6.0.rc1'
+    '3.6.0'
   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', '~> 6.0.0'
   s.add_dependency 'paranoia', '~> 2.4.1'
   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.6.0.rc1
+  version: 3.6.0
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-28 00:00:00.000000000 Z
+date: 2018-06-12 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: 6.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: paranoia
   requirement: !ruby/object:Gem::Requirement
@@ -371,7 +371,6 @@ 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

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

@@ -1,10 +0,0 @@
-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