spree_core 3.2.0.rc1 → 3.2.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc8d21681bc73e110e3d6e705da11f3dc39a53c0
-  data.tar.gz: 9de82bfd2ca0d7c423c39cce5eab7efe902dfc58
+  metadata.gz: 9df21e1febf6c28c6c7fbe5f29457f33e1662bf7
+  data.tar.gz: 2b855fcc790eb5ed35eaf4c2ae34f023c1f38586
 SHA512:
-  metadata.gz: aef6254d9ac18a5e56f5e4df41f2e024ad5a8d49ad8995781fd44f88a034fb2426e9f8de1c81dfb7dbe8720420b81eb4be3528cccaf084c0cce8bd7d401a3fee
-  data.tar.gz: f7136d7ae86448f2a66b85a6b323b3536a9f474489ec8a3d36aac2e892d818b4153a22d0f24147a997aae21157c473dd6fad21e085061c2c8dedc539af15a07a
+  metadata.gz: 9872b3128e4d27049be36b7a83dcea10c77b04cca603c8d2b052683c4989cd863f904c5b195c574e52d5ad7cc2c5b5d9f253e61cc3c31ffb6221f2c085888111
+  data.tar.gz: efaa4550232d0d9bc5c7a4ccfd16e6b346e07fb2c276636e27d1e52875e9593369481f06eb1932dca4faa9fdaf52db49b9342d7357d1cd813eb73e1d454e8653

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

@@ -3,6 +3,7 @@ module Spree::RansackableAttributes
   included do
     class_attribute :whitelisted_ransackable_associations
     class_attribute :whitelisted_ransackable_attributes
+    class_attribute :whitelisted_ransackable_scopes
 
     class_attribute :default_ransackable_attributes
     self.default_ransackable_attributes = %w[id name updated_at created_at]
@@ -14,6 +15,10 @@ module Spree::RansackableAttributes
     def self.ransackable_attributes(*args)
       self.default_ransackable_attributes | (self.whitelisted_ransackable_attributes || [])
     end
+
+    def self.ransackable_scopes(*args)
+      whitelisted_ransackable_scopes || []
+    end
   end
 
 end

data/app/models/spree/calculator/free_shipping.rb

@@ -1,7 +1,3 @@
-# TODO: Deprecate this class.
-# This calculator will be removed in future versions of Spree.
-# The only case where it was used was for Free Shipping Promotions.
-# There is now a Promotion Action which deals with these types of promotions instead.
 module Spree
   class Calculator::FreeShipping < Calculator
     def self.description
@@ -9,6 +5,11 @@ module Spree
     end
 
     def compute(object)
+      ActiveSupport::Deprecation.warn(<<-EOS, caller)
+        Spree::Calculator::FreeShipping will be removed in Spree 3.3
+        The only case where it was used was for Free Shipping Promotions.
+        There is now a Promotion Action which deals with these types of promotions instead
+      EOS
       if object.is_a?(Array)
         return if object.empty?
         order = object.first.order
@@ -19,4 +20,4 @@ module Spree
       order.ship_total
     end
   end
-end
+end

data/app/models/spree/product/scopes.rb

@@ -186,10 +186,14 @@ module Spree
       where("#{Product.quoted_table_name}.deleted_at IS NULL or #{Product.quoted_table_name}.deleted_at >= ?", Time.zone.now)
     end
 
-    add_search_scope :not_discontinued do
-      where("#{Product.quoted_table_name}.discontinue_on IS NULL or #{Product.quoted_table_name}.discontinue_on >= ?", Time.zone.now)
+    def self.not_discontinued(only_not_discontinued = true)
+      if only_not_discontinued != '0' && only_not_discontinued
+        where("#{Product.quoted_table_name}.discontinue_on IS NULL or #{Product.quoted_table_name}.discontinue_on >= ?", Time.zone.now)
+      else
+        all
+      end
     end
-
+    search_scopes << :not_discontinued
     # Can't use add_search_scope for this as it needs a default argument
     def self.available(available_on = nil, currency = nil)
       available_on ||= Time.current

data/app/models/spree/product.rb

@@ -116,6 +116,7 @@ module Spree
 
     self.whitelisted_ransackable_associations = %w[stores variants_including_master master variants]
     self.whitelisted_ransackable_attributes = %w[description name slug discontinue_on]
+    self.whitelisted_ransackable_scopes = %w[not_discontinued]
 
     # the master variant is not a member of the variants array
     def has_variants?

data/db/migrate/20130917024658_remove_promotions_event_name_field.rb

@@ -1,5 +1,5 @@
 class RemovePromotionsEventNameField < ActiveRecord::Migration[4.2]
   def change
-    remove_column :spree_promotions, :event_name
+    remove_column :spree_promotions, :event_name, :string
   end
 end

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "3.2.0.rc1"
+    "3.2.0.rc2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 3.2.0.rc1
+  version: 3.2.0.rc2
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-07 00:00:00.000000000 Z
+date: 2016-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant