spree_core 2.0.12 → 2.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f6fc34716045492c73cd83a2a7f9e446a0f5a6b
-  data.tar.gz: 94a3ffee5660aa9d365687e48197c2caed09936e
+  metadata.gz: 6a7abff523eebb24d6e7573a1276b2c68eac15b2
+  data.tar.gz: 59dd2a80a97247e186725cb8f0be540bf816ddf7
 SHA512:
-  metadata.gz: 73ce47ef477bde8e1f32f37556a55e610b290ab8e69f29518e7f2911401b7b281731383498276f0d0ccf34dd621838d5209b06642b7897526e8c763fd2e51b54
-  data.tar.gz: 687cf5058572498f0ed8582a32766056fb1090e74cbf9c5fd7645ffa041b9d38ec82379010e55ec3e1b8ae2fc38afe91c1dd7bddd2edb1ee944a862a7e6198ef
+  metadata.gz: 45e619b3362386a0fa401f357190c61d60c740064e68dc5a46802b60ddd41a0fe459d156eb59148e821d7573184a269260a838c16f045df11c5ae85c7a18c11a
+  data.tar.gz: 21e099c966c74e43758a2e3ef8c0864eefd5543f79c586d0d6354bcf923e695c7250d31d03b6bed10042800340634c1a0de657ffc1d9959aa198bd8bfa070bfa

data/app/helpers/spree/base_helper.rb

@@ -172,7 +172,7 @@ module Spree
 
     # Returns style of image or nil
     def image_style_from_method_name(method_name)
-      if style = method_name.to_s.sub(/_image$/, '')
+      if method_name.to_s.match(/_image$/) && style = method_name.to_s.sub(/_image$/, '')
         possible_styles = Spree::Image.attachment_definitions[:attachment][:styles]
         style if style.in? possible_styles.with_indifferent_access
       end

data/app/models/spree/country.rb

@@ -1,6 +1,6 @@
 module Spree
   class Country < ActiveRecord::Base
-    has_many :states, order: 'name ASC'
+    has_many :states, order: "#{Spree::State.quoted_table_name}.name ASC"
 
     validates :name, :iso_name, presence: true
 

data/app/models/spree/inventory_unit.rb

@@ -12,7 +12,7 @@ module Spree
         .where("spree_shipments.state != 'canceled'")
         .where(variant_id: stock_item.variant_id)
         .where('spree_orders.completed_at is not null')
-        .backordered.order("spree_orders.completed_at ASC")
+        .backordered.order("#{Spree::Order.quoted_table_name}.completed_at ASC")
     end
 
     attr_accessible :shipment, :variant_id

data/app/models/spree/option_type.rb

@@ -1,6 +1,6 @@
 module Spree
   class OptionType < ActiveRecord::Base
-    has_many :option_values, order: :position, dependent: :destroy
+    has_many :option_values, order: "#{Spree::OptionValue.quoted_table_name}.position", dependent: :destroy
     has_many :product_option_types, dependent: :destroy
     has_many :products, through: :product_option_types
     has_and_belongs_to_many :prototypes, join_table: 'spree_option_types_prototypes'
@@ -8,7 +8,7 @@ module Spree
     attr_accessible :name, :presentation, :option_values_attributes
 
     validates :name, :presentation, presence: true
-    default_scope order: "#{self.table_name}.position"
+    default_scope order: "#{quoted_table_name}.position"
 
     accepts_nested_attributes_for :option_values, reject_if: lambda { |ov| ov[:name].blank? || ov[:presentation].blank? }, allow_destroy: true
   end

data/app/models/spree/order.rb

@@ -47,9 +47,9 @@ module Spree
     belongs_to :ship_address, foreign_key: :ship_address_id, class_name: 'Spree::Address'
     alias_attribute :shipping_address, :ship_address
 
-    has_many :adjustments, as: :adjustable, dependent: :destroy, order: 'created_at ASC'
+    has_many :adjustments, as: :adjustable, dependent: :destroy, order: "#{::Spree::Adjustment.quoted_table_name}.created_at ASC"
     has_many :line_item_adjustments, through: :line_items, source: :adjustments
-    has_many :line_items, dependent: :destroy, order: 'created_at ASC'
+    has_many :line_items, dependent: :destroy, order: "#{::Spree::LineItem.quoted_table_name}.created_at ASC"
     has_many :payments, dependent: :destroy
     has_many :return_authorizations, dependent: :destroy
     has_many :state_changes, as: :stateful
@@ -100,7 +100,7 @@ module Spree
     end
 
     def self.by_customer(customer)
-      joins(:user).where("#{Spree.user_class.table_name}.email" => customer)
+      joins(:user).where("#{Spree.user_class.quoted_table_name}.email" => customer)
     end
 
     def self.by_state(state)

data/app/models/spree/product.rb

@@ -48,7 +48,7 @@ module Spree
       dependent: :destroy,
       order: "#{::Spree::Variant.quoted_table_name}.position ASC"
 
-    has_many :prices, through: :variants, order: 'spree_variants.position, spree_variants.id, currency'
+    has_many :prices, through: :variants, order: "#{::Spree::Variant.quoted_table_name}.position, #{::Spree::Variant.quoted_table_name}.id, #{::Spree::Price.quoted_table_name}.currency"
     has_many :stock_items, through: :variants_including_master
 
     delegate_belongs_to :master, :sku, :price, :currency, :display_amount, :display_price, :weight, :height, :width, :depth, :is_master, :has_default_price?, :cost_currency, :price_in, :amount_in

data/app/models/spree/product_property.rb

@@ -8,7 +8,7 @@ module Spree
 
     attr_accessible :property_name, :value, :position
 
