lib/velo/part.rb @@ -1,20 +1,20 @@ require "velo/device" -require "velo/lap" +require "velo/part" module Velo class Activity - attr_accessor :id, :sport, :device, :laps + attr_accessor :id, :sport, :device, :parts def initialize() super - self.laps = [] + self.parts = [] end def inspect() - s = "#<Activity #{id}: #{sport}, #{laps.size} laps, device: #{device}>" + s = "#<Activity #{id}: #{sport}, #{parts.size} parts, device: #{device}>" end alias_method :to_s, :inspect lib/velo/activity.rb @@ -5,7 +5,7 @@ require "rubygems" require "velo/activity" require "velo/device" -require "velo/lap" +require "velo/part" require "velo/trackpoint" @@ -20,7 +20,7 @@ module Velo a.device = Device.from_tcx activity.css("Creator") activity.css("Lap").each {|lap| - a.laps << Lap.from_tcx(lap) + a.parts << Part.from_tcx(lap) } a @@ -44,26 +44,26 @@ module Velo end end - class Lap - def self.from_tcx(lap) + class Part + def self.from_tcx(part) l = new - l.start_time = Time.parse lap["StartTime"] - l.trigger = lap.css("TriggerMethod").text - l.intensity = lap.css("Intensity").text - l.duration = lap.css("TotalTimeSeconds").text.to_f - l.distance = lap.css("DistanceMeters").text.to_f - l.calories = lap.css("Calories").text.to_f - l.speed_max = lap.css("MaximumSpeed").text.to_f - l.hr_average = lap.css("AverageHeartRateBpm").text.to_i - l.hr_max = lap.css("MaximumHeartRateBpm").text.to_i + l.start_time = Time.parse part["StartTime"] + l.trigger = part.css("TriggerMethod").text + l.intensity = part.css("Intensity").text + l.duration = part.css("TotalTimeSeconds").text.to_f + l.distance = part.css("DistanceMeters").text.to_f + l.calories = part.css("Calories").text.to_i + l.speed_max = part.css("MaximumSpeed").text.to_f + l.hr_average = part.css("AverageHeartRateBpm").text.to_i + l.hr_max = part.css("MaximumHeartRateBpm").text.to_i # O.M.G. - l.cadence_average = lap.children.each {|c| break c.text if c.name == "Cadence" } + l.cadence_average = part.children.each {|c| break c.text if c.name == "Cadence" } - l.watts_average = lap.css("Extensions").children.first.children.text.to_i + l.watts_average = part.css("Extensions").children.first.children.text.to_i - lap.css("Track Trackpoint").each {|point| + part.css("Track Trackpoint").each {|point| l.trackpoints << TrackPoint.from_tcx(point) } lib/velo/tcx.rb @@ -4,4 +4,4 @@ require "lib/velo/tcx" $xml = File.open(ARGV.first) {|f| Nokogiri::XML.parse f } $a = Velo::Activity.from_tcx $xml.css("Activity").first -p $a, $a.laps.first, $a.laps.first.trackpoints.first +p $a, $a.parts.first, $a.parts.first.trackpoints.first test.rb lib/velo/lap.rb 057ea34a32c2155ea52c875a2e1a79e870736f79 Eero Saynatkari projects@kittensoft.org http://github.com/rue/velo/commit/1f9a4808def7f46a407a4d1de4200232058d41a3 1f9a4808def7f46a407a4d1de4200232058d41a3 2009-10-15T19:41:20-07:00 2009-10-15T19:41:20-07:00 Rename Lap to a hopefully clearer Part. 678805b78042666f30858b73508ec18d6cafa273 Eero Saynatkari projects@kittensoft.org