cousin_roman 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a8b6dfc559930d66a36f9cf48fee854d3b9a34e
-  data.tar.gz: 6cc9bd2645c0c136e4553de3d68a2263056c4b11
+  metadata.gz: ec3fa2cc7d9e4ab2b07e528b54976fb4133a8b92
+  data.tar.gz: 9bdac0d47492a5a17cc9eee724a856364987e67c
 SHA512:
-  metadata.gz: 37d624ab76834dbfb7de0d3aaac9c68cf0c52e6feb094b1eddb224e5d9bbc193e31d2a4014ebe83dc9976218d09daef7cf16f1305d60a858ae01fc32a6a75f1a
-  data.tar.gz: af80ee0573e5013fbc7b9698e8472cae0215b6a762e9e15c9d129e9ff2b9714f9f0ac3b1c69521fcba1a2d3d5d95cdf824c5c76023cf773254af585da14fed22
+  metadata.gz: 5bebb3279b63fdca8189a5c1290a7ebb4baeb76abf42e88081e19614dc8bd7d386d8c70aefc7c416e91386566be700f96b0e17144d83469e8e4e043b64b6aa89
+  data.tar.gz: f6834054b705eb3e16f7aeb9b93f01c90b2622cf7dc88524570a4fa02d4ccb779a49bcb0bdb028fcdcaea8d220d9b43a1de3eac088958f7a9d757ba815b6ea12

data/README.md

@@ -1,9 +1,23 @@
 # CousinRoman
 
-`CousinRoman` provides functionality to convert between Roman and Arabian numerals.
-
+CousinRoman provides functionality to convert between Roman and Arabian numerals.
 The functionality provided via String and Integer extensions.
 
+## Roman numbers and conversion rules
+
+CousinRoman follows strict roman notation with subtractive rule, i.e.
+
+1. Letters should be ordered by decreasing of magnitude.
+2. Only I, X, C, M can be repeated, but up to three times.
+3. Letter with lower magnitude can appear BEFORE letter with higher magnitude,
+but only in the following cases: IV, IX, XL, XC, CD, CM - lets call them **subtractives**
+4. **subtractives** and regular letters cannot appear within the same power,
+i.e. `ivi` is not allowed.
+
+Therefore, only numbers within range of 1..3999 can be represented in roman notation.
+
+CousinRoman is thoroughly spec'ed, and considered reliable in following these rules.
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -38,6 +52,10 @@ For example:
 '100500'.to_roman! # => TypeError: not a valid roman number
 ```
 
+`String#to_arabian(!)` is case insensitive.
+
+`Integer#to_roman(!)` returns numerals in upper case.
+
 ## Testing
 
 Just run

data/lib/cousin_roman/arabian.rb

@@ -28,14 +28,14 @@ module CousinRoman
     end
 
     def build_roman(thousands, hundreds, tens, ones)
-      build_pow(thousands, 4) +
-      build_pow(hundreds, 3) +
-      build_pow(tens, 2) +
-      build_pow(ones, 1)
+      build_pow(thousands, 3) +
+      build_pow(hundreds, 2) +
+      build_pow(tens, 1) +
+      build_pow(ones, 0)
     end
 
     def build_pow(number, pow)
-      literals = pow_literals(pow)
+      literals = CousinRoman.literals_for_pow pow
 
       case number
       when 1..3 then literals[:one]*number
@@ -45,23 +45,5 @@ module CousinRoman
       else ""
       end
     end
-
-    def pow_literals(pow)
-      one_literal, _ = ONES.find do |literal, value|
-        value >= 10 ** (pow - 1) and value < 10 ** pow
-      end
-      five_literal, _ = FIVES.find do |literal, value|
-        value >= 10 ** (pow - 1) and value < 10 ** pow
-      end
-      subtractive_literals = {}
-      SUBTRACTIVES.select do |literal, value|
-        value >= 10 ** (pow - 1) and value < 10 ** pow
-      end.each do |literal, number|
-        order = number / (10 ** (pow - 1))
-        subtractive_literals[order] = literal
-      end
-
-      {one: one_literal, five: five_literal, subtractives: subtractive_literals}
-    end
   end
 end

data/lib/cousin_roman/roman.rb

@@ -18,12 +18,11 @@ module CousinRoman
     # 2. Sum this numeric values to get the final answer
     def convert(number)
       intermediate = number.dup.downcase
-      SUBTRACTIVES.each do |factor, value|
-        intermediate.gsub!(factor, "(#{value})")
-      end
-      ONES.merge(FIVES).each do |factor, value|
-        intermediate.gsub!(factor, "(#{value})")
-      end
+      compound = braketize_value_of SUBTRACTIVES
+      singular = braketize_value_of ONES.merge(FIVES)
+
+      compound.each { |literal, val| intermediate.gsub!(literal, val) }
+      singular.each { |literal, val| intermediate.gsub!(literal, val) }
 
       intermediate.scan(/\((\d*)\)/).reduce(0) do |sum, term|
         sum + term.first.to_i
@@ -47,5 +46,12 @@ module CousinRoman
     def roman_regex
       /^(M{0,3})(D?C{0,3}|C[DM])(L?X{0,3}|X[LC])(V?I{0,3}|I[VX])$/i
     end
+
+    private
+
+    # Make hash of the following structure {'i' => '(1)', 'v' => '(5)'...}
+    def braketize_value_of(factors)
+      Hash[factors.map { |literal, val| [literal, "(#{val})"] } ]
+    end
   end
 end

data/lib/cousin_roman/version.rb

@@ -1,3 +1,3 @@
 module CousinRoman
-  VERSION = "1.0.4"
+  VERSION = "1.0.5"
 end

data/lib/cousin_roman.rb

@@ -38,4 +38,16 @@ module CousinRoman
   }
 
   FACTORS = ONES.merge(FIVES).merge(SUBTRACTIVES)
+
+  def self.literals_for_pow(pow)
+    one, five = ONES.keys[pow], FIVES.keys[pow]
+    subtractives = if pow.between? 0, 2
+                     skeys = SUBTRACTIVES.keys
+                     { 4 => skeys[pow*2], 9 => skeys[pow*2 + 1] }
+                   else
+                     nil
+                   end
+
+    { one: one, five: five, subtractives: subtractives }
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cousin_roman
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Artem Pyanykh