kabal 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c320388dd7d3d224706c90a97fcace03b2c86131
-  data.tar.gz: 90f36dc3e091c41cc0d119f83a35b4b41aba328d
+  metadata.gz: 1ea013a0f028d6323f4ab271f5647adf7f1742ea
+  data.tar.gz: 432fa5274031043a02af026dadc029724a162afd
 SHA512:
-  metadata.gz: e4c81f9fb94f5ceb2c481ccd3df54d875c2f9002922503999878cafea214e6ffa18f926ffad1a0d180d4e555d266b6d7304b51b7340d8e77ce6961653dafe279
-  data.tar.gz: ebbb2434ceb4606f2419fee3483de0bf8a0b21b7d2501c795d79d042b305ae03cee211e2946bda5c37eddb6dd78bb91ac867c05168a980ff788959c077f545fd
+  metadata.gz: 8ff3291a1af1796313e96bc1d91bbfcf9fd859457e2d5c6a0c932584c4558dd978e0426e05b067c958b2feb801e7a3ce5739a7bd3672e7dc3991ec8bfd1ecf26
+  data.tar.gz: 56d0dbe59f9e225dac8cbe40253d614dab5f871f72a442484042ed6efb73ec0d99c7bb6eaf58bc1c8a5cb4d4ae451a6f57efbeb87f6134a9c79ca44e3d640d46

data/lib/kabal/languages/global/number_properities.rb

@@ -0,0 +1,21 @@
+module Kabal
+  module GlobalRules
+    module NumberProperities
+      def fractional?(number)
+        number % 1 != 0
+      end
+      def natural?(number)
+        number % 1 == 0
+      end
+      def number_is_thousands?(number)
+        number_order(number) < 3
+      end
+      def number_is_google?(number)
+        count(number) == 10 && number_order(number) == 99
+      end
+      def need_minus?(number)
+        number < 0
+      end
+    end
+  end
+end

data/lib/kabal/languages/language.rb

@@ -1,10 +1,12 @@
 require 'kabal/languages/global/fractional_numbers'
 require 'kabal/languages/global/natural_numbers'
+require 'kabal/languages/global/number_properities'
 
 module Kabal
   class Language
     include Kabal::GlobalRules::NaturalNumbers
     include Kabal::GlobalRules::FractionalNumbers
+    include Kabal::GlobalRules::NumberProperities
 
     def initialize
       @names = Kabal::Config::YamlLoader.yaml_object "languages/#{lang}"
@@ -36,9 +38,8 @@ module Kabal
 
     def error(number)
       if number_is_out_of_the_range? number
-        return Kabal::Errors::NumberOutRangeError.message
-      end
-      if (!supports_fractional?) && (number % 1 != 0)
+        Kabal::Errors::NumberOutRangeError.message
+      elsif (!supports_fractional?) && (number % 1 != 0)
         Kabal::Errors::NoSupportForFractionalNumberOnCurrentLanguages.message
       end
     end
@@ -80,22 +81,6 @@ module Kabal
       names[:dot]
     end
 
-    def fractional?(number)
-      number % 1 != 0
-    end
-
-    def natural?(number)
-      number % 1 == 0
-    end
-
-    def number_is_thousands?(number)
-      number_order(number) < 3
-    end
-
-    def number_is_google?(number)
-      count(number) == 10 && number_order(number) == 99
-    end
-
     def number_order(number)
       ((number.to_s.length - 1) / 3) * 3
     end
@@ -113,17 +98,13 @@ module Kabal
     end
 
     def fractional_but_no_support_fractional?(number)
-      number % 1 != 0 && !supports_fractional?
+      fractional?(number) && !supports_fractional?
     end
 
     def no_supports?(number)
       fractional_but_no_support_fractional?(number) || number_is_out_of_the_range?(number)
     end
 
-    def need_minus?(number)
-      number < 0
-    end
-
     def space
       ' '
     end

data/lib/kabal/version.rb

@@ -1,3 +1,3 @@
 module Kabal
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kabal
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-16 00:00:00.000000000 Z
+date: 2014-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,6 +72,7 @@ files:
 - lib/kabal/languages/english/natural_numbers.rb
 - lib/kabal/languages/global/fractional_numbers.rb
 - lib/kabal/languages/global/natural_numbers.rb
+- lib/kabal/languages/global/number_properities.rb
 - lib/kabal/languages/language.rb
 - lib/kabal/languages/russian.rb
 - lib/kabal/languages/russian/declinations.rb