ru_propisju 2.1.3 → 2.1.4

data/History.txt

@@ -1,3 +1,7 @@
+=== 2.1.4
+
+* Правильная обработка нулей в суммах
+
 === 2.1.3
 
 * Починен порядок тысячных долей на ruby 1.8x

data/lib/ru_propisju.rb

@@ -6,7 +6,7 @@ $KCODE = 'u' if RUBY_VERSION < '1.9.0'
 #   RuPropisju.rublej(123) # "сто двадцать три рубля"
 module RuPropisju
 
-  VERSION = '2.1.3'
+  VERSION = '2.1.4'
   
   # http://www.xe.com/symbols.php
   # (лица, приближенные форексам и всяким там валютам и курсам)
@@ -178,12 +178,13 @@ module RuPropisju
   #
   #   rublej(345.2) #=> "триста сорок пять рублей 20 копеек"
   def rublej(amount, locale = :ru)
-    parts = []
     locale_data = pick_locale(TRANSLATIONS, locale)
-    
     integrals = locale_data[:rub_integral]
     fractions = locale_data[:rub_fraction]
     
+    return zero(locale_data, integrals, fractions, locale == :ru) if amount.zero?
+    
+    parts = []
     parts << propisju_int(amount.to_i, 1, integrals, locale) unless amount.to_i == 0
     if amount.kind_of?(Float)
       remainder = (amount.divmod(1)[1]*100).round
@@ -220,7 +221,9 @@ module RuPropisju
     
     integrals = locale_root[:uah_integral]
     fractions = locale_root[:uah_fraction]
-
+    
+    return zero(locale_root, integrals, fractions, locale == 'ru') if amount.zero?
+    
     parts = []
     parts << propisju_int(amount.to_i, 2, integrals, locale) unless amount.to_i == 0
     if amount.kind_of? Float
@@ -243,7 +246,9 @@ module RuPropisju
     
     integrals = locale_root[:usd_integral]
     fractions = locale_root[:usd_fraction]
-
+    
+    return zero(locale_root, integrals, fractions, locale == 'ru') if amount.zero?
+    
     parts << propisju_int(amount.to_i, 1, integrals, locale) unless amount.to_i == 0
     if amount.kind_of?(Float)
       remainder = (amount.divmod(1)[1]*100).round
@@ -266,7 +271,9 @@ module RuPropisju
     
     integrals = locale_data[:eur_integral]
     fractions = locale_data[:eur_fraction]
-
+    
+    return zero(locale_root, integrals, fractions, locale == 'ru') if amount.zero?
+    
     parts << propisju_int(amount.to_i, 1, integrals, locale) unless amount.to_i == 0
     if amount.kind_of?(Float)
       remainder = (amount.divmod(1)[1]*100).round
@@ -303,6 +310,11 @@ module RuPropisju
 
   private
   
+  def zero(locale_data, integrals, fractions, fraction_as_number)
+    frac = fraction_as_number ? '0' : locale_data['0']
+    parts = [locale_data['0'], integrals[-1], frac, fractions[-1]]
+    parts.join(' ')
+  end
   
   # Cоставляет число прописью для чисел до тысячи
   
@@ -312,6 +324,9 @@ module RuPropisju
     
     locale = locale.to_s
     
+    # Ноль чего-то
+    # return "ноль %s" % item_forms[3] if remaining_amount_or_nil.zero?
+    
     rest, rest1, chosen_ordinal, ones, tens, hundreds = [nil]*6
     
     rest = remaining_amount  % 1000
@@ -437,6 +452,9 @@ module RuPropisju
     
     locale_root = pick_locale(TRANSLATIONS, locale)
     
+    # zero!
+    return [locale_root['0'], item_forms[-1]].compact.join(' ') if amount.zero?
+    
     fractions = [
       [:trillions, 1_000_000_000_000],
       [:billions, 1_000_000_000],
@@ -484,5 +502,5 @@ module RuPropisju
 
   public_instance_methods(true).map{|m| module_function(m) }
 
-  module_function :propisju_int, :propisju_float, :compose_ordinal, :pick_locale
+  module_function :zero, :propisju_int, :propisju_float, :compose_ordinal, :pick_locale
 end

data/ru_propisju.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ru_propisju"
-  s.version = "2.1.3"
+  s.version = "2.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Julik Tarkhanov"]
-  s.date = "2012-03-30"
+  s.date = "2012-04-02"
   s.email = "me@julik.nl"
   s.extra_rdoc_files = [
     "README.rdoc"
@@ -26,8 +26,8 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/julik/ru_propisju"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.16"
-  s.summary = "C\321\203\320\274\320\274\320\260 \320\277\321\200\320\276\320\277\320\270\321\201\321\214\321\216"
+  s.rubygems_version = "1.8.15"
+  s.summary = "C\u{443}\u{43c}\u{43c}\u{430} \u{43f}\u{440}\u{43e}\u{43f}\u{438}\u{441}\u{44c}\u{44e}"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/test/test_ru_propisju.rb

@@ -63,6 +63,7 @@ class TestRuPropisju < Test::Unit::TestCase
     assert_equal "сорок пять", RuPropisju.propisju(45, 1)
     assert_equal "пять", RuPropisju.propisju(5, 1)
     assert_equal "шестьсот двенадцать", RuPropisju.propisju(612, 1)
+    assert_equal "ноль", RuPropisju.propisju(0, 1)
 
 
     # ukrainian locale
@@ -129,6 +130,7 @@ class TestRuPropisju < Test::Unit::TestCase
   end
 
   def test_rublej
+    assert_equal "ноль рублей 0 копеек", RuPropisju.rublej(0)
     assert_equal "сто двадцать три рубля", RuPropisju.rublej(123)
     assert_equal "триста сорок три рубля 20 копеек", RuPropisju.rublej(343.20)
     assert_equal "42 копейки", RuPropisju.rublej(0.4187)
@@ -153,6 +155,8 @@ class TestRuPropisju < Test::Unit::TestCase
     assert_equal "триста тридцать две гривны", RuPropisju.griven(331.995)
     assert_equal "одна гривна", RuPropisju.grivna(1)
     assert_equal "три гривны четырнадцать копеек", RuPropisju.grivny(3.14)
+    assert_equal "ноль гривен 0 копеек", RuPropisju.griven(0)
+
     # ua locale
     assert_equal "сто двадцять три гривні", RuPropisju.griven(123, :ua)
     assert_equal "сто двадцять чотири гривні", RuPropisju.griven(124, :ua)
@@ -161,10 +165,12 @@ class TestRuPropisju < Test::Unit::TestCase
     assert_equal "триста тридцять дві гривні", RuPropisju.griven(331.995, :ua)
     assert_equal "одна гривня", RuPropisju.grivna(1, :ua)
     assert_equal "три гривні чотирнадцять копійок", RuPropisju.grivny(3.14, :ua)
+    assert_equal "нуль гривень нуль копійок", RuPropisju.griven(0, :ua)
 
   end
 
   def test_kopeek
+    assert_equal "ноль рублей 0 копеек", RuPropisju.kopeek(0)
     assert_equal "сто двадцать три рубля", RuPropisju.kopeek(12300)
     assert_equal "три рубля 14 копеек", RuPropisju.kopeek(314)
     assert_equal "32 копейки", RuPropisju.kopeek(32)

metadata

@@ -1,59 +1,45 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ru_propisju
-version: !ruby/object:Gem::Version 
-  hash: 13
+version: !ruby/object:Gem::Version
+  version: 2.1.4
   prerelease: 
-  segments: 
-  - 2
-  - 1
-  - 3
-  version: 2.1.3
 platform: ruby
-authors: 
+authors:
 - Julik Tarkhanov
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-03-30 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  type: :development
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
-  requirement: *id001
+date: 2012-04-02 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: jeweler
-- !ruby/object:Gem::Dependency 
-  type: :development
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &8967760 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  requirement: *id002
+  version_requirements: *8967760
+- !ruby/object:Gem::Dependency
   name: rake
+  requirement: &8967000 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *8967000
 description: 
 email: me@julik.nl
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
-files: 
+files:
 - Gemfile
 - History.txt
 - README.rdoc
@@ -62,39 +48,31 @@ files:
 - ru_propisju.gemspec
 - test/test_ru_propisju.rb
 homepage: http://github.com/julik/ru_propisju
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 792091439
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.16
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
-summary: !binary |
-  Q9GD0LzQvNCwINC/0YDQvtC/0LjRgdGM0Y4=
-
+summary: Cумма прописью
 test_files: []
-