spree_core 2.4.10 → 3.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 920d1116f3ab6e3411d25cbb20a68d9a3219dc54
-  data.tar.gz: 5ce011d689d7dc2c8b5daa7af24fa35cda922a75
+  metadata.gz: 599174c8bcc4c415e7a65af40048eeff77e07147
+  data.tar.gz: f0b4346703e8ff979bc55c7ba86204e5878d163c
 SHA512:
-  metadata.gz: 1904b47e5b0daea447eac9c638e2ea0b781758ed32e8f8e30f07e361bfa1e8bfbdce55d100f2678043d6bbe80a2ef3a130628d5b619790d615d6cd1830108392
-  data.tar.gz: bcad22a5914ca2dfc426588ec7ccaaefe6169801d4f8b3e0366e3f71b517e1042e84a60d819bd0eed13d39b76ca435c93359fc1dafa854c05f9303e0832ed227
+  metadata.gz: a20e56fe585721fd0daea6ae733b0cadcd53273e9f44aaf0e783e62b11bf1bf8d2dc1c00e06e5cc6d2de55099e54b1ed62f6162e402039946f00c547a75e8334
+  data.tar.gz: 0547cb6578f56c46bbbe61fdb6a920e74cca7e79b5fbcca9d8dfab376b5ae97a827571a3ba9a4737ac99dd6765797f69f4538604af0c9009b33493a7a371e7ce

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2007-2014, Spree Commerce, Inc. and other contributors
+Copyright (c) 2007-2015, Spree Commerce, Inc. and other contributors
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

data/app/controllers/spree/base_controller.rb

@@ -4,7 +4,6 @@ require_dependency 'spree/core/controller_helpers/strong_parameters'
 class Spree::BaseController < ApplicationController
   include Spree::Core::ControllerHelpers::Auth
   include Spree::Core::ControllerHelpers::RespondWith
-  include Spree::Core::ControllerHelpers::SSL
   include Spree::Core::ControllerHelpers::Common
   include Spree::Core::ControllerHelpers::Search
   include Spree::Core::ControllerHelpers::Store
@@ -13,4 +12,4 @@ class Spree::BaseController < ApplicationController
   respond_to :html
 end
 
-require 'spree/i18n/initializer'
+require 'spree/i18n/initializer'

data/app/helpers/spree/base_helper.rb

@@ -1,35 +1,37 @@
 module Spree
   module BaseHelper
 
