amount_inflector 3.0.0 → 3.0.1

data/Gemfile

@@ -9,6 +9,6 @@ source "http://rubygems.org"
 
 group :development do
   gem "rspec-rails", "~> 2.4.0"
-  gem "bundler", "~> 1.2.1"
+  gem "bundler"
   gem "jeweler", "~> 1.6.4"
 end

data/README.md

@@ -27,6 +27,11 @@ And then:
 bundle
 ```
 
+Release notes
+-------------
+v.3.0.1
+  - added support for inflection :promet
+
 Contributing to amount_inflector
 ---------------------------------
 

data/VERSION

@@ -1 +1 @@
-3.0.0
+3.0.1

data/amount_inflector.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "amount_inflector"
-  s.version = "3.0.0"
+  s.version = "3.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kresimir Bojcic"]
-  s.date = "2012-11-06"
+  s.date = "2012-11-13"
   s.description = "Amount Inflector for year/month/week/day (Croatian)"
   s.email = "kresimir.bojcic@gmail.com"
   s.extra_rdoc_files = [
@@ -43,16 +43,16 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rspec-rails>, ["~> 2.4.0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.2.1"])
+      s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
     else
       s.add_dependency(%q<rspec-rails>, ["~> 2.4.0"])
-      s.add_dependency(%q<bundler>, ["~> 1.2.1"])
+      s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
     end
   else
     s.add_dependency(%q<rspec-rails>, ["~> 2.4.0"])
-    s.add_dependency(%q<bundler>, ["~> 1.2.1"])
+    s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
   end
 end

data/lib/amount_inflector/amount_inflector.rb

@@ -11,6 +11,7 @@ class AmountInflector
      :tisuca => { one:"tisuću", few:"tisuće",  many:"tisuća" },
      :milijun => { one:"milijun", few:"milijuna",  many:"milijuna" },
      :milijarda => { one:"milijarda", few:"milijarde",  many:"milijardi" }
+     :promet => { one:"promet", few:"prometa",  many:"prometa" }
   }
 
   def self.inflect(amount, unit)

data/lib/amount_inflector/number_to_kune.rb

@@ -10,10 +10,8 @@ class NumberToKune
   WORDS = {
     "0" => "nula",
     "1" => "jedna",
-    "1_tisuca" => "jednu",
-    "1_milijun" => "jedan",
-    "2" => "dvije",
-    "2_milijun" => "dva",
+    "1_tisuca" => "jednu", "1_milijun" => "jedan",
+    "2" => "dvije", "2_milijun" => "dva",
     "3" => "tri",
     "4" => "četiri",
     "5" => "pet",
@@ -32,10 +30,8 @@ class NumberToKune
     "18" => "osamnaest",
     "19" => "devetnaest",
     "20" => "dvadeset",
-    "21" => "dvadesetjedna",
-    "21_milijun" => "dvadesetjedan",
-    "22" => "dvadesetdvije",
-    "22_milijun" => "dvadesetdva",
+    "21" => "dvadesetjedna", "21_milijun" => "dvadesetjedan",
+    "22" => "dvadesetdvije", "22_milijun" => "dvadesetdva",
     "30" => "trideset",
     "40" => "četrdeset",
     "50" => "pedeset",
@@ -69,48 +65,48 @@ class NumberToKune
     result += " i #{translate_to_words(after_decimal.to_s, '')} #{AmountInflector.inflect_unit(after_decimal.to_i, :lipa)}"
   end
 
-  private
-
   def translate_to_words(amount, in_words, unit = nil)
-    return in_words if amount.nil? || amount.size == 0 ||  amount.gsub("0","").size == 0
+    return in_words if amount.nil? || amount.size == 0 || amount.gsub("0","").size == 0
+    return '' if amount == "1" && !unit.nil?
+    raise "Nisu podrzani iznosi preko bilijun, a poslan je iznos #{amount}" if amount.to_i >= 1_000_000_000_000
 
     amount = amount.to_i.to_s
-    if amount.to_i < 1000
-      if amount.to_i < 1_000
-        if as_word(amount, unit) != nil
-          in_words += as_word(amount, unit)
-          decoded = amount.size
-        else
-          in_words += as_word(amount[0] +  "0" * (amount.size - 1), unit)
-          decoded = 1
-        end
-        translate_to_words(take_off(amount, decoded), in_words, unit)
-      end
-    elsif amount.to_i < 1_000_000
-      decompose(amount, :tisuca, in_words)
-    elsif amount.to_i < 1_000_000_000
-      decompose(amount, :milijun, in_words)
-    elsif amount.to_i < 1_000_000_000_000
-      decompose(amount, :milijarda, in_words)
+    if amount.to_i >= 1000
+      decompose(amount, in_words)
     else
-      raise "Nisu podrzani iznosi preko bilijun, a poslan je iznos #{amount}"
+      in_words += replaced_word(amount, unit)
+      translate_to_words(remove_first_n(amount, replaced_size(amount, unit)), in_words, unit)
     end
   end
 
+  def replaced_word(amount, unit)
+    as_word(amount, unit) || as_word(zeroed(amount), unit)
+  end
+
+  def replaced_size(amount, unit)
+    as_word(amount, unit).nil? ? 1 : amount.size
+  end
+
+  def zeroed(amount)
+    amount[0] +  "0" * (amount.size - 1)
+  end
+
   def as_word(amount, unit = nil)
-    (!unit.nil? &&  !WORDS["#{amount}_#{unit}"].nil?) ?  WORDS["#{amount}_#{unit}"] : WORDS[amount]
+    WORDS["#{amount}_#{unit.nil? ? '' : unit}"] || WORDS[amount]
+  end
+
+  def remove_first_n(source, n = 1)
+    source[n..-1]
   end
 
-  def take_off(source, number_to_take_off = 1)
-    result = source.reverse
-    (0...number_to_take_off).each { result.chop! }
-    result.reverse
+  def amount_unit(amount)
+    KOEFS.select { |key,value| amount.to_i >= value }.map { |key,value| key }.reverse[0]
   end
 
-  def decompose(amount, unit, in_words)
-    bez = (amount.to_i / KOEFS.fetch(unit)).to_s
-    in_words += translate_to_words(bez.to_s, '', unit) unless bez == "1"
-    in_words += AmountInflector.inflect_unit(bez.to_i, unit)
-    translate_to_words(amount[bez.size..amount.size - 1], in_words, unit)
+  def decompose(amount, in_words)
+    unit = amount_unit(amount)
+    without_unit = (amount.to_i / KOEFS.fetch(unit)).to_s
+    in_words += translate_to_words(without_unit.to_s, '', unit) + AmountInflector.inflect_unit(without_unit.to_i, unit)
+    translate_to_words(remove_first_n(amount, without_unit.size), in_words, unit)
   end
 end

data/spec/amount_inflector/number_to_kune_spec.rb

@@ -2,17 +2,22 @@
 require 'amount_inflector/number_to_kune.rb'
 
 describe NumberToKune do
-  it 'converts to kunas' do
+  it 'converts to kunas under 1000' do
     NumberToKune.convert(21).should == "dvadesetjedna kuna i nula lipa"
     NumberToKune.convert(100).should == "sto kuna i nula lipa"
     NumberToKune.convert(200).should == "dvjesto kuna i nula lipa"
     NumberToKune.convert(200.26).should == "dvjesto kuna i dvadesetšest lipa"
-    NumberToKune.convert(1_200.26).should == "tisućudvjesto kuna i dvadesetšest lipa"
     NumberToKune.convert(10).should == "deset kuna i nula lipa"
     NumberToKune.convert(3).should == "tri kune i nula lipa"
     NumberToKune.convert(18).should == "osamnaest kuna i nula lipa"
     NumberToKune.convert(24).should == "dvadesetčetiri kune i nula lipa"
     NumberToKune.convert(27).should == "dvadesetsedam kuna i nula lipa"
+    NumberToKune.convert(22).should == "dvadesetdvije kune i nula lipa"
+    NumberToKune.convert(0.00).should == "nula kuna i nula lipa"
+  end
+
+  it 'converts to kunas over 1000' do
+    NumberToKune.convert(1_200.26).should == "tisućudvjesto kuna i dvadesetšest lipa"
     NumberToKune.convert(1000).should == "tisuću kuna i nula lipa"
     NumberToKune.convert(101_000).should == "stojednutisuću kuna i nula lipa"
     NumberToKune.convert(1965).should == "tisućudevetstošezdesetpet kuna i nula lipa"
@@ -33,10 +38,14 @@ describe NumberToKune do
     NumberToKune.convert(926_543_864).should == "devetstodvadesetšestmilijunapetstočetrdesettritisućeosamstošezdesetčetiri kune i nula lipa"
     NumberToKune.convert(19_926_543_864).should == "devetnaestmilijardidevetstodvadesetšestmilijunapetstočetrdesettritisućeosamstošezdesetčetiri kune i nula lipa"
     NumberToKune.convert(121_926_543_864).should == "stodvadesetjednamilijardadevetstodvadesetšestmilijunapetstočetrdesettritisućeosamstošezdesetčetiri kune i nula lipa"
-    NumberToKune.convert(22).should == "dvadesetdvije kune i nula lipa"
     NumberToKune.convert(22_000_000).should == "dvadesetdvamilijuna kuna i nula lipa"
-    NumberToKune.convert(0.00).should == "nula kuna i nula lipa"
     NumberToKune.convert(97_543.21).should == "devedesetsedamtisućapetstočetrdesettri kune i dvadesetjedna lipa"
   end
 
+  it 'reports on a too big number of a number' do
+    lambda do
+        NumberToKune.convert(10000000000000)
+    end.should raise_error 'Nisu podrzani iznosi preko bilijun, a poslan je iznos 10000000000000'
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: amount_inflector
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-06 00:00:00.000000000 Z
+date: 2012-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails
@@ -32,17 +32,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
@@ -96,7 +96,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1772161144060008263
+      hash: 866616536439487970
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: