dugway 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e58f9b8d861b19265772a0bb454ae1a9cac1140c
-  data.tar.gz: 2af6e3d778fff5dbf60948d2e940ad1bdc07eb47
+  metadata.gz: 1084a19f3f1373dbc3f1ca375b4003d236cd0385
+  data.tar.gz: 7212879ca2ec43c38f495ac9dcbc6dad2b06a615
 SHA512:
-  metadata.gz: 38c26f7daab824b8ebfba0f644582d4b67d249c7e00ddc7145eaab096d4f064dfd1814389131f7c18f542cf90e67c036a8cc774acad05a56b73a0585d9ec5d7b
-  data.tar.gz: aa02501381d7a971a5cf26b054d14d298fbe11b20d370b92a7bb4d99ee0a3278f06c1c0dac2b92f0c9cd423a2103c60e28701a7e530dba62523dfee95eb87746
+  metadata.gz: aed377b55bc5bea4ff270a32a832958274db29c4029eca6771529b71d1b6c6be22dbe0fcf4867e7986a69041b2e4b42a02b0914ccebe409e30045eec72cff7aa
+  data.tar.gz: cb900d1a0cc36f331ab61a06cedbb40187a0da9afe77ccf37fb5fc768c6add12d43a216d1fd6a80bf7d6cabdd6d0422e222f6bdc246618ab24d0d89e5dab0267

data/lib/dugway.rb

@@ -22,7 +22,7 @@ module Dugway
     def application(options={})
       @options = options
 
-      I18n.load_path += Dir[File.join(File.dirname(__FILE__), 'data', 'locales', '*.yml').to_s]
+      I18n.load_path += Dir[File.join(File.dirname(__FILE__), 'dugway', 'data', 'locales', '*.yml').to_s]
       I18n.default_locale = 'en-US'
       I18n.locale = Dugway.store.locale
 

data/lib/dugway/liquid/filters/core_filters.rb

@@ -36,20 +36,20 @@ module Dugway
       # Money Filters
 
       def money(amount)
-        number_to_currency(amount, :locale => nil, :precision => I18n.translate('number.currency.format.precision'), :unit => '', :separator => I18n.translate('number.currency.format.separator'), :delimiter => I18n.translate('number.currency.format.delimiter'), :format => I18n.translate('number.currency.format.format')).strip
+        number_to_currency(amount, :unit => '').strip
       end
 
       def money_with_sign(amount)
         unit = I18n.translate('number.currency.format.unit')
