joule 1.0.0 → 1.0.1

data/lib/joule/tcx.rb

@@ -1,2 +1,8 @@
 require 'joule/tcx/parser'
-require 'joule/tcx/properties'
+require 'joule/tcx/properties'
+
+module Joule
+  module TCX
+    FILE_EXTENSION = "tcx"
+  end
+end

data/lib/joule/tcx/parser.rb

@@ -1,49 +1,33 @@
 require 'nokogiri'
+require 'time'
 
 module Joule
   module TCX
-    class Parser
-      include Joule::Calculator::MarkerCalculator
-      include Joule::Calculator::PeakPowerCalculator
-
-      attr_reader :data_points, :markers, :properties, :peak_powers
-
-      def initialize(string_or_io)
-        @string_or_io = string_or_io
-        @data_points = Array.new
-        @properties = Joule::TCX::Properties.new
-        @markers = Array.new
-        @peak_powers = Array.new
-        @has_native_speed = false
-      end
+    class Parser < Joule::Base::Parser
 
-      def parse(options = {})
-        @properties.record_interval = 1
+      def parse_workout()
         @total_record_count = 0
         parse_activity("Biking")
         create_workout_marker()
-
-        if(options[:calculate_marker_values])
-          calculate_marker_values()
-        end
-
-        if(options[:calculate_peak_power_values])
-          calculate_peak_power_values(:durations => options[:durations], :total_duration => @markers.first.duration_seconds)
-        end
-
+      end
+      
+      def parse_properties
+        @workout.properties = Joule::TCX::Properties.new
+        @workout.properties.record_interval = 1
       end
 
       private  
       def create_workout_marker
-        if(@markers.size > 1)
-          @markers << Marker.new(:start => 0, :end => @data_points.size - 1)
+        if(@workout.markers.size > 1)
+          @workout.markers << Marker.new(:start => 0, :end => @workout.data_points.size - 1)
         end
       end
+      
 
       def parse_activity(sport)
-        document = Nokogiri::XML::Document.parse(@string_or_io)
+        document = Nokogiri::XML::Document.parse(@data)
         document.xpath("//xmlns:Activity[@Sport='#{sport}']").each do |activity|
-          @properties.id = activity.at("./xmlns:Id").content
+          @workout.properties.date_time = Time.parse(activity.at("./xmlns:Id").content)
 
           activity.children.each do |child|
             parse_lap(child) if child.name == "Lap"
@@ -57,30 +41,19 @@ module Joule
       def parse_lap(lap_node)
 
         marker = Marker.new
-        marker.start_time = DateTime.parse(lap_node.attribute("StartTime").content)
-
-        if(@markers.size == 0)
-          @properties.start_date_time = marker.start_time
-        end
-
-        if @data_points.size > 0
-          marker.start = @data_points.last.time + 1
+                
+        if @workout.data_points.size > 0
+          marker.start = @workout.data_points.last.time + 1
         else
           marker.start= 0
         end
 
         lap_node.children.each do |child|
           marker.duration_seconds = child.content.to_i if child.name == "TotalTimeSeconds" 
-          # puts "Distance in meters: #{child.content}" if child.name == "DistanceMeters"
-          # puts "Maximum Speed: #{child.content}" if child.name == "MaximumSpeed"
-          # puts "Calories: #{child.content}" if child.name == "Calories"
-          # puts "Intensity: #{child.content}" if child.name == "Intensity"
-          # puts "Cadence: #{child.content}" if child.name == "Cadence"  
-          # puts "Trigger Method: #{child.content}" if child.name == "TriggerMethod"  
           parse_track(child) if(child.name == "Track")
         end
-        marker.end = @data_points.last.time
-        @markers << marker
+        marker.end = @workout.data_points.last.time
+        @workout.markers << marker
       end
 
       def parse_track(track)
@@ -104,21 +77,21 @@ module Joule
           parse_extensions(data, data_point) if data.name == "Extensions"
           parse_position(data, data_point) if data.name == "Position" 
         end
