ru_propisju 2.2.1 → 2.2.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 8caa7abb8128fcd57cf3b2902309b67fe20f7137
+  data.tar.gz: e14c5a3ea4bbc12353fb33f2d246a63ae60fc4e9
+SHA512:
+  metadata.gz: 95bfde5696ce888ebdf0d795b743026175ffb907707b4edc01a0ebbb6e1db3816b286aca32f502a7df0d4f9936314cae7e6b5a37ff265a35e933d34ec7661c90
+  data.tar.gz: f49d42ed3ef8009c0e649bcc707276076eaef080e08feec5a18deee6fad23b0d299fc63894e0eb9ce30463e0b58064541512b4b08ebbbf788b7cbb51b9a9e072

data/History.txt

@@ -1,3 +1,7 @@
+=== 2.2.2
+
+* Форматирование долей могло вызвать ошибку (https://github.com/julik/ru_propisju/issues/10)
+
 === 2.2.1
 
 * Опечатка в украинских числительных (https://github.com/julik/ru_propisju/pull/9)

data/lib/ru_propisju.rb

@@ -6,7 +6,7 @@ $KCODE = 'u' if RUBY_VERSION < '1.9.0'
 #   RuPropisju.rublej(123) # "сто двадцать три рубля"
 module RuPropisju
 
-  VERSION = '2.2.1'
+  VERSION = '2.2.2'
   
   # http://www.xe.com/symbols.php
   # (лица, приближенные форексам и всяким там валютам и курсам)
@@ -432,7 +432,7 @@ module RuPropisju
     end.freeze
 
     # Укорачиваем до триллионной доли
-    formatted = ("%0.#{words.length}f" % num).gsub(/0+$/, '')
+    formatted = ("%0.#{words.length}g" % num).gsub(/0+$/, '')
     wholes, decimals = formatted.split(/\./)
 
     return propisju_int(wholes.to_i, 1, [], locale) if decimals.to_i.zero?

data/ru_propisju.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ru_propisju"
-  s.version = "2.2.1"
+  s.version = "2.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Julik Tarkhanov"]
-  s.date = "2013-08-05"
+  s.date = "2013-11-28"
   s.email = "me@julik.nl"
   s.extra_rdoc_files = [
     "README.rdoc"
@@ -26,11 +26,11 @@ 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.25"
+  s.rubygems_version = "2.0.3"
   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
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<jeweler>, [">= 0"])

data/test/test_ru_propisju.rb

@@ -84,7 +84,11 @@ class TestRuPropisju < Test::Unit::TestCase
     assert_equal "двадцать одна подстава", RuPropisju.propisju_shtuk(21, 2, ["подстава", "подставы", "подстав"])
     assert_equal "двести двенадцать сволочей", RuPropisju.propisju_shtuk(212.00, 2, ["сволочь", "сволочи", "сволочей"])
     assert_equal "двести двенадцать целых четыре десятых куска", RuPropisju.propisju_shtuk(212.40, 2, ["кусок", "куска", "кусков"])
-
+    
+    # GH issue 10
+    # https://github.com/julik/ru_propisju/issues/10
+    assert_equal "одна тысяча сто две целых сорок одна сотая кубометра", RuPropisju.propisju_shtuk( 1102.41, 2, ["кубометр", "кубометра", "кубометров"])
+    
     # ua locale
     assert_equal "шість цілих", RuPropisju.propisju_shtuk(6, 2, ["ціла", "цілих", "цілих"], :ua)
     assert_equal "двадцять п'ять колес", RuPropisju.propisju_shtuk(25, 3, ["колесо", "колеса", "колес"], :ua)
@@ -99,6 +103,7 @@ class TestRuPropisju < Test::Unit::TestCase
     assert_equal "триста сорок одна целая двести сорок пять тысячных", RuPropisju.propisju(341.245, 1)
     assert_equal "двести три целых сорок одна сотая", RuPropisju.propisju(203.41, 1)
     assert_equal "четыреста сорок две целых пять десятых", RuPropisju.propisju(442.50000, 1)
+    
     # ua locale
     assert_equal "шість цілих п'ять десятих", RuPropisju.propisju(6.50, 1, :ua)
     assert_equal "триста сорок одна ціла дев'ять десятих", RuPropisju.propisju(341.9, 1, :ua)

metadata

@@ -1,46 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: ru_propisju
 version: !ruby/object:Gem::Version
-  version: 2.2.1
-  prerelease: 
+  version: 2.2.2
 platform: ruby
 authors:
 - Julik Tarkhanov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-05 00:00:00.000000000 Z
+date: 2013-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -60,29 +55,25 @@ files:
 homepage: http://github.com/julik/ru_propisju
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1598717423605578407
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Cумма прописью
 test_files: []