humanize 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16a8bb6b7223ea05173df5edfa4fba58d6c8eb26
-  data.tar.gz: c76ee281e953826a9be5bab803e9c5c72aa91791
+  metadata.gz: 2f4b736de653e7f262d1be96c6b0be4f5bfd7dad
+  data.tar.gz: 47a8b9e66ed64ea87ae09fafd3b8d8020c323d6b
 SHA512:
-  metadata.gz: cbd37e3919d8162155ed283507df8cb002fc0f66a5e1f0511c3ecbef663740994e7970493727534f53a3038dbd0ed386cf9f863dca85835242d954b02e5fb50e
-  data.tar.gz: adfe7d5af52b27d43437eaa4ba0a58da42f5f2d30662d8384bf964a8d3e4fd64ff9e7e02c158476b3013f4492c2114ae029a0a6c9ae56e74b388d21ae7cd4260
+  metadata.gz: 97d8614d71b227474f395af1c94e8b026c42f9ab3aa2b4d7ecd04319b017785e120ff13f708f80407413f7a32710472dd8e965e4bbb69b487a865ea5b3595555
+  data.tar.gz: 15126879e6a876b89a2cff78f331695dc393354bded16f5ca2997112fae8e81c74fb9570a1466e49711c150385296b51dc89b34cf16487a5db5f4379989c347f

data/.gitignore

@@ -0,0 +1 @@
+.byebug_history

data/.travis.yml

@@ -13,3 +13,4 @@ sudo: false
 
 before_install:
   - gem install bundler
+  - gem install rspec

data/Gemfile.lock

@@ -0,0 +1,104 @@
+PATH
+  remote: .
+  specs:
+    humanize (1.2.2)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    abstract_type (0.0.7)
+    adamantium (0.2.0)
+      ice_nine (~> 0.11.0)
+      memoizable (~> 0.4.0)
+    anima (0.3.0)
+      abstract_type (~> 0.0.7)
+      adamantium (~> 0.2)
+      equalizer (~> 0.0.11)
+    ast (2.3.0)
+    byebug (9.0.6)
+    coderay (1.1.1)
+    concord (0.1.5)
+      adamantium (~> 0.2.0)
+      equalizer (~> 0.0.9)
+    diff-lcs (1.2.5)
+    equalizer (0.0.11)
+    ice_nine (0.11.2)
+    memoizable (0.4.2)
+      thread_safe (~> 0.3, >= 0.3.1)
+    method_source (0.8.2)
+    morpher (0.2.6)
+      abstract_type (~> 0.0.7)
+      adamantium (~> 0.2.0)
+      anima (~> 0.3.0)
+      ast (~> 2.2)
+      concord (~> 0.1.5)
+      equalizer (~> 0.0.9)
+      ice_nine (~> 0.11.0)
+      procto (~> 0.0.2)
+    mutant (0.8.12)
+      abstract_type (~> 0.0.7)
+      adamantium (~> 0.2.0)
+      anima (~> 0.3.0)
+      ast (~> 2.2)
+      concord (~> 0.1.5)
+      diff-lcs (~> 1.2)
+      equalizer (~> 0.0.9)
+      ice_nine (~> 0.11.1)
+      memoizable (~> 0.4.2)
+      morpher (~> 0.2.6)
+      parallel (~> 1.3)
+      parser (~> 2.3.1, >= 2.3.1.4)
+      procto (~> 0.0.2)
+      regexp_parser (~> 0.3.6)
+      unparser (~> 0.2.5)
+    mutant-rspec (0.8.11)
+      mutant (~> 0.8.11)
+      rspec-core (>= 3.4.0, < 3.6.0)
+    parallel (1.9.0)
+    parser (2.3.1.4)
+      ast (~> 2.2)
+    procto (0.0.3)
+    pry (0.10.4)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    pry-byebug (3.4.0)
+      byebug (~> 9.0)
+      pry (~> 0.10)
+    regexp_parser (0.3.6)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.4)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+    slop (3.6.0)
+    thread_safe (0.3.5)
+    unparser (0.2.5)
+      abstract_type (~> 0.0.7)
+      adamantium (~> 0.2.0)
+      concord (~> 0.1.5)
+      diff-lcs (~> 1.2.5)
+      equalizer (~> 0.0.9)
+      parser (~> 2.3.0)
+      procto (~> 0.0.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  humanize!
+  mutant
+  mutant-rspec
+  pry-byebug
+  rspec
+
+BUNDLED WITH
+   1.13.5

data/README.markdown

@@ -78,6 +78,12 @@ Currently supported locales: `:en` and `:fr`
 2. 0.120000   0.000000   0.120000 (  0.116230)
 3. 0.130000   0.000000   0.130000 (  0.122856)
 
+## Testing
+
+Install development dependencies by running `bundle install`.
+
+You can run mutation testing by calling `bin/run_mutant`.
+
 ## Credits
 
 * *Original idea*: Brenton Fletcher

data/bin/run_mutant

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+mutant --include lib --require humanize --use rspec Humanize

data/humanize.gemspec

@@ -3,7 +3,7 @@
 
 Gem::Specification.new do |s|
   s.name = "humanize"
-  s.version = "1.2.1"
+  s.version = "1.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
@@ -17,4 +17,7 @@ Gem::Specification.new do |s|
   s.summary = "Extension to Numeric to humanize numbers"
 
   s.add_development_dependency 'rspec'
+  s.add_development_dependency 'mutant'
+  s.add_development_dependency 'mutant-rspec'
+  s.add_development_dependency 'pry-byebug'
 end

data/lib/humanize.rb

@@ -26,7 +26,7 @@ module Humanize
         sets << LOTS[locale][i] + (!sets.empty? ? (f ? ' ' + WORDS[locale][:and] : WORDS[locale][:comma]) : '') if !(r.zero? || i.zero?)
         f = true if i.zero? && r < 100
 
-        sets << SUB_ONE_THOUSAND[locale][r] if !r.zero?
+        sets << SUB_ONE_THOUSAND[locale][r] if !r.zero? && !exactly_one_thousand_in_french?(locale, r, sets)
         i = i.succ
 
       end
@@ -40,7 +40,7 @@ module Humanize
                           end
       o += ' ' + WORDS[locale][:point] + ' ' + decimals_as_words
     end
-    o
+    o.gsub(/ +/, ' ')
   end
 
   class << self
@@ -61,6 +61,10 @@ module Humanize
 
 private
 
+  def exactly_one_thousand_in_french?(locale, r, sets)
+    locale == :fr && r == 1 && sets.last.to_s.strip == 'mille'
+  end
+
   class Configuration
     attr_accessor :default_locale, :decimals_as
 

data/lib/words.rb

@@ -10,7 +10,7 @@ WORDS = {
     :negative => 'négatif',
     :zero => 'zéro',
     :point => 'virgule',
-    :and => 'et',
+    :and => '',
     :comma => ''
   }
 }

