maguire 0.1.2 → 0.1.3

data/README.md

@@ -12,7 +12,7 @@ Maguire.locale_paths << "path/to/my/locales"
 
 If you're adding a customization for French-speaking Canadians, the JSON file should be named `fr_CA.json`.
 
-The file should *at least* have a layouts hash for providing information on how to format the currencies. The layout format should always be in US Dollars (using the code `USD`, and symbol `$`) and use the monetary value of `1234567890.12`.
+The file should *at least* have a layouts hash for providing information on how to format the currencies. The layout format should always be in US Dollars (using the code `USD`, and symbol `$`) and use the monetary value of `1234567890.12`. In addition, there's an optional layout if there's a custom format when there's no minor units (cf. '$1.-"). The monetary value for the zero layout is `1.00`.
 
 So a layout for use in Quebec might be:
 
@@ -20,7 +20,7 @@ So a layout for use in Quebec might be:
 {
   "layouts": {
     "positive": "1.234.567.890,12 $",
-    "negative": "-1.234.567.890,12"
+    "negative": "-1.234.567.890,12 $"
   }
 }
 ```
@@ -54,6 +54,6 @@ A file for the Bitcoin currency would look like:
 After doing this, you can format your Bitcoins:
 
 ```ruby
-Maguire.format({ value: 400_000_00000000, currency: "BTC" })
+Maguire.format({ value: 400_000_00000000, currency: "BTC" }, { strip_insignificant_zeros: true })
 # ฿400,000
 ```

data/lib/maguire/locale.rb

@@ -9,8 +9,12 @@ module Maguire
     def initialize(locale, locale_data={})
       @locale = locale
 
-      @positive_formatting = parse_layout(locale_data[:layouts][:positive])
-      @negative_formatting = parse_layout(locale_data[:layouts][:negative])
+      layouts = locale_data[:layouts]
+      @positive_formatting = parse_layout(layouts[:positive])
+      @negative_formatting = parse_layout(layouts[:negative])
+      if layouts[:zero]
+        @zero_formatting = parse_zero_layout(layouts[:zero])
+      end
 
       @currency_overlays = locale_data
     end
@@ -46,8 +50,13 @@ module Maguire
         minor_value = ""
         decimal_symbol = ""
       else
-        minor_value = minor_value.to_s.rjust(currency.minor_units, "0")
         decimal_symbol = formatting[:decimal_symbol]
+
+        if minor_value == 0 && @zero_formatting
+          formatting = @zero_formatting
+        else
+          minor_value = minor_value.to_s.rjust(currency.minor_units, "0")
+        end
       end
 
       formatting[:layout] % {
@@ -115,6 +124,22 @@ module Maguire
         }
       end
 
+      def parse_zero_layout(layout)
+        layout = layout.dup
+
+        layout.gsub!("USD", "%{code}")
+        layout.gsub!("$", "%{symbol}")
+        layout.gsub!("1", "%{major_value}")
+        decimal_symbol = @positive_formatting[:decimal_symbol]
+        layout.gsub!(decimal_symbol, "%{decimal}")
+
+        {
+          layout: layout,
+          decimal_symbol: decimal_symbol,
+          digit_grouping_symbol: @positive_formatting[:digit_grouping_symbol]
+        }
+      end
+
       def round(value)
         value.to_i
       end

data/lib/maguire/locale.rb~

@@ -1,5 +1,4 @@
 require 'json'
-require 'pry'
 
 module Maguire
   class Locale
@@ -10,8 +9,12 @@ module Maguire
     def initialize(locale, locale_data={})
       @locale = locale
 
-      @positive_formatting = parse_layout(locale_data[:layouts][:positive])
-      @negative_formatting = parse_layout(locale_data[:layouts][:negative])
+      layouts = locale_data[:layouts]
+      @positive_formatting = parse_layout(layouts[:positive])
+      @negative_formatting = parse_layout(layouts[:negative])
+      if layouts[:zero]
+        @zero_formatting = parse_zero_layout([:zero])
+      end
 
       @currency_overlays = locale_data
     end
@@ -32,11 +35,35 @@ module Maguire
       formatting = value >= 0 ?
         @positive_formatting : @negative_formatting
 
+      symbol = currency.symbol
+      if options[:html] && currency.symbol_html
+        symbol = currency.symbol_html
+      end
+
+      strip_insignificant_zeros = options[:strip_insignificant_zeros]
+      if options[:no_minor_units] || currency.minor_units == 0
+        minor_value = 0
+        strip_insignificant_zeros = true
+      end
+
+      if strip_insignificant_zeros && minor_value == 0
+        minor_value = ""
+        decimal_symbol = ""
+      else
+        minor_value = minor_value.to_s.rjust(currency.minor_units, "0")
+        decimal_symbol = formatting[:decimal_symbol]
+
+        if minor_value == 0 && @zero_formatting
+          formatting = @zero_formatting
+        end
+      end
+
       formatting[:layout] % {
-        symbol: currency.symbol,
+        symbol: symbol,
         code: currency.code,
+        decimal: decimal_symbol,
         major_value: groups.join(formatting[:digit_grouping_symbol]),
-        minor_value: minor_value.to_s.rjust(currency.minor_units, "0")
+        minor_value: minor_value
       }
     end
 
@@ -46,7 +73,7 @@ module Maguire
       GROUPS_OF_FOUR_RE = /([0-9]{4}[^0-9])+/
       GROUPS_OF_THREE_RE = /([0-9]{3}[^0-9]){3}+/
 
-      def parse_south_asian_grouping(layout)
+      def parse_groups_in_south_asian_style(layout)
         @group_numbers_in_south_asian_style = true
         digit_grouping_symbol = layout.match(/1([^0-9]*)23/)[1]
         layout.gsub!(["1", "23", "45", "67", "890"].join(digit_grouping_symbol), "%{major_value}")
@@ -76,7 +103,7 @@ module Maguire
 
         digit_grouping_symbol =
           if layout =~ SOUTH_ASIAN_GROUPING_RE
-            parse_south_asian_style(layout)
+            parse_groups_in_south_asian_style(layout)
           elsif layout =~ GROUPS_OF_FOUR_RE
             parse_groups_of_four(layout)
           elsif layout =~ GROUPS_OF_THREE_RE
@@ -86,19 +113,40 @@ module Maguire
         layout.gsub!("USD", "%{code}")
         layout.gsub!("$", "%{symbol}")
         layout.gsub!("12", "%{minor_value}")
+        decimal_symbol = layout.match(/major_value}(.*)%{minor_value/)[1]
+        layout.gsub!(decimal_symbol, "%{decimal}")
 
         {
           layout: layout,
+          decimal_symbol: decimal_symbol,
           digit_grouping_symbol: digit_grouping_symbol
         }
       end
 
+      def parse_zero_layout(layout)
+        layout = layout.dup
+
+        layout.gsub!("USD", "%{code}")
+        layout.gsub!("$", "%{symbol}")
+        layout.gsub!("1", "%{major_value}")
+        decimal_symbol = @positive_layout[:decimal_symbol]
+        layout.gsub!(decimal_symbol, "%{decimal}")
+
+        {
+          layout: layout,
+          decimal_symbol: decimal_symbol,
+          digit_grouping_symbol: @positive_layout[:digit_grouping_symbol]
+        }
+      end
+
       def round(value)
         value.to_i
       end
 
       def break_off(value, number)
-        [value.slice(0, value.length - number), value.slice(value.length - number, value.length)]
+        len = value.length
+        number = len if number > len
+        [value.slice(0, len - number), value.slice(len - number, len)]
       end
 
       def split_value_into_groups_of(value, number)

data/lib/maguire/version.rb

@@ -1,3 +1,3 @@
 module Maguire
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

data/lib/maguire/version.rb~

@@ -1,3 +1,3 @@
 module Maguire
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: maguire
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-10 00:00:00.000000000 Z
+date: 2014-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri