spree_core 2.2.5 → 2.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88ab16ad8f605d308074b823d9a7c70f6504bb08
-  data.tar.gz: 6bcb7afca77e7006f6eb12e4ba1177b66bd3a585
+  metadata.gz: 04e5eefe3009befd78025ca57659db32bc2e50a3
+  data.tar.gz: f15a4fb3f353eb751af1989d90b3efead4115fbd
 SHA512:
-  metadata.gz: 91fa2acf65367622c4d6d526beb7d696dad6b2a143ee03a376c4045741620840c60b01f749feb8e771ca9fd618695872b37498d08369c35052c6b1d10cc2c176
-  data.tar.gz: 8e1596b38affe2af7d32a8dfefceea76e9626ad4b1540bf8ba3655d0d787fc6834544476ebfc0f7529413aac35ac132690574a6fbeb6afc83d333df7d7f253fa
+  metadata.gz: c5f0b142e192633ab15d86f362310bc9b6640b274f3da599e52ccf0440bf6434983c990adba8c2002d9b9b2415bcb01bb518c6da3bd267e800af093c16085eb4
+  data.tar.gz: e9fc9ce3dce676ea2c268012c0155fef5827ef8c17bcf868e3593ebb0f68b7c1a7959e97c625aff7cb041a83cbc1bbd3687dafd5d4c1bc42a6accc5846e587c8

data/app/models/spree/address.rb

@@ -20,8 +20,8 @@ module Spree
     end
 
     def self.default(user = nil, kind = "bill")
-      if user
-        user.send(:"#{kind}_address") || build_default
+      if user && user_address = user.send(:"#{kind}_address")
+        user_address.clone
       else
         build_default
       end

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

@@ -81,11 +81,17 @@ module Spree
       end
 
       def credit!(credit_amount=nil)
+        raise Core::GatewayError.new(Spree.t(:payment_processing_failed)) if processing?
+
+        # Calculate credit amount before marking as processing since it messes up the order totals not having payment in completed state.
+        credit_amount ||= credit_allowed >= order.outstanding_balance.abs ? order.outstanding_balance.abs : credit_allowed.abs
+        credit_amount = credit_amount.to_f
+
+        # Mark as processing to avoid race condition that could send multiple credits to the gateway.
+        started_processing!
         protect_from_connection_error do
           check_environment
 
-          credit_amount ||= credit_allowed >= order.outstanding_balance.abs ? order.outstanding_balance.abs : credit_allowed.abs
-          credit_amount = credit_amount.to_f
           credit_cents = Spree::Money.new(credit_amount, currency: currency).money.cents
 
           if payment_method.payment_profiles_supported?
@@ -95,6 +101,8 @@ module Spree
           end
 
           record_response(response)
+          # Always set back to 'completed' as initial payment record was successful.
+          self.update_column(:state, 'completed')
 
           if response.success?
             self.class.create!(
@@ -121,7 +129,6 @@ module Spree
 
       def partial_credit(amount)
         return if amount > credit_allowed
-        started_processing!
         credit!(amount)
       end
 

data/db/migrate/20140508151342_change_spree_price_amount_precision.rb

@@ -0,0 +1,8 @@
+class ChangeSpreePriceAmountPrecision < ActiveRecord::Migration
+  def change
+    change_column :spree_prices, :amount,  :decimal, :precision => 10, :scale => 2
+    change_column :spree_line_items, :price,  :decimal, :precision => 10, :scale => 2, :null => false
+    change_column :spree_line_items, :cost_price,  :decimal, :precision => 10, :scale => 2
+    change_column :spree_variants, :cost_price, :decimal, :precision => 10, :scale => 2
+  end
+end

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.2.5"
+    "2.2.6"
   end
 end

data/lib/spree/permitted_attributes.rb

@@ -27,7 +27,7 @@ module Spree
     mattr_reader *ATTRIBUTES
 
     @@address_attributes = [
-      :firstname, :lastname, :address1, :address2,
+      :id, :firstname, :lastname, :address1, :address2,
       :city, :country_id, :state_id, :zipcode, :phone,
       :state_name, :alternative_phone, :company,
       :country => [:iso, :name, :iso3, :iso_name],

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
@@ -143,7 +143,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]}'"
@@ -158,7 +158,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/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.2.5
+  version: 2.2.6
 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
@@ -604,6 +604,7 @@ files:
 - db/migrate/20140219060952_add_considered_risky_to_orders.rb
 - db/migrate/20140307235515_add_user_id_to_spree_credit_cards.rb
 - db/migrate/20140415041315_add_user_id_created_by_id_index_to_order.rb
+- db/migrate/20140508151342_change_spree_price_amount_precision.rb
 - db/migrate/20140601011216_set_shipment_total_for_users_upgrading.rb
 - db/migrate/20140609201656_add_deleted_at_to_spree_promotion_actions.rb
 - db/migrate/20140616202624_remove_uncaptured_amount_from_spree_payments.rb