solidus_core 1.3.2 → 1.4.0.beta1

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

@@ -8,7 +8,7 @@ module Spree
         include ControllerHelpers::Pricing
 
         included do
-          before_filter :set_current_order
+          before_action :set_current_order
 
           helper_method :current_order
           helper_method :simple_current_order
@@ -59,7 +59,7 @@ module Spree
 
         def set_current_order
           if try_spree_current_user && current_order
-            try_spree_current_user.orders.incomplete.where('id != ?', current_order.id).each do |order|
+            try_spree_current_user.orders.by_store(current_store).incomplete.where('id != ?', current_order.id).each do |order|
               current_order.merge!(order, try_spree_current_user)
             end
           end

data/lib/spree/core/current_store.rb

@@ -13,7 +13,11 @@ module Spree
       # looking up by the requesting server's name.
       # @return [Spree::Store]
       def store
-        Spree::Store.current(store_key)
+        if store_key
+          Spree::Store.current(store_key)
+        else
+          Spree::Store.default
+        end
       end
 
       private

data/lib/spree/core/delegate_belongs_to.rb

@@ -31,7 +31,7 @@ module DelegateBelongsTo
     # delegate_belongs_to :contact, [:defaults, :address, :fullname], :class_name => 'VCard'
     ##
     def delegate_belongs_to(association, *attrs)
-      ActiveSupport::Deprecation.warn "delegate_belongs_to is deprecated. Instead use rails built in delegates.", caller
+      Spree::Deprecation.warn "delegate_belongs_to is deprecated. Instead use rails built in delegates.", caller
       opts = attrs.extract_options!
       initialize_association :belongs_to, association, opts
       attrs = get_association_column_names(association) if attrs.empty?

data/lib/spree/core/routes.rb

@@ -2,44 +2,18 @@ module Spree
   module Core
     class Engine < ::Rails::Engine
       def self.add_routes(&block)
-        @spree_routes ||= []
-
-        # Anything that causes the application's routes to be reloaded,
-        # will cause this method to be called more than once
-        # i.e. https://github.com/plataformatec/devise/blob/31971e69e6a1bcf6c7f01eaaa44f227c4af5d4d2/lib/devise/rails.rb#L14
-        # In the case of Devise, this *only* happens in the production env
-        # This coupled with Rails 4's insistence that routes are not drawn twice,
-        # poses quite a serious problem.
-        #
-        # This is mainly why this whole file exists in the first place.
-        #
-        # Thus we need to make sure that the routes aren't drawn twice.
-        unless @spree_routes.include?(block)
-          @spree_routes << block
-        end
+        Spree::Deprecation.warn "Spree::Core::Engine.add_routes is deprecated, use Spree::Core::Engine.routes.draw instead"
+        routes.draw(&block)
       end
 
       def self.append_routes(&block)
-        @append_routes ||= []
-        # See comment in add_routes.
-        unless @append_routes.include?(block)
-          @append_routes << block
-        end
+        Spree::Deprecation.warn "Spree::Core::Engine.append_routes is deprecated, use Spree::Core::Engine.routes.append instead"
+        routes.append(&block)
       end
 
       def self.draw_routes(&block)
-        @spree_routes ||= []
-        @append_routes ||= []
-        eval_block(block) if block_given?
-        @spree_routes.each { |r| eval_block(&r) }
-        @append_routes.each { |r| eval_block(&r) }
-        # # Clear out routes so that they aren't drawn twice.
-        @spree_routes = []
-        @append_routes = []
-      end
-
-      def eval_block(&block)
-        Spree::Core::Engine.routes.send :eval_block, block
+        Spree::Deprecation.warn "Spree::Core::Engine.draw_routes is deprecated, use Spree::Core::Engine.routes.draw instead"
+        routes.draw(&block)
       end
     end
   end

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

@@ -30,7 +30,7 @@ module Spree
           curr_page = page || 1
 
           unless Spree::Config.show_products_without_price
-            @products = @products.joins(:prices).merge(Spree::Price.where(pricing_options.search_arguments)).uniq
+            @products = @products.joins(:prices).merge(Spree::Price.where(pricing_options.search_arguments)).distinct
           end
           @products = @products.page(curr_page).per(per_page)
         end
@@ -46,7 +46,7 @@ module Spree
         protected
 
         def get_base_scope
-          base_scope = Spree::Product.available
+          base_scope = Spree::Product.display_includes.available
           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)

data/lib/spree/core/stock_configuration.rb

@@ -1,8 +1,14 @@
 module Spree
   module Core
     class StockConfiguration
+      attr_writer :coordinator_class
       attr_writer :estimator_class
 
+      def coordinator_class
+        @coordinator_class ||= '::Spree::Stock::Coordinator'
+        @coordinator_class.constantize
+      end
+
       def estimator_class
         @estimator_class ||= '::Spree::Stock::Estimator'
         @estimator_class.constantize

data/lib/spree/core/version.rb

@@ -1,11 +1,11 @@
 module Spree
   def self.version
-    ActiveSupport::Deprecation.warn("Spree.version does not work and will be removed from solidus. Use Spree.solidus_version instead to determine the solidus version")
+    Spree::Deprecation.warn("Spree.version does not work and will be removed from solidus. Use Spree.solidus_version instead to determine the solidus version")
     "2.4.6.beta"
   end
 
   def self.solidus_version
-    "1.3.2"
+    "1.4.0.beta1"
   end
 
   def self.solidus_gem_version

data/lib/spree/core.rb

@@ -49,7 +49,7 @@ module Spree
     def self.const_missing(name)
       case name
       when :AdjustmentSource, :CalculatedAdjustments, :UserAddress, :UserPaymentSource
-        ActiveSupport::Deprecation.warn("Spree::Core::#{name} is deprecated! Use Spree::#{name} instead.", caller)
+        Spree::Deprecation.warn("Spree::Core::#{name} is deprecated! Use Spree::#{name} instead.", caller)
         Spree.const_get(name)
       else
         super
@@ -99,5 +99,6 @@ require 'spree/deprecation'
 
 require 'spree/mailer_previews/order_preview'
 require 'spree/mailer_previews/carton_preview'
+require 'spree/mailer_previews/reimbursement_preview'
 
 require 'spree/core/price_migrator'

data/lib/spree/i18n.rb

@@ -6,9 +6,16 @@ module Spree
     include ActionView::Helpers::TranslationHelper
   end
 
+  # This value is used as a count for the pluralization helpers related to I18n
+  # ex: Spree::Order.model_name.human(count: Spree::I18N_GENERIC_PLURAL)
+  # Related to Solidus issue #1164, this is needed to avoid problems with
+  # some pluralization calculators
+  I18N_GENERIC_PLURAL = 2.1
+
   class << self
     # Add spree namespace and delegate to Rails TranslationHelper for some nice
     # extra functionality. e.g return reasonable strings for missing translations
+
     def translate(key, options = {})
       options[:scope] = [:spree, *options[:scope]]
       TranslationHelperWrapper.new.translate(key, options)

data/lib/spree/mailer_previews/carton_preview.rb

@@ -2,7 +2,8 @@ module Spree
   class MailerPreviews
     class CartonPreview < ActionMailer::Preview
       def shipped
-        carton = Carton.first
+        carton = Carton.joins(:orders).last
+        raise "Your database needs at one shipped order with a carton to render this preview" unless carton
         Spree::Config.carton_shipped_email_class.shipped_email(order: carton.orders.first, carton: carton)
       end
     end

data/lib/spree/mailer_previews/order_preview.rb

@@ -2,15 +2,20 @@ module Spree
   class MailerPreviews
     class OrderPreview < ActionMailer::Preview
       def confirm
-        OrderMailer.confirm_email(Order.first)
+        order = Order.complete.last
+        raise "Your database needs at least one completed order to render this preview" unless order
+        OrderMailer.confirm_email(order)
       end
 
       def cancel
-        OrderMailer.cancel_email(Order.first)
+        order = Order.with_state(:canceled).last
+        raise "Your database needs at least one cancelled order to render this preview" unless order
+        OrderMailer.cancel_email(order)
       end
 
       def inventory_cancellation
-        order = Order.first
+        order = Spree::Order.joins(:inventory_units).merge(Spree::InventoryUnit.canceled).last
+        raise "Your database needs at least one order with a canceled inventory unit to render this preview" unless order
         OrderMailer.inventory_cancellation_email(order, [order.inventory_units.first])
       end
     end

data/lib/spree/mailer_previews/reimbursement_preview.rb

@@ -0,0 +1,11 @@
+module Spree
+  class MailerPreviews
+    class ReimbursementPreview < ActionMailer::Preview
+      def reimbursement
+        reimbursement = Reimbursement.last
+        raise "Your database needs at least one Reimbursement to render this preview" unless reimbursement
+        ReimbursementMailer.reimbursement_email(reimbursement)
+      end
+    end
+  end
+end

data/lib/spree/migrations.rb

@@ -22,13 +22,6 @@ module Spree
     # engine name on the file name
     def check
       if File.directory?(app_dir)
