triathlon 0.0.6 → 0.0.7

data/lib/bike.rb

@@ -1,27 +1,36 @@
 require 'converter'
 
+class TimePresenter
+  def self.present_hours_as_string(time)
+    hours = time.floor
+    fraction = time - hours
+    minutes = (60.0 * fraction)
+    minutes_string = minutes.floor.to_s
+    minutes_string = "0#{minutes_string}" if minutes < 10.0
+    fraction = minutes - minutes.floor
+    seconds = (60.0 * fraction)
+    seconds_string = seconds.round.to_s
+    seconds_string = "0#{seconds_string}" if seconds < 10.0
+    "#{hours}:#{minutes_string}:#{seconds_string}"
+  end
+end
+
 class Bike
-  def initialize
-    @converter = Converter.new
+  attr_accessor :distance, :speed
+
+  def initialize(distance, speed)
+    self.distance = distance.to_f
+    self.speed = speed.to_f
   end
-  def compute_speed(distance, time, *options)
-    # todo - could construct with the time unit and thus hold a conversion strategy
-    time_in_seconds = time
-    unless options.empty?
-      options_hash = options[0]
-      if options_hash[:time_unit] == :hours
-        time_in_seconds = @converter.hours_to_seconds time
-      elsif options_hash[:time_unit] == :minutes
-        time_in_seconds = @converter.minutes_to_seconds time
-      end
-    end
-    
-    speed_in_miles_per_second = distance / time_in_seconds
-    @converter.mps_to_mph speed_in_miles_per_second
+
+  def compute_time 
+    time = distance / speed # time in hours
+    TimePresenter.present_hours_as_string(time)
   end
   
-  def compute_time(distance, speed)
-    distance * (60.0 / speed) # assume speed in mph, convert to mpm
+  def to_s
+    p distance
+    p speed
   end
 end
 

data/lib/triathlon.rb

@@ -1,7 +1,3 @@
-module Triathlon
-  VERSION = "0.0.5".freeze
-end
-
 require 'bike'
 require 'converter'
 require 'splits'

data/test/unit/test_bike.rb

@@ -7,40 +7,18 @@ require 'test_helper'
 require 'bike'
 
 class TestBike < Test::Unit::TestCase
-  should "compute bike speed" do
-    distance = 14.5
-    time = 2400 # default is time in seconds
-    bikeRace = Bike.new
-    mph = bikeRace.compute_speed distance, time
-    expected_mph = 21.75
-    assert_in_delta(expected_mph, mph, 0.001)
-  end
-  
-  should "compute ride time given speed and distance" do
+  should "compute bike time from distance and speed" do
     distance = 24.8
     speed = 23.0
-    bikeRace = Bike.new
-    time = bikeRace.compute_time distance, speed
-    expected_time = 64.695652173913043
-    assert_in_delta(expected_time, time, 0.001)
-  end
-  
-  should "compute mph given time in hours" do
-    # 75 minutes = 24.8 miles at x miles/hour
-    distance = 24.8
-    time = 1.25 # 1:15, an hour and fifteen minutes
-    bikeRace = Bike.new
-    mph = bikeRace.compute_speed(distance, time, :time_unit => :hours)
-    expected_mph = 19.84
-    assert_in_delta(expected_mph, mph, 0.001)
-  end
-  
-  should "compute mph given time in minutes" do
-    distance = 14.5
-    time = 41.43
-    bikeRace = Bike.new
-    mph = bikeRace.compute_speed(distance, time, :time_unit => :minutes)
-    expected_mph = 21.0
-    assert_in_delta(expected_mph, mph, 0.001)
+    bike = Bike.new(distance, speed)
+    assert_in_delta(distance, bike.distance, 0.001)
+    assert_in_delta(speed, bike.speed, 0.001)
+    
+    puts bike
+
+    time = bike.compute_time
+    expected_time = "1:04:42"
+    p time
+    assert_equal(expected_time, time)
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: triathlon
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Waylon Calabrese
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-31 00:00:00 -05:00
+date: 2010-09-08 00:00:00 -05:00
 default_executable: 
 dependencies: []