-    default_scope order: "#{self.table_name}.position"
+    default_scope order: "#{quoted_table_name}.position"
 
     # virtual attributes for use with AJAX completion stuff
     def property_name

data/app/models/spree/property.rb

@@ -9,12 +9,12 @@ module Spree
 
     validates :name, :presentation, presence: true
 
-    scope :sorted, -> { order(:name) }
+    scope :sorted, -> { order("#{quoted_table_name}.name") }
 
     def self.find_all_by_prototype(prototype)
       id = prototype
       id = prototype.id if prototype.class == Prototype
-      joins("LEFT JOIN properties_prototypes ON property_id = #{self.table_name}.id").
+      joins("LEFT JOIN properties_prototypes ON property_id = #{quoted_table_name}.id").
         where(prototype_id: id)
     end
   end

data/app/models/spree/shipping_method.rb

@@ -64,11 +64,11 @@ module Spree
       end
 
       def self.on_backend_query
-        "#{table_name}.display_on != 'front_end' OR #{table_name}.display_on IS NULL"
+        "#{quoted_table_name}.display_on != 'front_end' OR #{quoted_table_name}.display_on IS NULL"
       end
 
       def self.on_frontend_query
-        "#{table_name}.display_on != 'back_end' OR #{table_name}.display_on IS NULL"
+        "#{quoted_table_name}.display_on != 'back_end' OR #{quoted_table_name}.display_on IS NULL"
       end
   end
 end

data/app/models/spree/state.rb

@@ -7,14 +7,14 @@ module Spree
     attr_accessible :name, :abbr
 
     def self.find_all_by_name_or_abbr(name_or_abbr)
-      where('name = ? OR abbr = ?', name_or_abbr, name_or_abbr)
+      where("#{quoted_table_name}.name = ? OR #{quoted_table_name}.abbr = ?", name_or_abbr, name_or_abbr)
     end
 
     # table of { country.id => [ state.id , state.name ] }, arrays sorted by name
     # blank is added elsewhere, if needed
     def self.states_group_by_country_id
       state_info = Hash.new { |h, k| h[k] = [] }
-      self.order('name ASC').each { |state|
+      self.order("#{quoted_table_name}.name ASC").each { |state|
         state_info[state.country_id.to_s].push [state.id, state.name]
       }
       state_info

data/app/models/spree/stock_movement.rb

@@ -10,7 +10,7 @@ module Spree
     validates :stock_item, presence: true
     validates :quantity, presence: true
 
-    scope :recent, order('created_at DESC')
+    scope :recent, order("#{quoted_table_name}.created_at DESC")
 
     def readonly?
       !new_record?

data/app/models/spree/taxonomy.rb

@@ -10,7 +10,7 @@ module Spree
 
     after_save :set_name
 
-    default_scope order: "#{self.table_name}.position"
+    default_scope order: "#{quoted_table_name}.position"
 
     private
       def set_name

data/app/models/spree/variant.rb

@@ -61,7 +61,7 @@ module Spree
     end
 
     def options_text
-      values = self.option_values.joins(:option_type).order("#{Spree::OptionType.table_name}.position asc")
+      values = self.option_values.joins(:option_type).order("#{Spree::OptionType.quoted_table_name}.position asc")
 
       values.map! do |ov|
         "#{ov.option_type.presentation}: #{ov.presentation}"

data/db/migrate/20130611054351_rename_shipping_methods_zones_to_spree_shipping_methods_zones.rb

@@ -1,5 +1,10 @@
 class RenameShippingMethodsZonesToSpreeShippingMethodsZones < ActiveRecord::Migration
   def change
     rename_table :shipping_methods_zones, :spree_shipping_methods_zones
+    # If Spree::ShippingMethod zones association was patched in
+    # CreateShippingMethodZone migrations, it needs to be patched back
+    Spree::ShippingMethod.has_and_belongs_to_many :zones, :join_table => 'spree_shipping_methods_zones',
+                                                          :class_name => 'Spree::Zone',
+                                                          :foreign_key => 'shipping_method_id'
   end
 end

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    '2.0.12'
+    '2.0.13'
   end
 end

data/lib/spree/promo/coupon_applicator.rb

@@ -34,7 +34,12 @@ module Spree
         event_name = "spree.checkout.coupon_code_added"
         if promotion.activate(:coupon_code => @order.coupon_code, :order => @order)
           promo = @order.adjustments.includes(:originator).promotion.detect { |p| p.originator.promotion.code == @order.coupon_code }
-          determine_promotion_application_result(promo)
+          if promo.present?
+            determine_promotion_application_result(promo)
+          else
+            # if action is create line items
+            return { :coupon_applied? => true, :success =>  Spree.t(:coupon_code_applied) }
+          end
         else
           return { :coupon_applied? => false, :error =>  Spree.t(:coupon_code_not_eligible) }
         end

data/lib/tasks/core.rake

@@ -86,8 +86,8 @@ use rake db:load_file[/absolute/path/to/sample/filename.rb]}
     end
 
     if load_sample
-      #prevent errors for missing attributes (since rails 3.1 upgrade)
-
+      # Reload models' attributes in case they were loaded in old migrations with wrong attributes
+      ActiveRecord::Base.descendants.each(&:reset_column_information)
       Rake::Task["spree_sample:load"].invoke
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 2.0.12
+  version: 2.0.13
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-29 00:00:00.000000000 Z
+date: 2014-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -212,14 +212,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.18
+        version: 3.2.21
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.18
+        version: 3.2.21
 - !ruby/object:Gem::Dependency
   name: ransack
   requirement: !ruby/object:Gem::Requirement