spree_core 2.0.1 → 2.0.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: ba256871b4271963d57988bbc055000835a3d359
+  data.tar.gz: f2070ec0df0c5b687f10d25f33528f0151153a02
+SHA512:
+  metadata.gz: ab1f9924ec12758bdde87c46fdc06e2f493208b6df9324d9119bc84cd8b5af1650687e6977979f77c7b5cc9d57c9eab03c7f2cb9f6a947dae698ff83743f4c81
+  data.tar.gz: 4ea86ef2c5b78eccc880297be77d7ab8e6d835e9a393f65840f3b31fb4f611753b05044550ba59de14ba01624f464b8d4a727042732f47789fe75a1b68497255

data/app/models/spree/app_configuration.rb

@@ -38,7 +38,6 @@ module Spree
     preference :check_for_spree_alerts, :boolean, default: true
     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 :create_inventory_units, :boolean, default: true # should only be false when track_inventory_levels is false, also disables RMA's
     preference :currency, :string, default: "USD"
     preference :currency_decimal_mark, :string, default: "."
     preference :currency_symbol_position, :string, default: "before"

data/app/models/spree/order.rb

@@ -273,32 +273,21 @@ module Spree
       contents.add(variant, quantity)
     end
 
+
     def remove_variant(variant, quantity = 1)
       ActiveSupport::Deprecation.warn("[SPREE] Spree::Order#remove_variant will be deprecated in Spree 2.1, please use order.contents.remove instead.")
       contents.remove(variant, quantity)
     end
 
-    def remove_variant(variant, quantity = 1)
-      current_item = find_line_item_by_variant(variant)
-      current_item.quantity += -quantity
-
-      if current_item.quantity == 0
-        current_item.destroy
-      else
-        current_item.save!
-      end
-
-      self.reload
-      current_item
-    end
-
     # Associates the specified user with the order.
     def associate_user!(user)
       self.user = user
       self.email = user.email
-      # disable validations since they can cause issues when associating
-      # an incomplete address during the address step
-      save(validate: false)
+
+      if persisted?
+        # immediately persist the changes we just made, but don't use save since we might have an invalid address associated
+        self.class.unscoped.where(id: id).update_all(email: user.email, user_id: user.id)
+      end
     end
 
     # FIXME refactor this method and implement validation using validates_* utilities

data/app/models/spree/return_authorization.rb

@@ -46,7 +46,7 @@ module Spree
           next unless inventory_unit.return_authorization.nil? && count < quantity
 
           inventory_unit.return_authorization = self
-          inventory_unit.return!
+          inventory_unit.save!
 
           count += 1
         end

data/app/models/spree/shipment.rb

@@ -35,7 +35,7 @@ module Spree
       event :ready do
         transition from: :pending, to: :ready, if: lambda { |shipment|
           # Fix for #2040
-          shipment.determine_state(shipment.order) == :ready
+          shipment.determine_state(shipment.order) == 'ready'
         }
       end
 

data/app/models/spree/shipping_method.rb

@@ -9,7 +9,9 @@ module Spree
     has_many :shipping_method_categories
     has_many :shipping_categories, through: :shipping_method_categories
 
-    has_and_belongs_to_many :zones
+    has_and_belongs_to_many :zones, :join_table => 'spree_shipping_methods_zones',
+                                    :class_name => 'Spree::Zone',
+                                    :foreign_key => 'shipping_method_id'
 
     attr_accessible :name, :zones, :display_on, :shipping_category_id,
                     :match_none, :match_one, :match_all, :tracking_url
@@ -23,14 +25,12 @@ module Spree
     end
 
     def zone
-      raise "DEPRECATION WARNING: ShippingMethod#zone is no longer correct. Multiple zones need to be supported"
-      Rails.logger.error "DEPRECATION WARNING: ShippingMethod#zone is no longer correct. Multiple zones need to be supported"
+      ActiveSupport::Deprecation.warn("[SPREE] ShippingMethod#zone is no longer correct. Multiple zones need to be supported")
       zones.first
     end
 
     def zone=(zone)
-      p "DEPRECATION WARNING: ShippingMethod#zone is no longer correct. Multiple zones need to be supported"
-      Rails.logger.error "DEPRECATION WARNING: ShippingMethod#zone= is no longer correct. Multiple zones need to be supported"
+      ActiveSupport::Deprecation.warn("[SPREE] ShippingMethod#zone= is no longer correct. Multiple zones need to be supported")
       zones = zone
     end
 