-        @data_points << data_point
+        @workout.data_points << data_point
         @trackpoint_count = @trackpoint_count + 1
         @total_record_count = @total_record_count + 1
       end
 
       def parse_times(data, data_point)
-        time_of_day =  DateTime.parse(data.content)
+        time_of_day =  Time.parse(data.content)
         data_point.time_of_day = (time_of_day.hour * 3600) + (time_of_day.min * 60) + time_of_day.sec
-        data_point.time = @total_record_count * @properties.record_interval
+        data_point.time = @total_record_count * @workout.properties.record_interval
 
         if(@trackpoint_count == 0)
           track_start_time = data_point.time_of_day
-          @track_offset_in_seconds = track_start_time - @properties.start_time_in_seconds
+          @track_offset_in_seconds = track_start_time - @workout.properties.start_time_in_seconds
         end
-        data_point.time_with_pauses = (@trackpoint_count * @properties.record_interval) + @track_offset_in_seconds
+        data_point.time_with_pauses = (@trackpoint_count * @workout.properties.record_interval) + @track_offset_in_seconds
       end
 
       def parse_heartrate(heartrate, data_point)
@@ -143,32 +116,14 @@ module Joule
         end
       end
 
-      def calculate_marker_values
-        @markers.each_with_index { |marker, i|
-          calculate_marker_averages marker      
-          calculate_marker_maximums marker
-          calculate_marker_training_metrics marker
-
-          if i.eql?(0)
-            marker.distance = @data_points.last.distance
-          else
-            marker.distance = @data_points[marker.end + 1].distance - @data_points[marker.start].distance
-          end
-
-          marker.duration_seconds = (marker.end - marker.start + 1) * @properties.record_interval
-          marker.energy = (marker.average_power.round * marker.duration_seconds)/1000
-
-        }
-      end
-
       def calculate_speed
