teich-hrmparser 0.4.7 → 0.4.8

data/.gitignore

@@ -0,0 +1,6 @@
+*.sw?
+.DS_Store
+coverage
+rdoc
+pkg
+

data/CHANGELOG.txt

@@ -1,3 +1,6 @@
+0.4.8 - May 23, 2009
+	Fixed importing when TCX LAP duration are totally completely incredibly insanely wrong
+	
 0.4.6 - May 11th, 2009
 	Added support for Suunto full variables including speed, distance, etc.
 	

data/README.rdoc

@@ -39,4 +39,4 @@ 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.
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:minor: 4
-:patch: 7
+:patch: 8
 :major: 0
+:minor: 4

data/hrmparser.gemspec

@@ -0,0 +1,56 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{hrmparser}
+  s.version = "0.4.8"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Oren Teich"]
+  s.date = %q{2009-05-24}
+  s.description = %q{Parses Polar and Garmin HRM files.}
+  s.email = %q{oren@teich.net}
+  s.extra_rdoc_files = [
+    "README.rdoc"
+  ]
+  s.files = [
+    ".gitignore",
+     "CHANGELOG.txt",
+     "README.rdoc",
+     "Rakefile",
+     "VERSION.yml",
+     "hrmparser.gemspec",
+     "lib/hrmparser.rb",
+     "lib/hrmparser/arraymath.rb",
+     "lib/hrmparser/importer.rb",
+     "lib/hrmparser/importer/garmin.rb",
+     "lib/hrmparser/importer/gpx.rb",
+     "lib/hrmparser/importer/polar.rb",
+     "lib/hrmparser/importer/suunto.rb",
+     "lib/hrmparser/trackpoint.rb",
+     "lib/hrmparser/workout.rb",
+     "spec/arraymath_spec.rb",
+     "spec/hrmparser_spec.rb",
+     "spec/spec.opts",
+     "spec/spec_helper.rb"
+  ]
+  s.homepage = %q{http://github.com/teich/hrmparser}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.3}
+  s.summary = %q{Heart Rate Monitor Parser}
+  s.test_files = [
+    "spec/arraymath_spec.rb",
+     "spec/hrmparser_spec.rb",
+     "spec/spec_helper.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    else
+    end
+  else
+  end
+end

data/lib/hrmparser/importer/garmin.rb

@@ -11,10 +11,12 @@ module Importer
 			@xml = Hpricot::XML(@data)
 			workout.time = Time.parse((@xml/:Id).innerHTML)
 
-			(@xml/:Lap).each do |lap|
-				f_time =  (lap/:TotalTimeSeconds).innerHTML
-				workout.duration += Float f_time
-			end
+      # Grab the duration from the lap.  This _can_ be totally, completly wrong - AKA 10 years long.
+      # So if we have trackpoints, we'll replace it down lower
+      (@xml/:Lap).each do |lap|
+        f_time =  (lap/:TotalTimeSeconds).innerHTML
+        workout.duration += Float f_time
+      end
 
 			found = false
 			trackpoints = Array.new
@@ -64,6 +66,7 @@ module Importer
 			end 
 
 			if found
+			  workout.duration = trackpoints.last.time - trackpoints.first.time
 				workout.trackpoints = trackpoints
 				workout.calc_average_speed! 
 				workout.calc_altitude_gain!

data/lib/hrmparser/workout.rb

@@ -31,7 +31,7 @@ module HRMParser
 			start = smoothed_altitude.first
 			smoothed_altitude.each do |alt|
 				diff = alt - start
-				if (diff > 0)
+				if (diff > 0.5)
 					gain += diff
 				end
 				start = alt

data/spec/hrmparser_spec.rb

@@ -3,196 +3,214 @@ require File.dirname(__FILE__) + '/spec_helper.rb'
 # Time to add your specs!
 # http://rspec.info/
 module HRMParser
-	describe "TrackPoint" do
-		context "new trackpoint" do
-			it "has no variables set" do
-				hrm = TrackPoint.new
-				hrm.speed == nil
-				hrm.distance == nil
-				hrm.lat.should == nil
-				hrm.lng.should == nil
-				hrm.altitude.should == nil
-				hrm.hr.should == nil
-			end
-		end
-	end
+  describe "TrackPoint" do
+    context "new trackpoint" do
+      it "has no variables set" do
+        hrm = TrackPoint.new
+        hrm.speed == nil
+        hrm.distance == nil
+        hrm.lat.should == nil
+        hrm.lng.should == nil
+        hrm.altitude.should == nil
+        hrm.hr.should == nil
+      end
+    end
+  end
 
-	describe "Workout" do
-		context "new workout" do
-			it "has no variables set" do
-				workout = Workout.new
-				workout.distance.should == nil
-				workout.duration.should == nil
-				workout.average_hr.should == nil
-				workout.name.should == nil
-				workout.file_name.should == nil
-			end
-			it "set name through initializer" do
-				workout = Workout.new(:name => "test workout")
-				workout.name.should == "test workout"
-			end
-			it "can not set average_hr during init" do
-				workout = Workout.new(:average_hr => 150)
-				workout.average_hr.should == nil
-			end
-		end
+  describe "Workout" do
+    context "new workout" do
+      it "has no variables set" do
+        workout = Workout.new
+        workout.distance.should == nil
+        workout.duration.should == nil
+        workout.average_hr.should == nil
+        workout.name.should == nil
+        workout.file_name.should == nil
+      end
+      it "set name through initializer" do
+        workout = Workout.new(:name => "test workout")
+        workout.name.should == "test workout"
+      end
+      it "can not set average_hr during init" do
+        workout = Workout.new(:average_hr => 150)
+        workout.average_hr.should == nil
+      end
+    end
 
-		context "Identifies files" do
-			it "identify file as garmin" do
-				type = Importer.file_type("spec/samples/small-garmin.TCX")
-				type.should == "GARMIN_XML"
-			end
-			it "identification returns nil if no file specified" do
-				type = Importer.file_type("")
-				type.should == nil
-			end
-			it "identify file as polar" do
-				type = Importer.file_type("spec/samples/polarRS400.hrm")
-				type.should == "POLAR_HRM"
-			end
-		end
+    context "Identifies files" do
+      it "identify file as garmin" do
+        type = Importer.file_type("spec/samples/small-garmin.TCX")
+        type.should == "GARMIN_XML"
+      end
+      it "identification returns nil if no file specified" do
+        type = Importer.file_type("")
+        type.should == nil
+      end
+      it "identify file as polar" do
+        type = Importer.file_type("spec/samples/polarRS400.hrm")
+        type.should == "POLAR_HRM"
+      end
+    end
 
-		context "Parse a GPS file" do
-			it "finds the duration, time" do
-				filename = "spec/samples/gps-with-suunto.gpx"
-				data = File.read(filename)
-				importer = Importer::GPX.new(:data => data)
-				workout = importer.restore
-				workout.time.should == Time.parse("Thu May 07 21:32:31 UTC 2009")
-				
-				# Duration is actualy less, but we don't account for stopped time right now
-				workout.duration.should be_close(6382,1)
-			end
-			it "calculates the distance and speed" do
-				filename = "spec/samples/gps-with-suunto.gpx"
-				data = File.read(filename)
-				importer = Importer::GPX.new(:data => data)
-				workout = importer.restore
-				workout.average_speed.should be_close(6.7, 0.2)
-				workout.distance.should be_close(26427, 1)
-			end
-		end
-		
-		context "Parse garmin file" do
-				it "finds workout start time on a short workout" do
-					filename = "spec/samples/indoor-garmin-405.TCX"
-					data = File.read(filename)
-					importer = Importer::Garmin.new(:data => data)
-					workout = importer.restore
-					workout.time.should == Time.parse("Fri Aug 22 01:04:55 UTC 2008")
-				end
-				it "finds the duration on a short workout" do
-					filename = "spec/samples/indoor-garmin-405.TCX"
-					data = File.read(filename)
-					importer = Importer::Garmin.new(:data => data)
-					workout = importer.restore
-					workout.duration.should be_close(755, 1)
-				end
-				it "indoor workout has no trackpoints" do
-					filename = "spec/samples/indoor-garmin-405.TCX"
-					data = File.read(filename)
-					importer = Importer::Garmin.new(:data => data)
-					workout = importer.restore
-					workout.distance.should be_nil
-					workout.average_hr.should be_nil
-					workout.average_speed.should be_nil
-					workout.altitude_gain.should be_nil
-					workout.trackpoints.should == {}
-				end
-			
-				# Parsing the full XML is just slow.  Commenting out for now.
-				it "gets workout level settings for outdoor workout" do
-					filename = "spec/samples/outdoor-garmin-405.TCX"
-					data = File.read(filename)
-					importer = Importer::Garmin.new(:data => data)
-					workout = importer.restore
-					workout.distance.should be_close(11740, 5)
-					workout.average_hr.should be_close(149.7, 0.5)
-					workout.average_speed.should be_close(1.5, 0.2)
-					workout.altitude_gain.should be_close(580, 25)
-				end
-			
-				it "gets workout level settings for weird distance workout" do
-					filename = "spec/samples/garmin-405-dies-distance.TCX"
-					data = File.read(filename)
-					importer = Importer::Garmin.new(:data => data)
-					workout = importer.restore
-					workout.distance.should be_close(9426, 1)
-					workout.average_hr.should == nil
-					workout.average_speed.should be_close(6.7, 0.2)
-					workout.altitude_gain.should be_close(40, 10)
-				end
-			
-				it "doesn't have any 0 in latitude" do
-					filename = "spec/samples/garmin-405-with-0-0.TCX"
-					data = File.read(filename)
-					importer = Importer::Garmin.new(:data => data)
-					workout = importer.restore
-					workout.trackpoints.map {|tp| tp.lat.should_not == 0.0}
-					workout.trackpoints.map {|tp| tp.lat.should_not == "undefined"}
-				end
-			end
-			
-			context "Parse polar RS400 file" do
-				it "finds the duration and time" do
-					filename ="spec/samples/polarRS400.hrm"
-					data = File.read(filename)
-					importer = Importer::Polar.new(:data => data, :time_zone => "Pacific Time (US & Canada)")
-					workout = importer.restore
-					workout.duration.should be_close(3569,1)
-					workout.time.should == Time.parse("Thu Apr 16 12:01:55 -0700 2009")
-				end
-				it "calculates the average heartrate" do
-					filename ="spec/samples/polarRS400.hrm"          
-					data = File.read(filename)
-					importer = Importer::Polar.new(:data => data, :time_zone => "Pacific Time (US & Canada)")
-					workout = importer.restore
-					workout.average_hr.should be_close(145, 1)
-				end
-			end
-			context "Parse a Polar RR file" do
-				it "calculates the heart rate from RR" do
-					filename ="spec/samples/polarRS800-RR.hrm"         
-					data = File.read(filename)
-					importer = Importer::Polar.new(:data => data, :time_zone => "Pacific Time (US & Canada)")
-					workout = importer.restore
-					workout.trackpoints.each {|tp| tp.hr.should < 220 && tp.hr.should > 30}
-					workout.average_hr.should be_close(115, 1)
-					workout.average_speed.should == nil
-				end
-			end
-			
-			context "Parse a Suunto T6C RR file" do
-				it "finds the duration and time" do
-					filename = "spec/samples/suunto-t6-RR-stops.sdf"
-					data = File.read(filename)
-					importer = Importer::Suunto.new(:data => data, :time_zone => "Pacific Time (US & Canada)")
-					workout = importer.restore
-					workout.duration.should be_close(4781,1)
-					workout.time.should == Time.parse("Thu May 07 14:16:07 -0700 2009")
-				end
-				it "calculates the average HR & altitude" do
-					filename = "spec/samples/suunto-t6-RR-stops.sdf"
-					data = File.read(filename)
-					importer = Importer::Suunto.new(:data => data, :time_zone => "Pacific Time (US & Canada)")
-					workout = importer.restore
-					workout.average_hr.should be_close(152,1)
-					workout.average_speed.should == nil
-					workout.trackpoints.each { |tp| tp.speed.should == nil }
-					workout.altitude_gain.should be_close(115, 10)
-				end
-				it "calculates the speed and distance" do
-					filename = "spec/samples/suunto-with-cadence-speed-distance.sdf"
-					data = File.read(filename)
-					importer = Importer::Suunto.new(:data => data, :time_zone => "Pacific Time (US & Canada)")
-					workout = importer.restore
-					workout.average_hr.should be_close(131,1)
-					workout.average_speed.should be_close(9.3, 0.1)
-					workout.altitude_gain.should be_close(70, 10)
-					workout.distance.should == 124597
-				end
-				
-				
-			end
-	end
+    context "Parse a GPS file" do
+      it "finds the duration, time" do
+        filename = "spec/samples/gps-with-suunto.gpx"
+        data = File.read(filename)
+        importer = Importer::GPX.new(:data => data)
+        workout = importer.restore
+        workout.time.should == Time.parse("Thu May 07 21:32:31 UTC 2009")
+
+        # Duration is actualy less, but we don't account for stopped time right now
+        workout.duration.should be_close(6382,1)
+      end
+      it "calculates the distance and speed" do
+        filename = "spec/samples/gps-with-suunto.gpx"
+        data = File.read(filename)
+        importer = Importer::GPX.new(:data => data)
+        workout = importer.restore
+        workout.average_speed.should be_close(6.7, 0.2)
+        workout.distance.should be_close(26427, 1)
+      end
+      it "handles files with drops" do
+        filename = "spec/samples/gps-flat-run.gpx"
+        data = File.read(filename)
+        importer = Importer::GPX.new(:data => data)
+        workout = importer.restore
+        workout.average_speed.should be_close(2.9, 0.2)
+        workout.distance.should be_close(11453, 1)
+        workout.altitude_gain.should be_close(325, 10)
+      end
+    end
+
+    context "Parse garmin file" do
+      it "finds workout start time on a short workout" do
+        filename = "spec/samples/indoor-garmin-405.TCX"
+        data = File.read(filename)
+        importer = Importer::Garmin.new(:data => data)
+        workout = importer.restore
+        workout.time.should == Time.parse("Fri Aug 22 01:04:55 UTC 2008")
+      end
+      it "finds the duration on a short workout" do
+        filename = "spec/samples/indoor-garmin-405.TCX"
+        data = File.read(filename)
+        importer = Importer::Garmin.new(:data => data)
+        workout = importer.restore
+        workout.duration.should be_close(755, 1)
+      end
+      it "indoor workout has no trackpoints" do
+        filename = "spec/samples/indoor-garmin-405.TCX"
+        data = File.read(filename)
+        importer = Importer::Garmin.new(:data => data)
+        workout = importer.restore
+        workout.distance.should be_nil
+        workout.average_hr.should be_nil
+        workout.average_speed.should be_nil
+        workout.altitude_gain.should be_nil
+        workout.trackpoints.should == {}
+      end
+
+      # Parsing the full XML is just slow.  Commenting out for now.
+      it "gets workout level settings for outdoor workout" do
+        filename = "spec/samples/outdoor-garmin-405.TCX"
+        data = File.read(filename)
+        importer = Importer::Garmin.new(:data => data)
+        workout = importer.restore
+        workout.distance.should be_close(11740, 5)
+        workout.average_hr.should be_close(149.7, 0.5)
+        workout.average_speed.should be_close(1.5, 0.2)
+        workout.altitude_gain.should be_close(580, 25)
+      end
+
+      it "gets workout level settings for weird distance workout" do
+        filename = "spec/samples/garmin-405-dies-distance.TCX"
+        data = File.read(filename)
+        importer = Importer::Garmin.new(:data => data)
+        workout = importer.restore
+        workout.distance.should be_close(9426, 1)
+        workout.average_hr.should == nil
+        workout.average_speed.should be_close(6.7, 0.2)
+        workout.altitude_gain.should be_close(40, 10)
+      end
+
+      it "doesn't have any 0 in latitude" do
+        filename = "spec/samples/garmin-405-with-0-0.TCX"
+        data = File.read(filename)
+        importer = Importer::Garmin.new(:data => data)
+        workout = importer.restore
+        workout.trackpoints.map {|tp| tp.lat.should_not == 0.0}
+        workout.trackpoints.map {|tp| tp.lat.should_not == "undefined"}
+      end
+      
+      it "handles files with INSANE duration" do
+        filename = "spec/samples/insane-duration.TCX"
+        data = File.read(filename)
+        importer = Importer::Garmin.new(:data => data)
+        workout = importer.restore
+        workout.duration.should be_close(4996, 0.2)
+      end
+    end
+
+    context "Parse polar RS400 file" do
+      it "finds the duration and time" do
+        filename ="spec/samples/polarRS400.hrm"
+        data = File.read(filename)
+        importer = Importer::Polar.new(:data => data, :time_zone => "Pacific Time (US & Canada)")
+        workout = importer.restore
+        workout.duration.should be_close(3569,1)
+        workout.time.should == Time.parse("Thu Apr 16 12:01:55 -0700 2009")
+      end
+      it "calculates the average heartrate" do
+        filename ="spec/samples/polarRS400.hrm"          
+        data = File.read(filename)
+        importer = Importer::Polar.new(:data => data, :time_zone => "Pacific Time (US & Canada)")
+        workout = importer.restore
+        workout.average_hr.should be_close(145, 1)
+      end
+    end
+
+    context "Parse a Polar RR file" do
+      it "calculates the heart rate from RR" do
+        filename ="spec/samples/polarRS800-RR.hrm"         
+        data = File.read(filename)
+        importer = Importer::Polar.new(:data => data, :time_zone => "Pacific Time (US & Canada)")
+        workout = importer.restore
+        workout.trackpoints.each {|tp| tp.hr.should < 220 && tp.hr.should > 30}
+        workout.average_hr.should be_close(115, 1)
+        workout.average_speed.should == nil
+      end
+    end
+
+    context "Parse a Suunto T6C RR file" do
+      it "finds the duration and time" do
+        filename = "spec/samples/suunto-t6-RR-stops.sdf"
+        data = File.read(filename)
+        importer = Importer::Suunto.new(:data => data, :time_zone => "Pacific Time (US & Canada)")
+        workout = importer.restore
+        workout.duration.should be_close(4781,1)
+        workout.time.should == Time.parse("Thu May 07 14:16:07 -0700 2009")
+      end
+      it "calculates the average HR & altitude" do
+        filename = "spec/samples/suunto-t6-RR-stops.sdf"
+        data = File.read(filename)
+        importer = Importer::Suunto.new(:data => data, :time_zone => "Pacific Time (US & Canada)")
+        workout = importer.restore
+        workout.average_hr.should be_close(152,1)
+        workout.average_speed.should == nil
+        workout.trackpoints.each { |tp| tp.speed.should == nil }
+        workout.altitude_gain.should be_close(115, 10)
+      end
+      it "calculates the speed and distance" do
+        filename = "spec/samples/suunto-with-cadence-speed-distance.sdf"
+        data = File.read(filename)
+        importer = Importer::Suunto.new(:data => data, :time_zone => "Pacific Time (US & Canada)")
+        workout = importer.restore
+        workout.average_hr.should be_close(131,1)
+        workout.average_speed.should be_close(9.3, 0.1)
+        workout.altitude_gain.should be_close(75, 15)
+        workout.distance.should == 124597
+      end
+
+
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: teich-hrmparser
 version: !ruby/object:Gem::Version 
-  version: 0.4.7
+  version: 0.4.8
 platform: ruby
 authors: 
 - Oren Teich
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-13 00:00:00 -07:00
+date: 2009-05-24 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -22,10 +22,12 @@ extensions: []
 extra_rdoc_files: 
 - README.rdoc
 files: 
+- .gitignore
 - CHANGELOG.txt
 - README.rdoc
 - Rakefile
 - VERSION.yml
+- hrmparser.gemspec
 - lib/hrmparser.rb
 - lib/hrmparser/arraymath.rb
 - lib/hrmparser/importer.rb
@@ -39,7 +41,7 @@ files:
 - spec/hrmparser_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-has_rdoc: true
+has_rdoc: false
 homepage: http://github.com/teich/hrmparser
 post_install_message: 
 rdoc_options: 
@@ -63,7 +65,7 @@ requirements: []
 rubyforge_project: 
 rubygems_version: 1.2.0
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Heart Rate Monitor Parser
 test_files: 
 - spec/arraymath_spec.rb