-        number_to_currency(amount).try(:gsub, unit, "<span class=\"currency_sign\">#{ HTMLEntities.new.encode(unit, :named) }</span>")
+        number_to_currency(amount).gsub(unit, %{<span class="currency_sign">#{ HTMLEntities.new.encode(unit, :named) }</span>})
       end
 
       def money_with_code(amount)
-        %{#{ money(amount) } <span class="currency_code">#{ currency.code }</span>}
+        %{#{ money(amount) } <span class="currency_code">#{ currency['code'] }</span>}
       end
 
       def money_with_sign_and_code(amount)
-        %{#{ money_with_sign(amount) } <span class="currency_code\">#{ currency.code }</span>}
+        %{#{ money_with_sign(amount) } <span class="currency_code">#{ currency['code'] }</span>}
       end
 
       # Shipping Filters

data/lib/dugway/liquid/filters/util_filters.rb

@@ -10,12 +10,12 @@ module Dugway
       end
 
       # Mimics
-      
+
       DEFAULT_CURRENCY_VALUES = { :format => "%u%n", :negative_format => "-%u%n", :unit => "$", :separator => ".", :delimiter => ",", :precision => 2, :significant => false, :strip_insignificant_zeros => false }
-      
+
       def number_to_currency(number, options={})
         return unless number
-        
+
         options.symbolize_keys!
 
         defaults  = I18n.translate(:'number.format', :locale => options[:locale], :default => {})
@@ -33,25 +33,74 @@ module Dugway
           format = options.delete(:negative_format)
           number = number.respond_to?("abs") ? number.abs : number.sub(/^-/, '')
         end
-        
-        value = number_with_precision(number, options[:precision])
+
+        value = number_with_precision(number, options)
         format.gsub(/%n/, value).gsub(/%u/, unit)
       end
 
-      def number_with_delimiter(number, delimiter=",", separator=".")
+      def number_with_delimiter(number, options={})
+        options.symbolize_keys!
+
         begin
-          parts = number.to_s.split('.')
-          parts[0].gsub!(/(\d)(?=(\d\d\d)+(?!\d))/, "\\1#{delimiter}")
-          parts.join separator
-        rescue
-          number
+          Float(number)
+        rescue ArgumentError, TypeError
+          if options[:raise]
+            raise InvalidNumberError, number
+          else
+            return number
+          end
         end
+
+        defaults = I18n.translate(:'number.format', :locale => options[:locale], :default => {})
+        options = options.reverse_merge(defaults)
+
+        parts = number.to_s.to_str.split('.')
+        parts[0].gsub!(/(\d)(?=(\d\d\d)+(?!\d))/, "\\1#{options[:delimiter]}")
+        parts.join(options[:separator]).html_safe
       end
 
-      def number_with_precision(number, precision=3)
-        "%01.#{precision}f" % number
-      rescue
-        number
+      def number_with_precision(number, options={})
+        options.symbolize_keys!
+
+        number = begin
+          Float(number)
+        rescue ArgumentError, TypeError
+          if options[:raise]
+            raise InvalidNumberError, number
+          else
+            return number
+          end
+        end
+
+        defaults           = I18n.translate(:'number.format', :locale => options[:locale], :default => {})
+        precision_defaults = I18n.translate(:'number.precision.format', :locale => options[:locale], :default => {})
+        defaults           = defaults.merge(precision_defaults)
+
+        options = options.reverse_merge(defaults)  # Allow the user to unset default values: Eg.: :significant => false
+        precision = options.delete :precision
+        significant = options.delete :significant
+        strip_insignificant_zeros = options.delete :strip_insignificant_zeros
+
+        if significant and precision > 0
+          if number == 0
+            digits, rounded_number = 1, 0
+          else
+            digits = (Math.log10(number.abs) + 1).floor
+            rounded_number = (BigDecimal.new(number.to_s) / BigDecimal.new((10 ** (digits - precision)).to_f.to_s)).round.to_f * 10 ** (digits - precision)
+            digits = (Math.log10(rounded_number.abs) + 1).floor # After rounding, the number of digits may have changed
+          end
+          precision -= digits
+          precision = precision > 0 ? precision : 0  #don't let it be negative
+        else
+          rounded_number = BigDecimal.new(number.to_s).round(precision).to_f
+        end
+        formatted_number = number_with_delimiter("%01.#{precision}f" % rounded_number, options)
+        if strip_insignificant_zeros
+          escaped_separator = Regexp.escape(options[:separator])
+          formatted_number.sub(/(#{escaped_separator})(\d*[1-9])?0+\z/, '\1\2').sub(/#{escaped_separator}\z/, '').html_safe
+        else
+          formatted_number
+        end
       end
 
       def tag(name, options = nil, open = false, escape = true)

data/lib/dugway/version.rb

@@ -1,3 +1,3 @@
 module Dugway
-  VERSION = "0.6.1"
+  VERSION = "0.6.2"
 end

data/spec/units/dugway/liquid/filters/core_filters_spec.rb

@@ -24,9 +24,33 @@ describe Dugway::Filters::CoreFilters do
     end
   end
 
+  describe "#money" do
+    it "should convert a number to currency format" do
+      rendered_template("{{ 1234.56 | money }}").should == '1,234.56'
+    end
+  end
+
+  describe "#money_with_sign" do
+    it "should convert a number to currency format with a sign" do
+      rendered_template("{{ 1234.56 | money_with_sign }}").should == '<span class="currency_sign">$</span>1,234.56'
+    end
+  end
+
+  describe "#money_with_code" do
+    it "should convert a number to currency format with a code" do
+      rendered_template("{{ 1234.56 | money_with_code }}").should == '1,234.56 <span class="currency_code">USD</span>'
+    end
+  end
+
+  describe "#money_with_sign_and_code" do
+    it "should convert a number to currency format with a sign and code" do
+      rendered_template("{{ 1234.56 | money_with_sign_and_code }}").should == '<span class="currency_sign">$</span>1,234.56 <span class="currency_code">USD</span>'
+    end
+  end
+
   private
 
   def rendered_template(template, assigns={})
-    Liquid::Template.parse(template).render(assigns)
+    Liquid::Template.parse(template).render(assigns, :registers => { :currency => Dugway.store.currency })
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dugway
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Big Cartel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-16 00:00:00.000000000 Z
+date: 2013-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler