spree_core 2.3.4 → 2.3.5

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

@@ -13,6 +13,9 @@ module Spree
             order = Spree::Order.create!
             order.associate_user!(user)
 
+            shipments_attrs = params.delete(:shipments_attributes)
+
+            create_shipments_from_params(shipments_attrs, order)
             create_line_items_from_params(params.delete(:line_items_attributes),order)
             create_shipments_from_params(params.delete(:shipments_attributes), order)
             create_adjustments_from_params(params.delete(:adjustments_attributes), order)
@@ -27,8 +30,15 @@ module Spree
 
             order.update_attributes!(params)
 
+            order.create_proposed_shipments unless shipments_attrs.present?
+
             # Really ensure that the order totals & states are correct
             order.updater.update
+            if shipments_attrs.present?
+              order.shipments.each_with_index do |shipment, index|
+                shipment.update_columns(cost: shipments_attrs[index][:cost].to_f) if shipments_attrs[index][:cost].present?
+              end
+            end
             order.reload
           rescue Exception => e
             order.destroy if order && order.persisted?
@@ -44,7 +54,7 @@ module Spree
             begin
               shipment = order.shipments.build
               shipment.tracking       = s[:tracking]
-              shipment.stock_location = Spree::StockLocation.find_by_name!(s[:stock_location])
+              shipment.stock_location = Spree::StockLocation.find_by_admin_name(s[:stock_location]) || Spree::StockLocation.find_by_name!(s[:stock_location])
 
               inventory_units = s[:inventory_units] || []
               inventory_units.each do |iu|
@@ -109,8 +119,11 @@ module Spree
           return [] unless adjustments
           adjustments.each do |a|
             begin
-              adjustment = order.adjustments.build(:amount => a[:amount].to_f,
-                                                  :label => a[:label])
+              adjustment = order.adjustments.build(
+                order:  order,
+                amount: a[:amount].to_f,
+                label:  a[:label]
+              )
               adjustment.save!
               adjustment.close!
             rescue Exception => e

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

@@ -42,7 +42,7 @@ module Spree
 
           def add_eagerload_scopes scope
             if include_images
-              scope.eager_load({master: [:prices, :images]})
+              scope.includes({master: [:prices, :images]})
             else
               scope.includes(master: :prices)
             end

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

@@ -1,6 +1,6 @@
 class EmailValidator < ActiveModel::EachValidator
   def validate_each(record,attribute,value)
-    unless value =~ /\A[^@\s]+@([^@\s]+\.)+[^@\s]+\z/
+    unless value =~ /\A([^@\.]|[^@\.]([^@\s]*)[^@\.])@([^@\s]+\.)+[^@\s]+\z/
       record.errors.add(attribute, :invalid, {:value => value}.merge!(options))
     end
   end

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    '2.3.4'
+    '2.3.5'
   end
 end

data/lib/spree/localized_number.rb