-        engine_in_app = app_migrations.map do |file_name|
-          name, engine = file_name.split(".", 2)
-          next unless match_engine?(engine)
-          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|
@@ -40,6 +33,19 @@ module Spree
       end
     end
 
+    def missing_migrations
+      @missing_migrations ||=
+        begin
+          engine_in_app = app_migrations.map do |file_name|
+            name, engine = file_name.split(".", 2)
+            next unless match_engine?(engine)
+            name
+          end.compact
+
+          engine_migrations.sort - engine_in_app.sort
+        end
+    end
+
     private
 
     def engine_migrations

data/lib/spree/permitted_attributes.rb

@@ -45,7 +45,7 @@ module Spree
     @@address_book_attributes = address_attributes + [:default]
 
     @@checkout_attributes = [
-      :coupon_code, :email, :shipping_method_id, :special_instructions, :use_billing
+      :coupon_code, :email, :special_instructions, :use_billing
     ]
 
     @@credit_card_update_attributes = [

data/lib/spree/testing_support/capybara_ext.rb

@@ -26,11 +26,16 @@ module CapybaraExt
   end
 
   def select2_search(value, options)
+    options = {
+      search: value, # by default search for the value
+      select: true
+    }.merge(options)
     label = find_label_by_text(options[:from])
     within label.first(:xpath, ".//..") do
       options[:from] = "##{find('.select2-container')['id']}"
     end
-    targetted_select2_search(value, options)
+    select2_search_without_selection(options[:search], from: options[:from])
+    select_select2_result(value) if options[:select]
   end
 
   def select2_search_without_selection(value, options)

data/lib/spree/testing_support/common_rake.rb

@@ -17,24 +17,20 @@ namespace :common do
 
     puts "Setting up dummy database..."
 
-    silence_stream(STDOUT) do
-      sh "bundle exec rake db:drop db:create db:migrate"
-    end
+    sh "bundle exec rake db:migrate VERBOSE=false"
 
     begin
       require "generators/#{ENV['LIB_NAME']}/install/install_generator"
       puts 'Running extension installation generator...'
       "#{ENV['LIB_NAME'].camelize}::Generators::InstallGenerator".constantize.start(["--auto-run-migrations"])
     rescue LoadError
-      puts 'Skipping installation no generator to run...'
+      # No extension generator to run
     end
   end
 
   task :seed do |_t, _args|
     puts "Seeding ..."
 
-    silence_stream(STDOUT) do
-      sh "bundle exec rake db:seed RAILS_ENV=test"
-    end
+    sh "bundle exec rake db:seed RAILS_ENV=test"
   end
 end

data/lib/spree/testing_support/controller_requests.rb

@@ -49,37 +49,45 @@ module Spree
       def spree_get(action, parameters = nil, session = nil, flash = nil)
         process_spree_action(action, parameters, session, flash, "GET")
       end
+      deprecate spree_get: :get, deprecator: Spree::Deprecation
 
       # Executes a request simulating POST HTTP method and set/volley the response
       def spree_post(action, parameters = nil, session = nil, flash = nil)
         process_spree_action(action, parameters, session, flash, "POST")
       end
+      deprecate spree_post: :post, deprecator: Spree::Deprecation
 
       # Executes a request simulating PUT HTTP method and set/volley the response
       def spree_put(action, parameters = nil, session = nil, flash = nil)
         process_spree_action(action, parameters, session, flash, "PUT")
       end
+      deprecate spree_put: :put, deprecator: Spree::Deprecation
 
       # Executes a request simulating DELETE HTTP method and set/volley the response
       def spree_delete(action, parameters = nil, session = nil, flash = nil)
         process_spree_action(action, parameters, session, flash, "DELETE")
       end
+      deprecate spree_delete: :delete, deprecator: Spree::Deprecation
 
       def spree_xhr_get(action, parameters = nil, session = nil, flash = nil)
         process_spree_xhr_action(action, parameters, session, flash, :get)
       end
+      deprecate spree_xhr_get: :get, deprecator: Spree::Deprecation
 
       def spree_xhr_post(action, parameters = nil, session = nil, flash = nil)
         process_spree_xhr_action(action, parameters, session, flash, :post)
       end
+      deprecate spree_xhr_post: :post, deprecator: Spree::Deprecation
 
       def spree_xhr_put(action, parameters = nil, session = nil, flash = nil)
         process_spree_xhr_action(action, parameters, session, flash, :put)
       end
+      deprecate spree_xhr_put: :put, deprecator: Spree::Deprecation
 
       def spree_xhr_delete(action, parameters = nil, session = nil, flash = nil)
         process_spree_xhr_action(action, parameters, session, flash, :delete)
       end
+      deprecate spree_xhr_delete: :delete, deprecator: Spree::Deprecation
 
       private
 

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

@@ -46,12 +46,31 @@ FactoryGirl.define do
         end
         order.line_items.reload
 
-        create(:shipment, order: order, cost: evaluator.shipment_cost, shipping_method: evaluator.shipping_method, address: evaluator.ship_address, stock_location: evaluator.stock_location)
+        create(:shipment, order: order, cost: evaluator.shipment_cost, shipping_method: evaluator.shipping_method, stock_location: evaluator.stock_location)
         order.shipments.reload
 
         order.update!
       end
 
+      factory :order_ready_to_complete do
+        state 'confirm'
+        payment_state 'checkout'
+
+        transient do
+          payment_type :credit_card_payment
+        end
+
+        after(:create) do |order, evaluator|
+          create(evaluator.payment_type, {
+            amount: order.total,
+            order: order,
+            state: order.payment_state
+          })
+
+          order.payments.reload
+        end
+      end
+
       factory :completed_order_with_totals do
         state 'complete'
 
@@ -94,7 +113,7 @@ FactoryGirl.define do
                 next unless evaluator.with_cartons
                 Spree::Carton.create!(
                   stock_location: shipment.stock_location,
-                  address: shipment.address,
+                  address: order.ship_address,
                   shipping_method: shipment.shipping_method,
                   inventory_units: shipment.inventory_units,
                   shipped_at: Time.current
@@ -108,19 +127,22 @@ FactoryGirl.define do
     end
   end
 
-  factory :completed_order_with_promotion, parent: :completed_order_with_totals, class: "Spree::Order" do
+  factory :completed_order_with_promotion, parent: :order_with_line_items, class: "Spree::Order" do
     transient do
       promotion nil
-      promotion_code nil
     end
 
     after(:create) do |order, evaluator|
       promotion = evaluator.promotion || create(:promotion, code: "test")
-      promotion_code = evaluator.promotion_code || promotion.codes.first
+      promotion_code = promotion.codes.first || create(:promotion_code, promotion: promotion)
 
-      promotion.actions.each do |action|
-        action.perform({ order: order, promotion: promotion, promotion_code: promotion_code })
-      end
+      promotion.activate(order: order, promotion_code: promotion_code)
+      order.order_promotions.create!(promotion: promotion, promotion_code: promotion_code)
+
+      # Complete the order after the promotion has been activated
+      order.refresh_shipment_rates
+      order.update_column(:completed_at, Time.current)
+      order.update_column(:state, "complete")
     end
   end
 end

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

@@ -6,7 +6,7 @@ require 'spree/testing_support/factories/store_credit_factory'
 FactoryGirl.define do
   factory :payment, aliases: [:credit_card_payment], class: Spree::Payment do
     association(:payment_method, factory: :credit_card_payment_method)
-    association(:source, factory: :credit_card)
+    source { create(:credit_card, user: order.user) }
     order
     state 'checkout'
     response_code '12345'

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

@@ -32,6 +32,12 @@ FactoryGirl.define do
         after :create do |product|
           product.master.stock_items.first.adjust_count_on_hand(10)
         end
+
+        factory :product_not_backorderable do
+          after :create do |product|
+            product.master.stock_items.first.update_column(:backorderable, false)
+          end
+        end
       end
 
       factory :product_with_option_types do

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

@@ -13,6 +13,7 @@ FactoryGirl.define do
       if reimbursement.return_items.empty?
         reimbursement.return_items = reimbursement.customer_return.return_items
       end
+      reimbursement.total = reimbursement.return_items.map { |ri| ri.amount }.sum
     end
   end
 end

data/lib/tasks/migrations/copy_shipped_shipments_to_cartons.rake

@@ -49,13 +49,15 @@ namespace 'spree:migrations:copy_shipped_shipments_to_cartons' do
               #{db_concat("'C'", 'spree_shipments.number')}, -- number
               spree_shipments.id, -- imported_from_shipment_id
               spree_shipments.stock_location_id,
-              spree_shipments.address_id,
+              spree_orders.ship_address_id,
               spree_shipping_rates.shipping_method_id,
               spree_shipments.tracking,
               spree_shipments.shipped_at,
               '#{Time.current.to_s(:db)}', -- created_at
               '#{Time.current.to_s(:db)}' -- updated_at
             from spree_shipments
+            left join spree_orders
+              on spree_orders.id = spree_shipments.order_id
             left join spree_shipping_rates
               on spree_shipping_rates.shipment_id = spree_shipments.id
               and spree_shipping_rates.selected = #{Spree::Carton.connection.quoted_true}

data/solidus_core.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'activemerchant', '~> 1.48'
   s.add_dependency 'acts_as_list', '~> 0.3'
-  s.add_dependency 'awesome_nested_set', '~> 3.0.1'
+  s.add_dependency 'awesome_nested_set', '~> 3.0', '>= 3.0.1'
   s.add_dependency 'carmen', '~> 1.0.0'
   s.add_dependency 'cancancan', '~> 1.10'
   s.add_dependency 'ffaker', '~> 2.0'
@@ -29,7 +29,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'highline', '~> 1.6.18' # Necessary for the install generator
   s.add_dependency 'kaminari', '~> 0.15', '>= 0.15.1'
   s.add_dependency 'monetize', '~> 1.1'
-  s.add_dependency 'paperclip', '~> 4.2.0'
+  s.add_dependency 'paperclip', '~> 4.2'
   s.add_dependency 'paranoia', '~> 2.1', '>= 2.1.4'
   s.add_dependency 'premailer-rails'
   s.add_dependency 'rails', '~> 4.2.5'
@@ -37,7 +37,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'responders'
   s.add_dependency 'state_machines-activerecord', '~> 0.2'
   s.add_dependency 'stringex', '~> 1.5.1'
-  s.add_dependency 'truncate_html', '0.9.2'
+  s.add_dependency 'truncate_html', '~> 0.9', '>= 0.9.2'
   s.add_dependency 'twitter_cldr', '~> 3.0'
 
   s.add_development_dependency 'email_spec', '~> 1.6'

data/spec/helpers/base_helper_spec.rb

@@ -60,7 +60,7 @@ describe Spree::BaseHelper, type: :helper do
     end
 
     it "should not raise errors when style exists" do
-      ActiveSupport::Deprecation.silence do
+      Spree::Deprecation.silence do
         very_strange_image(product)
       end
     end
@@ -152,7 +152,7 @@ describe Spree::BaseHelper, type: :helper do
     end
 
     it "should not raise errors when helper method called" do
-      ActiveSupport::Deprecation.silence do
+      Spree::Deprecation.silence do
         foobar_image(product)
       end
     end
@@ -167,4 +167,20 @@ describe Spree::BaseHelper, type: :helper do
       expect(pretty_time(DateTime.new(2012, 5, 6, 13, 33))).to eq "May 06, 2012  1:33 PM"
     end
   end
+
+  context "plural_resource_name" do
+    let(:plural_config) { Spree::I18N_GENERIC_PLURAL }
+    let(:base_class) { Spree::Product }
+
+    subject { plural_resource_name(base_class) }
+
+    it "should use ActiveModel::Naming module to pluralize model names" do
+      expect(subject).to eq base_class.model_name.human(count: plural_config)
+    end
+
+    it "should use the Spree::I18N_GENERIC_PLURAL constant" do
+      expect(base_class.model_name).to receive(:human).with(hash_including(count: plural_config))
+      subject
+    end
+  end
 end

data/spec/lib/i18n_spec.rb

@@ -40,6 +40,10 @@ describe "i18n" do
     expect(Spree.t(:missing_entry)).to include("<span")
   end
 
+  it "should have a Spree::I18N_GENERIC_PLURAL constant" do
+    expect(Spree::I18N_GENERIC_PLURAL).to eq 2.1
+  end
+
   context "missed + unused translations" do
     def key_with_locale(key)
       "#{key} (#{I18n.locale})"

data/spec/lib/spree/core/controller_helpers/order_spec.rb

@@ -66,14 +66,26 @@ describe Spree::Core::ControllerHelpers::Order, type: :controller do
   end
 
   describe '#set_current_order' do
-    let(:incomplete_order) { create(:order, user: user) }
+    let(:incomplete_order) { create(:order, store: incomplete_order_store, user: user) }
 
     context 'when current order not equal to users incomplete orders' do
       before { allow(controller).to receive_messages(current_order: order, last_incomplete_order: incomplete_order, cookies: double(signed: { guest_token: 'guest_token' })) }
 
-      it 'calls Spree::Order#merge! method' do
-        expect(order).to receive(:merge!).with(incomplete_order, user)
-        controller.set_current_order
+      context "an order from another store" do
+        let(:incomplete_order_store) { create(:store) }
+
+        it 'doesnt call Spree::Order#merge! method' do
+          expect(order).to_not receive(:merge!)
+          controller.set_current_order
+        end
+      end
+      context "an order from the same store" do
+        let(:incomplete_order_store) { store }
+
+        it 'calls Spree::Order#merge! method' do
+          expect(order).to receive(:merge!).with(incomplete_order, user)
+          controller.set_current_order
+        end
       end
     end
   end