spree_core 2.1.12 → 2.2.0

data/lib/spree/core/calculated_adjustments.rb

@@ -20,46 +20,6 @@ module Spree
             self.calculator = klass.new if klass && !self.calculator.is_a?(klass)
           end
 
-          # Creates a new adjustment for the target object (which is any class that has_many :adjustments) and
-          # sets amount based on the calculator as applied to the calculable argument (Order, LineItems[], Shipment, etc.)
-          # By default the adjustment will not be considered mandatory
-          def create_adjustment(label, target, calculable, mandatory=false, state="closed")
-            # Adjustment calculations done on Spree::Shipment objects MUST
-            # be done on their to_package'd variants instead
-            # It's only the package that contains the correct information.
-            # See https://github.com/spree/spree_active_shipping/pull/96 et. al
-            old_calculable = calculable
-            calculable = calculable.to_package if calculable.is_a?(Spree::Shipment)
-            amount = compute_amount(calculable)
-            return if amount == 0 && !mandatory
-            target.adjustments.create(
-              :amount => amount,
-              :source => old_calculable,
-              :originator => self,
-              :label => label,
-              :mandatory => mandatory,
-              :state => state
-            )
-          end
-
-          # Updates the amount of the adjustment using our Calculator and calling the +compute+ method with the +calculable+
-          # referenced passed to the method.
-          def update_adjustment(adjustment, calculable)
-            # Adjustment calculations done on Spree::Shipment objects MUST
-            # be done on their to_package'd variants instead
-            # It's only the package that contains the correct information.
-            # See https://github.com/spree/spree_active_shipping/pull/96 et. al
-            calculable = calculable.to_package if calculable.is_a?(Spree::Shipment)
-            adjustment.update_column(:amount, compute_amount(calculable))
-          end
-
-          # Calculate the amount to be used when creating an adjustment
-          # NOTE: May be overriden by classes where this module is included into.
-          # Such as Spree::Promotion::Action::CreateAdjustment.
-          def compute_amount(calculable)
-            self.calculator.compute(calculable)
-          end
-
           private
           def self.model_name_without_spree_namespace
             self.to_s.tableize.gsub('/', '_').sub('spree_', '')

data/lib/spree/core/controller_helpers.rb

@@ -1,3 +1,8 @@
+require 'spree/core/controller_helpers/common'
+require 'spree/core/controller_helpers/auth'
+require 'spree/core/controller_helpers/respond_with'
+require 'spree/core/controller_helpers/order'
+
 module Spree
   module Core
     module ControllerHelpers

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

@@ -8,7 +8,7 @@ module Spree
           helper_method :try_spree_current_user
 
           rescue_from CanCan::AccessDenied do |exception|
-            redirect_unauthorized_access
+            unauthorized
           end
         end
 
@@ -20,7 +20,7 @@ module Spree
         # Redirect as appropriate when an access request fails.  The default action is to redirect to the login screen.
         # Override this method in your controllers if you want to have special behavior in case the user is not authorized
         # to access the requested action.  For example, a popup window might simply close itself.
-        def redirect_unauthorized_access
+        def unauthorized
           if try_spree_current_user
             flash[:error] = Spree.t(:authorization_failure)
             redirect_to '/unauthorized'

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

@@ -14,11 +14,6 @@ module Spree
 
           protected
 
-          # Convenience method for firing instrumentation events with the default payload hash
-          def fire_event(name, extra_payload = {})
-            ActiveSupport::Notifications.instrument(name, default_notification_payload.merge(extra_payload))
-          end
-
           # Creates the hash that is sent as the payload for all notifications. Specific notifications will
           # add additional keys as appropriate. Override this method if you need additional data when
           # responding to a notification

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

@@ -4,16 +4,23 @@ module Spree
       module Order
         def self.included(base)
           base.class_eval do
+            helper_method :simple_current_order
             helper_method :current_order
             helper_method :current_currency
             before_filter :set_current_order
           end
         end
 
+        # Used in the link_to_cart helper.
+        def simple_current_order
+          @order ||= Spree::Order.find_by(id: session[:order_id], currency: current_currency)
+        end
+
         # The current incomplete order from the session for use in cart and during checkout
         def current_order(options = {})
           options[:create_order_if_necessary] ||= false
           options[:lock] ||= false
+
           return @current_order if @current_order
 
           if session[:order_id]
@@ -47,14 +54,6 @@ module Spree
             @order.associate_user!(try_spree_current_user) if @order.user.blank? || @order.email.blank?
           end
 
-          # This will trigger any "first order" promotions to be triggered
-          # Assuming of course that this session variable was set correctly in
-          # the authentication provider's registrations controller
-          if session[:spree_user_signup] && @order
-            fire_event('spree.user.signup', user: try_spree_current_user, order: @order)
-            session[:spree_user_signup] = nil
-          end
-
           session[:guest_token] = nil
         end
 
