numeri_romani 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ade03b2c587a395bdca23e658076da1888882da
-  data.tar.gz: 87e101a9b9f99d9f110d9a54a70fd56f2f459269
+  metadata.gz: 5d5ee7bc9fda2e4091a6f01cdc1e404d25061060
+  data.tar.gz: 4dddb21fe3840bf12c57aa2dc31a2aa664675070
 SHA512:
-  metadata.gz: 5bb59e7553ce3b684ff4f5ef5b8876e724febb9a5bcb434897e157dffdcbce790896f7eee5183fd34837f5f27e65296e68e911c7ec8f184edbc7a5aee9403389
-  data.tar.gz: 2abf0cf00f9dc25b30e34bb7b6a8de284ab07dc3ac80e072d2e5584c81f17ab8af01c1d853abf57240a0aa89b34c13056849db66725429977bb9c8cfdeb993ed
+  metadata.gz: 9de2688ffb265e598367845b005be1a93b12f255270082c661786c3066fe890fcff0adb6e701da6936206ddb3fd8abf68ab1207db9a0e7761318f566d2fa5664
+  data.tar.gz: 9b438adf3442505873a4c98e70b0bd84c63093b52c935ef474d4d2fc382ca5f1d8351c5975730fd557793c006ccacd096cd74b2119ef10d9a534e8290966e762

data/README.md

@@ -1,7 +1,7 @@
 # NumeriRomani
 
-Numeri Romani (lat. roman numerals) - simple library for conversion integers to roman numerals and roman numerals to integers.
-Convert numbers within range of 1..3_999_999.
+Numeri Romani (*lat. roman numerals*) - simple library for conversion integers to roman numerals and roman numerals to integers.
+Convert numbers within range of [$$\frac{1}{12}$$; 3_999_999 $$\frac{11}{12}$$].
 
 ## Installation
 
