d12n 0.0.5 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b325c6c4d24775e4056d7102380928c90291fe2
-  data.tar.gz: eb007a871dd91240dfe25195349ee8060b84533d
+  metadata.gz: c5df34197d3bfffd42c3b425ce8f2fa28cbbaf9a
+  data.tar.gz: 7d97e78a228379a178893e457466506802fd17fb
 SHA512:
-  metadata.gz: bb13167ab9842d3ec4a0e22c3577bb693c537693eeebc5e2f6e1d0e55c381dddc9854d9ce38a71c6c039c46e0f685f104a7018b7705a5e27eb54d75833df7162
-  data.tar.gz: 498b429e2fadeb20583592d807dd4f969344e127a9098de27598c832ab345665894f965bfc4f18b576ae5d929f619321f8cd56483d27e0750c853034a1f3b657
+  metadata.gz: db30f3bce1318b51a050acc1c1bc16b85902d5d48e416730f46ec68e3719259efb710547423a0284336b496066ff1906b9d8e7076dc37bb5b2ff13672b5a925b
+  data.tar.gz: 4e20e364e6228d631c081d44a6296b235fd2083716fc2ae3af2e0f307cba7ec59aa3704bfdecd3fa24564bb299c5c7a8b8a860f2d8e5afa4638218e2fcebfef2

data/README.md

@@ -39,8 +39,16 @@ d.amount.to_f # 3456.78, did not change
 ## Configuration
 
 ```ruby
-D12n.config.strategy = D12n::Strategy::DecimalPoint # the default, no need to set it
-D12n.config.strategy = D12n::Strategy::DecimalComma # Use this for example in DE or NL locales
+# the default, no need to set it
+# It will use the settings from your I18n locale (number.format) to parse and generate the formatted number
+# It is heavily recommended to use this
+D12n.config.strategy = D12n::Strategy::Default
+
+# Hard coded strategy using decimal point
+D12n.config.strategy = D12n::Strategy::DecimalPoint
+
+# Hard coded strategy using decimal comma
+D12n.config.strategy = D12n::Strategy::DecimalComma
 ```
 
 ### Custom method prefix

data/lib/d12n.rb

@@ -8,11 +8,12 @@ module D12n
   module Strategy
     autoload :DecimalPoint, 'd12n/strategy/decimal_point'
     autoload :DecimalComma, 'd12n/strategy/decimal_comma'
+    autoload :Default,      'd12n/strategy/default'
   end
 
   autoload :ModelSupport, 'd12n/model_support'
 
   def self.strategy
-    config.strategy || Strategy::DecimalPoint
+    config.strategy || Strategy::Default
   end
 end

data/lib/d12n/strategy/decimal_comma.rb

@@ -1,17 +1,17 @@
-require 'bigdecimal'
-
 module D12n
   module Strategy
     module DecimalComma
+      include Default
       extend self
 
-      # must raise ArgumentError when format is invalid
-      def formatted_to_bigdecimal(formatted)
-        BigDecimal.new formatted.tr('.', '').tr(',', '.')
+      private
+
+      def format_delimiter
+        '.'
       end
 
-      def bigdecimal_to_formatted(internal)
-        ActiveSupport::NumberHelper::NumberToDelimitedConverter.convert(internal, {})
+      def format_separator
+        ','
       end
     end
   end

data/lib/d12n/strategy/decimal_point.rb

@@ -3,15 +3,17 @@ require 'bigdecimal'
 module D12n
   module Strategy
     module DecimalPoint
+      include Default
       extend self
 
-      # must raise ArgumentError when format is invalid
-      def formatted_to_bigdecimal(formatted)
-        BigDecimal.new formatted.tr(',', '')
+      private
+
+      def format_delimiter
+        ','
       end
 
-      def bigdecimal_to_formatted(internal)
-        ActiveSupport::NumberHelper::NumberToDelimitedConverter.convert(internal, {})
+      def format_separator
+        '.'
       end
     end
   end

data/lib/d12n/strategy/default.rb

@@ -0,0 +1,28 @@
+module D12n
+  module Strategy
+    module Default
+      extend self
+
+      # must raise ArgumentError when format is invalid
+      def formatted_to_bigdecimal(formatted)
+        BigDecimal.new formatted.tr(format_delimiter, '').tr(format_separator, '.')
+      end
+
+      def bigdecimal_to_formatted(internal)
+        ActiveSupport::NumberHelper::NumberToDelimitedConverter.convert(internal, {})
+      end
+
+      private
+
+      # seperates the thousands, eg 1,000
+      def format_delimiter
+        ::I18n.translate(:'number.format.delimiter')
+      end
+
+      # seperates the decimal points, eg 9.95
+      def format_separator
+        ::I18n.translate(:'number.format.separator')
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: d12n
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.1
 platform: ruby
 authors:
 - Konstantin Munteanu
@@ -30,6 +30,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '6'
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -71,6 +85,7 @@ files:
 - lib/d12n/model_support.rb
 - lib/d12n/strategy/decimal_comma.rb
 - lib/d12n/strategy/decimal_point.rb
+- lib/d12n/strategy/default.rb
 homepage: https://github.com/mkon/d12n
 licenses:
 - MIT