to_russian_words 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5af8092d6536adb922bb4c15e65f96e2da717638
-  data.tar.gz: a4535afdade520cb50907ef6d12627229b55de27
+  metadata.gz: 346812726e96d15239f6716e319645cf612fd2c2
+  data.tar.gz: 2c260974caa40d84de6bf2ad29b1e7ccb8567266
 SHA512:
-  metadata.gz: c1a09a64c97b987f92662f8460fe3f71fff2f53bde458bef62ef2d76e361ba79b9e55ac2d2a49db35e6adbadcf8e59c6bbf260c4169a09180aeaa917d09bdbcb
-  data.tar.gz: 8a955db2e1a0740071258a834f8691a79bbda6d9effda6398c8a81cd6b044ac7e9ee8ec4429e0c060ab5669cb733cb5d08b0a309e0ca3c8d9d213c657e813efa
+  metadata.gz: 318b675911dcd1312837617dd05de09a45c758e9ff613fb24d691dc90238ed2b670270527dfa9e13bb9b443cf767e79acfbcacb67abb82bff68da70a2c3a3f8a
+  data.tar.gz: dde4be3a41c0a2365e98eaa176bedbadca3fdc46cb16722bf02aa3276d118b56a0d3dd797fa71e14c82df0c3303420bfb63b6cbde7fafa3e0f5950a8ad9b46e6

data/README.md

@@ -7,16 +7,18 @@ e.g.
     25.to_words('dative') # "двадцати пяти" 
     70.to_words('dative') # "семидесяти" 
     70.to_words() # "семьдесят" 
+    
+With large numbers may be inaccurate, fix ... soon :)
 
 ## Installation
 
 Add this line to your application's Gemfile:
 
-    gem 'to_words', git: 'git://github.com/VasiliyG/to_words.git', tag: 'v1.0.7'
+    gem 'to_words', '1.1.1'
 
 And then execute:
 
-    $ bundle
+    $ bundle install
 
 ## Usage
 

data/lib/to_russian_words.rb

@@ -22,7 +22,7 @@ module ToRussianWords
     while num != 0
       num, remaining = num.divmod(1000)
       temp_result = result_below_one_thousand(remaining, counter, russian_case)
-      result << temp_result + ' ' + divisions(russian_case)[counter] + ' ' if temp_result
+      result << temp_result + ' ' + divisions(russian_case)[counter][remaining.to_s.last.to_i] if temp_result
       counter += 1
     end
     sign + result.reverse.join(' ').rstrip

data/lib/to_russian_words/divisions.rb

@@ -2,23 +2,23 @@
 module ToRussianWords
   module Divisions
     NOMINATIVE_DIVISIONS = [
-      '',
-      'тысяч',
-      'миллион',
-      'миллиард',
-      'триллион',
-      'квадрильон',
-      'нониллион'
+      ([''] * 10),
+      ['', 'тысяча', (['тысячи'] * 3),  (['тысяч'] * 5)].flatten,
+      ['', 'миллион', (['миллиона'] * 3),  (['миллионов'] * 5)].flatten,
+      ['', 'миллиард', (['миллиарда'] * 3),  (['миллиардов'] * 5)].flatten,
+      ['', 'триллион', (['триллиона'] * 3),  (['триллионов'] * 5)].flatten,
+      ['', 'квадрильон', (['квадрильона'] * 3),  (['квадрильонов'] * 5)].flatten,
+      ['', 'нониллион', (['нониллиона'] * 3),  (['нониллионов'] * 5)].flatten
     ].freeze
 
     DATIVE_DIVISIONS = [
-      '',
-      'тысячи',
-      'миллиона',
-      'миллиарда',
-      'триллиона',
-      'квадрильона',
-      'нониллиона'
+      ([''] * 10),
+      ['', 'тысячи', (['тысяч'] * 8)].flatten,
+      ['', 'миллиона', (['миллионов'] * 8)].flatten,
+      ['', 'миллиарда', (['миллиардов'] * 8)].flatten,
+      ['', 'триллиона', (['триллионов'] * 8)].flatten,
+      ['', 'квадрильона', (['квадрильонов'] * 8)].flatten,
+      ['', 'нониллиона', (['нониллионов'] * 8)].flatten,
     ].freeze
   end
 end

data/lib/to_russian_words/utils.rb

@@ -14,11 +14,11 @@ module ToRussianWords
     end
 
     def higher_than_hundred(hundred, remaining, counter, russian_case)
-      century = under_hundred(russian_case)[hundred]
+      century = (hundred == 1 ? '' : under_hundred(russian_case)[hundred])
       if remaining != 0
-        return century + "#{hundred_name(russian_case)} " + under_hundred(russian_case)[remaining]
+        return century + "#{hundred_name(russian_case, remaining)} " + under_hundred(russian_case)[remaining]
       end
-      return century + "#{hundred_name(russian_case)} " if remaining == 0
+      return century + "#{hundred_name(russian_case, remaining)} " if remaining == 0
     end
 
     def check_sign(num)
@@ -49,12 +49,23 @@ module ToRussianWords
       end
     end
 
-    def hundred_name(russian_case)
+    def hundred_name(russian_case, remaining)
+      remaining = remaining.to_s.last.to_i
       case russian_case
       when 'dative'
-        'сот'
+        if remaining == 1
+          'ста'
+        else
+          'сот'
+        end
       else
-        'ста'
+        if remaining == 1
+          'сто'
+        elsif remaining.between?(2, 4)
+          'ста'
+        else
+          'сот'
+        end
       end
     end
   end

data/lib/to_russian_words/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module ToRussianWords
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: to_russian_words
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Vasiliy Gandzha