@@ -74,7 +73,7 @@ module Spree
         end
 
         def ip_address
-          request.remote_ip
+          request.env['HTTP_X_REAL_IP'] || request.env['REMOTE_ADDR']
         end
       end
     end

data/lib/spree/core/engine.rb

@@ -4,18 +4,6 @@ module Spree
       isolate_namespace Spree
       engine_name 'spree'
 
-      config.autoload_paths += %W(#{config.root}/lib)
-
-      config.after_initialize do
-        ActiveSupport::Notifications.subscribe(/^spree\./) do |*args|
-          event_name, start_time, end_time, id, payload = args
-          Activator.active.event_name_starts_with(event_name).each do |activator|
-            payload[:event_name] = event_name
-            activator.activate(payload)
-          end
-        end
-      end
-
       initializer "spree.environment", :before => :load_config_initializers do |app|
         app.config.spree = Spree::Core::Environment.new
         Spree::Config = app.config.spree.preferences #legacy access
@@ -71,9 +59,11 @@ module Spree
           Spree::Calculator::FlatPercentItemTotal,
           Spree::Calculator::FlatRate,
           Spree::Calculator::FlexiRate,
-          Spree::Calculator::PerItem,
-          Spree::Calculator::PercentPerItem,
-          Spree::Calculator::FreeShipping
+        ]
+
+        app.config.spree.calculators.add_class('promotion_actions_create_item_adjustments')
+        app.config.spree.calculators.promotion_actions_create_item_adjustments = [
+          Spree::Calculator::PercentOnLineItem
         ]
       end
 
@@ -91,8 +81,11 @@ module Spree
       end
 
       initializer 'spree.promo.register.promotions.actions' do |app|
-        app.config.spree.promotions.actions = [Spree::Promotion::Actions::CreateAdjustment,
-          Spree::Promotion::Actions::CreateLineItems]
+        app.config.spree.promotions.actions = [
+          Promotion::Actions::CreateAdjustment,
+          Promotion::Actions::CreateItemAdjustments,
+          Promotion::Actions::CreateLineItems,
+          Promotion::Actions::FreeShipping]
       end
 
       # filter sensitive information during logging

data/lib/spree/core/permalinks.rb

@@ -68,4 +68,4 @@ module Spree
 end
 
 ActiveRecord::Base.send :include, Spree::Core::Permalinks
-ActiveRecord::Relation.send :include, Spree::Core::Permalinks
+ActiveRecord::Relation.send :include, Spree::Core::Permalinks

data/lib/spree/core/product_duplicator.rb

@@ -2,12 +2,8 @@ module Spree
   class ProductDuplicator
     attr_accessor :product
 
-    @@clone_images_default = true
-    mattr_accessor :clone_images_default
-
-    def initialize(product, include_images = @@clone_images_default)
+    def initialize(product)
       @product = product
-      @include_images = include_images
     end
 
     def duplicate
@@ -27,7 +23,6 @@ module Spree
     def duplicate_product
       product.dup.tap do |new_product|
         new_product.name = "COPY OF #{product.name}"
-        new_product.permalink = "copy-of-#{product.permalink}"
         new_product.taxons = product.taxons
         new_product.created_at = nil
         new_product.deleted_at = nil
@@ -43,7 +38,7 @@ module Spree
       master.dup.tap do |new_master|
         new_master.sku = "COPY OF #{master.sku}"
         new_master.deleted_at = nil
-        new_master.images = master.images.map { |image| duplicate_image image } if @include_images
+        new_master.images = master.images.map { |image| duplicate_image image }
         new_master.price = master.price
         new_master.currency = master.currency
       end
@@ -53,7 +48,7 @@ module Spree
       new_variant = variant.dup
       new_variant.sku = "COPY OF #{new_variant.sku}"
       new_variant.deleted_at = nil
-      new_variant.option_values = variant.option_values.map { |option_value| option_value}
+      new_variant.option_values = variant.option_values.map { |option_value| option_value.dup}
       new_variant
     end
 

data/lib/spree/core/user_address.rb

@@ -27,4 +27,4 @@ module Spree
       end
     end
   end
-end
+end

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

@@ -1,7 +1,29 @@
+# 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 value =~ /\A[^@\s]+@([^@\s]+\.)+[^@\s]+\z/
+    unless valid?(value)
       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.1.12"
+    "2.2.0"
   end
 end

data/lib/spree/money.rb

@@ -30,7 +30,7 @@ module Spree
 
       # Check the first character for a currency symbol, alternatively get it
       # from the stated currency string
-      c = if ::Monetize.assume_from_symbol && i =~ /^(\$|€|£)/
+      c = if ::Money.assume_from_symbol && i =~ /^(\$|€|£)/
         case i
         when /^\$/ then "USD"
         when /^€/ then "EUR"

data/lib/spree/permitted_attributes.rb

