arrabiata 0.1.0 → 0.3.0

data/README.md

@@ -1,9 +1,9 @@
-## Arabiata - dead simple conversion of roman <> arabian numerals
+## Arrabiata - dead simple conversion of roman letters <> arabic numerals
 
 ### Example
 
-        >> Arabiata.to_arabian("MC")
+        >> Arrabiata.to_arabic("MC")
         => 1100
 
-        >> Arabiata.to_roman(1100)
+        >> Arrabiata.to_roman(1100)
         => "MC"

data/Rakefile

@@ -1,14 +1,16 @@
 require 'rake/testtask'
 require 'rspec/core/rake_task'
 require 'rake/gempackagetask'
+require "yard"
+require "yard/rake/yardoc_task"
 
 require 'jeweler'
 Jeweler::Tasks.new do |gem|
   gem.name = "arrabiata"
   gem.homepage = "http://github.com/invadersmustdie/arrabiata"
   gem.license = "MIT"
-  gem.summary = %Q{dead simple conversion of roman <> arabian numerals}
-  gem.description = %Q{dead simple conversion of roman <> arabian numerals}
+  gem.summary = %Q{dead simple conversion of roman <> arabic numerals}
+  gem.description = %Q{dead simple conversion of roman <> arabic numerals}
   gem.email = "rugek@dirtyhack.net"
   gem.authors = ["invadersmustdie"]
 end
@@ -19,4 +21,8 @@ RSpec::Core::RakeTask.new(:spec) do |spec|
   spec.rspec_opts = ['--colour', '-f documentation', '--backtrace']
 end
 
+YARD::Rake::YardocTask.new do |t|
+  t.files = FileList[ "lib/**/*.rb", "README.md"]
+end
+
 task :default => [:spec]

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.3.0

data/arrabiata.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{arrabiata}
-  s.version = "0.1.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["invadersmustdie"]
-  s.date = %q{2011-01-20}
-  s.description = %q{dead simple conversion of roman <> arabian numerals}
+  s.date = %q{2011-12-26}
+  s.description = %q{dead simple conversion of roman <> arabic numerals}
   s.email = %q{rugek@dirtyhack.net}
   s.extra_rdoc_files = [
     "LICENSE.txt",
@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
     "VERSION",
     "arrabiata.gemspec",
     "lib/arrabiata.rb",
-    "spec/arrabiata_to_arabian_spec.rb",
+    "spec/arrabiata_to_arabic_spec.rb",
     "spec/arrabiata_to_roman_spec.rb",
     "spec/spec_helper.rb"
   ]
@@ -31,9 +31,9 @@ Gem::Specification.new do |s|
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
-  s.summary = %q{dead simple conversion of roman <> arabian numerals}
+  s.summary = %q{dead simple conversion of roman <> arabic numerals}
   s.test_files = [
-    "spec/arrabiata_to_arabian_spec.rb",
+    "spec/arrabiata_to_arabic_spec.rb",
     "spec/arrabiata_to_roman_spec.rb",
     "spec/spec_helper.rb"
   ]

data/lib/arrabiata.rb

@@ -4,34 +4,48 @@ class Arrabiata
   class UnknownRomanNumberError < ArrabiataError; end
 
   CONVERSION = {
-    "M" => 1000,
-    "D" => 500,
-    "C" => 100,
-    "L" => 50,
-    "X" => 10,
-    "V" => 5,
-    "I" => 1
+    "M"     => 1000,
+    "CM"    => 900,
+    "D"     => 500,
+    "CD"    => 400,
+    "C"     => 100,
+    "XC"    => 90,
+    "L"     => 50,
+    "XL"    => 40,
+    "X"     => 10,
+    "IX"    => 9,
+    "V"     => 5,
+    "IV"    => 4,
+    "I"     => 1
   }
 
+  # Converts arabic number to roman letters.
+  #
+  # @param [Fixnum] arabic number
+  # @return [String] roman letters
+  #
   def self.to_roman(n)
     raise ArgumentError, "first argument is not a Fixnum" if !n.is_a?(Fixnum)
     raise NoZeroInRomanNumbers, "roman numeral system doesn't include 0" if n == 0
 
     result = ""
 
