fit4ruby 3.2.0 → 3.7.0

data/lib/fit4ruby/Lap.rb

@@ -19,13 +19,24 @@ module Fit4Ruby
 
     include RecordAggregator
 
-    attr_reader :records
+    attr_reader :records, :lengths
 
-    def initialize(records, previous_lap, field_values)
+    # Create a new Lap object.
+    # @param records [Array of Records] Records to associate with the Lap.
+    # @param lengths [Array of Lengths] Lengths to associate with the Lap.
+    # @param first_length_index [Fixnum] Index of the first Length in this Lap.
+    # @param previous_lap [Lap] Previous Lap on same Session.
+    # @param field_values [Hash] Hash that provides initial values for certain
+    #        fields.
+    def initialize(records, previous_lap, field_values, first_length_index, lengths)
       super('lap')
+      @lengths = lengths
       @meta_field_units['avg_stride_length'] = 'm'
       @records = records
       @previous_lap = previous_lap
+      @lengths.each { |length| @records += length.records }
+      @first_length_index = first_length_index
+      @num_lengths = @lengths.length
 
       if previous_lap && previous_lap.records && previous_lap.records.last
         # Set the start time of the new lap to the timestamp of the last record
@@ -43,10 +54,25 @@ module Fit4Ruby
       set_field_values(field_values)
     end
 
-    def check(index)
+    def check(index, activity)
       unless @message_index == index
         Log.fatal "message_index must be #{index}, not #{@message_index}"
       end
+
+      return if @num_lengths.zero?
+
+      unless @first_length_index
+        Log.fatal 'first_length_index is not set'
+      end
+
+      @first_length_index.upto(@first_length_index - @num_lengths) do |i|
+        if (length = activity.lengths[i])
+          @lengths << length
+        else
+          Log.fatal "Lap references length #{i} which is not contained in "
+          "the FIT file."
+        end
+      end
     end
 
     # Compute the average stride length for this Session.

data/lib/fit4ruby/Length.rb

@@ -0,0 +1,53 @@
+#!/usr/bin/env ruby -w
+# encoding: UTF-8
+#
+# = Length.rb -- Fit4Ruby - FIT file processing library for Ruby
+#
+# Copyright (c) 2014, 2015 by Chris Schlaeger <cs@taskjuggler.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of version 2 of the GNU General Public License as
+# published by the Free Software Foundation.
+#
+
+require 'fit4ruby/FitDataRecord'
+require 'fit4ruby/RecordAggregator'
+
+module Fit4Ruby
+
+  class Length < FitDataRecord
+
+    include RecordAggregator
+
+    attr_reader :records
+
+    def initialize(records, previous_length, field_values)
+      super('length')
+      @records = records
+      @previous_length = previous_length
+
+      if previous_length && previous_length.records && previous_length.records.last
+        # Set the start time of the new length to the timestamp of the last record
+        # of the previous length.
+        @start_time = previous_length.records.last.timestamp
+      elsif records.first
+        # Or to the timestamp of the first record.
+        @start_time = records.first.timestamp
+      end
+
+      if records.last
+        @total_elapsed_time = records.last.timestamp - @start_time
+      end
+
+      set_field_values(field_values)
+    end
+
+    def check(index)
+      unless @message_index == index
+        Log.fatal "message_index must be #{index}, not #{@message_index}"
+      end
+    end
+
+  end
+
+end

data/lib/fit4ruby/Record.rb

@@ -38,14 +38,14 @@ module Fit4Ruby
       end
     end
 
-    # Convert the 'speed' field into a running pace. The pace is measured in
-    # minutes per Kilometer.
+    # Convert the 'speed' or 'enhanced_speed' field into a running pace. The
+    # pace is measured in minutes per Kilometer.
     # @return [Float or nil] pace for this Record in m/s or nil if not
     #         available.
     def pace
-      return nil unless @speed
+      return nil unless @speed || @enhanced_speed
 
-      1000.0 / (@speed * 60.0)
+      1000.0 / ((@speed || @enhanced_speed) * 60.0)
     end
 
   end

data/lib/fit4ruby/version.rb

@@ -1,4 +1,4 @@
 module Fit4Ruby
   # The version number of the library.
