m9t 0.1.5 → 0.1.6

data/lib/m9t.rb

@@ -37,7 +37,7 @@ module M9t
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 1
-    TINY = 5
+    TINY = 6
  
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/m9t/speed.rb

@@ -14,7 +14,8 @@ module M9t
     SECONDS_PER_HOUR  = 60.0 * 60
     MS_TO_KMH         = SECONDS_PER_HOUR / M9t::Distance::METERS_PER_KILOMETER
     MS_TO_MPH         = SECONDS_PER_HOUR / M9t::Distance::METERS_PER_MILE
-    MS_TO_KNOTS       = 1.852 / SECONDS_PER_HOUR * M9t::Distance::METERS_PER_KILOMETER
+    KNOTS_TO_KMH      = 1.852
+    MS_TO_KNOTS       = 1.0 / (KNOTS_TO_KMH / SECONDS_PER_HOUR * M9t::Distance::METERS_PER_KILOMETER)
 
     include M9t::Base
 
@@ -22,12 +23,17 @@ module M9t
 
       # Accepts kilometers per hour and returns a M9t::Speed instance
       def kilometers_per_hour(kmh, options = {})
-        new(kmh.to_f * MS_TO_KMH, options)
+        new(kmh.to_f / MS_TO_KMH, options)
       end
 
       # Accepts miles per hour and returns a M9t::Speed instance
       def miles_per_hour(mph, options = {})
-        new(mph.to_f * MS_TO_MPH, options)
+        new(mph.to_f / MS_TO_MPH, options)
+      end
+
+      # Accepts knots and returns a M9t::Speed instance
+      def knots(knots, options = {})
+        new(knots.to_f / MS_TO_KNOTS, options)
       end
 
       # Identity conversion. Simply returns the supplied number
@@ -37,17 +43,27 @@ module M9t
 
       # Converts meters per second to kilometers per hour
       def to_kilometers_per_hour(mps)
-        mps.to_f / MS_TO_KMH
+        mps.to_f * MS_TO_KMH
       end
 
       # Converts meters per second to miles per hour
       def to_miles_per_hour(mps)
-        mps.to_f / MS_TO_MPH
+        mps.to_f * MS_TO_MPH
       end
 
       # Converts meters per second to knots
       def to_knots(mps)
-        mps.to_f / MS_TO_KNOTS
+        mps.to_f * MS_TO_KNOTS
+      end
+
+      # Converts knots to kilometers hour
+      def knots_to_kilometers_per_hour(knots)
+        to_kilometers_per_hour(knots.to_f / MS_TO_KNOTS)
+      end
+
+      # Converts knots to kilometers hour
+      def kilometers_per_hour_to_knots(knh)
+        to_knots(kmh.to_f / MS_TO_KMH)
       end
 
     end

data/test/speed_test.rb

@@ -25,16 +25,30 @@ class TestM9tSpeed < Test::Unit::TestCase
     assert_equal('speed', M9t::Speed.measurement_name)
   end
 
+  # conversion constants
+
+  def test_knot_conversion
+    assert_in_delta(1.9438, M9t::Speed::MS_TO_KNOTS, 0.0001)
+  end
+
   # input conversions
 
+  def test_class_kilometers_per_hour
+    assert_in_delta(0.2778, M9t::Speed.kilometers_per_hour(1).value, 0.0001)
+  end
+
   def test_class_miles_per_hour
-    assert_equal(45, M9t::Speed.miles_per_hour(20.1168).value)
+    assert_in_delta(0.447, M9t::Speed.miles_per_hour(1).value, 0.0001)
+  end
+
+  def test_class_knots
+    assert_in_delta 0.5144, M9t::Speed.knots(1).value, 0.0001
   end
 
   # output conversions
 
   def test_class_to_miles_per_hour
-    assert_equal(20.1168, M9t::Speed.to_miles_per_hour(45))
+    assert_in_delta(100.6621, M9t::Speed.to_miles_per_hour(45), 0.0001)
   end
 
   # Instance methods
@@ -48,11 +62,11 @@ class TestM9tSpeed < Test::Unit::TestCase
   # output conversions
 
   def test_kmh
-    assert_equal(12.5, M9t::Speed.new(45).to_kilometers_per_hour)
+    assert_equal(162, M9t::Speed.new(45).to_kilometers_per_hour)
   end
 
   def test_mph
-    assert_equal(20.1168, M9t::Speed.new(45).to_miles_per_hour)
+    assert_in_delta(100.6621, M9t::Speed.new(45).to_miles_per_hour, 0.0001)
   end
 
   # to_s

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Joe Yates