-    # NOTE: this version doesn't yet respects the subtractive principle
-    CONVERSION.sort_by { |d| d.last }.reverse.each do |k|
-      x = n / k.last
-      if x != 0
-        result << k.first * x
-        n = n - x * k.last
+    CONVERSION.sort_by { |d| d.last }.reverse.each do |roman, arabic|
+      while(n >= arabic) do
+        result << roman
+        n -= arabic
       end
     end
 
     result
   end
 
-  def self.to_arabian(str)
+  # Converts roman letters to arabic number.
+  #
+  # @param [String] roman letters
+  # @return [Fixnum] arabic number
+  #
+  def self.to_arabic(str)
     raise ArgumentError, "first argument is not a String" if !str.is_a?(String)
 
     result = 0
@@ -43,4 +57,10 @@ class Arrabiata
 
     result
   end
+
+  # @deprecated
+  #  Use .to_arabic instead.
+  def self.to_arabian(str)
+    to_arabic(str)
+  end
 end

data/spec/{arrabiata_to_arabian_spec.rb → arrabiata_to_arabic_spec.rb}

@@ -1,35 +1,35 @@
 require "spec_helper"
 
-describe "Arrabiata -> to_arabian" do
+describe "Arrabiata -> to_arabic" do
   it "should fail on characters not defined in roman numerals" do
     lambda {
-      Arrabiata.to_arabian("MVVa")
+      Arrabiata.to_arabic("MVVa")
     }.should raise_error(Arrabiata::UnknownRomanNumberError, "'a' is not defined in roman numbers")
   end
 
   it "should fail on invalid argument passed" do
     lambda {
-      Arrabiata.to_arabian(4.2)
+      Arrabiata.to_arabic(4.2)
     }.should raise_error(ArgumentError, "first argument is not a String")
   end
 
   it "should convert III to 3" do
-    Arrabiata.to_arabian("III").should == 3
+    Arrabiata.to_arabic("III").should == 3
   end
 
   it "should convert VIII to 8" do
-    Arrabiata.to_arabian("VIII").should == 8
+    Arrabiata.to_arabic("VIII").should == 8
   end
 
   it "should convert M to 1000" do
-    Arrabiata.to_arabian("M").should == 1000
+    Arrabiata.to_arabic("M").should == 1000
   end
 
   it "should convert MIII to 1003" do
-    Arrabiata.to_arabian("MIII").should == 1003
+    Arrabiata.to_arabic("MIII").should == 1003
   end
 
   it "should convert MMDCCCLV to 2855 " do
-    Arrabiata.to_arabian("MMDCCCLV").should == 2855
+    Arrabiata.to_arabic("MMDCCCLV").should == 2855
   end
 end

data/spec/arrabiata_to_roman_spec.rb

@@ -32,4 +32,20 @@ describe "Arrabiata -> to_roman" do
   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"
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: arrabiata
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 19
   prerelease: false
   segments: 
   - 0
-  - 1
+  - 3
   - 0
-  version: 0.1.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - invadersmustdie
@@ -15,11 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-20 00:00:00 +01:00
+date: 2011-12-26 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
-description: dead simple conversion of roman <> arabian numerals
+description: dead simple conversion of roman <> arabic numerals
 email: rugek@dirtyhack.net
 executables: []
 
@@ -35,7 +35,7 @@ files:
 - VERSION
 - arrabiata.gemspec
 - lib/arrabiata.rb
-- spec/arrabiata_to_arabian_spec.rb
+- spec/arrabiata_to_arabic_spec.rb
 - spec/arrabiata_to_roman_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
@@ -71,8 +71,8 @@ rubyforge_project:
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: dead simple conversion of roman <> arabian numerals
+summary: dead simple conversion of roman <> arabic numerals
 test_files: 
-- spec/arrabiata_to_arabian_spec.rb
+- spec/arrabiata_to_arabic_spec.rb
 - spec/arrabiata_to_roman_spec.rb
 - spec/spec_helper.rb