triathlon 0.0.7 → 0.0.8

data/lib/bike.rb

@@ -1,23 +1,8 @@
 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
-
+require 'time_presenter'
 class Bike
   attr_accessor :distance, :speed
-
+  include TimePresenter
   def initialize(distance, speed)
     self.distance = distance.to_f
     self.speed = speed.to_f
@@ -25,7 +10,7 @@ class Bike
 
   def compute_time 
     time = distance / speed # time in hours
-    TimePresenter.present_hours_as_string(time)
+    present_hours_as_string(time)
   end
   
   def to_s

data/lib/converter.rb

@@ -1,13 +1,28 @@
 class Converter
   SecondsPerHour = 3600
   SecondsPerMinute = 60
+  
   def hours_to_seconds(hours)
     hours * SecondsPerHour
   end
+  
   def minutes_to_seconds(minutes)
     minutes * SecondsPerMinute
   end
+  
   def mps_to_mph(mps)
     mps * SecondsPerHour
   end
+  
+  def string_to_seconds(time_string)
+    pace_times = time_string.split(':').map{|string| string.to_i}
+    converter = Converter.new
+    if pace_times.size == 3
+      @total_pace_in_seconds = converter.hours_to_seconds(pace_times[0]) + converter.minutes_to_seconds(pace_times[1]) + pace_times[2]
+    elsif pace_times.size == 2
+      @total_pace_in_seconds = converter.minutes_to_seconds(pace_times[0]) + pace_times[1]
+    else
+      @total_pace_in_seconds = pace_times[0]
+    end
+  end
 end

data/lib/splits.rb

@@ -1,27 +1,7 @@
 require 'converter'
-
-class SplitPresenter
-  def initialize(seconds)
-    @total_seconds = seconds.to_f
-  end
-  
-  def to_s
-    if @total_seconds > 3600.0
-      return 'NYI'
-    end
-
-    minutes = (@total_seconds / 60.0).truncate
-    seconds = (@total_seconds - (minutes * 60.0)).round
-    seconds_string = seconds.to_s
-    if seconds < 10
-      seconds_string = "0#{seconds_string}"
-    end
-    return "#{minutes}:#{seconds_string}"
-  end
-  
-end
-
+require 'time_presenter'
 class Splits
+  include TimePresenter
   def initialize(pace)
     pace_times = pace.split(':').map{|string| string.to_i}
     converter = Converter.new
@@ -33,20 +13,12 @@ class Splits
       @total_pace_in_seconds = pace_times[0]
     end
   end
-  
-  def get_four_hundred()
-    return SplitPresenter.new(@total_pace_in_seconds / 4.0)
-  end
-
-  def get_eight_hundred()
-    return SplitPresenter.new(@total_pace_in_seconds / 2.0)
-  end
-
-  def get_one_hundred()
-    return SplitPresenter.new(@total_pace_in_seconds / 16.0)
+  def split(meters)
+    ratio = meters.to_f / 1600.0
+    split = @total_pace_in_seconds * ratio
+    present_seconds_as_string split
   end
-
   def pace
-    return SplitPresenter.new(@total_pace_in_seconds)
+    present_seconds_as_string @total_pace_in_seconds
   end
 end

data/lib/triathlon.rb

@@ -1,3 +1,4 @@
 require 'bike'
 require 'converter'
-require 'splits'
+require 'splits'
+require 'swim'

data/test/unit/test_bike.rb

@@ -13,12 +13,8 @@ class TestBike < Test::Unit::TestCase
     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

data/test/unit/test_converter.rb

@@ -22,4 +22,14 @@ class TestConverter < Test::Unit::TestCase
     expected_mph = 24.5
     assert_in_delta(expected_mph, mph, 0.001)
   end
+  
+  should 'convert a time string to seconds' do
+    converter = Converter.new
+    seconds = converter.string_to_seconds "1:45"
+    expected_seconds = 105
+    assert expected_seconds == seconds
+    seconds = converter.string_to_seconds "5:44"
+    expected_seconds = 344
+    assert expected_seconds == seconds
+  end
 end

data/test/unit/test_splits.rb

@@ -3,36 +3,31 @@ require 'test_helper'
 require 'splits'
 
 class TestSplits < Test::Unit::TestCase
-  should 'return split as a string' do
-    split = SplitPresenter.new(430)
-    assert_equal split.to_s, "7:10"
-  end
-
   should 'compute 400m pace' do
     splits = Splits.new("10:00")
-    four_hundred = splits.get_four_hundred
-    assert_equal four_hundred.to_s, "2:30"
+    four_hundred = splits.split 400
+    assert_equal four_hundred, "2:30"
   end
  
   should 'compute 800m pace' do
     splits = Splits.new("6:53")
-    eight_hundred = splits.get_eight_hundred
-    assert_equal eight_hundred.to_s, "3:27"
+    eight_hundred = splits.split 800
+    assert_equal eight_hundred, "3:27"
   end
 
   should 'compute 100m pace' do
     splits = Splits.new("5:00")
-    one_hundred = splits.get_one_hundred
-    assert_equal one_hundred.to_s, "0:19"
+    one_hundred = splits.split 100
+    assert_equal one_hundred, "0:19"
   end
   
   should 'return original pace' do
     splits = Splits.new("7:15")
-    assert_equal splits.pace.to_s, "7:15"
+    assert_equal splits.pace, "7:15"
   end
   
   should 'present time with seconds less than ten correctly' do
     splits = Splits.new("6:16")
-    assert_equal splits.get_eight_hundred.to_s, "3:08"
+    assert_equal splits.split(800), "3:08"
   end
 end

metadata

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