maguire 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68b624745bcd22e8111fc985132ffa0bc3074af3
-  data.tar.gz: cfad026deb4b6355ba405ec5d20879a51ceb9ce6
+  metadata.gz: 5b8a9547a3d6a67df4625d6dab4dc0cf349d3a98
+  data.tar.gz: 7bb60dad2dbd894f8e6507a269a89e5fb7920539
 SHA512:
-  metadata.gz: 57778cf554336ddf7be48aeccf0d00cb263447a8d193f27c966d86afb08369a8bc43deb2bc474edfb8be846c36bab366e148fce06eda3b43b91aa5ef8b7ef971
-  data.tar.gz: 6a334c4e870965cb3f993b0de21288ed8888145d53b610c783685f50b635983edaf62668e1539927fec273633e9bff73adc8ed4e370b9956462327671bc0f0ae
+  metadata.gz: 5561964ac6f5b4596a1fe417c19538f6e3f01d831d4ebbfe1d04767a8464502e929a5e5fd871afce0f31c95993fbacc321a61c522c83af6054cb169d067357a1
+  data.tar.gz: a4701b0b27e4e94e36311b976098ee512ff90c21245ca1def2db7f16499df8c96bc18c0f3cc0783352356dd98d437dc69e3363c7f6cac80ace7d75f4663ff701

data/lib/maguire/locale.rb

@@ -54,6 +54,10 @@ module Maguire
         strip_insignificant_zeros = true
       end
 
+      if major_value == 0 && minor_value == 0 && options[:free]
+        return options[:free]
+      end
+
       if strip_insignificant_zeros && minor_value == 0
         minor_value = ""
         decimal_symbol = ""
@@ -80,6 +84,7 @@ module Maguire
 
     def as_json
       {
+        id: @locale,
         positive: @positive_formatting,
         negative: @negative_formatting,
         zero: @zero_formatting
@@ -198,7 +203,7 @@ module Maguire
 
     class << self
       def lookup(options)
-        locale = "#{options[:lang].downcase}_#{options[:country].upcase}"
+        locale = "#{options[:lang].downcase}-#{options[:country].upcase}"
         data = Maguire.locale_paths.load(locale)
         if data.nil?
           raise Locale::NotSupportedError.new("The locale #{locale} isn't supported")

data/lib/maguire/version.rb

@@ -1,3 +1,3 @@
 module Maguire
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maguire
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Tim Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-08 00:00:00.000000000 Z
+date: 2014-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -422,7 +422,7 @@ files:
 - lib/maguire/hash.rb
 - lib/maguire/locale.rb
 - lib/maguire/version.rb
-- locale/en_US.json
+- locale/en-US.json
 homepage: http://github.com/paddle8/maguire
 licenses: []
 metadata: {}