spree_core 3.4.0.rc1 → 3.4.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c01ec77a94de597431df6260fdfe18a88817c241
-  data.tar.gz: 72dcbd2cd49f05b804e3bf427d47899d3f11a3a0
+  metadata.gz: 2197427b41a26e477f45fe4ca4440b71c7f51f31
+  data.tar.gz: 0cbbda0e9bd9e23d1150a903d678708fe7f8e74d
 SHA512:
-  metadata.gz: 95ba01f3578d5bebce43b70a421996ca9b6c7a7493b03b27841fd45a08bddfdabc79eb31e266a8d33a0c870e48962f47f2a34735e8cf1eccac1cd849b239d8ab
-  data.tar.gz: 1ab924152669666ce1d0e1dd4bbfd6b056b6cd66149d19bdd26b8bb0c8244dbd583a31a7e9aebb8944650e49e00885d9da6fd3c582eb51d49133ff60c48998ab
+  metadata.gz: d1164ec3d27a3b434187540f4105fdd7a2d924289f93433bdd4abe28c8bb6e387bc3110a4417e5422bb43343142f3ed2b4defad8b4adb36a21f52500fafa4cf8
+  data.tar.gz: 3fb8bd3dca97d2eb69b4d78814a1c0240314180261ec9f3f835b503ad7235438c7fd27322c01a158f8728a0e9504bc391aed4d3c45effc4158bfa224f58db0ed

data/app/models/spree/asset.rb

@@ -1,4 +1,8 @@
 module Spree
+  Paperclip.interpolates :viewable_id do |attachment, _style|
+    attachment.instance.viewable_id
+  end
+
   class Asset < Spree::Base
     belongs_to :viewable, polymorphic: true, touch: true
     acts_as_list scope: [:viewable_id, :viewable_type]

data/app/models/spree/base.rb

@@ -18,7 +18,7 @@ class Spree::Base < ApplicationRecord
 
   self.abstract_class = true
 
-  mattr_accessor :belongs_to_required_by_default, instance_accessor: false do
+  def self.belongs_to_required_by_default
     false
   end
 

data/app/models/spree/order/checkout.rb

@@ -58,7 +58,7 @@ module Spree
 
               event :return do
                 transition to: :returned,
-                           from: [:complete, :awaiting_return, :canceled, :resumed],
+                           from: [:complete, :awaiting_return, :canceled, :returned, :resumed],
                            if: :all_inventory_units_returned?
               end
 

data/app/models/spree/shipment_handler.rb

@@ -20,9 +20,9 @@ module Spree
     def perform
       @shipment.inventory_units.each &:ship!
       @shipment.process_order_payments if Spree::Config[:auto_capture_on_dispatch]
-      send_shipped_email
       @shipment.touch :shipped_at
       update_order_shipment_state
+      send_shipped_email
     end
 
     private

data/app/models/spree/taxon.rb

@@ -30,15 +30,7 @@ module Spree
     after_save :touch_ancestors_and_taxonomy
     after_touch :touch_ancestors_and_taxonomy
 
-    has_attached_file :icon,
-                      styles: { mini: '32x32>', normal: '128x128>' },
-                      default_style: :mini,
-                      url: '/spree/taxons/:id/:style/:basename.:extension',
-                      path: ':rails_root/public/spree/taxons/:id/:style/:basename.:extension',
-                      default_url: '/assets/default_taxon.png'
-
-    validates_attachment :icon,
-                         content_type: { content_type: ['image/jpg', 'image/jpeg', 'image/png', 'image/gif'] }
+    has_one :icon, as: :viewable, dependent: :destroy, class_name: 'Spree::TaxonIcon'
 
     self.whitelisted_ransackable_associations = %w[taxonomy]
 

data/app/models/spree/taxon_icon.rb

@@ -0,0 +1,13 @@
+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'] }
+  end
+end

data/db/default/spree/countries.rb

@@ -1,31 +1,16 @@
 require 'carmen'
 
-connection      = ApplicationRecord.connection
-country_inserts = []
-
-country_values = -> do
-  Carmen::Country.all.each do |country|
-    name            = connection.quote country.name
-    iso3            = connection.quote country.alpha_3_code
-    iso             = connection.quote country.alpha_2_code
-    iso_name        = connection.quote country.name.upcase
-    numcode         = connection.quote country.numeric_code
-    states_required = connection.quote country.subregions?
-
-    country_inserts << [name, iso3, iso, iso_name, numcode, states_required].join(", ")
-  end
-
-  country_inserts.join("), (")
+Carmen::Country.all.each do |country|
+  Spree::Country.where(
+    name: country.name,
+    iso3: country.alpha_3_code,
+    iso: country.alpha_2_code,
+    iso_name: country.name.upcase,
+    numcode: country.numeric_code,
+    states_required: country.subregions?
+  ).first_or_create
 end
 
-columns = ["name", "iso3", "iso", "iso_name", "numcode", "states_required"]
-columns = connection.adapter_name =~ /MySQL/i ? columns.join(", ") : "\"#{columns.join('", "')}\""
-
-connection.execute <<-SQL
-  INSERT INTO spree_countries (#{columns})
-  VALUES (#{country_values.call});
-SQL
-
 Spree::Config[:default_country_id] = Spree::Country.find_by(iso: "US").id
 
 # find countries that do not use postal codes (by iso) and set 'zipcode_required' to false for them.

data/lib/friendly_id/slug_rails5_patch.rb

@@ -0,0 +1,11 @@
+# Temporary fix to FriendlyId in Rails5, so that we don't
+# encounter any validation errors when creating slugs via
+# FriendlyId::History on a paranoid model.
+# See: https://github.com/norman/friendly_id/issues/822
+if Rails::VERSION::STRING >= '5.0'
+  module FriendlyId
+    class Slug < ActiveRecord::Base
+      belongs_to :sluggable, polymorphic: true, optional: true
+    end
+  end
+end

data/lib/spree/core.rb

@@ -21,11 +21,11 @@ StateMachines::Machine.ignore_method_conflicts = true
 module Spree
   mattr_accessor :user_class
 
-  def self.user_class
+  def self.user_class(constantize: true)
     if @@user_class.is_a?(Class)
       raise 'Spree.user_class MUST be a String or Symbol object, not a Class object.'
     elsif @@user_class.is_a?(String) || @@user_class.is_a?(Symbol)
-      @@user_class.to_s.constantize
+      constantize ? @@user_class.to_s.constantize : @@user_class.to_s
     end
   end
 

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    '3.4.0.rc1'
+    '3.4.0.rc2'
   end
 end

data/lib/spree_core.rb

@@ -1 +1,2 @@
+require 'friendly_id/slug_rails5_patch'
 require 'spree/core'

data/lib/tasks/core.rake

@@ -157,4 +157,14 @@ use rake db:load_file[/absolute/path/to/sample/filename.rb]}
       puts 'DONE !   Your database should no longer have line items that are associated with deleted variants.'
     end
   end
+
+  desc 'Migrates taxon icons to spree assets after upgrading to Spree 3.4: only needed if you used taxons icons.'
+  task migrate_taxon_icons: :environment do |_t, _args|
+    Spree::Taxon.where.not(icon_file_name: nil).find_each do |taxon|
+      taxon.create_icon(attachment_file_name: taxon.icon_file_name,
+                        attachment_content_type: taxon.icon_content_type,
+                        attachment_file_size: taxon.icon_file_size,
+                        attachment_updated_at: taxon.icon_updated_at)
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 3.4.0.rc1
+  version: 3.4.0.rc2
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-22 00:00:00.000000000 Z
+date: 2017-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -536,6 +536,7 @@ files:
 - app/models/spree/tax_category.rb
 - app/models/spree/tax_rate.rb
 - app/models/spree/taxon.rb
+- app/models/spree/taxon_icon.rb
 - app/models/spree/taxonomy.rb
 - app/models/spree/tracker.rb
 - app/models/spree/validations/db_maximum_length_validator.rb
@@ -835,6 +836,7 @@ files:
 - db/migrate/20170722102643_add_analytics_kind_to_spree_trackers.rb
 - db/migrate/20170727103056_rename_tracker_kind_field.rb
 - db/seeds.rb
+- lib/friendly_id/slug_rails5_patch.rb
 - lib/generators/spree/custom_user/custom_user_generator.rb
 - lib/generators/spree/custom_user/templates/authentication_helpers.rb.tt
 - lib/generators/spree/custom_user/templates/initializer.rb.tt