spree_core 2.3.13 → 2.4.0.rc1

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

@@ -10,12 +10,10 @@ module Spree
             ensure_country_id_from_params params[:bill_address_attributes]
             ensure_state_id_from_params params[:bill_address_attributes]
 
-            order = Spree::Order.create!
+            create_params = params.slice :currency
+            order = Spree::Order.create! create_params
             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)
@@ -30,15 +28,8 @@ 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?
@@ -54,7 +45,7 @@ module Spree
             begin
               shipment = order.shipments.build
               shipment.tracking       = s[:tracking]
-              shipment.stock_location = Spree::StockLocation.find_by_admin_name(s[:stock_location]) || Spree::StockLocation.find_by_name!(s[:stock_location])
+              shipment.stock_location = Spree::StockLocation.find_by_name!(s[:stock_location])
 
               inventory_units = s[:inventory_units] || []
               inventory_units.each do |iu|
@@ -119,11 +110,8 @@ module Spree
           return [] unless adjustments
           adjustments.each do |a|
             begin
-              adjustment = order.adjustments.build(
-                order:  order,
-                amount: a[:amount].to_f,
-                label:  a[:label]
-              )
+              adjustment = order.adjustments.build(: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.includes({master: [:prices, :images]})
+              scope.eager_load({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.13'
+    "2.4.0.rc1"
   end
 end

data/lib/spree/instrumentation.rb

@@ -0,0 +1,41 @@
+module Spree
+  class << self
+    attr_accessor :instrumenter
+
+    delegate :instrument, :instrument_method, to: :instrumenter
+  end
+
+  module Instrumentation
+    class Base
+      def instrument_method klass, method
+        klass.send(:alias_method, :"#{method}_without_instrumentation", method)
+        klass.send(:define_method, method) do |*args|
+          Spree.instrument("#{klass}.#{method}") do
+            send("#{method}_without_instrumentation", *args)
+          end
+        end
+      end
+    end
+    class Logger < Base
+      def instrument name
+        Rails.logger.tagged name do
+          ret = nil
+          ms = Benchmark.ms do
+            ret = yield
+          end
+          Rails.logger.info "Finished in #{ms.round(1)}ms"
+          ret
+        end
+      end
+    end
+    class None
+      def instrument name
+        yield
+      end
+      def instrument_method klass, method
+      end
+    end
+  end
+
+  self.instrumenter = Rails.env.development?? Instrumentation::Logger.new : Instrumentation::None.new
+end

data/lib/spree/migrations.rb

@@ -28,13 +28,9 @@ module Spree
           name
         end.compact! || []
 
-        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"
+        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"
           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

@@ -3,6 +3,7 @@ module Spree
     ATTRIBUTES = [
       :address_attributes,
       :checkout_attributes,
+      :customer_return_attributes,
       :image_attributes,
       :inventory_unit_attributes,
       :line_item_attributes,
@@ -29,15 +30,15 @@ module Spree
 
     @@address_attributes = [
       :id, :firstname, :lastname, :first_name, :last_name,
-      :address1, :address2, :city, :country_id, :state_id, 
+      :address1, :address2, :city, :country_id, :state_id,
       :zipcode, :phone, :state_name, :alternative_phone, :company,
-      :country => [:iso, :name, :iso3, :iso_name],
-      :state => [:name, :abbr]
+      country: [:iso, :name, :iso3, :iso_name],
+      state: [:name, :abbr]
     ]
 
-    @@checkout_attributes = [
-      :coupon_code, :email, :shipping_method_id, :special_instructions, :use_billing
-    ]
+    @@checkout_attributes = [:email, :use_billing, :shipping_method_id, :coupon_code, :special_instructions]
+
+    @@customer_return_attributes = [:stock_location_id, return_items_attributes: [:id, :inventory_unit_id, :return_authorization_id, :returned, :pre_tax_amount, :acceptance_status, :exchange_variant_id]]
 
     @@image_attributes = [:alt, :attachment, :position, :viewable_type, :viewable_id]
 
@@ -62,7 +63,7 @@ module Spree
 
     @@property_attributes = [:name, :presentation]
 
-    @@return_authorization_attributes = [:amount, :reason, :stock_location_id]
+    @@return_authorization_attributes = [:amount, :memo, :stock_location_id, :inventory_units_attributes, :return_authorization_reason_id]
 
     @@shipment_attributes = [
       :order, :special_instructions, :stock_location_id, :id,
@@ -71,7 +72,7 @@ module Spree
     # month / year may be provided by some sources, or others may elect to use one field
     @@source_attributes = [
       :number, :month, :year, :expiry, :verification_value,
-      :first_name, :last_name, :cc_type, :gateway_customer_profile_id, 
+      :first_name, :last_name, :cc_type, :gateway_customer_profile_id,
       :gateway_payment_profile_id, :last_digits, :name, :encrypted_data]
 
     @@stock_item_attributes = [:variant, :stock_location, :backorderable, :variant_id]
@@ -85,7 +86,7 @@ module Spree
       :quantity, :stock_item, :stock_item_id, :originator, :action]
 
     @@store_attributes = [:name, :url, :seo_title, :meta_keywords,
-                         :meta_description, :default_currency]
+                         :meta_description, :default_currency, :mail_from_address]
 
     @@taxonomy_attributes = [:name]
 

data/lib/spree/testing_support/ability_helpers.rb

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

data/lib/spree/testing_support/authorization_helpers.rb

@@ -37,9 +37,7 @@ module Spree
           end
 
           before do
-            allow(Spree.user_class).to receive(:find_by).
-                                         with(hash_including(:spree_api_key)).
-                                         and_return(Spree.user_class.new)
+            allow_any_instance_of(Api::BaseController).to receive(:try_spree_current_user).and_return(Spree.user_class.new)
           end
         end
 
@@ -58,6 +56,6 @@ module Spree
 end
 
 RSpec.configure do |config|
-  config.extend Spree::TestingSupport::AuthorizationHelpers::Controller, type: :controller
-  config.extend Spree::TestingSupport::AuthorizationHelpers::Request, type: :feature
+  config.extend Spree::TestingSupport::AuthorizationHelpers::Controller, :type => :controller
+  config.extend Spree::TestingSupport::AuthorizationHelpers::Request, :type => :feature
 end

data/lib/spree/testing_support/capybara_ext.rb

@@ -8,7 +8,7 @@ module CapybaraExt
   end
 
   def eventually_fill_in(field, options={})
-    expect(page).to have_css('#' + field)
+    page.should 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/calculator_factory.rb

@@ -9,12 +9,4 @@ FactoryGirl.define do
 
   factory :default_tax_calculator, class: Spree::Calculator::DefaultTax do
   end
-
-  factory :shipping_calculator, class: Spree::Calculator::Shipping::FlatRate do
-    after(:create) { |c| c.set_preference(:amount, 10.0) }
-  end
-
-  factory :shipping_no_amount_calculator, class: Spree::Calculator::Shipping::FlatRate do
-    after(:create) { |c| c.set_preference(:amount, 0) }
-  end
 end

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

@@ -2,7 +2,7 @@ FactoryGirl.define do
   factory :credit_card, class: Spree::CreditCard do
     verification_value 123
     month 12
-    year { 1.year.from_now.year }
+    year { Time.now.year }
     number '4111111111111111'
     name 'Spree Commerce'
     association(:payment_method, factory: :credit_card_payment_method)

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

@@ -0,0 +1,31 @@
+FactoryGirl.define do
+
+  factory :customer_return, class: Spree::CustomerReturn do
+    association(:stock_location, factory: :stock_location)
+
+    ignore do
+      line_items_count 1
+      return_items_count { line_items_count }
+    end
+
+    before(:create) do |customer_return, evaluator|
+      shipped_order = create(:shipped_order, line_items_count: evaluator.line_items_count)
+
+      shipped_order.inventory_units.take(evaluator.return_items_count).each do |inventory_unit|
+        customer_return.return_items << build(:return_item, inventory_unit: inventory_unit)
+      end
+    end
+
+    factory :customer_return_with_accepted_items do
+      after(:create) do |customer_return|
+        customer_return.return_items.each(&:accept!)
+      end
+    end
+  end
+
+  # for the case when you want to supply existing return items instead of generating some
+  factory :customer_return_without_return_items, class: Spree::CustomerReturn do
+    association(:stock_location, factory: :stock_location)
+  end
+
+end

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

@@ -2,6 +2,7 @@ FactoryGirl.define do
   factory :inventory_unit, class: Spree::InventoryUnit do
     variant
     order
+    line_item
     state 'on_hand'
     association(:shipment, factory: :shipment, state: 'pending')
     # return_authorization