data/spec/configuration_spec.rb

@@ -1,8 +1,7 @@
-require 'rubygems'
-require 'humanize'
-require 'rspec'
+require 'spec_helper'
 
 module Humanize
+
   describe Configuration do
 
     after(:each) do

data/spec/humanize_spec.rb

@@ -1,6 +1,4 @@
-require 'rubygems'
-require 'humanize'
-require 'rspec'
+require 'spec_helper'
 
 describe "Humanize" do
   require_relative 'tests'
@@ -19,12 +17,52 @@ describe "Humanize" do
 
     it 'uses default locale' do
       Humanize.config.default_locale = :fr
-      expect(42.humanize).to eql("quarante-deux".gsub(/ +/, ' '))
+      expect(42.humanize).to eql('quarante-deux')
     end
 
     it 'uses locale passed as argument if given' do
       Humanize.config.default_locale = :en
-      expect(42.humanize(:locale => :fr)).to eql("quarante-deux".gsub(/ +/, ' '))
+      expect(42.humanize(:locale => :fr)).to eql('quarante-deux')
+    end
+
+    describe 'french specific rules' do
+
+      it 'one thousand and one equals "mille un"' do
+        expect(1002.humanize(:locale => :fr)).to eql('mille deux')
+      end
+
+      it 'two thousand and one equals "deux mille un"' do
+        expect(2001.humanize(:locale => :fr)).to eql('deux mille un')
+      end
+
+      it 'ten thousand equals "dix mille"' do
+        expect(2001.humanize(:locale => :fr)).to eql('deux mille un')
+      end
+
+    end
+
+  end
+
+  describe 'decimals_as option' do
+
+    it 'uses value from configuration' do
+      Humanize.config.decimals_as = :number
+      expect(0.42.humanize).to eql('zero point forty-two')
+    end
+
+    it 'uses value passed as argument if given' do
+      Humanize.config.decimals_as = :number
+      expect(0.42.humanize(:decimals_as => :digits)).to eql('zero point four two')
+    end
+
+  end
+
+  describe 'both options work together' do
+
+    it 'work together' do
+      expect(
+        0.42.humanize(:locale => :fr, :decimals_as => :number)
+      ).to eql('zéro virgule quarante-deux')
     end
 
   end

data/spec/spec_helper.rb

@@ -0,0 +1,11 @@
+require 'rubygems'
+require 'humanize'
+require 'rspec'
+require 'timeout'
+# require 'pry-byebug'
+
+RSpec.configure do |config|
+  config.around(:each) do |example|
+    Timeout.timeout(5, &example)
+  end
+end

data/spec/tests.rb

@@ -5,6 +5,7 @@ TESTS = [
  [8, "eight"],
  [11, "eleven"],
  [21, "twenty-one"],
+ [99, "ninety-nine"],
  [100, "one hundred"],
  [101, "one hundred and one"],
  [111, "one hundred and eleven"],

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: humanize
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Jack Chen
@@ -25,19 +25,64 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mutant
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mutant-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: radarlistener@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitignore"
 - ".travis.yml"
 - Gemfile
+- Gemfile.lock
 - LICENSE.md
 - README.markdown
 - Rakefile
 - Wordlist.source
 - bench.rb
+- bin/run_mutant
 - humanize.gemspec
 - lib/cache.rb
 - lib/humanize.rb
@@ -47,6 +92,7 @@ files:
 - spec/TODO
 - spec/configuration_spec.rb
 - spec/humanize_spec.rb
+- spec/spec_helper.rb
 - spec/tests.rb
 homepage: https://github.com/radar/humanize
 licenses: []
@@ -75,4 +121,5 @@ test_files:
 - spec/TODO
 - spec/configuration_spec.rb
 - spec/humanize_spec.rb
+- spec/spec_helper.rb
 - spec/tests.rb