@@ -27,7 +27,7 @@ module Spree
     mattr_reader *ATTRIBUTES
 
     @@address_attributes = [
-      :id, :firstname, :lastname, :address1, :address2,
+      :firstname, :lastname, :address1, :address2,
       :city, :country_id, :state_id, :zipcode, :phone,
       :state_name, :alternative_phone, :company,
       :country => [:iso, :name, :iso3, :iso_name],
@@ -68,7 +68,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]
 
     @@stock_item_attributes = [:variant, :stock_location, :backorderable, :variant_id]

data/lib/spree/testing_support/caching.rb

@@ -0,0 +1,47 @@
+module Spree
+  module TestingSupport
+    module Caching
+      def cache_writes
+        @cache_write_events
+      end
+
+      def assert_written_to_cache(key)
+        unless @cache_write_events.detect { |event| event[:key].starts_with?(key) }
+          fail %Q{Expected to find #{key} in the cache, but didn't.
+
+  Cache writes:
+  #{@cache_write_events.join("\n")}
+          }
+        end
+      end
+
+      def clear_cache_events
+        @cache_read_events = []
+        @cache_write_events = []
+      end
+    end
+  end
+end
+
+RSpec.configure do |config|
+  config.include Spree::TestingSupport::Caching, :caching => true
+
+  config.before(:each, :caching => true) do
+    ActionController::Base.perform_caching = true
+
+    ActiveSupport::Notifications.subscribe("read_fragment.action_controller") do |event, start_time, finish_time, _, details|
+      @cache_read_events ||= []
+      @cache_read_events << details 
+    end
+
+    ActiveSupport::Notifications.subscribe("write_fragment.action_controller") do |event, start_time, finish_time, _, details|
+      @cache_write_events ||= []
+      @cache_write_events << details
+    end
+  end
+
+  config.after(:each, :caching => true) do
+    ActionController::Base.perform_caching = false
+    Rails.cache.clear
+  end
+end

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

@@ -3,15 +3,24 @@ FactoryGirl.define do
     association(:adjustable, factory: :order)
     amount 100.0
     label 'Shipping'
-    association(:source, factory: :shipment)
+    association(:source, factory: :tax_rate)
     eligible true
   end
 
-  factory :line_item_adjustment, class: Spree::Adjustment do
+  factory :tax_adjustment, class: Spree::Adjustment do
     association(:adjustable, factory: :line_item)
     amount 10.0
     label 'VAT 5%'
     association(:source, factory: :tax_rate)
     eligible true
+
+    after(:create) do |adjustment|
+      # Set correct tax category, so that adjustment amount is not 0
+      if adjustment.adjustable.is_a?(Spree::LineItem)
+        adjustment.source.tax_category = adjustment.adjustable.tax_category
+        adjustment.source.save
+        adjustment.update!
+      end
+    end
   end
 end

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

@@ -7,7 +7,8 @@ FactoryGirl.define do
   factory :credit_card, class: TestCard do
     verification_value 123
     month 12
-    year { 1.year.from_now.year }
+    year { Time.now.year }
     number '4111111111111111'
+    name 'Spree Commerce'
   end
 end

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

@@ -21,20 +21,27 @@ FactoryGirl.define do
       end
 
       after(:create) do |order, evaluator|
+        create_list(:line_item, evaluator.line_items_count, order: order)
+        order.line_items.reload
+
         create(:shipment, order: order)
         order.shipments.reload
 
-        create_list(:line_item, evaluator.line_items_count, order: order)
-        order.line_items.reload
         order.update!
       end
 
       factory :completed_order_with_totals do
         state 'complete'
-        completed_at { Time.now }
 
         after(:create) do |order|
           order.refresh_shipment_rates
+          order.update_column(:completed_at, Time.now)
+        end
+
+        factory :completed_order_with_pending_payment do
+          after(:create) do |order|
+            create(:payment, amount: order.total, order: order)
+          end
         end
 
         factory :order_ready_to_ship do
@@ -52,8 +59,6 @@ FactoryGirl.define do
 
         factory :shipped_order do
           after(:create) do |order|
-            order.update_totals # To ensure we have the right total
-            create(:payment, amount: order.total, order: order, state: 'completed')
             order.shipments.each do |shipment|
               shipment.inventory_units.each { |u| u.update_column('state', 'shipped') }
               shipment.update_column('state', 'shipped')

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

@@ -1,7 +1,7 @@
 FactoryGirl.define do
   factory :payment, class: Spree::Payment do
     amount 45.75
-    association(:payment_method, factory: :bogus_payment_method)
+    association(:payment_method, factory: :credit_card_payment_method)
     association(:source, factory: :credit_card)
     order
     state 'checkout'
@@ -10,7 +10,7 @@ FactoryGirl.define do
 
   factory :check_payment, class: Spree::Payment do
     amount 45.75
-    payment_method
+    association(:payment_method, factory: :check_payment_method)
     order
   end
 end