spree_core 3.1.5 → 3.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba95ac1b99044d7f579a367a10672e82a13efc3b
-  data.tar.gz: 24f6ecc33a216a0751a5985bb51f52a8de04a0a3
+  metadata.gz: c472ca75b2962657a6312f4e01b13630ab719613
+  data.tar.gz: caa7069c782639d4073c45b953010122f70041da
 SHA512:
-  metadata.gz: b62b3e3298c5698d54b1231edfba99e1d7a6a3619ec5080f9e7a3efea36c148b4c15953e798d37b14236c1636323e6cb315a1892f2085bf7413f0b82bb611d09
-  data.tar.gz: 3063bc05fdb6418d3b1091cbbef5624696ae587fb423d66c26bcbcc0db59e32c8619758c52c3840be0919717ed35d116e0825bd7a7d47c555b561ac296fd46b2
+  metadata.gz: c50ba8a21f237214d164f930a581be054bb7a2b2f1afbf087e21e38a5f73922271a14efb2457f346f68a69379a09199cdbe47288df750fe88b868264cf13cdc5
+  data.tar.gz: 7373d178297eec7b4f18d79be8ce8f59638972af9a552eabe6d677b2c0fdf38584b5b1e98a423ff939cd3db81c5d9568d82d509076009bafbcc049db4200ba14

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

@@ -3,9 +3,10 @@ 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]
+    self.default_ransackable_attributes = %w[id name updated_at created_at]
 
     def self.ransackable_associations(*args)
       self.whitelisted_ransackable_associations || []
@@ -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/concerns/spree/user_methods.rb

@@ -8,6 +8,10 @@ module Spree
     include Spree::RansackableAttributes
 
     included do
+      # we need to have this callback before any dependent: :destroy associations
+      # https://github.com/rails/rails/issues/3458
+      before_destroy :check_completed_orders
+
       has_many :role_users, class_name: 'Spree::RoleUser', foreign_key: :user_id, dependent: :destroy
       has_many :spree_roles, through: :role_users, class_name: 'Spree::Role', source: :role
 
@@ -43,5 +47,11 @@ module Spree
     def total_available_store_credit
       store_credits.reload.to_a.sum(&:amount_remaining)
     end
+
+    private
+
+    def check_completed_orders
+      raise Spree::Core::DestroyWithOrdersError if orders.complete.present?
+    end
   end
 end

data/app/models/spree/legacy_user.rb

@@ -7,15 +7,7 @@ module Spree
 
     self.table_name = 'spree_users'
 
-    before_destroy :check_completed_orders
-
     attr_accessor :password
     attr_accessor :password_confirmation
-
-    private
-
-      def check_completed_orders
-        raise Spree::Core::DestroyWithOrdersError if orders.complete.present?
-      end
   end
 end

data/app/models/spree/order.rb

@@ -53,7 +53,7 @@ module Spree
     end
 
     self.whitelisted_ransackable_associations = %w[shipments user promotions bill_address ship_address line_items]
-    self.whitelisted_ransackable_attributes =  %w[completed_at created_at email number state payment_state shipment_state total considered_risky]
+    self.whitelisted_ransackable_attributes = %w[completed_at email number state payment_state shipment_state total considered_risky]
 
     attr_reader :coupon_code
     attr_accessor :temporary_address, :temporary_credit_card

data/app/models/spree/product.rb

@@ -105,6 +105,7 @@ module Spree
     end
 
     validates :slug, length: { minimum: 3 }, allow_blank: true, uniqueness: true
+    validate :discontinue_on_must_be_later_than_available_on, if: -> { available_on && discontinue_on }
 
     attr_accessor :option_values_hash
 
@@ -114,6 +115,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?
@@ -370,6 +372,12 @@ module Spree
       removed_classifications = classifications.where(taxon: taxon)
       removed_classifications.each &:remove_from_list
     end
+
+    def discontinue_on_must_be_later_than_available_on
+      if discontinue_on < available_on
+        errors.add(:discontinue_on, :invalid_date_range)
+      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/stock_transfer.rb

@@ -10,7 +10,7 @@ module Spree
     belongs_to :source_location, class_name: 'StockLocation'
     belongs_to :destination_location, class_name: 'StockLocation'
 
-    self.whitelisted_ransackable_attributes = %w[reference source_location_id destination_location_id created_at number]
+    self.whitelisted_ransackable_attributes = %w[reference source_location_id destination_location_id number]
 
     def to_param
       number

data/config/locales/en.yml

@@ -315,6 +315,8 @@ en:
               invalid_date_range: must be later than start date
         spree/product:
           attributes:
+            discontinue_on:
+              invalid_date_range: must be later than available date
             base:
               cannot_destroy_if_attached_to_line_items: Cannot delete products once they are attached to line items.
         spree/refund:

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "3.1.5"
+    "3.1.6"
   end
 end

data/spree_core.gemspec

@@ -16,11 +16,11 @@ Gem::Specification.new do |s|
   s.homepage    = 'http://spreecommerce.com'
   s.license     = 'BSD-3'
 
-  s.files        = `git ls-files`.split("\n")
+  s.files        = `git ls-files`.split("\n").reject { |f| f.match(/^spec/) }
   s.require_path = 'lib'
 
   s.add_dependency 'activemerchant', '~> 1.59'
-  s.add_dependency 'acts_as_list', '0.7.2'
+  s.add_dependency 'acts_as_list', '~> 0.7', '>= 0.7.2'
   s.add_dependency 'awesome_nested_set', '~> 3.0.1'
   s.add_dependency 'carmen', '~> 1.0.0'
   s.add_dependency 'cancancan', '~> 1.10.1'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 3.1.5
+  version: 3.1.6
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-04 00:00:00.000000000 Z
+date: 2017-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -28,14 +28,20 @@ dependencies:
   name: acts_as_list
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.2
 - !ruby/object:Gem::Dependency
@@ -934,209 +940,6 @@ files:
 - lib/tasks/email.rake
 - lib/tasks/exchanges.rake
 - script/rails
-- spec/fixtures/microdata.html
-- spec/fixtures/microdata_itemref.html
-- spec/fixtures/microdata_no_itemscope.html
-- spec/fixtures/thinking-cat.jpg
-- spec/helpers/base_helper_spec.rb
-- spec/helpers/products_helper_spec.rb
-- spec/lib/calculated_adjustments_spec.rb
-- spec/lib/i18n_spec.rb
-- spec/lib/search/base_spec.rb
-- spec/lib/spree/core/controller_helpers/auth_spec.rb
-- spec/lib/spree/core/controller_helpers/order_spec.rb
-- spec/lib/spree/core/controller_helpers/search_spec.rb
-- spec/lib/spree/core/controller_helpers/store_spec.rb
-- spec/lib/spree/core/controller_helpers/strong_parameters_spec.rb
-- spec/lib/spree/core/delegate_belongs_to_spec.rb
-- spec/lib/spree/core/importer/order_spec.rb
-- spec/lib/spree/core/number_generator_spec.rb
-- spec/lib/spree/core/token_generator_spec.rb
-- spec/lib/spree/core/validators/email_spec.rb
-- spec/lib/spree/core_spec.rb
-- spec/lib/spree/localized_number_spec.rb
-- spec/lib/spree/migrations_spec.rb
-- spec/lib/spree/money_spec.rb
-- spec/lib/tasks/exchanges_spec.rb
-- spec/mailers/order_mailer_spec.rb
-- spec/mailers/reimbursement_mailer_spec.rb
-- spec/mailers/shipment_mailer_spec.rb
-- spec/mailers/test_mailer_spec.rb
-- spec/models/option_type_prototype_spec.rb
-- spec/models/spree/ability_spec.rb
-- spec/models/spree/address_spec.rb
-- spec/models/spree/adjustable/adjuster/base_spec.rb
-- spec/models/spree/adjustable/adjuster/promotion_spec.rb
-- spec/models/spree/adjustable/adjuster/tax_spec.rb
-- spec/models/spree/adjustable/adjustments_updater_spec.rb
-- spec/models/spree/adjustment_spec.rb
-- spec/models/spree/app_configuration_spec.rb
-- spec/models/spree/asset_spec.rb
-- spec/models/spree/calculator/default_tax_spec.rb
-- spec/models/spree/calculator/flat_percent_item_total_spec.rb
-- spec/models/spree/calculator/flat_rate_spec.rb
-- spec/models/spree/calculator/flexi_rate_spec.rb
-- spec/models/spree/calculator/percent_on_line_item_spec.rb
-- spec/models/spree/calculator/price_sack_spec.rb
-- spec/models/spree/calculator/refunds/default_refund_amount_spec.rb
-- spec/models/spree/calculator/shipping.rb
-- spec/models/spree/calculator/shipping/flat_percent_item_total_spec.rb
-- spec/models/spree/calculator/shipping/flat_rate_spec.rb
-- spec/models/spree/calculator/shipping/flexi_rate_spec.rb
-- spec/models/spree/calculator/shipping/per_item_spec.rb
-- spec/models/spree/calculator/shipping/price_sack_spec.rb
-- spec/models/spree/calculator/tiered_flat_rate_spec.rb
-- spec/models/spree/calculator/tiered_percent_spec.rb
-- spec/models/spree/calculator_spec.rb
-- spec/models/spree/classification_spec.rb
-- spec/models/spree/concerns/display_money_spec.rb
-- spec/models/spree/concerns/user_methods_spec.rb
-- spec/models/spree/concerns/vat_price_calculation_spec.rb
-- spec/models/spree/country_spec.rb
-- spec/models/spree/credit_card_spec.rb
-- spec/models/spree/customer_return_spec.rb
-- spec/models/spree/exchange_spec.rb
-- spec/models/spree/gateway/bogus_simple.rb
-- spec/models/spree/gateway/bogus_spec.rb
-- spec/models/spree/gateway_spec.rb
-- spec/models/spree/image_spec.rb
-- spec/models/spree/inventory_unit_spec.rb
-- spec/models/spree/line_item_spec.rb
-- spec/models/spree/option_type_spec.rb
-- spec/models/spree/option_value_spec.rb
-- spec/models/spree/order/address_spec.rb
-- spec/models/spree/order/adjustments_spec.rb
-- spec/models/spree/order/callbacks_spec.rb
-- spec/models/spree/order/checkout_spec.rb
-- spec/models/spree/order/currency_updater_spec.rb
-- spec/models/spree/order/finalizing_spec.rb
-- spec/models/spree/order/helpers_spec.rb
-- spec/models/spree/order/payment_spec.rb
-- spec/models/spree/order/risk_assessment_spec.rb
-- spec/models/spree/order/shipments_spec.rb
-- spec/models/spree/order/state_machine_spec.rb
-- spec/models/spree/order/store_credit_spec.rb
-- spec/models/spree/order/tax_spec.rb
-- spec/models/spree/order/totals_spec.rb
-- spec/models/spree/order/updating_spec.rb
-- spec/models/spree/order/validations_spec.rb
-- spec/models/spree/order_contents_spec.rb
-- spec/models/spree/order_inventory_spec.rb
-- spec/models/spree/order_merger_spec.rb
-- spec/models/spree/order_spec.rb
-- spec/models/spree/order_updater_spec.rb
-- spec/models/spree/payment/gateway_options_spec.rb
-- spec/models/spree/payment/store_credit_spec.rb
-- spec/models/spree/payment_method/store_credit_spec.rb
-- spec/models/spree/payment_method_spec.rb
-- spec/models/spree/payment_spec.rb
-- spec/models/spree/preference_spec.rb
-- spec/models/spree/preferences/configuration_spec.rb
-- spec/models/spree/preferences/preferable_spec.rb
-- spec/models/spree/preferences/scoped_store_spec.rb
-- spec/models/spree/preferences/store_spec.rb
-- spec/models/spree/price_spec.rb
-- spec/models/spree/product/scopes_spec.rb
-- spec/models/spree/product_duplicator_spec.rb
-- spec/models/spree/product_filter_spec.rb
-- spec/models/spree/product_option_type_spec.rb
-- spec/models/spree/product_promotion_rule_spec.rb
-- spec/models/spree/product_property_spec.rb
-- spec/models/spree/product_spec.rb
-- spec/models/spree/promotion/actions/create_adjustment_spec.rb
-- spec/models/spree/promotion/actions/create_item_adjustments_spec.rb
-- spec/models/spree/promotion/actions/create_line_items_spec.rb
-- spec/models/spree/promotion/actions/free_shipping_spec.rb
-- spec/models/spree/promotion/rules/first_order_spec.rb
-- spec/models/spree/promotion/rules/item_total_spec.rb
-- spec/models/spree/promotion/rules/one_use_per_user_spec.rb
-- spec/models/spree/promotion/rules/option_value_spec.rb
-- spec/models/spree/promotion/rules/product_spec.rb
-- spec/models/spree/promotion/rules/taxon_spec.rb
-- spec/models/spree/promotion/rules/user_logged_in_spec.rb
-- spec/models/spree/promotion/rules/user_spec.rb
-- spec/models/spree/promotion_action_spec.rb
-- spec/models/spree/promotion_category_spec.rb
-- spec/models/spree/promotion_handler/cart_spec.rb
-- spec/models/spree/promotion_handler/coupon_spec.rb
-- spec/models/spree/promotion_handler/free_shipping_spec.rb
-- spec/models/spree/promotion_handler/page_spec.rb
-- spec/models/spree/promotion_rule_spec.rb
-- spec/models/spree/promotion_rule_taxon_spec.rb
-- spec/models/spree/promotion_rule_user_spec.rb
-- spec/models/spree/promotion_spec.rb
-- spec/models/spree/property_prototype_spec.rb
-- spec/models/spree/property_spec.rb
-- spec/models/spree/prototype_spec.rb
-- spec/models/spree/prototype_taxon_spec.rb
-- spec/models/spree/refund_reason_spec.rb
-- spec/models/spree/refund_spec.rb
-- spec/models/spree/reimbursement/credit_spec.rb
-- spec/models/spree/reimbursement/reimbursement_type_engine_spec.rb
-- spec/models/spree/reimbursement/reimbursement_type_validator_spec.rb
-- spec/models/spree/reimbursement_performer_spec.rb
-- spec/models/spree/reimbursement_spec.rb
-- spec/models/spree/reimbursement_tax_calculator_spec.rb
-- spec/models/spree/reimbursement_type/credit_spec.rb
-- spec/models/spree/reimbursement_type/exchange_spec.rb
-- spec/models/spree/reimbursement_type/original_payment_spec.rb
-- spec/models/spree/reimbursement_type/store_credit_spec.rb
-- spec/models/spree/return_authorization_reason_spec.rb
-- spec/models/spree/return_authorization_spec.rb
-- spec/models/spree/return_item/eligibility_validator/default_spec.rb
-- spec/models/spree/return_item/eligibility_validator/inventory_shipped_spec.rb
-- spec/models/spree/return_item/eligibility_validator/no_reimbursements_spec.rb
-- spec/models/spree/return_item/eligibility_validator/order_completed_spec.rb
-- spec/models/spree/return_item/eligibility_validator/rma_required_spec.rb
-- spec/models/spree/return_item/eligibility_validator/time_since_purchase_spec.rb
-- spec/models/spree/return_item/exchange_variant_eligibility/same_option_value_spec.rb
-- spec/models/spree/return_item/exchange_variant_eligibility/same_product_spec.rb
-- spec/models/spree/return_item_spec.rb
-- spec/models/spree/returns_calculator_spec.rb
-- spec/models/spree/role_spec.rb
-- spec/models/spree/shipment_spec.rb
-- spec/models/spree/shipping_calculator_spec.rb
-- spec/models/spree/shipping_category_spec.rb
-- spec/models/spree/shipping_method_spec.rb
-- spec/models/spree/shipping_rate_spec.rb
-- spec/models/spree/state_spec.rb
-- spec/models/spree/stock/availability_validator_spec.rb
-- spec/models/spree/stock/content_item_spec.rb
-- spec/models/spree/stock/coordinator_spec.rb
-- spec/models/spree/stock/differentiator_spec.rb
-- spec/models/spree/stock/estimator_spec.rb
-- spec/models/spree/stock/inventory_unit_builder_spec.rb
-- spec/models/spree/stock/package_spec.rb
-- spec/models/spree/stock/packer_spec.rb
-- spec/models/spree/stock/prioritizer_spec.rb
-- spec/models/spree/stock/quantifier_spec.rb
-- spec/models/spree/stock/splitter/backordered_spec.rb
-- spec/models/spree/stock/splitter/base_spec.rb
-- spec/models/spree/stock/splitter/shipping_category_spec.rb
-- spec/models/spree/stock/splitter/weight_spec.rb
-- spec/models/spree/stock_item_spec.rb
-- spec/models/spree/stock_location_spec.rb
-- spec/models/spree/stock_movement_spec.rb
-- spec/models/spree/stock_transfer_spec.rb
-- spec/models/spree/store_credit_event_spec.rb
-- spec/models/spree/store_credit_spec.rb
-- spec/models/spree/store_spec.rb
-- spec/models/spree/tax_category_spec.rb
-- spec/models/spree/tax_rate_spec.rb
-- spec/models/spree/taxon_spec.rb
-- spec/models/spree/taxonomy_spec.rb
-- spec/models/spree/tracker_spec.rb
-- spec/models/spree/user_spec.rb
-- spec/models/spree/variant_spec.rb
-- spec/models/spree/zone_member_spec.rb
-- spec/models/spree/zone_spec.rb
-- spec/spec_helper.rb
-- spec/support/big_decimal.rb
-- spec/support/concerns/adjustment_source.rb
-- spec/support/concerns/default_price.rb
-- spec/support/rake.rb
-- spec/support/test_gateway.rb
-- spec/validators/db_maximum_length_validator_spec.rb
 - spree_core.gemspec
 - vendor/assets/javascripts/jquery-migrate-1.0.0.js
 - vendor/assets/javascripts/jquery.payment.js
@@ -1163,7 +966,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.23
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: The bare bones necessary for Spree.

data/spec/fixtures/microdata.html

@@ -1,22 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <!-- shameless -->
-    <head>
-        <title>Jason Ronallo</title>
-    </head>
-
-    <body>
-      <span itemscope itemtype="http://schema.org/Person"
-        itemid="http://ronallo.com#me">
-        <a itemprop="url" href="http://twitter.com/ronallo">
-          <span itemprop="name">Jason Ronallo</span>
-        </a> is the 
-        <span itemprop="jobTitle">Associate Head of Digital Library Initiatives</span> at 
-        <span itemprop="affiliation" itemscope itemtype="http://schema.org/Library" itemid="http://lib.ncsu.edu">
-          <span itemprop="name">
-            <a itemprop="url" href="http://www.lib.ncsu.edu">NCSU Libraries</a>
-          </span>
-        </span>
-      </span>
-    </body>
-</html>