@@ -0,0 +1,20 @@
+module Spree
+  class LocalizedNumber
+
+    # Strips all non-price-like characters from the number, taking into account locale settings.
+    def self.parse(number)
+      return number unless number.is_a?(String)
+
+      separator, delimiter = I18n.t([:'number.currency.format.separator', :'number.currency.format.delimiter'])
+      non_number_characters = /[^0-9\-#{separator}]/
+
+      # strip everything else first
+      number.gsub!(non_number_characters, '')
+      # then replace the locale-specific decimal separator with the standard separator if necessary
+      number.gsub!(separator, '.') unless separator == '.'
+
+      number.to_d
+    end
+
+  end
+end

data/lib/spree/migrations.rb

@@ -28,9 +28,13 @@ module Spree
           name
         end.compact! || []
 
-        unless (engine_migrations.sort - engine_in_app.sort).empty?
-          puts "[#{engine_name.capitalize} WARNING] Missing migrations." \
-               " Run `bundle exec rake railties:install:migrations` to get them.\n\n"
+        missing_migrations = engine_migrations.sort - engine_in_app.sort
+        unless missing_migrations.empty?
+          puts "[#{engine_name.capitalize} WARNING] Missing migrations."
+          missing_migrations.each do |migration|
+            puts "[#{engine_name.capitalize} WARNING] #{migration} from #{engine_name} is missing."
+          end
+          puts "[#{engine_name.capitalize} WARNING] Run `bundle exec rake railties:install:migrations` to get them.\n\n"
           true
         end
       end

data/lib/spree/money.rb

@@ -6,7 +6,7 @@ module Spree
   class Money
     attr_reader :money
 
-    delegate :cents, :to => :money
+    delegate :cents, to: :money
 
     def initialize(amount, options={})
       @money = Monetize.parse([amount, (options[:currency] || Spree::Config[:currency])].join)
@@ -26,7 +26,7 @@ module Spree
       @money.format(@options)
     end
 
-    def to_html(options = { :html => true })
+    def to_html(options = { html: true })
       output = @money.format(@options.merge(options))
       if options[:html]
         # 1) prevent blank, breaking spaces

data/lib/spree/permitted_attributes.rb

@@ -35,7 +35,9 @@ module Spree
       :state => [:name, :abbr]
     ]
 
-    @@checkout_attributes = [:email, :use_billing, :shipping_method_id, :coupon_code, :special_instructions]
+    @@checkout_attributes = [
+      :coupon_code, :email, :shipping_method_id, :special_instructions, :use_billing
+    ]
 
     @@image_attributes = [:alt, :attachment, :position, :viewable_type, :viewable_id]
 

data/lib/spree/testing_support/ability_helpers.rb

@@ -1,105 +1,105 @@
 shared_examples_for 'access granted' do
   it 'should allow read' do
-    ability.should be_able_to(:read, resource, token) if token
-    ability.should be_able_to(:read, resource) unless token
+    expect(ability).to be_able_to(:read, resource, token) if token
+    expect(ability).to be_able_to(:read, resource) unless token
   end
 
   it 'should allow create' do
-    ability.should be_able_to(:create, resource, token) if token
-    ability.should be_able_to(:create, resource) unless token
+    expect(ability).to be_able_to(:create, resource, token) if token
+    expect(ability).to be_able_to(:create, resource) unless token
   end
 
   it 'should allow update' do
-    ability.should be_able_to(:update, resource, token) if token
-    ability.should be_able_to(:update, resource) unless token
+    expect(ability).to be_able_to(:update, resource, token) if token
+    expect(ability).to be_able_to(:update, resource) unless token
   end
 end
 
 shared_examples_for 'access denied' do
   it 'should not allow read' do
-    ability.should_not be_able_to(:read, resource)
+    expect(ability).to_not be_able_to(:read, resource)
   end
 
   it 'should not allow create' do
-    ability.should_not be_able_to(:create, resource)
+    expect(ability).to_not be_able_to(:create, resource)
   end
 
   it 'should not allow update' do
-    ability.should_not be_able_to(:update, resource)
+    expect(ability).to_not be_able_to(:update, resource)
   end
 end
 
 shared_examples_for 'admin granted' do
   it 'should allow admin' do
-    ability.should be_able_to(:admin, resource, token) if token
-    ability.should be_able_to(:admin, resource) unless token
+    expect(ability).to be_able_to(:admin, resource, token) if token
+    expect(ability).to be_able_to(:admin, resource) unless token
   end
 end
 
 shared_examples_for 'admin denied' do
   it 'should not allow admin' do
-    ability.should_not be_able_to(:admin, resource)
+    expect(ability).to_not be_able_to(:admin, resource)
   end
 end
 
 shared_examples_for 'index allowed' do
   it 'should allow index' do
-    ability.should be_able_to(:index, resource)
+    expect(ability).to be_able_to(:index, resource)
   end
 end
 
 shared_examples_for 'no index allowed' do
   it 'should not allow index' do
-    ability.should_not be_able_to(:index, resource)
+    expect(ability).to_not be_able_to(:index, resource)
   end
 end
 
 shared_examples_for 'create only' do
   it 'should allow create' do
-    ability.should be_able_to(:create, resource)
+    expect(ability).to be_able_to(:create, resource)
   end
 
   it 'should not allow read' do
-    ability.should_not be_able_to(:read, resource)
+    expect(ability).to_not be_able_to(:read, resource)
   end
 
   it 'should not allow update' do
-    ability.should_not be_able_to(:update, resource)
+    expect(ability).to_not be_able_to(:update, resource)
   end
 
   it 'should not allow index' do
-    ability.should_not be_able_to(:index, resource)
+    expect(ability).to_not be_able_to(:index, resource)
   end
 end
 
 shared_examples_for 'read only' do
   it 'should not allow create' do
-    ability.should_not be_able_to(:create, resource)
+    expect(ability).to_not be_able_to(:create, resource)
   end
 
   it 'should not allow update' do
-    ability.should_not be_able_to(:update, resource)
+    expect(ability).to_not be_able_to(:update, resource)
   end
 
   it 'should allow index' do
-    ability.should be_able_to(:index, resource)
+    expect(ability).to be_able_to(:index, resource)
   end
 end
 
 shared_examples_for 'update only' do
   it 'should not allow create' do
-    ability.should_not be_able_to(:create, resource)
+    expect(ability).to_not be_able_to(:create, resource)
   end
 
   it 'should not allow read' do
-    ability.should_not be_able_to(:read, resource)
+    expect(ability).to_not be_able_to(:read, resource)
   end
 
   it 'should allow update' do
-    ability.should be_able_to(:update, resource)
+    expect(ability).to be_able_to(:update, resource)
   end
 
   it 'should not allow index' do
-    ability.should_not be_able_to(:index, resource)
+    expect(ability).to_not be_able_to(:index, resource)
   end
 end

data/lib/spree/testing_support/capybara_ext.rb

@@ -8,7 +8,7 @@ module CapybaraExt
   end
 
   def eventually_fill_in(field, options={})
-    page.should have_css('#' + field)
+    expect(page).to have_css('#' + field)
     fill_in field, options
   end
 
@@ -145,7 +145,7 @@ end
 
 RSpec::Matchers.define :have_title do |expected|
   match do |actual|
-    has_css?("title", :text => expected, visible: false)
+    has_css?("title", text: expected, visible: false)
   end
 
   failure_message do |actual|

data/lib/spree/testing_support/factories/line_item_factory.rb

@@ -3,7 +3,7 @@ FactoryGirl.define do
     quantity 1
     price { BigDecimal.new('10.00') }
     order
-    ignore do
+    transient do
       association :product
     end
     variant{ product.master }

data/lib/spree/testing_support/factories/order_factory.rb

@@ -16,7 +16,7 @@ FactoryGirl.define do
       bill_address
       ship_address
 
-      ignore do
+      transient do
         line_items_count 5
       end
 

data/lib/spree/testing_support/factories/promotion_factory.rb

@@ -3,7 +3,7 @@ FactoryGirl.define do
     name 'Promo'
 
     trait :with_line_item_adjustment do
-      ignore do
+      transient do
         adjustment_rate 10
       end
 
@@ -16,7 +16,7 @@ FactoryGirl.define do
     factory :promotion_with_item_adjustment, traits: [:with_line_item_adjustment]
 
     trait :with_order_adjustment do
-      ignore do
+      transient do
         order_adjustment_amount 10
       end
 
@@ -30,13 +30,13 @@ FactoryGirl.define do
     end
 
     trait :with_item_total_rule do
-      ignore do
+      transient do
         item_total_threshold_amount 10
       end
 
       after(:create) do |promotion, evaluator|
         rule = Spree::Promotion::Rules::ItemTotal.create!(
-          preferred_operator: 'gte', 
+          preferred_operator: 'gte',
           preferred_amount: evaluator.item_total_threshold_amount
         )
         promotion.rules << rule

data/lib/spree/testing_support/factories/stock_factory.rb

@@ -1,7 +1,7 @@
 FactoryGirl.define do
   # must use build()
   factory :stock_packer, class: Spree::Stock::Packer do
-    ignore do
+    transient do
       stock_location { build(:stock_location) }
       contents []
     end
@@ -10,7 +10,7 @@ FactoryGirl.define do
   end
 
   factory :stock_package, class: Spree::Stock::Package do
-    ignore do
+    transient do
       stock_location { build(:stock_location) }
       order { create(:order_with_line_items, line_items_count: 2) }
       contents []

data/lib/spree/testing_support/flash.rb

@@ -5,12 +5,12 @@ module Spree
         flash = convert_flash(flash)
 
         within("[class='flash success']") do
-          page.should have_content(flash)
+          expect(page).to have_content(flash)
         end
       end
 
       def assert_successful_update_message(resource)
-        flash = Spree.t(:successfully_updated, :resource => Spree.t(resource))
+        flash = Spree.t(:successfully_updated, resource: Spree.t(resource))
         assert_flash_success(flash)
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 2.3.4
+  version: 2.3.5
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-07 00:00:00.000000000 Z
+date: 2014-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -184,14 +184,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.1
+        version: '0.15'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.15.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.1
+        version: '0.15'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.15.1
 - !ruby/object:Gem::Dependency
   name: monetize
   requirement: !ruby/object:Gem::Requirement
@@ -240,14 +246,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.6
+        version: 4.1.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.6
+        version: 4.1.8
 - !ruby/object:Gem::Dependency
   name: ransack
   requirement: !ruby/object:Gem::Requirement
@@ -612,6 +618,9 @@ files:
 - db/migrate/20140616202624_remove_uncaptured_amount_from_spree_payments.rb
 - db/migrate/20140804185157_add_default_to_shipment_cost.rb
 - db/migrate/20140927193717_default_pre_tax_amount_should_be_zero.rb
+- db/migrate/20141021194502_add_state_lock_version_to_order.rb
+- db/migrate/20141101231208_fix_adjustment_order_presence.rb
+- db/migrate/20141105213646_update_classifications_positions.rb
 - db/seeds.rb
 - lib/generators/spree/custom_user/custom_user_generator.rb
 - lib/generators/spree/custom_user/templates/authentication_helpers.rb.tt
@@ -664,6 +673,7 @@ files:
 - lib/spree/i18n.rb
 - lib/spree/i18n/base.rb
 - lib/spree/i18n/initializer.rb
+- lib/spree/localized_number.rb
 - lib/spree/migrations.rb
 - lib/spree/money.rb
 - lib/spree/permitted_attributes.rb
@@ -725,19 +735,6 @@ files:
 - lib/tasks/core.rake
 - vendor/assets/javascripts/jquery-migrate-1.0.0.js
 - vendor/assets/javascripts/jquery.payment.js
-- vendor/assets/javascripts/jquery.validate/localization/messages_et.js
-- vendor/assets/javascripts/jquery.validate/localization/messages_eu.js
-- vendor/assets/javascripts/jquery.validate/localization/messages_hr.js
-- vendor/assets/javascripts/jquery.validate/localization/messages_ka.js
-- vendor/assets/javascripts/jquery.validate/localization/messages_ko.js
-- vendor/assets/javascripts/jquery.validate/localization/messages_my.js
-- vendor/assets/javascripts/jquery.validate/localization/messages_pt_BR.js
-- vendor/assets/javascripts/jquery.validate/localization/messages_pt_PT.js
-- vendor/assets/javascripts/jquery.validate/localization/messages_sl.js
-- vendor/assets/javascripts/jquery.validate/localization/messages_sv.js
-- vendor/assets/javascripts/jquery.validate/localization/messages_uk.js
-- vendor/assets/javascripts/jquery.validate/localization/messages_zh.js
-- vendor/assets/javascripts/jquery.validate/localization/messages_zh_TW.js
 - vendor/assets/javascripts/jsuri.js
 - vendor/assets/stylesheets/normalize.css
 - vendor/assets/stylesheets/skeleton.css