humanize 2.4.0 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 472a0141b600f7c9bbb378b46d7e922cb6e316e505bbfa2b875352eb470e6c5b
-  data.tar.gz: ab0da50e9a77b43baacb2968d130c5011b42669e83b53ac04e2399204dc5abd3
+  metadata.gz: 5f9cdb19077b40926c9c10dddd5c22eedf5534332d909d67db6ce40f62bdce1a
+  data.tar.gz: 8213cfd2c275c83681e37294e64984acc8515120bf6e8fcb5b100286b0f4e29d
 SHA512:
-  metadata.gz: 0e4069ccfdb3ec72e7412a4a042aaf5f5e3d164463869e44e2ef7f4b49552113e849bf467a4e144de3d0a4265468d1356fd0fd76fdc53bc2a32591032f09c92c
-  data.tar.gz: 304a2ae874741ed483f1dbe2d76bf5fde7fbfa6ad6532d6a9a3354468db4f2f0926734c12c3719f643a37755696990dea648cb7b67ecaa8d5dbe4f76d338a2f0
+  metadata.gz: a0ec450dbe6f00973d2ecc0bc94f68024c1827dca512c07d84be2bad683c003b4e2e579e636520e6564059e98b9b3b5fcf4d7bf86f3df42d37e312cf08503c6e
+  data.tar.gz: 3fd51e3028b37cd95c09c0d67ff0556a765a8744cea634005c6fd32b7e9d7e43ed3245e0232a1fce8d2561f7c83b0ae1162e7cbb5245d28b44d99b6243bad4c4

data/humanize.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "humanize"
-  s.version = "2.4.0"
+  s.version = "2.4.1"
 
   s.required_ruby_version = '>= 2.3'
   s.require_paths = ["lib"]

data/lib/humanize.rb

@@ -75,17 +75,18 @@ module Humanize
     leading_zeroes = [grouping[0]] * exponent.abs
     decimals_as = :digits if leading_zeroes.any?
 
-    decimals_as_words = case decimals_as
-    when :digits
-      digits = significant_digits.chars.map do |num|
-        grouping[num.to_i]
+    decimals_as_words =
+      case decimals_as
+      when :digits
+        digits = significant_digits.chars.map do |num|
+          grouping[num.to_i]
+        end
+
+        (leading_zeroes + digits).join(spacer)
+      when :number
+        significant_digits.to_i.humanize(locale: locale)
       end
 
-      (leading_zeroes + digits).join(spacer)
-    when :number
-      significant_digits.to_i.humanize(locale: locale)
-    end
-
     parts.insert(0, decimals_as_words, locale_class::POINT)
   end
 

data/lib/humanize/locales/es.rb

@@ -1,5 +1,4 @@
 require_relative 'constants/es'
-require 'pry'
 
 module Humanize
   class Es

data/lib/humanize/locales/jp.rb

@@ -6,7 +6,7 @@ module Humanize
       iteration = 0
       parts = []
       until number.zero?
-        number, remainder = number.divmod(10000)
+        number, remainder = number.divmod(10_000)
         unless remainder.zero?
           add_grouping(parts, iteration)
           parts << SUB_ONE_GROUPING[remainder]
@@ -24,7 +24,7 @@ module Humanize
       grouping = LOTS[iteration]
       return unless grouping
 
-      parts << "#{grouping}"
+      parts << grouping.to_s
     end
   end
 end

data/spec/locales/jp_spec.rb

@@ -132,38 +132,40 @@ RSpec.describe Humanize, 'jp locale' do
     [5678, '五千六百七十八'],
     [6789, '六千七百八十九'],
     [9999, '九千九百九十九'],
-    [10000, '一万'],
-    [11000, '一万一千'],
-    [11100, '一万一千百'],
-    [11110, '一万一千百十'],
-    [11111, '一万一千百十一'],
-    [20000, '二万'],
-    [21000, '二万一千'],
-    [21100, '二万一千百'],
-    [21110, '二万一千百十'],
-    [21111, '二万一千百十一'],
-    [23456, '二万三千四百五十六'],
-    [345678, '三十四万五千六百七十八'],
-    [456789, '四十五万六千七百八十九'],
-    [678901, '六十七万八千九百一'],
-    [9876543, '九百八十七万六千五百四十三'],
-    [10000000, '一千万'],
-    [11110000, '一千百十一万'],
-    [20000000, '二千万'],
-    [22220000, '二千二百二十二万'],
-    [87654321, '八千七百六十五万四千三百二十一'],
-    [100000000, '一億'],
-    [765432109, '七億六千五百四十三万二千百九'],
-    [543210987, '五億四千三百二十一万九百八十七'],
-    [5678000000, '五十六億七千八百万'],
-    [1000000000000, '一兆'],
-    [1000000000001, '一兆一'],
-    [1000100010000, '一兆一億一万'],
-    [1000100010001, '一兆一億一万一'],
-    [1100110011001, '一兆一千一億一千一万一千一'],
-    [2200220022002, '二兆二千二億二千二万二千二'],
-    [999999999999999999999999999999999999999999999999999999999999999999999999, '九千九百九十九無量大数九千九百九十九不可思議九千九百九十九那由他九千九百九十九阿僧祇九千九百九十九恒河沙九千九百九十九極九千九百九十九載九千九百九十九正九千九百九十九澗九千九百九十九溝九千九百九十九穣九千九百九十九𥝱九千九百九十九垓九千九百九十九京九千九百九十九兆九千九百九十九億九千九百九十九万九千九百九十九',
-     [-123422223.48948753, 'マイナス一億二千三百四十二万二千二百二十三・四八九四八八']]
+    [10_000, '一万'],
+    [11_000, '一万一千'],
+    [11_100, '一万一千百'],
+    [11_110, '一万一千百十'],
+    [11_111, '一万一千百十一'],
+    [20_000, '二万'],
+    [21_000, '二万一千'],
+    [21_100, '二万一千百'],
+    [21_110, '二万一千百十'],
+    [21_111, '二万一千百十一'],
+    [23_456, '二万三千四百五十六'],
+    [345_678, '三十四万五千六百七十八'],
+    [456_789, '四十五万六千七百八十九'],
+    [678_901, '六十七万八千九百一'],
+    [9_876_543, '九百八十七万六千五百四十三'],
+    [10_000_000, '一千万'],
+    [11_110_000, '一千百十一万'],
+    [20_000_000, '二千万'],
+    [22_220_000, '二千二百二十二万'],
+    [87_654_321, '八千七百六十五万四千三百二十一'],
+    [100_000_000, '一億'],
+    [765_432_109, '七億六千五百四十三万二千百九'],
+    [543_210_987, '五億四千三百二十一万九百八十七'],
+    [5_678_000_000, '五十六億七千八百万'],
+    [1_000_000_000_000, '一兆'],
+    [1_000_000_000_001, '一兆一'],
+    [1_000_100_010_000, '一兆一億一万'],
+    [1_000_100_010_001, '一兆一億一万一'],
+    [1_100_110_011_001, '一兆一千一億一千一万一千一'],
+    [2_200_220_022_002, '二兆二千二億二千二万二千二'],
+    # rubocop:disable Metrics/LineLength
+    [999_999_999_999_999_999_999_999_999_999_999_999_999_999_999_999_999_999_999_999_999_999_999_999, '九千九百九十九無量大数九千九百九十九不可思議九千九百九十九那由他九千九百九十九阿僧祇九千九百九十九恒河沙九千九百九十九極九千九百九十九載九千九百九十九正九千九百九十九澗九千九百九十九溝九千九百九十九穣九千九百九十九𥝱九千九百九十九垓九千九百九十九京九千九百九十九兆九千九百九十九億九千九百九十九万九千九百九十九'],
+    # rubocop:enable Metrics/LineLength
+    [-123_422_223.48_948_753, 'マイナス一億二千三百四十二万二千二百二十三・四八九四八八']
   ]
 
   tests.each do |num, output|
@@ -175,7 +177,7 @@ RSpec.describe Humanize, 'jp locale' do
   context 'decimals: number' do
     it 'returns the decimals as whole numbers' do
       num = 8.159265358
-      expect(num.humanize()).to eq('八・一五九二六五三五八')
+      expect(num.humanize).to eq('八・一五九二六五三五八')
       expect(num.humanize(decimals_as: :number)).to eq('八・一億五千九百二十六万五千三百五十八')
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: humanize
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.4.1
 platform: ruby
 authors:
 - Jack Chen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-31 00:00:00.000000000 Z
+date: 2020-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mutant