formatting 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8491d72d7e09b9a42a8c97708417a144262245a4
-  data.tar.gz: 9a2be257d8fef3a05d78945223bde008c89ca9b4
+  metadata.gz: aa1abfad65855a703931fa20362f151000298872
+  data.tar.gz: 344114e77b5029eb1a39664743923c2d24f9860b
 SHA512:
-  metadata.gz: d603a5393ff8b04fa33a0a9c9752e8b43f4d5a7dd0334702e6fbeafa32261a9a13ed887ac111740268561029af2a0e2da9411c0ceb51b659b6ffc672f21c7e1c
-  data.tar.gz: 20f56e657f8898923ee5f218f448e45bd6a4f65ad7da863725dcb6eaa7a42733d24acac6f4b5fc7a572c95b090c49ca6a02c94c47010f3663100019aa1045d5a
+  metadata.gz: d45a173c7ead2b95c59d8cafdbb154e3e54d615f8d6148a67ac7fb19fd40c9fe02bd38948f454b37d74375482662d9050e0b8a0f574e2a7f4bef5ec7db68ea29
+  data.tar.gz: 3aa14ccd4b6fd33fd18fd8da8638409de22673dfb3ef2dbe5d6a783c7c7f18f641acc3049eeb05a5befe33f46704ea7979bce664532f954448ba47ed5ca96828

data/formatting.gemspec

@@ -17,6 +17,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.add_dependency "attr_extras"
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"

data/lib/formatting/currency.rb

@@ -1,8 +1,16 @@
+require "attr_extras"
+
 module Formatting
   module Currency
-    include Number
-
     def format_currency(record_or_currency, amount_or_method, opts = {})
+      FormatCurrency.new(record_or_currency, amount_or_method, opts).format
+    end
+  end
+
+  class FormatCurrency
+    pattr_initialize :record_or_currency, :amount_or_method, :opts
+
+    def format
       format_string = opts.fetch(:format, "<amount> <currency>")
       skip_currency = opts.fetch(:skip_currency, false)
 
@@ -26,7 +34,7 @@ module Formatting
 
       return "" if amount.nil?
 
-      amount = format_number(amount, opts)
+      amount = FormatNumber.new(amount, opts).format
       apply_format_string(format_string, amount, currency)
     end
 

data/lib/formatting/number.rb

@@ -1,6 +1,16 @@
+require "attr_extras"
+
 module Formatting
   module Number
     def format_number(number, opts = {})
+      FormatNumber.new(number, opts).format
+    end
+  end
+
+  class FormatNumber
+    pattr_initialize :input_number, :opts
+
+    def format
       thousands_separator = opts.fetch(:thousands_separator) { default_thousands_separator }
       decimal_separator   = opts.fetch(:decimal_separator) { default_decimal_separator }
       round           = opts.fetch(:round, 2)
@@ -8,6 +18,8 @@ module Formatting
       explicit_sign   = opts.fetch(:explicit_sign, false)
       blank_when_zero = opts.fetch(:blank_when_zero, false)
 
+      number = input_number
+
       has_decimals = number.to_s.include?(".")
 
       if blank_when_zero

data/lib/formatting/version.rb

@@ -1,3 +1,3 @@
 module Formatting
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: formatting
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Henrik Nyh
@@ -10,6 +10,20 @@ bindir: bin
 cert_chain: []
 date: 2014-02-13 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: attr_extras
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement