cousin_roman 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4d7fcee5c6d30a502f4b7bbf78d944a8c6e3d02
-  data.tar.gz: 09980720de8dbdfd533450dcf8d72b114a925762
+  metadata.gz: bd6c304cffc6a79b1ac5ab743f49a368a4e4002a
+  data.tar.gz: cdc85045a0dda001f293a225456c2ea7b9f7da88
 SHA512:
-  metadata.gz: 00c5f147a205cd9498bb1a84e19b546174e61f3d72fff381cf3fd92d106d1b0e24a196c092da8df5b63ce2eb121551b0ecd5b2817121f4edc7d55769d789af3d
-  data.tar.gz: e13de4db11e56b467f4dc2c90b68c1b1042764a5b99d3d05f9ea2b2c6c9259131c51012e404b3519a6506b53da55c4e635b5bf1740df7d1cb755f3857896f7b8
+  metadata.gz: 6a2a97591dcee49decf72fd77e94267170663cc5cc79b186fd62a795eabbd88bd214c4f35d9ee520886149168b9b5507cb06c44da8ac2e4b59562df3b49c744e
+  data.tar.gz: 32919249c36a26eb13058a1db4c894d6c60507d34e684da14e040524f8637fcdf78217913b402d1a4d1b08fbf8920dc227fa1c8c4a62d9afe5f3d48902d2a1ef

data/lib/cousin_roman/arabian.rb

@@ -11,11 +11,8 @@ module CousinRoman
     end
 
     def to_roman!(arabian)
-      if valid? arabian
-        convert arabian
-      else
-        raise TypeError, 'not a valid roman number'
-      end
+       valid? arabian or raise TypeError, 'not a valid roman number'
+       convert arabian
     end
 
     def convert(number)

data/lib/cousin_roman/integer_extension.rb

@@ -1,9 +1,15 @@
-class Integer
-  def to_roman
-    CousinRoman::Arabian.to_roman(self)
-  end
+module CousinRoman
+  module IntegerExtension
+    def to_roman
+      CousinRoman::Arabian.to_roman(self)
+    end
 
-  def to_roman!
-    CousinRoman::Arabian.to_roman!(self)
+    def to_roman!
+      CousinRoman::Arabian.to_roman!(self)
+    end
   end
 end
+
+class Integer
+  include CousinRoman::IntegerExtension
+end

data/lib/cousin_roman/roman.rb

@@ -21,8 +21,7 @@ module CousinRoman
       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) }
+      [compound, singular].each { |factors| factors.each { |literal, val| intermediate.gsub!(literal, val) } }
 
       intermediate.scan(/\((\d*)\)/).reduce(0) do |sum, term|
         sum + term.first.to_i
@@ -36,11 +35,8 @@ module CousinRoman
 
     def to_arabian!(number)
       clean = number.strip
-      if valid? clean
-        convert clean
-      else
-        raise TypeError, 'not a valid roman number'
-      end
+      valid? clean or raise TypeError, 'not a valid roman number'
+      convert clean
     end
 
     def roman_regex

data/lib/cousin_roman/string_extension.rb

@@ -1,9 +1,15 @@
-class String
-  def to_arabian
-    CousinRoman::Roman.to_arabian(self)
-  end
+module CousinRoman
+  module StringExtension
+    def to_arabian
+      CousinRoman::Roman.to_arabian(self)
+    end
 
-  def to_arabian!
-    CousinRoman::Roman.to_arabian!(self)
+    def to_arabian!
+      CousinRoman::Roman.to_arabian!(self)
+    end
   end
 end
+
+class String
+  include CousinRoman::StringExtension
+end

data/lib/cousin_roman/version.rb

@@ -1,3 +1,3 @@
 module CousinRoman
-  VERSION = "1.0.7"
+  VERSION = "1.0.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cousin_roman
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
 platform: ruby
 authors:
 - Artem Pyanykh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-19 00:00:00.000000000 Z
+date: 2013-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -98,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.8
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Convert Roman numerals to Integers and vice versa