spree_core 3.0.4 → 3.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 825167ffd3b796e7bd880c79751eeb2631f9762e
-  data.tar.gz: 3dfd8c5d5a0301435c90967be33a2befc3950087
+  metadata.gz: e9e78e82569d33a57fc77a288f4bb6478a0fdf25
+  data.tar.gz: ec9e23165c2db5df7e0d0c58aa11d243fed18bb7
 SHA512:
-  metadata.gz: 9935e7fc716719657036cfb862d4a6ac5a705303c0029ca2828948ababadb82b97ea92d3a8e2580fc3a8c2df0a962b7920035ef7aec47bc81bd3bbc3d65b206b
-  data.tar.gz: 65ef7e2171aecf3e4a62c863601959e550bfad2d8c0e80ac7314469a13adc2dbdb079b6dc48ba02acf8e412da7aed44124c06d073dcfeeec67f0b79d071e13ef
+  metadata.gz: ff1a688974b9cc46f3f4baecdc5212e3b6eb4ec6324cf47aeb29e1d8c50a2b1872635f9b3817b27a28f7cd5368fb7c10299e35e077ff7e9c9faadf6b6e8a2a34
+  data.tar.gz: 6cec5411da47ddfaf0504c2724dc866160d1443a021c3394e7b229745a469298396992d77a2b3cbfd98987efa1397d4999f53d09f7b742ee73676099d2feb222

data/app/models/spree/app_configuration.rb

@@ -31,15 +31,12 @@ module Spree
     preference :auto_capture, :boolean, default: false # automatically capture the credit card (as opposed to just authorize and capture later)
     preference :auto_capture_on_dispatch, :boolean, default: false # Captures payment for each shipment in Shipment#after_ship callback, and makes Shipment.ready when payment authorized.
     preference :binary_inventory_cache, :boolean, default: false # only invalidate product cache when a stock item changes whether it is in_stock
-    preference :check_for_spree_alerts, :boolean, default: false
     preference :checkout_zone, :string, default: nil # replace with the name of a zone if you would like to limit the countries
     preference :company, :boolean, default: false # Request company field for billing and shipping addr
     preference :currency, :string, default: "USD"
     preference :default_country_id, :integer
-    preference :dismissed_spree_alerts, :string, default: ''
     preference :expedited_exchanges, :boolean, default: false # NOTE this requires payment profiles to be supported on your gateway of choice as well as a delayed job handler to be configured with activejob. kicks off an exchange shipment upon return authorization save. charge customer if they do not return items within timely manner.
     preference :expedited_exchanges_days_window, :integer, default: 14 # the amount of days the customer has to return their item after the expedited exchange is shipped in order to avoid being charged
-    preference :last_check_for_spree_alerts, :string, default: nil
     preference :layout, :string, default: 'spree/layouts/spree_application'
     preference :logo, :string, default: 'logo/spree_50.png'
     preference :max_level_in_taxons_menu, :integer, default: 1 # maximum nesting level in taxons menu

data/app/models/spree/country.rb

@@ -4,9 +4,10 @@ module Spree
     has_many :addresses, dependent: :nullify
 
     has_many :zone_members,
-      -> { where(zoneable_type: 'Spree::Country') },
-      class_name: 'Spree::ZoneMember',
-      foreign_key: :zoneable_id
+             -> { where(zoneable_type: 'Spree::Country') },
+             class_name: 'Spree::ZoneMember',
+             dependent: :destroy,
+             foreign_key: :zoneable_id
 
     has_many :zones, through: :zone_members, class_name: 'Spree::Zone'
 

data/app/models/spree/payment_method/check.rb

@@ -14,13 +14,15 @@ module Spree
       payment.state != 'void'
     end
 
-    def capture(*args)
+    def capture(*)
       simulated_successful_billing_response
     end
 
-    def cancel(response); end
+    def cancel(*)
+      simulated_successful_billing_response
+    end
 
-    def void(*args)
+    def void(*)
       simulated_successful_billing_response
     end
 
@@ -28,7 +30,7 @@ module Spree
       false
     end
 
-    def credit(*args)
+    def credit(*)
       simulated_successful_billing_response
     end
 

data/app/models/spree/product.rb

@@ -31,7 +31,7 @@ module Spree
     has_many :properties, through: :product_properties
 
     has_many :classifications, dependent: :delete_all, inverse_of: :product
-    has_many :taxons, through: :classifications
+    has_many :taxons, through: :classifications, before_remove: :remove_taxon
     has_and_belongs_to_many :promotion_rules, join_table: :spree_products_promotion_rules
 
     belongs_to :tax_category, class_name: 'Spree::TaxCategory'
@@ -100,7 +100,7 @@ module Spree
     alias :options :product_option_types
 
     self.whitelisted_ransackable_associations = %w[stores variants_including_master master variants]
-    self.whitelisted_ransackable_attributes = %w[slug]
+    self.whitelisted_ransackable_attributes = %w[description name slug]
 
     # the master variant is not a member of the variants array
     def has_variants?
@@ -351,6 +351,10 @@ module Spree
       Spree::Taxonomy.where(id: taxonomy_ids).update_all(updated_at: Time.current)
     end
 