-    # Defined because Rails' current_page? helper is not working when Spree is mounted at root.
-    def current_spree_page?(url)
-      path = request.fullpath.gsub(/^\/\//, '/')
-      if url.is_a?(String)
-        return path == url
-      elsif url.is_a?(Hash)
-        return path == spree.url_for(url)
+    def available_countries
+      checkout_zone = Zone.find_by(name: Spree::Config[:checkout_zone])
+
+      if checkout_zone && checkout_zone.kind == 'country'
+        countries = checkout_zone.country_list
+      else
+        countries = Country.all
       end
-      return false
+
+      countries.collect do |country|
+        country.name = Spree.t(country.iso, scope: 'country_names', default: country.name)
+        country
+      end.sort_by { |c| c.name.parameterize }
     end
 
-    def link_to_cart(text = nil)
-      text = text ? h(text) : Spree.t('cart')
-      css_class = nil
+    def display_price(product_or_variant)
+      product_or_variant.price_in(current_currency).display_price.to_html
+    end
 
-      if simple_current_order.nil? or simple_current_order.item_count.zero?
-        text = "#{text}: (#{Spree.t('empty')})"
-        css_class = 'empty'
+    def link_to_tracking(shipment, options = {})
+      return unless shipment.tracking && shipment.shipping_method
+
+      if shipment.tracking_url
+        link_to(shipment.tracking, shipment.tracking_url, options)
       else
-        text = "#{text}: (#{simple_current_order.item_count})  <span class='amount'>#{simple_current_order.display_total.to_html}</span>"
-        css_class = 'full'
+        content_tag(:span, shipment.tracking)
       end
-
-      link_to text.html_safe, spree.cart_path, :class => "cart-info #{css_class}"
     end
 
-    # human readable list of variant options
-    def variant_options(v, options={})
-      v.options_text
+    def logo(image_path=Spree::Config[:logo])
+      link_to image_tag(image_path), spree.root_path
     end
 
     def meta_data
@@ -58,101 +60,6 @@ module Spree
       end.join("\n")
     end
 
-    def body_class
-      @body_class ||= content_for?(:sidebar) ? 'two-col' : 'one-col'
-      @body_class
-    end
-
-    def logo(image_path=Spree::Config[:logo])
-      link_to image_tag(image_path), spree.root_path
-    end
-
-    def flash_messages(opts = {})
-      ignore_types = ["order_completed"].concat(Array(opts[:ignore_types]).map(&:to_s) || [])
-
-      flash.each do |msg_type, text|
-        unless ignore_types.include?(msg_type)
-          concat(content_tag :div, text, class: "flash #{msg_type}")
-        end
-      end
-      nil
-    end
-
-    def breadcrumbs(taxon, separator="&nbsp;&raquo;&nbsp;", breadcrumb_class="inline")
-      return "" if current_page?("/") || taxon.nil?
-
-      crumbs = [[Spree.t(:home), spree.root_path]]
-
-      if taxon
-        crumbs << [Spree.t(:products), products_path]
-        crumbs += taxon.ancestors.collect { |a| [a.name, spree.nested_taxons_path(a.permalink)] } unless taxon.ancestors.empty?
-        crumbs << [taxon.name, spree.nested_taxons_path(taxon.permalink)]
-      else
-        crumbs << [Spree.t(:products), products_path]
-      end
-
-      separator = raw(separator)
-
-      crumbs.map! do |crumb|
-        content_tag(:li, itemscope:"itemscope", itemtype:"http://data-vocabulary.org/Breadcrumb") do
-          link_to(crumb.last, itemprop: "url") do
-            content_tag(:span, crumb.first, itemprop: "title")
-          end + (crumb == crumbs.last ? '' : separator)
-        end
-      end
-
-      content_tag(:nav, content_tag(:ul, raw(crumbs.map(&:mb_chars).join), class: breadcrumb_class), id: 'breadcrumbs', class: 'sixteen columns')
-    end
-
-    def taxons_tree(root_taxon, current_taxon, max_level = 1)
-      return '' if max_level < 1 || root_taxon.leaf?
-      content_tag :ul, class: 'taxons-list' do
-        root_taxon.children.map do |taxon|
-          css_class = (current_taxon && current_taxon.self_and_ancestors.include?(taxon)) ? 'current' : nil
-          content_tag :li, class: css_class do
-           link_to(taxon.name, seo_url(taxon)) +
-           taxons_tree(taxon, current_taxon, max_level - 1)
-          end
-        end.join("\n").html_safe
-      end
-    end
-
-    def available_countries
-      checkout_zone = Zone.find_by(name: Spree::Config[:checkout_zone])
-
-      if checkout_zone && checkout_zone.kind == 'country'
-        countries = checkout_zone.country_list
-      else
-        countries = Country.all
-      end
-
-      countries.collect do |country|
-        country.name = Spree.t(country.iso, scope: 'country_names', default: country.name)
-        country
-      end.sort_by { |c| c.name.parameterize }
-    end
-
-    def seo_url(taxon)
-      return spree.nested_taxons_path(taxon.permalink)
-    end
-
-    def gem_available?(name)
-       Gem::Specification.find_by_name(name)
-    rescue Gem::LoadError
-       false
-    rescue
-       Gem.available?(name)
-    end
-
-    def display_price(product_or_variant)
-      product_or_variant.price_in(current_currency).display_price.to_html
-    end
-
-    def pretty_time(time)
-      [I18n.l(time.to_date, format: :long),
-        time.strftime("%l:%M %p")].join(" ")
-    end
-
     def method_missing(method_name, *args, &block)
       if image_style = image_style_from_method_name(method_name)
         define_image_method(image_style)
@@ -162,26 +69,21 @@ module Spree
       end
     end
 
-    def link_to_tracking(shipment, options = {})
-      return unless shipment.tracking && shipment.shipping_method
-
-      if shipment.tracking_url
-        link_to(shipment.tracking, shipment.tracking_url, options)
-      else
-        content_tag(:span, shipment.tracking)
-      end
+    def pretty_time(time)
+      [I18n.l(time.to_date, format: :long), time.strftime("%l:%M %p")].join(" ")
     end
 
-    private
+    def seo_url(taxon)
+      return spree.nested_taxons_path(taxon.permalink)
+    end
 
-    # Returns style of image or nil
-    def image_style_from_method_name(method_name)
-      if method_name.to_s.match(/_image$/) && style = method_name.to_s.sub(/_image$/, '')
-        possible_styles = Spree::Image.attachment_definitions[:attachment][:styles]
-        style if style.in? possible_styles.with_indifferent_access
-      end
+    # human readable list of variant options
+    def variant_options(v, options={})
+      v.options_text
     end
 
+    private
+
     def create_product_image_tag(image, product, options, style)
       options.reverse_merge! alt: image.alt.blank? ? product.name : image.alt
       image_tag image.attachment.url(style), options
@@ -205,5 +107,13 @@ module Spree
         end
       end
     end
+
+    # Returns style of image or nil
+    def image_style_from_method_name(method_name)
+      if method_name.to_s.match(/_image$/) && style = method_name.to_s.sub(/_image$/, '')
+        possible_styles = Spree::Image.attachment_definitions[:attachment][:styles]
+        style if style.in? possible_styles.with_indifferent_access
+      end
+    end
   end
 end

data/app/helpers/spree/products_helper.rb

@@ -45,7 +45,7 @@ module Spree
 
     def line_item_description_text description_text
       if description_text.present?
-        truncate(strip_tags(description_text.gsub(' ', ' ').squish), length: 100)
+        truncate(strip_tags(description_text.gsub(' ', ' ')), length: 100)
       else
         Spree.t(:product_has_no_description)
       end

data/app/models/concerns/spree/adjustment_source.rb

@@ -3,21 +3,57 @@ module Spree
     extend ActiveSupport::Concern
 
     included do
-      def deals_with_adjustments_for_deleted_source
-        adjustment_scope = self.adjustments.includes(:order).references(:spree_orders)
-
-        # For incomplete orders, remove the adjustment completely.
-        adjustment_scope.where("spree_orders.completed_at IS NULL").destroy_all
-
-        # For complete orders, the source will be invalid.
-        # Therefore we nullify the source_id, leaving the adjustment in place.
-        # This would mean that the order's total is not altered at all.
-        adjustment_scope.where("spree_orders.completed_at IS NOT NULL").each do |adjustment|
-          adjustment.update_columns(
-            source_id: nil,
-            updated_at: Time.now,
-          )
-        end
+      has_many :adjustments, as: :source
+      before_destroy :deals_with_adjustments_for_deleted_source
+    end
+
+    protected
+
+    def create_adjustment(order, adjustable, included = nil)
+      amount = compute_amount(adjustable)
+      return if amount == 0
+      adjustments.new(order: order,
+                      adjustable: adjustable,
+                      label: label(amount),
+                      amount: amount,
+                      included: included).save
+    end
+
+    def create_unique_adjustment(order, adjustable)
+      return if already_adjusted?(adjustable)
+      create_adjustment(order, adjustable)
+    end
+
+    def create_unique_adjustments(order, adjustables)
+      adjustables.where.not(id: already_adjusted_ids(order)).map do |adjustable|
+        create_adjustment(order, adjustable) if !block_given? || yield(adjustable)
+      end.any?
+    end
+
+    private
+
+    def already_adjusted_ids(order)
+      adjustments.where(order: order).pluck(:adjustable_id)
+    end
+
+    def already_adjusted?(adjustable)
+      adjustments.where(adjustable: adjustable).exists?
+    end
+
+    def deals_with_adjustments_for_deleted_source
+      adjustment_scope = adjustments.includes(:order).references(:spree_orders)
+
+      # For incomplete orders, remove the adjustment completely.
+      adjustment_scope.where("spree_orders.completed_at IS NULL").destroy_all
+
+      # For complete orders, the source will be invalid.
+      # Therefore we nullify the source_id, leaving the adjustment in place.
+      # This would mean that the order's total is not altered at all.
+      adjustment_scope.where("spree_orders.completed_at IS NOT NULL").each do |adjustment|
+        adjustment.update_columns(
+          source_id: nil,
+          updated_at: Time.now,
+        )
       end
     end
   end

data/app/models/concerns/spree/calculated_adjustments.rb

@@ -6,6 +6,7 @@ module Spree
       has_one   :calculator, class_name: "Spree::Calculator", as: :calculable, inverse_of: :calculable, dependent: :destroy, autosave: true
       accepts_nested_attributes_for :calculator
       validates :calculator, presence: true
+      delegate :compute, to: :calculator
 
       def self.calculators
         spree_calculators.send model_name_without_spree_namespace

data/app/models/concerns/spree/display_money.rb

@@ -0,0 +1,32 @@
+module Spree
+  module DisplayMoney
+    ##
+    # Takes a list of methods that the base object wants to be able to use
+    # to display with Spree::Money, and turns them into display_* methods.
+    # Intended to help clean up some of the presentational logic that exists
+    # at the model layer.
+    #
+    #
+    # ==== Examples
+    # Decorate a method, with the default option of using the base object's 
+    # currency
+    #
+    #     extend Spree::DisplayMoney
+    #     money_methods :tax_amount, :price
+    #
+    # Decorate a method, but with some additional options
+    #     extend Spree::DisplayMoney
+    #     money_methods tax_amount: { currency: "CAD", no_cents: true }, :price
+    def money_methods(*args)
+      args.each do |money_method|
+        money_method = { money_method => {} } unless money_method.is_a? Hash
+        money_method.each do |method_name, opts|
+          define_method("display_#{method_name}") do
+            default_opts = respond_to?(:currency) ? { currency: currency } : {}
+            Spree::Money.new(send(method_name), default_opts.merge(opts))
+          end
+        end
+      end
+    end
+  end
+end

data/app/models/concerns/spree/named_type.rb

@@ -4,7 +4,7 @@ module Spree
 
     included do
       scope :active, -> { where(active: true) }
-      default_scope -> { order("LOWER(#{self.table_name}.name)") }
+      default_scope { order("LOWER(#{self.table_name}.name)") }
 
       validates :name, presence: true, uniqueness: { case_sensitive: false }
     end

data/app/models/concerns/spree/number_generator.rb

@@ -0,0 +1,39 @@
+module Spree
+  module NumberGenerator
+    extend ActiveSupport::Concern
+
+    NUMBER_LENGTH  = 9
+    NUMBER_LETTERS = false
+    NUMBER_PREFIX  = 'N'
+
+    included do
+      before_validation :generate_number, on: :create # generate number before make_permalink
+      validates :number, uniqueness: true
+    end
+
+    def self.by_number(number)
+      where(number: number)
+    end
+
+    def generate_number(options = {})
+      options[:length]  ||= NUMBER_LENGTH
+      options[:letters] ||= NUMBER_LETTERS
+      options[:prefix]  ||= NUMBER_PREFIX
+
+      possible = (0..9).to_a
+      possible += ('A'..'Z').to_a if options[:letters]
+
+      self.number ||= loop do
+        # Make a random number.
+        random = "#{options[:prefix]}#{(0...options[:length]).map { possible.shuffle.first }.join}"
+        # Use the random  number if no other order exists with it.
+        if self.class.exists?(number: random)
+          # If over half of all possible options are taken add another digit.
+          options[:length] += 1 if self.class.count > (10 ** options[:length] / 2)
+        else
+          break random
+        end
+      end
+    end
+  end
+end

data/app/models/concerns/spree/user_reporting.rb

@@ -1,13 +1,12 @@
 module Spree
   module UserReporting
+    extend DisplayMoney
+    money_methods :lifetime_value, :average_order_value
+
     def lifetime_value
       spree_orders.complete.pluck(:total).sum
     end
 
-    def display_lifetime_value
-      Spree::Money.new(lifetime_value)
-    end
-
     def order_count
       BigDecimal(spree_orders.complete.count)
     end
@@ -19,9 +18,5 @@ module Spree
         BigDecimal("0.00")
       end
     end
-
-    def display_average_order_value
-      Spree::Money.new(average_order_value)
-    end
   end
 end