arrabiata 0.3.0 → 0.4.0

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/arrabiata.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{arrabiata}
-  s.version = "0.3.0"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["invadersmustdie"]
-  s.date = %q{2011-12-26}
+  s.date = %q{2011-12-27}
   s.description = %q{dead simple conversion of roman <> arabic numerals}
   s.email = %q{rugek@dirtyhack.net}
   s.extra_rdoc_files = [

data/lib/arrabiata.rb

@@ -50,9 +50,29 @@ class Arrabiata
 
     result = 0
 
-    str.scan(/\w/).each do |char|
+    chars = str.scan(/\w/)
+    sum_up = 0
+    sub_down = 0
+
+    chars.each_with_index do |char, idx|
       raise UnknownRomanNumberError, "'#{char}' is not defined in roman numbers" if !CONVERSION[char]
-      result = result + CONVERSION[char]
+
+      current_value = CONVERSION[char]
+      next_char = chars[idx+1]
+      next_value = CONVERSION[next_char]
+
+      if next_value && next_value >= current_value
+        if next_value > current_value
+          sub_down += current_value
+        elsif next_value == current_value
+          sum_up += current_value
+        end
+      else
+        result = result + current_value + sum_up - sub_down
+
+        sum_up = 0
+        sub_down = 0
+      end
     end
 
     result

data/spec/arrabiata_to_arabic_spec.rb

@@ -13,23 +13,29 @@ describe "Arrabiata -> to_arabic" do
     }.should raise_error(ArgumentError, "first argument is not a String")
   end
 
-  it "should convert III to 3" do
-    Arrabiata.to_arabic("III").should == 3
-  end
-
-  it "should convert VIII to 8" do
-    Arrabiata.to_arabic("VIII").should == 8
-  end
+  roman_to_arabic_map = {
+    "III" => 3,
+    "VIII" => 8,
+    "IX" => 9,
+    "XIV" => 14,
+    "XIX" => 19,
+    "M" => 1000,
+    "MIII" => 1003,
+    "MMDCCCLV" => 2855
+  }
 
-  it "should convert M to 1000" do
-    Arrabiata.to_arabic("M").should == 1000
+  roman_to_arabic_map.each do |roman, arabic|
+    it "should convert #{roman} to #{arabic}" do
+      Arrabiata.to_arabic(roman).should == arabic
+    end
   end
 
-  it "should convert MIII to 1003" do
-    Arrabiata.to_arabic("MIII").should == 1003
-  end
+  # smoke test
+  1.upto(1000) do |n|
+    roman_letters = Arrabiata.to_roman(n)
 
-  it "should convert MMDCCCLV to 2855 " do
-    Arrabiata.to_arabic("MMDCCCLV").should == 2855
+    it "should convert #{n} / #{roman_letters} forward and backward" do 
+      Arrabiata.to_arabic(roman_letters).should == n
+    end
   end
 end

data/spec/arrabiata_to_roman_spec.rb

@@ -3,7 +3,7 @@ require "spec_helper"
 describe "Arrabiata -> to_roman" do
   it "should fail on 0 because its not included in roman numerals" do
     lambda { 
-      Arrabiata.to_roman(0) 
+      Arrabiata.to_roman(0)
     }.should raise_error(Arrabiata::NoZeroInRomanNumbers, "roman numeral system doesn't include 0")
   end
 
@@ -13,39 +13,21 @@ describe "Arrabiata -> to_roman" do
     }.should raise_error(ArgumentError, "first argument is not a Fixnum")
   end
 
-  it "should convert 3 to III" do
-    Arrabiata.to_roman(3).should == "III"
-  end
-
-  it "should convert 8 to VIII" do
-    Arrabiata.to_roman(8).should == "VIII"
-  end
-
-  it "should convert 1000 to M" do
-    Arrabiata.to_roman(1000).should == "M"
-  end
-
-  it "should convert 1003 to M" do
-    Arrabiata.to_roman(1003).should == "MIII"
-  end
-
-  it "should convert 2855 to MMDCCCLV" do
-    Arrabiata.to_roman(2855).should == "MMDCCCLV"
-  end
-
-  it "should convert 79 to LXXIX" do
-    Arrabiata.to_roman(79).should == "LXXIX"
-  end
-
-  it "should convert 4 to IV" do
-    Arrabiata.to_roman(4).should == "IV"
-  end
-
-  it "should convert 19 to XIX" do
-    Arrabiata.to_roman(19).should == "XIX"
-  end
-
-  it "should convert 8759 to MMMMMMMMDCCLIX" do
-    Arrabiata.to_roman(8759).should == "MMMMMMMMDCCLIX"
+  arabic_to_roman_map = {
+    3 => "III",
+    8 => "VIII",
+    1000 => "M",
+    1003 => "MIII",
+    2855 => "MMDCCCLV",
+    79 => "LXXIX",
+    4 => "IV",
+    19 => "XIX",
+    8759 => "MMMMMMMMDCCLIX"
+  }
+
+  arabic_to_roman_map.each do |arabic, roman|
+    it "should convert #{arabic} to #{roman}" do
+      Arrabiata.to_roman(arabic).should == roman
+    end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: arrabiata
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 15
   prerelease: false
   segments: 
   - 0
-  - 3
+  - 4
   - 0
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - invadersmustdie
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-26 00:00:00 +01:00
+date: 2011-12-27 00:00:00 +01:00
 default_executable: 
 dependencies: []