@@ -22,8 +22,39 @@ Or install it yourself as:
 ## Usage
 ```ruby
 NumeriRomani.to_roman(521) # => 'DXXI'
+NumeriRomani.to_roman(125_202) # => 'C̅X̅X̅V̅CCII'
+NumeriRomani.to_roman(-1) # => ArgumentError: Number should be in interval [1..3_999_999]
+NumeriRomani.to_roman(10**7) # => ArgumentError: Number should be in interval [1..3_999_999]
+```
+```ruby
 NumeriRomani.to_decimal('DXXI') # => 521
+NumeriRomani.to_decimal('M̅M̅C̅C̅C̅X̅L̅V̅DCLXXVIII') # => 2_345_678
+NumeriRomani.to_decimal('IIIXC') # => ArgumentError: Not valid roman number
 ````
+Fractions:
+
+| Roman numeral|Fraction  |
+|:------------:| :-------:|
+| S            |6/12 (1/2)|
+| ⁙ (*****)    |      5/12|
+| ∷ (****)     |4/12 (1/3)|
+| ∴ (***)      |3/12 (1/4)|
+| ∶ (**)       |2/12(1/6) |
+| ⋅ (*)        |      1/12|
+
+```ruby
+NumeriRomani.to_decimal('IS') # => (3/2)
+NumeriRomani.to_decimal('S⁙') # => (11/12)
+NumeriRomani.to_decimal('S*****') # => (11/12)
+```
+
+```ruby
+NumeriRomani.to_roman(3/4r) # => 'S∴'
+NumeriRomani.to_roman(5.5) # => 'VS'
+NumeriRomani.to_roman(10.11) # => 'X⋅' (0.11 ~ 1/12)
+NumeriRomani.to_roman(10.13) # => 'X∶' (0.13 ~ 2/12)
+NumeriRomani.to_roman(12.77) # => 'XIIS∷' (0.77 ~ 10/12)
+```
 
 ## Development
 
@@ -45,8 +76,6 @@ Here's some ideas (maybe also a roadmap for possible future versions of the libr
 
 * **Add Apostrophus system for big numbers.** For instance: CCC|ƆƆƆ|ƆƆƆ (C̅X̅X̅MMMCXXIII)
 
-* **Extend for fractions**. For instance S: - 2/3, S:·: - 11/12
-
 * **Add Validation module**.
 
 ## License

data/lib/numeri_romani/digits.rb

@@ -11,7 +11,7 @@ module NumeriRomani
     'X̅'  => 10_000,
     'I̅X̅' => 9_000,
     'V̅'  => 5_000,
-    'I̅V̅'  => 4_000,
+    'I̅V̅' => 4_000,
     'M'  => 1_000,
     'CM' => 900,
     'D'  => 500,
@@ -27,5 +27,19 @@ module NumeriRomani
     'I'  => 1
   }.freeze
 
-  REGEXP = /^((M\u0305){0,3})((D\u0305)?(C\u0305){0,3}|C\u0305D\u0305|C\u0305M\u0305)((L\u0305)?(X\u0305){0,3}|X\u0305L\u0305|X\u0305C\u0305)((V\u0305)?(I\u0305){0,3}|I\u0305V\u0305|I\u0305X\u0305)(M{0,3})(D?C{0,3}|C[DM])(L?X{0,3}|X[LC])(V?I{0,3}|I[VX])$/
+  FRACTIONS = {
+    'S⁙' => 11/12r,
+    'S∷' => 10/12r,
+    'S∴' => 9/12r,
+    'S∶' => 8/12r,
+    'S⋅' => 7/12r,
+    'S' => 6/12r,
+    '⁙' => 5/12r,
+    '∷' => 4/12r,
+    '∴' => 3/12r,
+    '∶' => 2/12r,
+    '⋅' => 1/12r,
+  }.freeze
+
+  REGEXP = /^((M\u0305){0,3})((D\u0305)?(C\u0305){0,3}|C\u0305D\u0305|C\u0305M\u0305)((L\u0305)?(X\u0305){0,3}|X\u0305L\u0305|X\u0305C\u0305)((V\u0305)?(I\u0305){0,3}|I\u0305V\u0305|I\u0305X\u0305)(M{0,3})(D?C{0,3}|C[DM])(L?X{0,3}|X[LC])(V?I{0,3}|I[VX])(#{FRACTIONS.keys.join('|')}|(S?\*{0,5}))?$/
 end

data/lib/numeri_romani/version.rb

@@ -1,3 +1,3 @@
 module NumeriRomani
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

data/lib/numeri_romani.rb

@@ -1,20 +1,28 @@
-require 'numeri_romani/version'
 require 'numeri_romani/digits'
 
 module NumeriRomani
   class << self
     def to_roman(decimal_number)
-      raise ArgumentError.new('Number should be an Integer') unless decimal_number.is_a?(Integer)
-      raise ArgumentError.new('Number should be in interval [1..3_999_999]') unless decimal_number.between?(1, 3_999_999)
-      DIGITS.map do |letter, value|
-        count, decimal_number = decimal_number.divmod(value)
+      unless [Integer, Float, Rational].include?(decimal_number.class)
+        raise ArgumentError.new('Number should be an Integer/Float/Rational')
+      end
+      unless decimal_number.between?(1/12r, 3_999_999 + 11/12r)
+        raise ArgumentError.new('Number should be in interval [(1/12)..3_999_999(11/12)]')
+      end
+      integer = decimal_number.to_i
+      fract = (decimal_number - integer).to_r
+      fract = Rational((12.0 * fract.numerator / fract.denominator).round, 12)
+      roman = DIGITS.map do |letter, value|
+        count, integer = integer.divmod(value)
         [letter * count]
-      end.join
+      end
+      (roman << FRACTIONS.key(fract)).join
     end
 
     def to_decimal(roman_number)
       raise ArgumentError.new('Not valid roman number') unless roman_number.match?(REGEXP)
-      roman_number.scan(/#{DIGITS.keys.join('|')}/).sum { |let| DIGITS[let] }
+      result = roman_number.scan(/#{(DIGITS.keys + FRACTIONS.keys).join('|')}/).sum { |let| DIGITS[let] || FRACTIONS[let] }
+      result + roman_number.count('*') * 1/12r
     end
   end
 end

data/numeri_romani.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Vasiliy Petrov"]
   spec.email         = ["saugardas@yandex.ru"]
 
-  spec.summary       = %q{Conversion between Decimals and Roman Numbers}
+  spec.summary       = %q{Conversion between Decimals and Roman numbers in interval (1/12)-3_999_999(11/12)}
   spec.description   = %q{Conversion between Decimals and Roman Numbers}
   spec.homepage      = "https://github.com/saugardas/numeri_romani"
   spec.license       = "MIT"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: numeri_romani
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Vasiliy Petrov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-08 00:00:00.000000000 Z
+date: 2017-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -96,5 +96,5 @@ rubyforge_project:
 rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
-summary: Conversion between Decimals and Roman Numbers
+summary: Conversion between Decimals and Roman numbers in interval (1/12)-3_999_999(11/12)
 test_files: []