hyde 0.0.2 → 0.0.3

data/Rakefile

@@ -17,7 +17,7 @@ DESCRIPTION       = "unit converter of hyde"
 RUBYFORGE_PROJECT = "lowreal"
 HOMEPATH          = "http://#{RUBYFORGE_PROJECT}.rubyforge.org"
 BIN_FILES         = %w( hyde )
-VERS              = "0.0.2"
+VERS              = "0.0.3"
 
 REV = File.read(".svn/entries")[/committed-rev="(d+)"/, 1] rescue nil
 CLEAN.include ['**/.*.sw?', '*.gem', '.config']

data/lib/hyde.rb

@@ -1,17 +1,66 @@
 
 module Hyde
+	Units = {
+#		:metre      => 1,
+		:m          => 1,
+		:hyde       => 1.56,
+		:barleycorn => 0.008467 ,
+		:inch       => 0.0254   ,
+		:feet       => 0.3048   ,
+		:yard       => 0.9144   ,
+		:pole       => 5.0292   ,
+		:chain      => 20.1168  ,
+		:furlong    => 201.168  ,
+		:mile       => 1609.344 ,
+		:league     => 4828.032 ,
+	}
 
-	# convert unit hyde to metre
-	def hyde_to_m(hyde)
-		hyde * 1.56
-	end
-	module_function :hyde_to_m
+	Prefix = {
+		:Y  => 1e24,
+		:Z  => 1e21,
+		:E  => 1e18,
+		:P  => 1e15,
+		:T  => 1e12,
+		:G  => 1e9,
+		:M  => 1e6,
+		:k  => 1e3,
+		:h  => 1e2,
+		:da => 1e1,
+		:d  => 1e-1,
+		:c  => 1e-2,
+		:m  => 1e-3,
+		:u  => 1e-6,
+		:n  => 1e-9,
+		:p  => 1e-12,
+		:f  => 1e-15,
+		:a  => 1e-18,
+		:z  => 1e-21,
+		:y  => 1e-24,
+	}
+
+	Units.each do |u, v|
+		module_eval <<-EOS
+			def metre_to_#{u}(m)
+				m / Units[:#{u}]
+			end
+			module_function :metre_to_#{u}
+
+			def #{u}_to_metre(t)
+				t * Units[:#{u}]
+			end
+			module_function :#{u}_to_metre
+
+			def hyde_to_#{u}(hyde)
+				metre_to_#{u}(hyde_to_metre(hyde))
+			end
+			module_function :hyde_to_#{u}
 
-	# convert unit metre to hyde
-	def m_to_hyde(m)
-		m / 1.56
+			def #{u}_to_hyde(t)
+				metre_to_hyde(#{u}_to_metre(t))
+			end
+			module_function :#{u}_to_hyde
+		EOS
 	end
-	module_function :m_to_hyde
 
 	module NumericExtension
 		# convert to hyde taking self as m
@@ -29,17 +78,13 @@ module Hyde
 		end
 
 		def convert(a)
-			_, num, unit = */([\d.]+)([ck]?m|hyde)/.match(a)
+			_, num, prefix, unit = */([\d.]+)(#{Prefix.keys.join("|")})?(#{Units.keys.join("|")})/o.match(a)
 			num = num.to_f
-			case unit
-			when "m"
-				"#{Hyde.m_to_hyde(num)}hyde"
-			when "cm"
-				"#{Hyde.m_to_hyde(num / 100)}hyde"
-			when "km"
-				"#{Hyde.m_to_hyde(num * 1000)}hyde"
-			when "hyde"
-				"#{Hyde.hyde_to_m(num) * 100}cm"
+			num *= Prefix[prefix.to_sym] if prefix
+			if unit == "hyde"
+				"%.1fcm" % [Hyde.hyde_to_metre(num) * 100]
+			else
+				"%.1fhyde" % [Hyde.send("#{unit}_to_hyde", num)]
 			end
 		end
 	end

data/test/hyde_test.rb

@@ -3,8 +3,18 @@ require File.dirname(__FILE__) + '/test_helper.rb'
 require "test/unit"
 class HydeTest < Test::Unit::TestCase
 	def test_convert
+		assert_equal 1.56, Hyde.hyde_to_metre(1),    "hyde must be 156cm"
 		assert_equal 1.56, Hyde.hyde_to_m(1),    "hyde must be 156cm"
 		assert_equal    1, Hyde.m_to_hyde(1.56), "156cm must be hyde"
+		assert_equal 0.008467, Hyde.barleycorn_to_metre(1)
+		assert_equal  0.0254, Hyde.inch_to_metre(1)
+		assert_equal  0.3048, Hyde.feet_to_metre(1)
+		assert_equal  0.9144, Hyde.yard_to_metre(1)
+		assert_equal  5.0292, Hyde.pole_to_metre(1)
+		assert_equal  20.1168, Hyde.chain_to_metre(1)
+		assert_equal  201.168, Hyde.furlong_to_metre(1)
+		assert_equal  1609.344, Hyde.mile_to_metre(1)
+		assert_equal  4828.032, Hyde.league_to_metre(1)
 	end
 
 	def test_coreextension
@@ -17,5 +27,6 @@ class HydeTest < Test::Unit::TestCase
 		assert_equal "1.0hyde", c.convert("156cm")
 		assert_equal "1.0hyde", c.convert("1.56m")
 		assert_equal "1.0hyde", c.convert("0.00156km")
+		assert_equal "1.0hyde", c.convert("5.11811024feet")
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hyde
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - cho45