humanize 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04423347ffc9c0535b9468a69e175d31304b22e9
-  data.tar.gz: c2dcf65fa8b595ae0c635ab8ae4195d87c4a46f4
+  metadata.gz: 1a4e43c1d739513348d02de2ff1ff5a9f70ae5d9
+  data.tar.gz: 1f9b6e062f12066a8c6bc8b35ebfd2f270416cf7
 SHA512:
-  metadata.gz: 136f6423100d0fade6cc41dc7fdd62b3fb059d54eef89dcb979ea9f469f908bce201f50941a20bc521a3489670d4ec41b5643aaf1436e515adcb2989d010ec74
-  data.tar.gz: a1c08f3c8713d9c1c318b1d159b5afc0bd4092a6ef18d06dab06610b6a39c30c65e09a5eb55155fd45f2eb289833175f1ac83896473608bb0e10bc3130b55f35
+  metadata.gz: 5bac4a44f2dcbf47b79c88bedcb37abc5e08d668af8c29739fc38c80e5dd24c1e6cbebad5f8cf82865b51c3b549579e4dc9a51d38e21d68ab790e370c6815c20
+  data.tar.gz: 27c0004f535b4beaf57c6e0c03f2daf6679dfd424b0417ef287b40cf69501edded9b30790e97d14628eaa21751d38bfed1f72ccf4f097618733dad65804cd072

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    humanize (1.4.0)
+    humanize (1.5.0)
 
 GEM
   remote: https://rubygems.org/
@@ -101,4 +101,4 @@ DEPENDENCIES
   rspec
 
 BUNDLED WITH
-   1.15.3
+   1.16.0.pre.2

data/bin/console

@@ -0,0 +1,15 @@
+#!/usr/bin/env ruby
+
+require 'bundler/setup'
+require 'humanize'
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+require 'irb'
+IRB.start
+

data/humanize.gemspec

@@ -3,7 +3,7 @@
 
 Gem::Specification.new do |s|
   s.name = "humanize"
-  s.version = "1.5.0"
+  s.version = "1.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]

data/lib/humanize.rb

@@ -36,12 +36,19 @@ module Humanize
     end
     if self.class == Float
       decimals = self.to_s.split(/\./, 2).last
+      has_leading_zeroes = decimals[/^0+/].to_s.length > 0
+      decimals_as = :digits if has_leading_zeroes
       decimals_as_words = case decimals_as
                           when :digits then decimals.scan(/./).map { |n| SUB_ONE_THOUSAND[locale][n.to_i] }.join(' ')
                           when :number then decimals.to_i.humanize(:locale => locale)
                           end
       o += ' ' + WORDS[locale][:point] + ' ' + decimals_as_words
     end
+    if locale == :id
+      lots = LOTS[:id].drop(2).map{|n| n + ' '}
+      wrong_1000_re = /(?<=#{lots.join("|")})\s*satu ribu|^satu ribu/
+      o.sub!(wrong_1000_re, 'seribu')
+    end
     o.gsub(/ +/, ' ')
   end
 

data/spec/humanize_spec.rb

@@ -59,6 +59,26 @@ describe "Humanize" do
 
     end
 
+    describe 'indonesian specific rules' do
+      before do
+        Humanize.config.default_locale = :id
+      end
+
+      context 'one thousand' do
+        it 'equals "satu ribu" when it is not the only thousand in its thousands range' do
+          expect(1_101_000.humanize).to eql('satu juta seratus satu ribu')
+          expect(2_201_042.humanize).to eql('dua juta dua ratus satu ribu empat puluh dua')
+        end
+
+        it 'equals "seribu" when it is the lone thousand in its thousands range' do
+          expect(1_000.humanize).to eql('seribu')
+          expect(1_042.humanize).to eql('seribu empat puluh dua')
+          expect(1_001_042.humanize).to eql('satu juta seribu empat puluh dua')
+          expect(1_000_001_042.humanize).to eql('satu miliar seribu empat puluh dua')
+        end
+      end
+    end
+
   end
 
   describe 'decimals_as option' do
@@ -73,6 +93,19 @@ describe "Humanize" do
       expect(0.42.humanize(:decimals_as => :digits)).to eql('zero point four two')
     end
 
+    describe 'when set as number' do
+
+      before do
+        Humanize.config.decimals_as = :number
+      end
+
+      it 'reads the decimals as digits if led by zero(s)' do
+        expect(0.042.humanize).to eql('zero point zero four two')
+        expect(0.0042.humanize).to eql('zero point zero zero four two')
+      end
+
+    end
+
   end
 
   describe 'both options work together' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: humanize
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Jack Chen
@@ -82,6 +82,7 @@ files:
 - Rakefile
 - Wordlist.source
 - bench.rb
+- bin/console
 - bin/run_mutant
 - humanize.gemspec
 - lib/humanize.rb