+    def remove_taxon(taxon)
+      removed_classifications = classifications.where(taxon: taxon)
+      removed_classifications.each &:remove_from_list
+    end
   end
 end
 

data/app/models/spree/product_property.rb

@@ -19,10 +19,10 @@ module Spree
     end
 
     def property_name=(name)
-      unless name.blank?
-        unless property = Property.find_by(name: name)
-          property = Property.create(name: name, presentation: name)
-        end
+      if name.present?
+        # don't use `find_by :name` to workaround globalize/globalize#423 bug
+        property = Property.where(name: name).first ||
+                   Property.create(name: name, presentation: name)
         self.property = property
       end
     end

data/app/models/spree/state.rb

@@ -4,9 +4,10 @@ module Spree
     has_many :addresses, dependent: :nullify
 
     has_many :zone_members,
-      -> { where(zoneable_type: 'Spree::State') },
-      class_name: 'Spree::ZoneMember',
-      foreign_key: :zoneable_id
+             -> { where(zoneable_type: 'Spree::State') },
+             class_name: 'Spree::ZoneMember',
+             dependent: :destroy,
+             foreign_key: :zoneable_id
 
     has_many :zones, through: :zone_members, class_name: 'Spree::Zone'
 

data/app/models/spree/stock/availability_validator.rb

@@ -4,12 +4,11 @@ module Spree
       def validate(line_item)
         unit_count = line_item.inventory_units.size
         return if unit_count >= line_item.quantity
+
         quantity = line_item.quantity - unit_count
         return if quantity.zero?
 
-        quantifier = Stock::Quantifier.new(line_item.variant)
-
-        return if quantifier.can_supply?(quantity)
+        return if item_available?(line_item, quantity)
 
         variant = line_item.variant
         display_name = "#{variant.name}"
@@ -20,6 +19,12 @@ module Spree
           item: display_name.inspect
         )
       end
+
+      private
+
+      def item_available?(line_item, quantity)
+        Stock::Quantifier.new(line_item.variant).can_supply?(quantity)
+      end
     end
   end
 end

data/app/models/spree/variant.rb

@@ -216,6 +216,10 @@ module Spree
       self.track_inventory? && Spree::Config.track_inventory_levels
     end
 
+    def track_inventory
+      self.should_track_inventory?
+    end
+
     def volume
       (width || 0) * (height || 0) * (depth || 0)
     end

data/config/locales/en.yml

@@ -513,7 +513,6 @@ en:
     categories: Categories
     category: Category
     charged: Charged
-    check_for_spree_alerts: Check for Spree alerts
     checkout: Checkout
     choose_a_customer: Choose a customer
     choose_a_taxon_to_sort_products_for: "Choose a taxon to sort products for"
@@ -616,6 +615,7 @@ en:
     destination: Destination
     destroy: Destroy
     discount_amount: Discount Amount
+    discontinue_on: Discontinue On
     dismiss_banner: No. Thanks! I'm not interested, do not display this message again
     display: Display
     doesnt_track_inventory: It doesn't track inventory

data/db/migrate/20141217215630_update_product_slug_index.rb

@@ -1,6 +1,6 @@
 class UpdateProductSlugIndex < ActiveRecord::Migration
   def change
-    remove_index :spree_products, :slug
+    remove_index :spree_products, :slug if index_exists?(:spree_products, :slug)
     add_index :spree_products, :slug, unique: true
   end
 end

data/db/migrate/20150309161154_ensure_payments_have_numbers.rb

@@ -1,5 +1,6 @@
 class EnsurePaymentsHaveNumbers < ActiveRecord::Migration
   def change
+    add_index :spree_payments, :number unless index_exists?(:spree_payments, :number)
     Spree::Payment.where(number: nil).find_each do |payment|
       payment.generate_number
       payment.update_columns(number: payment.number)

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    '3.0.4'
+    '3.0.5'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 3.0.4
+  version: 3.0.5
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-19 00:00:00.000000000 Z
+date: 2016-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -150,20 +150,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.18
-- !ruby/object:Gem::Dependency
-  name: httparty
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.11'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.11'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -352,6 +338,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: sprockets-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: email_spec
   requirement: !ruby/object:Gem::Requirement
@@ -404,7 +404,6 @@ files:
 - app/models/spree/adjustable/adjustments_updater.rb
 - app/models/spree/adjustable/promotion_accumulator.rb
 - app/models/spree/adjustment.rb
-- app/models/spree/alert.rb
 - app/models/spree/app_configuration.rb
 - app/models/spree/asset.rb
 - app/models/spree/base.rb
@@ -922,8 +921,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.23
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: The bare bones necessary for Spree.
 test_files: []
+has_rdoc: 

data/app/models/spree/alert.rb

@@ -1,17 +0,0 @@
-require 'httparty'
-
-module Spree
-  class Alert
-    def self.current(host)
-      params = {
-        version: Spree.version,
-        name: Spree::Store.current.name,
-        host: host,
-        rails_env: Rails.env,
-        rails_version: Rails.version
-      }
-
-      HTTParty.get('http://alerts.spreecommerce.com/alerts.json', query: params).parsed_response
-    end
-  end
-end