humanize 2.5.0 → 2.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 238c8473d0d8ce9c6aef43453a46bf6e8751fd9c425a9b24abe5268e120ae491
-  data.tar.gz: d305845dc8e91b63b5b004c8d797c8e4b1f14995c20d4a490c66d61b1e57d07f
+  metadata.gz: a7a40f302be49db5675f1cfbde2b6a3bfb6246c0807045517fb5f6014bb2b89d
+  data.tar.gz: 6bbffce67dc0543ed68459bf1cdab7437d157a48e56e9d0c9cf034ec4156d7cc
 SHA512:
-  metadata.gz: 511c850b9ef98cce32abe87f7ead90a9b235672cd45f1fd871ac06c5247cf63577a0013a13d06474395723582c9a5f9b01227a13f2bca6a1c157d3e5b9e3cf00
-  data.tar.gz: 330401654240ba9aaeaca94c3d888db1c44884fa0a0945999c6670db6302252f12cd13b0ab516573d0a44511725104418b65feb224c70472937f5d9d2bfc482f
+  metadata.gz: c01dccd2f61c3c6fb8836793d01b737b374a2d949467ad16fb81446804434a7efe9367f2215880edb6d6469b52ed50b9ec345f29ac5fdfd65e84b3f081dcc0fc
+  data.tar.gz: b6ccedf9ed4e1468030c68ed7d09d098e6cc9741638323a061357d43e5e8ab2c663933e4223b8a9a464167bf9444dd75c731ef6160bebcf09290a8957f16a978

data/.github/workflows/ruby.yml

@@ -1,6 +1,6 @@
 name: Ruby
 
-on: [push]
+on: [push, pull_request]
 
 jobs:
   build:

data/.rubocop.yml

@@ -1,5 +1,5 @@
 AllCops:
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.4
 
 Style/StringLiterals:
   Enabled: false
@@ -10,7 +10,7 @@ Style/FrozenStringLiteralComment:
 Style/Documentation:
   Enabled: false
 
-Metrics/LineLength:
+Layout/LineLength:
   Max: 200
   Exclude:
     - lib/humanize/locales/constants/*.rb

data/humanize.gemspec

@@ -1,15 +1,14 @@
 Gem::Specification.new do |s|
   s.name = "humanize"
-  s.version = "2.5.0"
+  s.version = "2.5.1"
 
-  s.required_ruby_version = '>= 2.3'
+  s.required_ruby_version = '>= 2.4'
   s.require_paths = ["lib"]
   s.authors = ["Jack Chen", "Ryan Bigg"]
   s.email = "me@ryanbigg.com"
   s.files         = `git ls-files`.split($/)
   s.test_files    = s.files.grep(%r{^(spec)/})
   s.homepage = "https://github.com/radar/humanize"
-  s.rubygems_version = "2.5.1"
   s.summary = "Extension to Numeric to humanize numbers"
 
   s.add_development_dependency 'mutant'

data/lib/humanize/locales/fr.rb

@@ -8,7 +8,7 @@ module Humanize
       until number.zero?
         number, remainder = number.divmod(1000)
         unless remainder.zero?
-          add_grouping(parts, iteration)
+          add_grouping(parts, iteration, remainder)
 
           parts << SUB_ONE_GROUPING[remainder] unless exactly_one_thousand?(remainder, parts)
         end
@@ -25,8 +25,16 @@ module Humanize
       remainder == 1 && parts.last.to_s.strip == 'mille'
     end
 
-    def add_grouping(parts, iteration)
-      grouping = LOTS[iteration]
+    def plural_for_lots(remainder, word, iteration)
+      if remainder > 1 && iteration >= 2
+        "#{word}s"
+      else
+        word
+      end
+    end
+
+    def add_grouping(parts, iteration, remainder)
+      grouping = plural_for_lots(remainder, LOTS[iteration], iteration)
       return unless grouping
 
       parts << grouping

data/spec/locales/fr_spec.rb

@@ -11,7 +11,13 @@ RSpec.describe Humanize, "fr locale" do
     [8.15, 'huit virgule un cinq'],
     [1002, 'mille deux'],
     [2001, 'deux mille un'],
-    [10_000, 'dix mille']
+    [10_000, 'dix mille'],
+    [1_000_000, "un million"],
+    [2_000_000, "deux millions"],
+    [5_000_000, "cinq millions"],
+    [1_000_000_000, "un milliard"],
+    [2_000_000_000, "deux milliards"],
+    [5_000_000_000, "cinq milliards"]
   ]
 
   tests.each do |num, output|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: humanize
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.5.1
 platform: ruby
 authors:
 - Jack Chen
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-23 00:00:00.000000000 Z
+date: 2021-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mutant
@@ -153,7 +153,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="