data/app/models/spree/stock_location.rb

@@ -19,6 +19,10 @@ module Spree
       stock_items.where(variant_id: variant).order(:id).first
     end
 
+    def stock_item_or_create(variant)
+      stock_item(variant) || stock_items.create(variant: variant)
+    end
+
     def count_on_hand(variant)
       stock_item(variant).try(:count_on_hand)
     end
@@ -36,7 +40,8 @@ module Spree
     end
 
     def move(variant, quantity, originator = nil)
-      stock_item(variant).stock_movements.create!(quantity: quantity, originator: originator)
+      stock_item_or_create(variant).stock_movements.create!(quantity: quantity,
+                                                            originator: originator)
     end
 
     def fill_status(variant, quantity)

data/app/models/spree/stock_movement.rb

@@ -3,7 +3,7 @@ module Spree
     belongs_to :stock_item, class_name: 'Spree::StockItem'
     belongs_to :originator, polymorphic: true
 
-    attr_accessible :quantity, :stock_item, :stock_item_id, :originator
+    attr_accessible :quantity, :stock_item, :stock_item_id, :originator, :action
 
     after_create :update_stock_item_quantity
 

data/app/models/spree/variant.rb

@@ -129,20 +129,11 @@ module Spree
       "#{name} - #{sku}"
     end
 
-    private
-
-      # Ensures a new variant takes the product master price when price is not supplied
-      def check_price
-        if price.nil? && Spree::Config[:require_master_price]
-          raise 'No master variant found to infer price' unless (product && product.master)
-          raise 'Must supply price for variant or master.price for product.' if self == product.master
-          self.price = product.master.price
-        end
-        if currency.nil?
-          self.currency = Spree::Config[:currency]
-        end
-      end
+    def in_stock?(quantity=1)
+      Spree::Stock::Quantifier.new(self).can_supply?(quantity)
+    end
 
+    private
       # strips all non-price-like characters from the price, taking into account locale settings
       def parse_price(price)
         return price unless price.is_a?(String)
@@ -157,10 +148,14 @@ module Spree
 
       # Ensures a new variant takes the product master price when price is not supplied
       def check_price
-        if price.nil?
+        if price.nil? && Spree::Config[:require_master_price]
+          raise 'No master variant found to infer price' unless (product && product.master)
           raise 'Must supply price for variant or master.price for product.' if self == product.master
           self.price = product.master.price
         end
+        if currency.nil?
+          self.currency = Spree::Config[:currency]
+        end
       end
 
       def save_default_price

data/app/models/spree/zone.rb

@@ -2,7 +2,9 @@ module Spree
   class Zone < ActiveRecord::Base
     has_many :zone_members, dependent: :destroy, class_name: "Spree::ZoneMember"
     has_many :tax_rates, dependent: :destroy
-    has_and_belongs_to_many :shipping_methods
+    has_and_belongs_to_many :shipping_methods, :join_table => 'spree_shipping_methods_zones',
+                                               :class_name => 'Spree::ShippingMethod',
+                                               :foreign_key => 'zone_id'
 
     validates :name, presence: true, uniqueness: true
     after_save :remove_defunct_members

data/config/locales/en.yml

@@ -288,6 +288,13 @@ en:
           delivery_error: Test Mail delivery error
           delivery_success: Test Mail sent successfully
           error: ! 'Test Mail error: %{e}'
+      tab:
+        overview: "Overview"
+        orders: "Orders"
+        products: "Products"
+        reports: "Reports"
+        configuration: "Configuration"
+        promotions: "Promotions"
     administration: Administration
     agree_to_privacy_policy: Agree to Privacy Policy
     agree_to_terms_of_service: Agree to Terms of Service
@@ -431,6 +438,7 @@ en:
       jirafe:
         app_id: App ID
         app_token: App Token
+        currently_unavailable: Jirafe is currently unavailable. Spree will automatically connect to Jirafe once it is available.
         explanation: The fields below may already be populated if you chose to register with Jirafe from the admin dashboard.
         header: Jirafe Analytics Settings
         site_id: Site ID
@@ -944,6 +952,7 @@ en:
     smtp_username: SMTP Username
     source: Source
     special_instructions: Special Instructions
+    split: Split
     spree_gateway_error_flash_for_checkout: There was a problem with your payment information. Please check your information and try again.
     start: Start
     start_date: Valid from

data/db/migrate/20130611054351_rename_shipping_methods_zones_to_spree_shipping_methods_zones.rb

@@ -0,0 +1,5 @@
+class RenameShippingMethodsZonesToSpreeShippingMethodsZones < ActiveRecord::Migration
+  def change
+    rename_table :shipping_methods_zones, :spree_shipping_methods_zones
+  end
+end

data/lib/spree/core/calculated_adjustments.rb

@@ -3,7 +3,7 @@ module Spree
     module CalculatedAdjustments
       def self.included(klass)
         klass.class_eval do
-          has_one   :calculator, :as => :calculable, :dependent => :destroy
+          has_one   :calculator, :class_name => "Spree::Calculator", :as => :calculable, :dependent => :destroy
           accepts_nested_attributes_for :calculator
           attr_accessible :calculator_type, :calculator_attributes
           validates :calculator, :presence => true

data/lib/spree/core/engine.rb

@@ -66,9 +66,12 @@ module Spree
         Mail.register_interceptor(Spree::Core::MailInterceptor)
       end
 
+      # We need to define promotions rules here so extensions and existing apps
+      # can add their custom classes on their initializer files
       initializer 'spree.promo.environment' do |app|
         app.config.spree.add_class('promotions')
         app.config.spree.promotions = Spree::Promo::Environment.new
+        app.config.spree.promotions.rules = []
       end
 
       initializer 'spree.promo.register.promotion.calculators' do |app|
@@ -83,8 +86,12 @@ module Spree
         ]
       end
 
-      initializer 'spree.promo.register.promotions.rules' do |app|
-        app.config.spree.promotions.rules = [
+      # Promotion rules need to be evaluated on after initialize otherwise
+      # Spree.user_class would be nil and users might experience errors related
+      # to malformed model associations (Spree.user_class is only defined on
+      # the app initializer)
+      config.after_initialize do
+        Rails.application.config.spree.promotions.rules.concat [
           Spree::Promotion::Rules::ItemTotal,
           Spree::Promotion::Rules::Product,
           Spree::Promotion::Rules::User,

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "2.0.1"
+    "2.0.2"
   end
 end

data/lib/spree/testing_support/capybara_ext.rb

@@ -46,6 +46,17 @@ module CapybaraExt
     targetted_select2(value, options)
   end
 
+  def select2_no_label value, options={}
+    raise "Must pass a hash containing 'from'" if not options.is_a?(Hash) or not options.has_key?(:from)
+
+    placeholder = options[:from]
+    minlength = options[:minlength] || 4
+
+    click_link placeholder
+
+    select_select2_result(value)
+  end
+
   def targetted_select2(value, options)
     # find select2 element and click it
     find(options[:from]).find('a').click

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 2.0.1
-  prerelease: 
+  version: 2.0.2
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-04 00:00:00.000000000 Z
+date: 2013-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_list
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_nested_set
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: state_machine
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: ffaker
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -110,7 +97,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: paperclip
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -118,7 +104,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -126,7 +111,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -134,7 +118,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -142,7 +125,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: ransack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -150,7 +132,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -158,7 +139,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -166,7 +146,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -174,23 +153,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.7.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.7.7
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -198,7 +174,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -206,23 +181,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: stringex
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -230,7 +202,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -238,7 +209,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: cancan
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -246,7 +216,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -254,7 +223,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: truncate_html
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -262,7 +230,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -270,7 +237,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: money
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -278,7 +244,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -286,7 +251,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -294,7 +258,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -607,6 +570,7 @@ files:
 - db/migrate/20130423223847_set_default_shipping_rate_cost.rb
 - db/migrate/20130509115210_add_number_to_stock_transfer.rb
 - db/migrate/20130514151929_add_sku_index_to_spree_variants.rb
+- db/migrate/20130611054351_rename_shipping_methods_zones_to_spree_shipping_methods_zones.rb
 - db/seeds.rb
 - vendor/assets/javascripts/jquery-migrate-1.0.0.js
 - vendor/assets/javascripts/jsuri.js
@@ -615,29 +579,25 @@ files:
 homepage: http://spreecommerce.com
 licenses:
 - BSD-3
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -283587825053128084
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: The bare bones necessary for Spree.
 test_files: []