spree_core 2.0.7 → 2.0.8

data/lib/generators/spree/dummy/templates/rails/database.yml

@@ -27,21 +27,31 @@ production:
   database: <%= database_prefix %>spree_production
   encoding: utf8
 <% when 'postgres' %>
+<% db_host = ENV['DB_HOST'] -%>
 development:
   adapter: postgresql
   database: <%= database_prefix %>spree_development
   username: postgres
   min_messages: warning
+<% unless db_host.blank? %>
+  host: <%= db_host %>
+<% end %>
 test:
   adapter: postgresql
   database: <%= database_prefix %>spree_test
   username: postgres
   min_messages: warning
+<% unless db_host.blank? %>
+  host: <%= db_host %>
+<% end %>
 production:
   adapter: postgresql
   database: <%= database_prefix %>spree_production
   username: postgres
   min_messages: warning
+<% unless db_host.blank? %>
+  host: <%= db_host %>
+<% end %>
 <% else %>
 development:
   adapter: sqlite3

data/lib/spree/core/delegate_belongs_to.rb

@@ -37,6 +37,8 @@ module DelegateBelongsTo
       attrs = get_association_column_names(association) if attrs.empty?
       attrs.concat get_association_column_names(association) if attrs.delete :defaults
       attrs.each do |attr|
+        next if attribute_method?(attr)
+
         class_def attr do |*args|
           if args.empty?
             send(:delegator_for, association).send(attr)

data/lib/spree/core/engine.rb

@@ -86,7 +86,11 @@ module Spree
         ]
       end
 
-      initializer 'spree.promo.register.promotion.calculators' do
+      # Promotion rules need to be evaluated on after initialize otherwise
+      # Spree.user_class would be nil and users might experience errors related
+      # to malformed model associations (Spree.user_class is only defined on
+      # the app initializer)
+      config.after_initialize do
         Rails.application.config.spree.promotions.rules.concat [
           Spree::Promotion::Rules::ItemTotal,
           Spree::Promotion::Rules::Product,

data/lib/spree/core/permalinks.rb

@@ -37,6 +37,10 @@ module Spree
           permalink_options[:prefix] || ""
         end
 
+        def permalink_length
+          permalink_options[:length] || 9
+        end
+
         def permalink_order
           order = permalink_options[:order]
           "#{order} ASC," if order
@@ -44,7 +48,7 @@ module Spree
       end
 
       def generate_permalink
-        "#{self.class.permalink_prefix}#{Array.new(9){rand(9)}.join}"
+        "#{self.class.permalink_prefix}#{Array.new(self.class.permalink_length){rand(9)}.join}"
       end
 
       def save_permalink(permalink_value=self.to_param)

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "2.0.7"
+    "2.0.8"
   end
 end

data/lib/spree/i18n.rb

@@ -4,6 +4,7 @@ require 'spree/i18n/base'
 
 module Spree
   extend ActionView::Helpers::TranslationHelper
+  extend ActionView::Helpers::TagHelper
 
   class << self
     # Add spree namespace and delegate to Rails TranslationHelper for some nice

data/lib/spree/money.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'money'
 
 module Spree
@@ -7,7 +9,7 @@ module Spree
     delegate :cents, :to => :money
 
     def initialize(amount, options={})
-      @money = ::Money.parse([amount, (options[:currency] || Spree::Config[:currency])].join)
+      @money = self.class.parse([amount, (options[:currency] || Spree::Config[:currency])].join)
       @options = {}
       @options[:with_currency] = Spree::Config[:display_currency]
       @options[:symbol_position] = Spree::Config[:currency_symbol_position].to_sym
@@ -20,6 +22,174 @@ module Spree
       @options[:symbol_position] = @options[:symbol_position].to_sym
     end
 
+    # This method is being deprecated in Money 6.1.0, so now lives here.
+    def self.parse(input, currency = nil)
+      i = input.to_s.strip
+
+      # raise Money::Currency.table.collect{|c| c[1][:symbol]}.inspect
+
+      # Check the first character for a currency symbol, alternatively get it
+      # from the stated currency string
+      c = if ::Money.assume_from_symbol && i =~ /^(\$|€|£)/
+        case i
+        when /^\$/ then "USD"
+        when /^€/ then "EUR"
+        when /^£/ then "GBP"
+        end
+      else
+        i[/[A-Z]{2,3}/]
+      end
+
+      # check that currency passed and embedded currency are the same,
+      # and negotiate the final currency
+      if currency.nil? and c.nil?
+        currency = ::Money.default_currency
+      elsif currency.nil?
+        currency = c
+      elsif c.nil?
+        currency = currency
+      elsif currency != c
+        # TODO: ParseError
+        raise ArgumentError, "Mismatching Currencies"
+      end
+      currency = ::Money::Currency.wrap(currency)
+
+      fractional = extract_cents(i, currency)
+      ::Money.new(fractional, currency)
+    end
+
+    # This method is being deprecated in Money 6.1.0, so now lives here.
+    def self.extract_cents(input, currency = Money.default_currency)
+      # remove anything that's not a number, potential thousands_separator, or minus sign
+      num = input.gsub(/[^\d.,'-]/, '')
+
+      # set a boolean flag for if the number is negative or not
+      negative = num =~ /^-|-$/ ? true : false
+
+      # decimal mark character
+      decimal_char = currency.decimal_mark
+
+      # if negative, remove the minus sign from the number
+      # if it's not negative, the hyphen makes the value invalid
+      if negative
+        num = num.sub(/^-|-$/, '')
+      end
+
+      raise ArgumentError, "Invalid currency amount (hyphen)" if num.include?('-')
+
+      #if the number ends with punctuation, just throw it out.  If it means decimal,
+      #it won't hurt anything.  If it means a literal period or comma, this will
+      #save it from being mis-interpreted as a decimal.
+      num.chop! if num.match(/[\.|,]$/)
+
+      # gather all decimal_marks within the result number
+      used_delimiters = num.scan(/[^\d]/)
+
+      # determine the number of unique decimal_marks within the number
+      #
+      # e.g.
+      # $1,234,567.89 would return 2 (, and .)
+      # $125,00 would return 1
+      # $199 would return 0
+      # $1 234,567.89 would raise an error (decimal_marks are space, comma, and period)
+      case used_delimiters.uniq.length
+        # no decimal_mark or thousands_separator; major (dollars) is the number, and minor (cents) is 0
+      when 0 then major, minor = num, 0
+
+        # two decimal_marks, so we know the last item in this array is the
+        # major/minor thousands_separator and the rest are decimal_marks
+      when 2
+        thousands_separator, decimal_mark = used_delimiters.uniq
+
+        # remove all thousands_separator, split on the decimal_mark
+        major, minor = num.gsub(thousands_separator, '').split(decimal_mark)
+        min = 0 unless min
+      when 1
+        # we can't determine if the comma or period is supposed to be a decimal_mark or a thousands_separator
+        # e.g.
+        # 1,00 - comma is a thousands_separator
+        # 1.000 - period is a thousands_separator
+        # 1,000 - comma is a decimal_mark
+        # 1,000,000 - comma is a decimal_mark
+        # 10000,00 - comma is a thousands_separator
+        # 1000,000 - comma is a thousands_separator
+
+        # assign first decimal_mark for reusability
+        decimal_mark = used_delimiters.first
+
+        # When we have identified the decimal mark character
+        if decimal_char == decimal_mark
+          major, minor = num.split(decimal_char)
+
+        else
+          # decimal_mark is used as a decimal_mark when there are multiple instances, always
+          if num.scan(decimal_mark).length > 1 # multiple matches; treat as decimal_mark
+            major, minor = num.gsub(decimal_mark, ''), 0
+          else
+            # ex: 1,000 - 1.0000 - 10001.000
+            # split number into possible major (dollars) and minor (cents) values
+            possible_major, possible_minor = num.split(decimal_mark)
+            possible_major ||= "0"
+            possible_minor ||= "00"
+
+            # if the minor (cents) length isn't 3, assign major/minor from the possibles
+            # e.g.
+            #   1,00 => 1.00
+            #   1.0000 => 1.00
+            #   1.2 => 1.20
+            if possible_minor.length != 3 # thousands_separator
+              major, minor = possible_major, possible_minor
+            else
+              # minor length is three
+              # let's try to figure out intent of the thousands_separator
+
+              # the major length is greater than three, which means
+              # the comma or period is used as a thousands_separator
+              # e.g.
+              #   1000,000
+              #   100000,000
+              if possible_major.length > 3
+                major, minor = possible_major, possible_minor
+              else
+                # number is in format ###{sep}### or ##{sep}### or #{sep}###
+                # handle as , is sep, . is thousands_separator
+                if decimal_mark == '.'
+                  major, minor = possible_major, possible_minor
+                else
+                  major, minor = "#{possible_major}#{possible_minor}", 0
+                end
+              end
+            end
+          end
+        end
+      else
+        # TODO: ParseError
+        raise ArgumentError, "Invalid currency amount"
+      end
+
+      # build the string based on major/minor since decimal_mark/thousands_separator have been removed
+      # avoiding floating point arithmetic here to ensure accuracy
+      cents = (major.to_i * currency.subunit_to_unit)
+      # Because of an bug in JRuby, we can't just call #floor
+      minor = minor.to_s
+      minor = if minor.size < currency.decimal_places
+                (minor + ("0" * currency.decimal_places))[0,currency.decimal_places].to_i
+              elsif minor.size > currency.decimal_places
+                if minor[currency.decimal_places,1].to_i >= 5
+                  minor[0,currency.decimal_places].to_i+1
+                else
+                  minor[0,currency.decimal_places].to_i
+                end
+              else
+                minor.to_i
+              end
+
+      cents += minor
+
+      # if negative, multiply by -1; otherwise, return positive cents
+      negative ? cents * -1 : cents
+    end
+
     def to_s
       @money.format(@options)
     end

data/lib/spree/testing_support/capybara_ext.rb

@@ -36,8 +36,8 @@ module CapybaraExt
     label = find_label_by_text(options[:from])
     within label.first(:xpath,".//..") do
       options[:from] = "##{find(".select2-container")["id"]}"
-      targetted_select2_search(value, options)
     end
+    targetted_select2_search(value, options)
   end
 
   def targetted_select2_search(value, options)
@@ -51,8 +51,8 @@ module CapybaraExt
 
     within label.first(:xpath,".//..") do
       options[:from] = "##{find(".select2-container")["id"]}"
-      targetted_select2(value, options)
     end
+    targetted_select2(value, options)
   end
 
   def select2_no_label value, options={}
@@ -73,9 +73,10 @@ module CapybaraExt
   end
 
   def select_select2_result(value)
-    #p %Q{$("div.select2-result-label:contains('#{value}')").mouseup()}
-    sleep(1)
-    page.execute_script(%Q{$("div.select2-result-label:contains('#{value}')").mouseup()})
+    # results are in a div appended to the end of the document
+    within(:xpath, '//body') do
+      page.find("div.select2-result-label", text: %r{#{Regexp.escape(value)}}i).click
+    end
   end
 
   def find_label_by_text(text)

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

@@ -12,6 +12,10 @@ FactoryGirl.define do
     # ensure stock item will be created for this products master
     before(:create) { create(:stock_location) if Spree::StockLocation.count == 0 }
 
+    after(:create) do |p|
+      p.variants_including_master.each { |v| v.save! }
+    end
+
     factory :custom_product do
       name 'Custom Product'
       price 17.99

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

@@ -9,6 +9,8 @@ FactoryGirl.define do
     height { generate(:random_float) }
     width  { generate(:random_float) }
     depth  { generate(:random_float) }
+    is_master 0
+    track_inventory true
 
     product { |p| p.association(:base_product) }
     option_values { [create(:option_value)] }
@@ -20,5 +22,18 @@ FactoryGirl.define do
       # on_hand 5
       product { |p| p.association(:product) }
     end
+
+    factory :master_variant do
+      is_master 1
+    end
+
+    factory :on_demand_variant do
+      track_inventory false
+
+      factory :on_demand_master_variant do
+        is_master 1
+      end
+    end
+
   end
 end