-        @data_points.each_with_index { |v, i| 
+        @workout.data_points.each_with_index { |v, i| 
           if(i == 0)
             delta = v.distance 
           else
-            delta = v.distance - @data_points[i-1].distance
+            delta = v.distance - @workout.data_points[i-1].distance
           end
-          v.speed = delta / @properties.record_interval      
+          v.speed = delta / @workout.properties.record_interval      
         }
       end
     end

data/lib/joule/tcx/properties.rb

@@ -1,11 +1,13 @@
 module Joule
   module TCX
     class Properties
-      attr_accessor :id, :record_interval, :start_date_time
+      attr_accessor :record_interval, :date_time
 
       def start_time_in_seconds
-        (@start_date_time.hour * 3600) + (@start_date_time.min * 60) + @start_date_time.sec
+        (@date_time.hour * 3600) + (@date_time.min * 60) + @date_time.sec
       end
+      
+      
     end  
   end
 end

data/lib/joule/units_conversion.rb

@@ -2,7 +2,7 @@ module Joule
   module UnitsConversion
     def convert_speed(speed)
       #convert to mm/s
-      if self.properties.speed_units_are_english?
+      if @workout.properties.speed_units_are_english?
         miles_per_hour_to_millimeters_per_second speed
       else
         kilometers_per_hour_to_millimeters_per_second speed
@@ -11,7 +11,7 @@ module Joule
 
     def convert_distance(distance)
       #convert distance to mm
-      if self.properties.distance_units_are_english?
+      if @workout.properties.distance_units_are_english?
         miles_to_millimeters distance
       else
         kilometers_to_millimeters distance

data/lib/joule/workout.rb

@@ -0,0 +1,29 @@
+module Joule
+  class Workout
+    # An Array of DataPoint objects.  Contains all the data points. 
+    attr_accessor :data_points
+    
+    # An Array of Marker objects.  The first marker always represents the entire 
+    # set of data.    
+    attr_accessor :markers
+    
+    # An Array of Hash objects representing the peak powers for a give duration (5
+    # second, 5 minute, 20  minute, etc).  This is also sometimes referred to the
+    # mean maximal power. Peak power calculations can add a significant amount 
+    # of time to parsing, so you can perform these later on if you want to with 
+    # the Joule::Calculator::PeakPowerCalculator.
+    attr_accessor :peak_powers
+
+    # The properties object represents device properties specific to the data
+    # being parsed.  
+    attr_accessor :properties
+    
+    def initialize()
+      @data_points = Array.new
+      @markers = Array.new
+      @peak_powers = Array.new 
+      @properties = Object.new     
+    end
+    
+  end
+end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: joule
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  hash: 21
+  prerelease: false
+  segments: 
+  - 1
+  - 0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Andrew Olson
@@ -9,30 +15,42 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-05 00:00:00 -05:00
+date: 2010-09-15 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: nokogiri
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 1
+        - 4
+        - 1
         version: 1.4.1
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: fastercsv
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 1
+        - 4
+        - 0
         version: 1.4.0
-    version: 
-description: ""
+  type: :runtime
+  version_requirements: *id002
+description: Joule parses and does some basic analyzing of powermeter data. Supported formats include SRM(.srm), Saris PowerTap(.csv), iBike(.csv), and Garmin(.tcx)
 email: anolson@gmail.com
 executables: []
 
@@ -41,41 +59,42 @@ extensions: []
 extra_rdoc_files: 
 - README.rdoc
 files: 
-- lib/joule
 - lib/joule/array.rb
-- lib/joule/calculator
+- lib/joule/base/parser.rb
+- lib/joule/base.rb
 - lib/joule/calculator/marker_calculator.rb
 - lib/joule/calculator/peak_power_calculator.rb
 - lib/joule/calculator/power_calculator.rb
 - lib/joule/calculator.rb
-- lib/joule/csv
 - lib/joule/csv/parser.rb
 - lib/joule/csv.rb
 - lib/joule/data_point.rb
-- lib/joule/float.rb
-- lib/joule/ibike
+- lib/joule/exception/unsupported_file_type_exception.rb
+- lib/joule/exception.rb
+- lib/joule/hashable.rb
 - lib/joule/ibike/parser.rb
 - lib/joule/ibike/properties.rb
 - lib/joule/ibike.rb
 - lib/joule/marker.rb
-- lib/joule/powertap
+- lib/joule/peak_power.rb
 - lib/joule/powertap/parser.rb
 - lib/joule/powertap/properties.rb
 - lib/joule/powertap.rb
-- lib/joule/srm
 - lib/joule/srm/parser.rb
 - lib/joule/srm/properties.rb
 - lib/joule/srm.rb
-- lib/joule/tcx
 - lib/joule/tcx/parser.rb
 - lib/joule/tcx/properties.rb
 - lib/joule/tcx.rb
 - lib/joule/units_conversion.rb
+- lib/joule/workout.rb
 - lib/joule.rb
 - README.rdoc
 - Rakefile
 has_rdoc: true
 homepage: http://github.com/anolson/joule
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --line-numbers
@@ -87,23 +106,30 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 11
+      segments: 
+      - 1
+      - 2
       version: "1.2"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.1
+rubygems_version: 1.3.7
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: A Ruby library for parsing bicycle powermeter data.
 test_files: []
 

data/lib/joule/float.rb

@@ -1,39 +0,0 @@
-# Copyright (c) 2004-2009 David Heinemeier Hansson
-# 
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-# 
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-class Float
-  remove_method :round
- 
-  # Rounds the float with the specified precision.
-  #
-  # x = 1.337
-  # x.round # => 1
-  # x.round(1) # => 1.3
-  # x.round(2) # => 1.34
-  def round(precision = nil)
-    if precision
-      magnitude = 10.0 ** precision
-      (self * magnitude).round / magnitude
-    else
-      super()
-    end
-  end
-end