fit4ruby 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e4beacf9c830030659639298786cee59c0ebfee
-  data.tar.gz: 3ea6167aa94d87c9d1d0437ab0ae584babc1b586
+  metadata.gz: d7421c4ad0cf94e98f1ee6eece22948d8fc2f6b4
+  data.tar.gz: 394e28074fea568b49142c6e5548226046241a82
 SHA512:
-  metadata.gz: d496ad8d7e68b229b95e6f51e7f1f9f9d1ae06861824858c6d093a185030782773215dea93160b7a692557b2386fc5b51f4c958e08440a7ca5938791204771e8
-  data.tar.gz: 65dcb11f85cfcccb61a64f3da8144d2f557f06e18a3f11f8df4eac6607aab9e32346b4170b6379ddbb95276a7610f41802d8e459c4a8f720195fc007ee381ad4
+  metadata.gz: d8e86bad757aec6cc33c0030d6fc17cdad765ba661c9e48ae09d643bb4497c902e79207fbc2a57549da136d5f7a5d7c616532d8f564c4e8bbdf9fb343b9117bb
+  data.tar.gz: 8b262ae977668501bb9cedb8982e17065f5ba997da36bb8e790c0b8faa98a724a8ae74d70e7cef24ff48c9eef4efc8a5f734fe00d0549a64c79fb20826b3a087

data/fit4ruby.gemspec

@@ -10,8 +10,9 @@ GEM_SPEC = Gem::Specification.new do |spec|
   spec.summary      = 'Library to read GARMIN FIT files.'
   spec.description  = <<EOT
 This library can read and write FIT files and convert them into a Ruby data
-structure for easy processing. This library was written for the Garmin FR620.
-Fit files from other devices may or may not work.
+structure for easy processing. This library was written for Garmin devices
+like the FR620, Fenix 3 and Fenix 3 HR. Fit files from other devices may work
+as well but have not been tested.
 EOT
   spec.authors      = [ 'Chris Schlaeger' ]
   spec.email        = 'chris@linux.com'

data/lib/fit4ruby/DumpedField.rb

@@ -0,0 +1,50 @@
+#!/usr/bin/env ruby -w
+# encoding: UTF-8
+#
+# = DumpedField.rb -- Fit4Ruby - FIT file processing library for Ruby
+#
+# Copyright (c) 2016 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.
+#
+
+module Fit4Ruby
+
+  # If the user has requested a dump of the records, this class is used to
+  # capture a subset of the field related information for the later textual
+  # dump.
+  class DumpedField
+
+    attr_reader :message_number, :field_number
+
+    # Create a new field dump record.
+    # @param message_number [Fixnum] The global message number of the message
+    #        this field belongs to.
+    # @param field_number [Fixnum] The number of the FIT message field
+    # @param name [String] The name of the field
+    # @param type [Symbol] The type of the field
+    # @param value [String] A human readable dump of the field value
+    def initialize(message_number, field_number, name, type, value)
+      @message_number = message_number
+      @field_number = field_number
+      @name = name
+      @type = type
+      @value = value
+    end
+
+    def <=>(f)
+      @field_number <=> f.field_number
+    end
+
+    def to_s(index)
+      "[#{'%03d' % @message_number}:#{'%03d' % index}:" +
+      "#{'%03d' % @field_number}:" +
+      "#{"%-7s" % @type}] #{@name}: " + "#{@value}"
+    end
+
+  end
+
+end
+

data/lib/fit4ruby/FitFile.rb

@@ -144,8 +144,14 @@ module Fit4Ruby
     end
 
     def dump_records(records)
+      # For each message number we keep a count for how often we already had
+      # this kind of message.
+      message_counters = Hash.new(0)
+
       records.each do |record|
-        record.dump
+        record.dump(message_counters[record.number])
+        # Increase the counter for this message number.
+        message_counters[record.number] += 1
       end
     end
 

data/lib/fit4ruby/FitMessageRecord.rb

@@ -14,6 +14,7 @@ require 'bindata'
 require 'fit4ruby/Log'
 require 'fit4ruby/GlobalFitMessage'
 require 'fit4ruby/FitFileEntity'
+require 'fit4ruby/DumpedField'
 
 module Fit4Ruby
 
