formatting 0.0.13 → 0.0.14

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YWI5ZTFkMTdmMTc0NGJhYTdlYzJjMTU2NDFhZTAwNTliNjUyYTRkZQ==
+    YzE3NDZkOGE2ODY0ZDgxNWViNGEzNGY0NTMyNjBmMjg5MTBhNTI1MA==
   data.tar.gz: !binary |-
-    OGU1OWE2YWY5Y2ZmMThjYTZhMDQzMzgyNDQ1ZDNiOTNkMTFmYmY5Yw==
+    NmM1M2JjNjQ1NDA0N2FjYzI0NmU3ZTc1YWQ4M2FlYTgxZGJlNWEyNQ==
 SHA512:
   metadata.gz: !binary |-
-    NzQ5MGY5MDQ0ZDIxMzc3ZGE3YzcyNDQxZDU5MmJmM2IyNTBlYWIxYTgwYWNi
-    YTdlMWMwOWZlNzI1Y2MzY2Q2MzUyMzNiMjIwOGYxMDg1MTdmYTEyMjgzZDgw
-    MzQ4NmRmMTY5MjU2OTY1ODJkNmFhOWEyOGJiOTNlZmE3NGI0YmQ=
+    NTBiNDc1MTMzNzg5NmU2YjliNjhjZDYyOThjODhhMDVmM2ExNTAzZmQ3NDg4
+    MWU4YmNiNDcyODNhZjgwZDNmYzhiNDE3ZmI0OGQ5ZTNiMzU5OWYzNmNlNDBh
+    Y2YzYTQ3YTlhZjdkNDMzY2Y0MWM1ODllN2Y1NzllYzAxY2JmMzU=
   data.tar.gz: !binary |-
-    Yjc3MDk0NTY5YTM4ZmM5YWI1ZGM3ZTkyMTAzNTdiYmY3Y2UzNjk4YzhmNDUz
-    MjNlZDA3ODc3MzkzZmFkMTVmZTQ4MzQ3MDMwNzEwNTEwNzQ1MDQ2NWY5ZGVj
-    MTEzOTIxODkzYTJlMDc4ODFlYzAzNmI0Zjc5ZDJmNGU2NjIzOTk=
+    YjI2YWRiYTBlZTY4ZjBlOWZkZDdiYTgwYTlhNDQ1NTA0YjE3MmI4MTM4Mjhk
+    NzhhMTk1OGUzYzNhM2NmNjc3MGJhNzEyMmFhYTE3OWZhYWNkYzZjYjZkNzQw
+    YWM1MzYzMDA5N2IyOWQxNDhkOGQwNzFkOTM3NzQxZTA4YmY4NDI=

data/README.md

@@ -40,14 +40,15 @@ Formatting.format_number(1, explicit_sign: true)  # => "+1.00"
 
 #### Options
 
-name                | default                                                                          | explanation
---------------------|----------------------------------------------------------------------------------|------------
-thousands_separator | `I18n.t("number.format.delimiter")` if available, otherwise a non-breaking space |
-decimal_separator   | `I18n.t("number.format.separator")` if available, otherwise `"."`                |
-round               | `2`                                                                              | Round to the given number of decimals. Don't round if given `false`.
-blank_when_zero     | `false`                                                                          | If `true`, returns `""` for a zero value.
-min_decimals        | `2`                                                                              | Show at least that number of decimals. Don't enforce if given `false`.
-explicit_sign       | `false`                                                                          | If `true`, prefixes positive values with a `"+"`. Doesn't prefix `0`.
+name                    | default                                                                          | explanation
+------------------------|----------------------------------------------------------------------------------|------------
+thousands_separator     | `I18n.t("number.format.delimiter")` if available, otherwise a non-breaking space |
+decimal_separator       | `I18n.t("number.format.separator")` if available, otherwise `"."`                |
+round                   | `2`                                                                              | Round to the given number of decimals. Don't round if given `false`.
+blank_when_zero         | `false`                                                                          | If `true`, returns `""` for a zero value.
+min_decimals            | `2`                                                                              | Show at least that number of decimals. Don't enforce if given `false`.
+explicit_sign           | `false`                                                                          | If `true`, prefixes positive values with a `"+"`. Doesn't prefix `0`.
+decimals_on_integers    | `true`                                                                           | If `false`, integers won't include decimals.
 
 
 ### Currency

data/lib/formatting/number.rb

@@ -10,17 +10,18 @@ module Formatting
   class FormatNumber
     attr_private :input_number,
       :thousands_separator, :decimal_separator,
-      :round, :min_decimals, :explicit_sign, :blank_when_zero
+      :round, :min_decimals, :decimals_on_integers, :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)
+      @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)
+      @decimals_on_integers = opts.fetch(:decimals_on_integers, true)
+      @explicit_sign        = opts.fetch(:explicit_sign, false)
+      @blank_when_zero      = opts.fetch(:blank_when_zero, false)
     end
 
     def format
@@ -48,7 +49,7 @@ module Formatting
         integer = "+#{integer}" if number > 0
       end
 
-      if min_decimals
+      if min_decimals && (has_decimals || decimals_on_integers)
         decimals ||= "0"
         decimals = decimals.ljust(min_decimals, "0")
       end

data/lib/formatting/version.rb

@@ -1,3 +1,3 @@
 module Formatting
-  VERSION = "0.0.13"
+  VERSION = "0.0.14"
 end

data/spec/number_spec.rb

@@ -110,6 +110,16 @@ describe Formatting do
       end
     end
 
+    context "decimals on integers" do
+      it "defaults to adding decimals" do
+        expect_formatted(12).to eq "12.00"
+      end
+
+      it "can be turned off" do
+        expect_formatted(12, decimals_on_integers: false).to eq "12"
+      end
+    end
+
     context "explicit sign" do
       it "is not included by default" do
         expect_formatted(1).to eq "1.00"

metadata

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