formatting 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa1abfad65855a703931fa20362f151000298872
-  data.tar.gz: 344114e77b5029eb1a39664743923c2d24f9860b
+  metadata.gz: 86d1360d37ac53df729455a549d27360133a2926
+  data.tar.gz: b1a7d79c9b51f887b3900b3b384e27903d0c2907
 SHA512:
-  metadata.gz: d45a173c7ead2b95c59d8cafdbb154e3e54d615f8d6148a67ac7fb19fd40c9fe02bd38948f454b37d74375482662d9050e0b8a0f574e2a7f4bef5ec7db68ea29
-  data.tar.gz: 3aa14ccd4b6fd33fd18fd8da8638409de22673dfb3ef2dbe5d6a783c7c7f18f641acc3049eeb05a5befe33f46704ea7979bce664532f954448ba47ed5ca96828
+  metadata.gz: 7f548175ebee4b7c92fa55706cb9cb49316aba8ab32b74e30600d35e114299bc2f32aa34aea5c716ef53c9ddc69d08871be57d47cc65477deaff69b76158b791
+  data.tar.gz: 1bc2c988fa321b29b252e760095e276f7f1822db22f296b04b16acd696b5a7e5cdc023cdfd76fd41e955c9db1634cfba7ccc1c0b3973d8f56561bf0564908a3d

data/lib/formatting/currency.rb

@@ -8,29 +8,21 @@ module Formatting
   end
 
   class FormatCurrency
-    pattr_initialize :record_or_currency, :amount_or_method, :opts
+    attr_private :record_or_currency, :amount_or_method, :opts,
+      :format_string, :skip_currency
 
-    def format
-      format_string = opts.fetch(:format, "<amount> <currency>")
-      skip_currency = opts.fetch(:skip_currency, false)
-
-      unless skip_currency
-        currency = opts.fetch(:currency) {
-          case record_or_currency
-          when String, Symbol
-            record_or_currency
-          else
-            record_or_currency.respond_to?(:currency) ? record_or_currency.currency : nil
-          end
-        }
-        currency = nil if currency == false
-      end
+    def initialize(record_or_currency, amount_or_method, opts)
+      @record_or_currency = record_or_currency
+      @amount_or_method = amount_or_method
+      @opts = opts
 
-      if amount_or_method.is_a?(Symbol)
-        amount = record_or_currency.public_send(amount_or_method)
-      else
-        amount = amount_or_method
-      end
+      @format_string = opts.fetch(:format, "<amount> <currency>")
+      @skip_currency = opts.fetch(:skip_currency, false)
+    end
+
+    def format
+      currency = determine_currency
+      amount = determine_amount
 
       return "" if amount.nil?
 
@@ -40,6 +32,30 @@ module Formatting
 
     private
 
+    def default_currency
+      case record_or_currency
+      when String, Symbol
+        record_or_currency
+      else
+        record_or_currency.respond_to?(:currency) ? record_or_currency.currency : nil
+      end
+    end
+
+    def determine_currency
+      return nil if skip_currency
+
+      currency = opts.fetch(:currency) { default_currency }
+      currency == false ? nil : currency
+    end
+
+    def determine_amount
+      if amount_or_method.is_a?(Symbol)
+        record_or_currency.public_send(amount_or_method)
+      else
+        amount_or_method
+      end
+    end
+
     def apply_format_string(format_string, amount, currency)
       out = format_string.dup
       out.gsub!("<amount>", amount)

data/lib/formatting/number.rb

@@ -8,16 +8,22 @@ module Formatting
   end
 
   class FormatNumber
-    pattr_initialize :input_number, :opts
+    attr_private :input_number,
+      :thousands_separator, :decimal_separator,
+      :round, :min_decimals, :explicit_sign, :blank_when_zero
+
+    def initialize(input_number, opts)
+      @input_number = input_number
+
+      @thousands_separator = opts.fetch(:thousands_separator) { default_thousands_separator }
+      @decimal_separator   = opts.fetch(:decimal_separator) { default_decimal_separator }
+      @round           = opts.fetch(:round, 2)
+      @min_decimals    = opts.fetch(:min_decimals, 2)
+      @explicit_sign   = opts.fetch(:explicit_sign, false)
+      @blank_when_zero = opts.fetch(:blank_when_zero, false)
+    end
 
     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)
-      min_decimals    = opts.fetch(:min_decimals, 2)
-      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?(".")
@@ -35,6 +41,7 @@ module Formatting
 
       integer, decimals = number.to_s.split(".")
 
+      # Separate groups by thousands separator.
       integer.gsub!(/(\d)(?=(\d\d\d)+(?!\d))/, "\\1#{thousands_separator}")
 
       if explicit_sign

data/lib/formatting/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: formatting
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Henrik Nyh