-  VERSION = '3.2.0'
+  VERSION = '3.7.0'
 end

data/spec/FitFile_spec.rb

@@ -14,10 +14,13 @@ $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 require 'fit4ruby'
 
-describe Fit4Ruby do
+ENV['TZ'] = 'UTC'
 
-  before(:each) do
-    ts = Time.now
+describe Fit4Ruby do
+  let(:fit_file) { 'test.fit' }
+  let(:timestamp) { Time.now }
+  let(:activity) do
+    ts = timestamp
     a = Fit4Ruby::Activity.new
     a.total_timer_time = 30 * 60.0
     a.new_user_data({ :age => 33, :height => 1.78, :weight => 73.0,
@@ -97,20 +100,65 @@ describe Fit4Ruby do
                   :event_type => 'marker', :recovery_hr => 132 })
 
     a.aggregate
+    a
+  end
 
-    @activity = a
+  before do
+    File.delete(fit_file) if File.exist?(fit_file)
+    expect(File.exist?(fit_file)).to be false
   end
 
-  it 'should write an Activity FIT file and read it back' do
-    fit_file = 'test.fit'
+  after { File.delete(fit_file) }
 
-    File.delete(fit_file) if File.exists?(fit_file)
-    Fit4Ruby.write(fit_file, @activity)
-    expect(File.exists?(fit_file)).to be true
+  it 'should write an Activity FIT file and read it back' do
+    Fit4Ruby.write(fit_file, activity)
+    expect(File.exist?(fit_file)).to be true
 
     b = Fit4Ruby.read(fit_file)
-    expect(b).to eq(@activity)
-    File.delete(fit_file)
+    expect(b.laps.count).to eq 6
+    expect(b.lengths.count).to eq 0
+    expect(b.inspect).to eq(activity.inspect)
+  end
+
+  context 'activity with Lengths' do
+    let(:activity) do
+      ts = timestamp
+      laps = 0
+      lengths = 0
+      a = Fit4Ruby::Activity.new
+
+      a.total_timer_time = 30 * 60.0
+      a.new_device_info({ :timestamp => ts,
+        :device_index => 0, :manufacturer => 'garmin',
+        :serial_number => 123456789 })
+
+      0.upto(a.total_timer_time / 60) do |mins|
+        ts += 60
+        if mins > 0 && mins % 5 == 0
+          a.new_lap({ :timestamp => ts, :sport => 'swimming',
+            :message_index => laps, :total_cycles => 195 })
+          laps += 1
+
+          a.new_length({ :timestamp => ts, :event => 'length',
+            :message_index => lengths, :total_strokes => 45 })
+          lengths += 1
+        end
+      end
+      a
+    end
+
+    it 'should write an Activity FIT file and read it back' do
+      Fit4Ruby.write(fit_file, activity)
+      expect(File.exist?(fit_file)).to be true
+
+      b = Fit4Ruby.read(fit_file)
+      expect(b.laps.count).to eq 6
+      expect(b.lengths.count).to eq 6
+      expect(b.laps.select { |l| l.sport == 'swimming' }.count).to eq 6
+      expect(b.lengths.select { |l| l.total_strokes == 45 }.count).to eq 6
+      expect(b.inspect).to eq(activity.inspect)
+    end
+
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fit4ruby
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.7.0
 platform: ruby
 authors:
 - Chris Schlaeger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-08 00:00:00.000000000 Z
+date: 2020-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bindata
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.12
+        version: 0.9.20
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.12
+        version: 0.9.20
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.6
+        version: 12.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.6
+        version: 12.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +66,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.4
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.8'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.12'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.12'
 description: |
   This library can read and write FIT files and convert them into a Ruby data
   structure for easy processing. This library was written for Garmin devices
@@ -118,6 +146,7 @@ files:
 - lib/fit4ruby/HRV.rb
 - lib/fit4ruby/HeartRateZones.rb
 - lib/fit4ruby/Lap.rb
+- lib/fit4ruby/Length.rb
 - lib/fit4ruby/Log.rb
 - lib/fit4ruby/Metrics.rb
 - lib/fit4ruby/Monitoring.rb
@@ -161,7 +190,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.5
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: Library to read and write GARMIN FIT files.