spree_core 2.3.2 → 2.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7bfe527c1516e5d8393c4cb6a23bf795bff2f8d
-  data.tar.gz: dd9c6e528157dd843740ff2cd5bc86d6fa906192
+  metadata.gz: 7b180601af90a25cab2272036e7e46087ad23181
+  data.tar.gz: 9380b234a2c586b66ca775c79d6299d9d65c5b0b
 SHA512:
-  metadata.gz: 0fb13c6c497d8ab9d920e6f950a532e16524f305e2591e82b12bd1ae1aa47d53f2a8ca0fd293d588c8b8ed32d3bac49c2a2cfef851a1ba9b237b7149994c9f60
-  data.tar.gz: 5ea8cacb10c49bf4afaa936a9ae348d13979a1f30855214e491aff0abf9ca9ba3f495f7d38c295a1266b4be9ab26e5adbf47c5dc464b72fc0555b2fc2740f1d8
+  metadata.gz: b175161e97670be7b65499e3b07b105f62847bd5ee18a7f07cfb83215c0756d6ff99bb617986ffcb860dfecc440df8f63b9313048cc6e7bcdac7428e58c9c3fc
+  data.tar.gz: a3a4564276563192dc89b30e225aff9b28ccc5c1ddaeb0696403f6a8a062df67267fe152154c15f7cc0274c0cccf7408131a430c679d4ad6c7e2fbd0b8ac3ce6

data/app/assets/javascripts/spree.js.coffee.erb

@@ -7,7 +7,8 @@ class window.Spree
     "<%= Rails.application.routes.url_helpers.spree_path %>"
 
   @pathFor: (path) ->
-    "#{window.location.origin}#{@mountedAt()}#{path}"
+    locationOrigin = "#{window.location.protocol}//#{window.location.hostname}" + (if window.location.port then ":#{window.location.port}" else "")
+    "#{locationOrigin}#{@mountedAt()}#{path}"
 
   # Helper function to take a URL and add query parameters to it
   # Uses the JSUri library from here: https://code.google.com/p/jsuri/

data/app/models/spree/ability.rb

@@ -46,10 +46,6 @@ module Spree
         can [:read, :update], Order do |order, token|
           order.user == user || order.guest_token && token == order.guest_token
         end
-        can [:create, :read], Address
-        can :update, Address do |address|
-          user.bill_address == address || user.ship_address == address
-        end
         can :display, CreditCard, user_id: user.id
         can :display, Product
         can :display, ProductProperty

data/app/models/spree/order.rb

@@ -629,14 +629,12 @@ module Spree
         end
       end
 
-      def after_cancel
-        shipments.each { |shipment| shipment.cancel! }
-        payments.completed.each { |payment| payment.cancel! }
-
-        send_cancel_email
-        self.update_column(:payment_state, 'credit_owed') unless shipped?
-        self.update!
-      end
+    def after_cancel
+      shipments.each { |shipment| shipment.cancel! }
+      payments.completed.each { |payment| payment.cancel! }
+      send_cancel_email
+      self.update!
+    end
 
       def send_cancel_email
         OrderMailer.cancel_email(self.id).deliver

data/app/models/spree/order/checkout.rb

@@ -71,7 +71,7 @@ module Spree
 
               if states[:payment]
                 before_transition to: :complete do |order|
-                  if order.payment_required? && order.payments.empty?
+                  if order.payment_required? && order.payments.valid.empty?
                     order.errors.add(:base, Spree.t(:no_payment_found))
                     false
                   elsif order.payment_required?
@@ -96,6 +96,7 @@ module Spree
               if states[:delivery]
                 before_transition to: :delivery, do: :create_proposed_shipments
                 before_transition to: :delivery, do: :ensure_available_shipping_rates
+                before_transition to: :delivery, do: :set_shipments_cost
                 before_transition from: :delivery, do: :apply_free_shipping_promotions
               end
 

data/app/models/spree/order_populator.rb

@@ -11,7 +11,6 @@ module Spree
 
     def populate(variant_id, quantity)
       attempt_cart_add(variant_id, quantity)
-      order.ensure_updated_shipments
       valid?
     end
 
@@ -26,7 +25,7 @@ module Spree
       # 2,147,483,647 is crazy.
       # See issue #2695.
       if quantity > 2_147_483_647
-        errors.add(:base, Spree.t(:please_enter_reasonable_quantity, :scope => :order_populator))
+        errors.add(:base, Spree.t(:please_enter_reasonable_quantity, scope: :order_populator))
         return false
       end
 

data/app/models/spree/order_updater.rb

@@ -168,6 +168,7 @@ module Spree
         order.payment_state = 'paid' if !order.outstanding_balance?
       end
       order.state_changed('payment') if last_state != order.payment_state
+      order.payment_state
     end
 
     private

data/app/models/spree/payment.rb

@@ -23,12 +23,16 @@ module Spree
 
     # update the order totals, etc.
     after_save :update_order
+
     # invalidate previously entered payments
     after_create :invalidate_old_payments
 
     attr_accessor :source_attributes, :request_env
 
     after_initialize :build_source
+    after_rollback :persist_invalid
+
+    validates :amount, numericality: true
 
     default_scope -> { order("#{self.table_name}.created_at") }
 
@@ -41,10 +45,6 @@ module Spree
     scope :risky, -> { where("avs_response IN (?) OR (cvv_response_code IS NOT NULL and cvv_response_code != 'M') OR state = 'failed'", RISKY_AVS_CODES) }
     scope :valid, -> { where.not(state: %w(failed invalid)) }
 
-    after_rollback :persist_invalid
-
-    validates :amount, numericality: true
-
     def persist_invalid
       return unless ['failed', 'invalid'].include?(state)
       state_will_change!

data/app/models/spree/payment/processing.rb

@@ -81,6 +81,9 @@ module Spree
       end
 
       def credit!(credit_amount=nil)
+        raise Core::GatewayError.new(Spree.t(:payment_processing_failed)) if processing?
+
+        started_processing!
         protect_from_connection_error do
           check_environment
 
@@ -97,6 +100,7 @@ module Spree
           record_response(response)
 
           if response.success?
+            self.update_column(:state, 'completed')
             self.class.create!(
               :order => order,
               :source => self,
@@ -121,7 +125,6 @@ module Spree
 
       def partial_credit(amount)
         return if amount > credit_allowed
-        started_processing!
         credit!(amount)
       end
 

data/app/models/spree/product.rb

@@ -273,11 +273,22 @@ module Spree
     end
 
     # there's a weird quirk with the delegate stuff that does not automatically save the delegate object
-    # when saving so we force a save using a hook.
+    # when saving so we force a save using a hook
+    # Fix for issue #5306
     def save_master
-      if master && (master.changed? || master.new_record? || (master.default_price && (master.default_price.changed? || master.default_price.new_record?)))
-        master.save
-        @nested_changes = true
+      begin
+        if master && (master.changed? || master.new_record? || (master.default_price && (master.default_price.changed? || master.default_price.new_record?)))
+          master.save!
+          @nested_changes = true
+        end
+
+      # If the master cannot be saved, the Product object will get its errors
+      # and will be destroyed
+      rescue ActiveRecord::RecordInvalid
+        master.errors.each do |att, error|
+          self.errors.add(att, error)
+        end
+        raise
       end
     end
 

data/app/models/spree/product_property.rb

@@ -4,7 +4,8 @@ module Spree
     belongs_to :property, class_name: 'Spree::Property', inverse_of: :product_properties
 
     validates :property, presence: true
-    validates :value, length: { maximum: 255 }
+
+    validates_with Spree::Validations::DbMaximumLengthValidator, field: :value
 
     default_scope -> { order("#{self.table_name}.position") }
 

data/app/models/spree/promotion.rb

@@ -23,6 +23,7 @@ module Spree
     before_save :normalize_blank_values
 
     scope :coupons, ->{ where("#{table_name}.code IS NOT NULL") }
+    scope :applied, -> { joins(:orders).uniq }
 
     def self.advertised
       where(advertise: true)

data/app/models/spree/validations/db_maximum_length_validator.rb

@@ -0,0 +1,22 @@
+module Spree
+  module Validations
+    ##
+    # Validates a field based on the maximum length of the underlying DB field, if there is one.
+    class DbMaximumLengthValidator < ActiveModel::Validator
+
+      def initialize(options)
+        super
+        @field = options[:field].to_s
+        raise ArgumentError.new("a field must be specified to the validator") if @field.blank?
+      end
+
+      def validate(record)
+        limit = record.class.columns_hash[@field].limit
+        value = record[@field.to_sym]
+        if value && limit && value.to_s.length > limit 
+          record.errors.add(@field.to_sym, :too_long, count: limit)
+        end
+      end
+    end
+  end
+end

data/lib/spree/core/controller_helpers/order.rb

@@ -14,7 +14,15 @@ module Spree
 
         # Used in the link_to_cart helper.
         def simple_current_order
-          @simple_current_order ||= Spree::Order.incomplete.find_by(current_order_params)
+
+          return @simple_current_order if @simple_current_order
+
+          @simple_current_order = find_order_by_token_or_user
+
+          if @simple_current_order
+            @simple_current_order.last_ip_address = ip_address
+            return @simple_current_order
+          end
         end
 
         # The current incomplete order from the guest_token for use in cart and during checkout
@@ -24,15 +32,9 @@ module Spree
 
           return @current_order if @current_order
 
-          # Find any incomplete orders for the guest_token
-          @current_order = Spree::Order.incomplete.includes(:adjustments).lock(options[:lock]).find_by(current_order_params)
+          @current_order = find_order_by_token_or_user(options)
 
-          # Find any incomplete orders for the current user
-          if @current_order.nil? && try_spree_current_user
-            @current_order = Spree::Order.incomplete.order('id DESC').where({ currency: current_currency, user_id: try_spree_current_user.try(:id)}).first
-          end
-
-          if options[:create_order_if_necessary] and (@current_order.nil? or @current_order.completed?)
+          if options[:create_order_if_necessary] && (@current_order.nil? || @current_order.completed?)
             @current_order = Spree::Order.new(current_order_params)
             @current_order.user ||= try_spree_current_user
             # See issue #3346 for reasons why this line is here
@@ -79,6 +81,20 @@ module Spree
         def current_order_params
           { currency: current_currency, guest_token: cookies.signed[:guest_token], user_id: try_spree_current_user.try(:id) }
         end
+
+        def find_order_by_token_or_user(options={})
+
+          # Find any incomplete orders for the guest_token
+          order = Spree::Order.incomplete.includes(:adjustments).lock(options[:lock]).find_by(current_order_params)
+
+          # Find any incomplete orders for the current user
+          if order.nil? && try_spree_current_user
+            order = Spree::Order.incomplete.order('id DESC').where({ currency: current_currency, user_id: try_spree_current_user.try(:id)}).first
+          end
+
+          order
+        end
+
       end
     end
   end

data/lib/spree/core/search/base.rb

@@ -13,10 +13,9 @@ module Spree
         end
 
         def retrieve_products
-          @products_scope = get_base_scope
+          @products = get_base_scope
           curr_page = page || 1
 
-          @products = @products_scope.includes([:master => :prices])
           unless Spree::Config.show_products_without_price
             @products = @products.where("spree_prices.amount IS NOT NULL").where("spree_prices.currency" => current_currency)
           end
@@ -37,9 +36,18 @@ module Spree
             base_scope = base_scope.in_taxon(taxon) unless taxon.blank?
             base_scope = get_products_conditions_for(base_scope, keywords)
             base_scope = add_search_scopes(base_scope)
+            base_scope = add_eagerload_scopes(base_scope)
             base_scope
           end
 
+          def add_eagerload_scopes scope
+            if include_images
+              scope.eager_load({master: [:prices, :images]})
+            else
+              scope.includes(master: :prices)
+            end
+          end
+
           def add_search_scopes(base_scope)
             search.each do |name, scope_attribute|
               scope_name = name.to_sym
@@ -64,6 +72,7 @@ module Spree
             @properties[:taxon] = params[:taxon].blank? ? nil : Spree::Taxon.find(params[:taxon])
             @properties[:keywords] = params[:keywords]
             @properties[:search] = params[:search]
+            @properties[:include_images] = params[:include_images]
 
             per_page = params[:per_page].to_i
             @properties[:per_page] = per_page > 0 ? per_page : Spree::Config[:products_per_page]

data/lib/spree/core/validators/email.rb

@@ -1,29 +1,7 @@
-# Borrowed from http://my.rails-royce.org/2010/07/21/email-validation-in-ruby-on-rails-without-regexp/
-# Mentioned in tweet here: https://twitter.com/_sohara/status/177120126083141633
-require 'mail'
 class EmailValidator < ActiveModel::EachValidator
   def validate_each(record,attribute,value)
-    unless valid?(value)
+    unless value =~ /\A[^@\s]+@([^@\s]+\.)+[^@\s]+\z/
       record.errors.add(attribute, :invalid, {:value => value}.merge!(options))
     end
   end
-
-  def valid?(email)
-    begin
-      m = Mail::Address.new(email)
-      # We must check that value contains a domain and that value is an email address
-      r = m.domain && m.address == email
-      t = m.__send__(:tree)
-      # We need to dig into treetop
-      # A valid domain must have dot_atom_text elements size > 1
-      # user@localhost is excluded
-      # treetop must respond to domain
-      # We exclude valid email values like <user@localhost.com>
-      # Hence we use m.__send__(tree).domain
-      r &&= (t.domain.dot_atom_text.elements.size > 1)
-    rescue Exception => e
-      r = false
-    end
-    r
-  end
 end

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "2.3.2"
+    '2.3.3'
   end
 end

data/lib/spree/testing_support/capybara_ext.rb

@@ -13,7 +13,7 @@ module CapybaraExt
   end
 
   def within_row(num, &block)
-    if example.metadata[:js]
+    if RSpec.current_example.metadata[:js]
       within("table.index tbody tr:nth-child(#{num})", &block)
     else
       within(:xpath, all("table.index tbody tr")[num-1].path, &block)
@@ -21,7 +21,7 @@ module CapybaraExt
   end
 
   def column_text(num)
-    if example.metadata[:js]
+    if RSpec.current_example.metadata[:js]
       find("td:nth-child(#{num})").text
     else
       all("td")[num-1].text
@@ -133,7 +133,7 @@ RSpec::Matchers.define :have_meta do |name, expected|
     has_css?("meta[name='#{name}'][content='#{expected}']", visible: false)
   end
 
-  failure_message_for_should do |actual|
+  failure_message do |actual|
     actual = first("meta[name='#{name}']")
     if actual
       "expected that meta #{name} would have content='#{expected}' but was '#{actual[:content]}'"
@@ -148,7 +148,7 @@ RSpec::Matchers.define :have_title do |expected|
     has_css?("title", :text => expected, visible: false)
   end
 
-  failure_message_for_should do |actual|
+  failure_message do |actual|
     actual = first("title")
     if actual
       "expected that title would have been '#{expected}' but was '#{actual.text}'"

data/lib/spree/testing_support/order_walkthrough.rb

@@ -20,7 +20,7 @@ class OrderWalkthrough
       end
     end
 
-    order = Spree::Order.create!(:email => "spree@example.com")
+    order = Spree::Order.create!(email: "spree@example.com")
     add_line_item!(order)
     order.next!
 
@@ -50,7 +50,7 @@ class OrderWalkthrough
   end
 
   def self.payment(order)
-    order.payments.create!(:payment_method => Spree::PaymentMethod.first, :amount => order.total)
+    order.payments.create!(payment_method: Spree::PaymentMethod.first, amount: order.total)
     # TODO: maybe look at some way of making this payment_state change automatic
     order.payment_state = 'paid'
     order.next!
@@ -65,4 +65,3 @@ class OrderWalkthrough
   end
 
 end
-

data/lib/spree/testing_support/preferences.rb

@@ -22,8 +22,8 @@ module Spree
       end
 
       def assert_preference_unset(preference)
-        find("#preferences_#{preference}")['checked'].should be_false
-        Spree::Config[preference].should be_false
+        find("#preferences_#{preference}")['checked'].should be false
+        Spree::Config[preference].should be false
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 2.3.2
+  version: 2.3.3
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-29 00:00:00.000000000 Z
+date: 2014-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.43.1
+        version: 1.44.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.43.1
+        version: 1.44.1
 - !ruby/object:Gem::Dependency
   name: acts_as_list
   requirement: !ruby/object:Gem::Requirement
@@ -445,6 +445,7 @@ files:
 - app/models/spree/taxon.rb
 - app/models/spree/taxonomy.rb
 - app/models/spree/tracker.rb
+- app/models/spree/validations/db_maximum_length_validator.rb
 - app/models/spree/variant.rb
 - app/models/spree/variant/scopes.rb
 - app/models/spree/zone.rb