to_russian_words 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 346812726e96d15239f6716e319645cf612fd2c2
-  data.tar.gz: 2c260974caa40d84de6bf2ad29b1e7ccb8567266
+  metadata.gz: 76a4e11c1c88b6b6314f0aa1a3799fd43b505e7b
+  data.tar.gz: d4eaac1f43767afe425ec5eb99c570e32ce7d930
 SHA512:
-  metadata.gz: 318b675911dcd1312837617dd05de09a45c758e9ff613fb24d691dc90238ed2b670270527dfa9e13bb9b443cf767e79acfbcacb67abb82bff68da70a2c3a3f8a
-  data.tar.gz: dde4be3a41c0a2365e98eaa176bedbadca3fdc46cb16722bf02aa3276d118b56a0d3dd797fa71e14c82df0c3303420bfb63b6cbde7fafa3e0f5950a8ad9b46e6
+  metadata.gz: b69998d59c7a3e8327eda7a716be631aba75ec7db9a73663fade52d9516225fbeffd74b65221a1eaddfcb6c17e83cccdf93f4323845aec88557e4db59f829db9
+  data.tar.gz: 7a0545fba7c84714b0602e9cbc0348f55430e0133b232e18ac7f8d6316526c2bc10c5854ff39a1893fcb5a40fff08b5acb4b8c8a1f56b0c24742e57fdb0d69c9

data/lib/to_russian_words.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 module ToRussianWords
-  require "to_russian_words/version"
-  require_relative "./to_russian_words/under_hundred.rb"
-  require_relative "./to_russian_words/divisions.rb"
-  require_relative "./to_russian_words/utils.rb"
+  require 'to_russian_words/version'
+  require_relative './to_russian_words/under_hundred.rb'
+  require_relative './to_russian_words/divisions.rb'
+  require_relative './to_russian_words/utils.rb'
 
   include ToRussianWords::UnderHundred
   include ToRussianWords::Divisions

data/lib/to_russian_words/russian_gender_labels.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+module ToRussianWords
+  module RussianGenderLabels
+    NOMINATIVE_RUSSIAN_FEMALE_LABEL = [
+      '', 'одна', 'две'
+    ].freeze
+
+    DATIVE_RUSSIAN_FEMALE_LABEL = [
+      '', 'одной', 'двух'
+    ].freeze
+  end
+end

data/lib/to_russian_words/utils.rb

@@ -1,24 +1,26 @@
 # frozen_string_literal: true
 require_relative './under_hundred.rb'
 require_relative "./divisions.rb"
+require_relative "./russian_gender_labels.rb"
 module ToRussianWords
   module Utils
     include UnderHundred
     include Divisions
+    include RussianGenderLabels
 
     def result_below_one_thousand(num, counter, russian_case)
       hundred, remaining = num.divmod(100)
 
       return higher_than_hundred(hundred, remaining, counter, russian_case) if hundred != 0
-      under_hundred(russian_case)[remaining] if hundred == 0 && remaining != 0
+      under_hundred(russian_case, counter == 1 ? num : nil)[remaining] if hundred == 0 && remaining != 0
     end
 
     def higher_than_hundred(hundred, remaining, counter, russian_case)
-      century = (hundred == 1 ? '' : under_hundred(russian_case)[hundred])
+      century = (hundred == 1 ? '' : under_hundred(russian_case, hundred)[hundred])
       if remaining != 0
-        return century + "#{hundred_name(russian_case, remaining)} " + under_hundred(russian_case)[remaining]
+        return century + "#{hundred_name(hundred, russian_case)} " + under_hundred(russian_case)[remaining]
       end
-      return century + "#{hundred_name(russian_case, remaining)} " if remaining == 0
+      return century + "#{hundred_name(hundred, russian_case)} " if remaining == 0
     end
 
     def check_sign(num)
@@ -31,12 +33,12 @@ module ToRussianWords
       raise 'A whole number is expected'
     end
 
-    def under_hundred(russian_case)
+    def under_hundred(russian_case, hundred = 0)
       case russian_case
       when 'dative'
-        DATIVE_UNDER_HUNDRED
+        [1, 2].include?(hundred) ? DATIVE_RUSSIAN_FEMALE_LABEL : DATIVE_UNDER_HUNDRED
       else
-        NOMINATIVE_UNDER_HUNDRED
+        [1, 2].include?(hundred) ? NOMINATIVE_RUSSIAN_FEMALE_LABEL : NOMINATIVE_UNDER_HUNDRED
       end
     end
 
@@ -49,19 +51,20 @@ module ToRussianWords
       end
     end
 
-    def hundred_name(russian_case, remaining)
-      remaining = remaining.to_s.last.to_i
+    def hundred_name(hundred, russian_case)
       case russian_case
       when 'dative'
-        if remaining == 1
+        if hundred == 1
           'ста'
         else
           'сот'
         end
       else
-        if remaining == 1
+        if [1, 4].include? hundred
           'сто'
-        elsif remaining.between?(2, 4)
+        elsif hundred == 2
+          'сти'
+        elsif hundred == 3
           'ста'
         else
           'сот'

data/lib/to_russian_words/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: to_russian_words
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Vasiliy Gandzha
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-25 00:00:00.000000000 Z
+date: 2017-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -96,6 +96,7 @@ files:
 - Rakefile
 - lib/to_russian_words.rb
 - lib/to_russian_words/divisions.rb
+- lib/to_russian_words/russian_gender_labels.rb
 - lib/to_russian_words/under_hundred.rb
 - lib/to_russian_words/utils.rb
 - lib/to_russian_words/version.rb