@@ -78,8 +79,12 @@ module Fit4Ruby
            (filter.field_names.nil? ||
             filter.field_names.include?(field_name)) &&
            (value != field.undefined_value || !filter.ignore_undef)
-          fields_dump << [ field.type(true), field_name,
-                           (field_def ? field_def : field).to_s(value) ]
+          fields_dump << DumpedField.new(
+            @global_message_number,
+            field.field_definition_number.snapshot,
+            field_name,
+            field.type(true),
+            (field_def ? field_def : field).to_s(value))
         end
       end
     end

data/lib/fit4ruby/FitRecord.rb

@@ -16,6 +16,7 @@ require 'fit4ruby/FitDefinition'
 require 'fit4ruby/FitMessageRecord'
 require 'fit4ruby/FitFilter'
 require 'fit4ruby/FitFileEntity'
+require 'fit4ruby/DumpedField'
 
 module Fit4Ruby
 
@@ -25,6 +26,8 @@ module Fit4Ruby
   # kind of record this is.
   class FitRecord
 
+    attr_reader :number
+
     def initialize(definitions)
       @definitions = definitions
       @name = @number = @fields = nil
@@ -72,13 +75,13 @@ module Fit4Ruby
       self
     end
 
-    def dump
+    def dump(index)
       return unless @fields
 
       begin
         puts "Message #{@number}: #{@name}" unless @fields.empty?
-        @fields.each do |type, name, value|
-          puts " [#{"%-7s" % type}] #{name}: " + "#{value}"
+        @fields.sort.each do |field|
+          puts field.to_s(index)
         end
       rescue Errno::EPIPE
         # Avoid ugly error message when aborting a less/more pipe.

data/lib/fit4ruby/GlobalFitMessages.rb

@@ -444,7 +444,7 @@ module Fit4Ruby
     field 8, 'uint16', 'recovery_time', :scale => 60, :unit => 'hours'
     field 9, 'uint16', 'undocumented_field_9' # maybe activity measurement
     field 10, 'uint8', 'undocumented_field_10'
-    field 11, 'uint16', 'undocumented_field_11'
+    field 11, 'uint16', 'running_lactate_threshold_heart_rate', :unit => 'bpm'
     field 12, 'uint16', 'undocumented_field_12'
     field 13, 'uint16', 'undocumented_field_13'
     field 14, 'uint8', 'undocumented_field_14'
@@ -517,9 +517,9 @@ module Fit4Ruby
     field 11, 'enum', 'undocumented_field_11'
     field 12, 'enum', 'undocumented_field_12'
     field 13, 'uint8', 'undocumented_field_13'
-    field 14, 'uint16', 'undocumented_field_14'
-    field 15, 'uint16', 'undocumented_field_15'
-    field 16, 'uint16', 'undocumented_field_16'
+    field 14, 'uint16', 'running_lactate_threshold_heart_rate', :unit => 'bpm'
+    field 15, 'uint16', 'running_lactate_threshold_speed', :scale => 100, :unit => 'm/s'
+    field 16, 'uint16', 'undocumented_field_16' # very correlated to 14 and 15
     field 17, 'sint8', 'undocumented_field_17'
     field 18, 'uint8', 'undocumented_field_18'
     field 19, 'uint8', 'undocumented_field_19'

data/lib/fit4ruby/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fit4ruby
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Chris Schlaeger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-19 00:00:00.000000000 Z
+date: 2016-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bindata
@@ -68,8 +68,9 @@ dependencies:
         version: 1.6.4
 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 the Garmin FR620.
-  Fit files from other devices may or may not work.
+  structure for easy processing. This library was written for Garmin devices
+  like the FR620, Fenix 3 and Fenix 3 HR. Fit files from other devices may work
+  as well but have not been tested.
 email: chris@linux.com
 executables: []
 extensions: []
@@ -86,6 +87,7 @@ files:
 - lib/fit4ruby/Converters.rb
 - lib/fit4ruby/DataSources.rb
 - lib/fit4ruby/DeviceInfo.rb
+- lib/fit4ruby/DumpedField.rb
 - lib/fit4ruby/EPO_Data.rb
 - lib/fit4ruby/Event.rb
 - lib/fit4ruby/FileCreator.rb