fit4ruby 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 012c8c74873a9ce1d703e72c75e14019d480db0f
-  data.tar.gz: 32137198f2a8a87dc473c7bdc0c3bdc978a9e31c
+  metadata.gz: 7f651054b5f16738a2ca5fc4146cdb817c4ef102
+  data.tar.gz: b1af399d6335bcf932dfdeb3b35897191bfc6290
 SHA512:
-  metadata.gz: b5c6653686b550a201b71ad021af82d79cc03b092fceda5441fd286c0a3e34ff2c7f2291b35aa5f8ed3c740060953a47b63ef1c2c895a8571cf09a0464566640
-  data.tar.gz: bb3b5778604e1f342163fd751c3e3beccb09c3aa8ddcebb5deb7274c1623e6d194408b54486f34837d80645aa471e5c2132236551d5bf4c8ff2fc1f3864f3a07
+  metadata.gz: 773e7c729a6ecae371b03269da9da1312f9ca7da35f3e14e6cc6e2c8429955d5f4ea0f965a975bde69368853d9a7555280f4da9a630dd8e1525f827e090b06d1
+  data.tar.gz: 2e4ea74d55a4496977133a15e0ccb5bf0902b4104c32587e783c3427c175cc123c70a498a8e0b0a56cc28451e3fb95b6c0a509b9b28431ff376194b2a94c0932

data/lib/fit4ruby/Activity.rb

@@ -3,7 +3,7 @@
 #
 # = Activity.rb -- Fit4Ruby - FIT file processing library for Ruby
 #
-# Copyright (c) 2014 by Chris Schlaeger <cs@taskjuggler.org>
+# 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
@@ -14,6 +14,7 @@ require 'fit4ruby/FitDataRecord'
 require 'fit4ruby/FileId'
 require 'fit4ruby/FileCreator'
 require 'fit4ruby/DeviceInfo'
+require 'fit4ruby/DataSources'
 require 'fit4ruby/UserProfile'
 require 'fit4ruby/Session'
 require 'fit4ruby/Lap'
@@ -28,8 +29,9 @@ module Fit4Ruby
   # equivalents of the message record structures used in the FIT file.
   class Activity < FitDataRecord
 
-    attr_accessor :file_id, :file_creator, :device_infos, :user_profiles,
-                  :sessions, :laps, :records, :events, :personal_records
+    attr_accessor :file_id, :file_creator, :device_infos, :data_sources,
+                  :user_profiles, :sessions, :laps, :records,
+                  :events, :personal_records
 
     # Create a new Activity object.
     # @param field_values [Hash] A Hash that provides initial values for
@@ -42,6 +44,7 @@ module Fit4Ruby
       @file_id = FileId.new
       @file_creator = FileCreator.new
       @device_infos = []
+      @data_sources = []
       @user_profiles = []
       @events = []
       @sessions = []
@@ -61,23 +64,25 @@ module Fit4Ruby
     # objects. Any errors will be reported via the Log object.
     def check
       unless @timestamp && @timestamp >= Time.parse('1990-01-01T00:00:00+00:00')
-        Log.error "Activity has no valid timestamp"
+        Log.fatal "Activity has no valid timestamp"
       end
       unless @total_timer_time
-        Log.error "Activity has no valid total_timer_time"
+        Log.fatal "Activity has no valid total_timer_time"
       end
+      unless @device_infos.length > 0
+        Log.fatal "Activity must have at least one device_info section"
+      end
+      @device_infos.each.with_index { |d, index| d.check(index) }
       unless @num_sessions == @sessions.count
-        Log.error "Activity record requires #{@num_sessions}, but "
+        Log.fatal "Activity record requires #{@num_sessions}, but "
                   "#{@sessions.length} session records were found in the "
                   "FIT file."
       end
-      @sessions.each { |s| s.check(self) }
       # Laps must have a consecutively growing message index.
       @laps.each.with_index do |lap, index|
-        unless lap.message_index == index
-          Log.error "Lap #{index} has wrong message_index #{lap.message_index}"
-        end
+        lap.check(index)
       end
+      @sessions.each { |s| s.check(self) }
     end
 
     # Convenience method that aggregates all the distances from the included
@@ -196,8 +201,8 @@ module Fit4Ruby
       @file_id.write(io, id_mapper)
       @file_creator.write(io, id_mapper)
 
-      (@device_infos + @user_profiles + @events + @sessions + @laps +
-       @records + @personal_records).sort.each do |s|
+      (@device_infos + @data_sources + @user_profiles + @events +
+       @sessions + @laps + @records + @personal_records).sort.each do |s|
         s.write(io, id_mapper)
       end
       super
@@ -229,6 +234,14 @@ module Fit4Ruby
       new_fit_data_record('device_info', field_values)
     end
 
+    # Add a new SourceData to the Activity.
+    # @param field_values [Hash] A Hash that provides initial values for
+    #        certain fields of the FitDataRecord.
+    # @return [SourceData]
+    def new_data_sources(field_values = {})
+      new_fit_data_record('data_sources', field_values)
+    end
+
     # Add a new UserProfile to the Activity.
     # @param field_values [Hash] A Hash that provides initial values for
     #        certain fields of the FitDataRecord.
@@ -291,7 +304,9 @@ module Fit4Ruby
     def ==(a)
       super(a) && @file_id == a.file_id &&
         @file_creator == a.file_creator &&
-        @device_infos == a.device_infos && @user_profiles == a.user_profiles &&
+        @device_infos == a.device_infos &&
+        @data_sources == a.data_sources &&
+        @user_profiles == a.user_profiles &&
         @events == a.events &&
         @sessions == a.sessions && personal_records == a.personal_records
     end
@@ -310,14 +325,21 @@ module Fit4Ruby
         @file_creator = (record = FileCreator.new(field_values))
       when 'device_info'
         @device_infos << (record = DeviceInfo.new(field_values))
+      when 'data_sources'
+        @data_sources << (record = DataSources.new(field_values))
       when 'user_profile'
         @user_profiles << (record = UserProfile.new(field_values))
       when 'event'
         @events << (record = Event.new(field_values))
       when 'session'
         unless @cur_lap_records.empty?
+          # Copy selected fields from section to lap.
+          lap_field_values = {}
+          [ :timestamp, :sport ].each do |f|
+            lap_field_values[f] = field_values[f] if field_values.include?(f)
+          end
           # Ensure that all previous records have been assigned to a lap.
-          record = create_new_lap(field_values)
+          record = create_new_lap(lap_field_values)
         end
         @num_sessions += 1
         @sessions << (record = Session.new(@cur_session_laps, @lap_counter,
@@ -341,6 +363,7 @@ module Fit4Ruby
 
     def create_new_lap(field_values)
       lap = Lap.new(@cur_lap_records, @laps.last, field_values)
+      lap.message_index = @lap_counter - 1
       @lap_counter += 1
       @cur_session_laps << lap
       @laps << lap

data/lib/fit4ruby/DataSources.rb

@@ -0,0 +1,35 @@
+#!/usr/bin/env ruby -w
+# encoding: UTF-8
+#
+# = DataSources.rb -- Fit4Ruby - FIT file processing library for Ruby
+#
+# Copyright (c) 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'
+
+module Fit4Ruby
+
+  # The DataSources objects are generated by message 22. This message type is
+  # not documented by Garmin and hence the message name and all field names
+  # and their interpretation are guessed. Unless this message gets officially
+  # documented, all names are subject to change. Even minor version changes of
+  # this library can break the API for this message type.
+  class DataSources < FitDataRecord
+
+    def initialize(field_values = {})
+      super('data_sources')
+      set_field_values(field_values)
+    end
+
+    def check(index)
+    end
+
+  end
+
+end
+

data/lib/fit4ruby/DeviceInfo.rb

@@ -3,7 +3,7 @@
 #
 # = DeviceInfo.rb -- Fit4Ruby - FIT file processing library for Ruby
 #
-# Copyright (c) 2014 by Chris Schlaeger <cs@taskjuggler.org>
+# 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
@@ -21,6 +21,41 @@ module Fit4Ruby
       set_field_values(field_values)
     end
 
+    # Ensure that FitDataRecords have a deterministic sequence. Device infos
+    # are sorted by device_index.
+    def <=>(fdr)
+      @timestamp == fdr.timestamp ?
+        @message.name == fdr.message.name ?
+          @device_index <=> fdr.device_index :
+          RecordOrder.index(@message.name) <=>
+            RecordOrder.index(fdr.message.name) :
+        @timestamp <=> fdr.timestamp
+    end
+
+    def check(index)
+      unless @device_index
+        Log.fatal 'device info record must have a device_index'
+      end
+      if @device_index == 0
+        unless @manufacturer
+          Log.fatal 'device info record 0 must have a manufacturer field set'
+        end
+        if @manufacturer == 'garmin'
+          unless @garmin_product
+            Log.fatal 'device info record 0 must have a garman_product ' +
+                      'field set'
+          end
+        else
+          unless @product
+            Log.fatal 'device info record 0 must have a product field set'
+          end
+        end
+        if @serial_number.nil?
+          Log.fatal 'device info record 0 must have a serial number set'
+        end
+      end
+    end
+
   end
 
 end

data/lib/fit4ruby/Event.rb

@@ -3,7 +3,7 @@
 #
 # = Event.rb -- Fit4Ruby - FIT file processing library for Ruby
 #
-# Copyright (c) 2014 by Chris Schlaeger <cs@taskjuggler.org>
+# 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
@@ -21,6 +21,19 @@ module Fit4Ruby
       set_field_values(field_values)
     end
 
+    # Ensure that FitDataRecords have a deterministic sequence. Events are
+    # sorted by event_type and then event.
+    def <=>(fdr)
+      @timestamp == fdr.timestamp ?
+        @message.name == fdr.message.name ?
+          @event_type == fdr.event_type ?
+            @event <=> fdr.event :
+            @event_type <=> fdr.event_type :
+          RecordOrder.index(@message.name) <=>
+            RecordOrder.index(fdr.message.name) :
+        @timestamp <=> fdr.timestamp
+    end
+
   end
 
 end

data/lib/fit4ruby/FileNameCoder.rb

@@ -0,0 +1,67 @@
+#!/usr/bin/env ruby -w
+# encoding: UTF-8
+#
+# = FileNameCoder.rb -- Fit4Ruby - FIT file processing library for Ruby
+#
+# Copyright (c) 2014 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
+
+  # This class provides encoder and decoder for the FIT file names typically
+  # used for activies and monitor data files.
+  class FileNameCoder
+
+    CodeBook = 0.upto(9).map{ |i| (?0.ord + i).chr} +
+               0.upto(25).map{ |i|(?A.ord + i).chr}
+
+    # Convert a Time to a corresponding FIT file name.
+    # @param [Time] time stamp
+    # @return [String] FIT file name with extension '.FIT'
+    def FileNameCoder::encode(time)
+      utc = time.utc
+      if (year = utc.year) < 2010 || year > 2033
+        raise ArgumentError, "Year must be between 2010 and 2033"
+      end
+      year = CodeBook[year - 2010]
+      month = CodeBook[utc.month]
+      day = CodeBook[utc.day]
+      hour = CodeBook[utc.hour]
+      minutes = "%02d" % utc.min
+      seconds = "%02d" % utc.sec
+
+      year + month + day + hour + minutes + seconds + '.FIT'
+    end
+
+    # Convert a FIT file name into the corresponding Time value.
+    # @param [String] FIT file name. This can be a full path name but must end
+    #        with a '.FIT' extension.
+    # @return [Time] corresponding Time value
+    def FileNameCoder::decode(file_name)
+      base = File.basename(file_name.upcase)
+      unless /\A[0-9A-Z]{4}[0-9]{4}\.FIT\z/ =~ base
+        raise ArgumentError, "#{file_name} is not a valid FIT file name"
+      end
+
+      year = 2010 + CodeBook.index(base[0])
+      month = CodeBook.index(base[1])
+      day = CodeBook.index(base[2])
+      hour = CodeBook.index(base[3])
+      minutes = base[4,2].to_i
+      seconds = base[6,2].to_i
+      if month == 0 || month > 12 || day == 0 || day > 31 ||
+         hour >= 24 || minutes >= 60 || seconds >= 60
+        raise ArgumentError, "#{file_name} is not a valid FIT file name"
+      end
+
+      Time.new(year, month, day, hour, minutes, seconds, "+00:00")
+    end
+
+  end
+
+end
+

data/lib/fit4ruby/FitDataRecord.rb

@@ -3,7 +3,7 @@
 #
 # = FitDataRecord.rb -- Fit4Ruby - FIT file processing library for Ruby
 #
-# Copyright (c) 2014 by Chris Schlaeger <cs@taskjuggler.org>
+# 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
@@ -19,6 +19,11 @@ module Fit4Ruby
 
     include Converters
 
+    RecordOrder = [ 'user_profile', 'device_info', 'data_sources', 'event',
+                    'record', 'lap', 'session', 'personal_records' ]
+
+    attr_reader :message
+
     def initialize(record_id)
       @message = GlobalFitMessages.find_by_name(record_id)
 
@@ -91,7 +96,10 @@ module Fit4Ruby
     end
 
     def <=>(fdr)
-      @timestamp <=> fdr.timestamp
+      @timestamp == fdr.timestamp ?
+        RecordOrder.index(@message.name) <=>
+        RecordOrder.index(fdr.message.name) :
+        @timestamp <=> fdr.timestamp
     end
 
     def write(io, id_mapper)

data/lib/fit4ruby/FitDefinition.rb

@@ -41,7 +41,7 @@ module Fit4Ruby
 
     def check
       if architecture.snapshot > 1
-        Log.error "Illegal architecture value #{architecture.snapshot}"
+        Log.fatal "Illegal architecture value #{architecture.snapshot}"
       end
       fields.each { |f| f.check }
     end

data/lib/fit4ruby/FitFile.rb

@@ -33,7 +33,7 @@ module Fit4Ruby
       begin
         io = ::File.open(file_name, 'rb')
       rescue StandardError => e
-        Log.critical("Cannot open FIT file '#{file_name}'", e)
+        Log.fatal "Cannot open FIT file '#{file_name}': #{e.message}"
       end
       header = FitHeader.read(io)
       header.check
@@ -66,7 +66,7 @@ module Fit4Ruby
       begin
         io = ::File.open(file_name, 'wb+')
       rescue StandardError => e
-        Log.critical("Cannot open FIT file '#{file_name}'", e)
+        Log.fatal "Cannot open FIT file '#{file_name}': #{e.message}"
       end
 
       # Create a header object, but don't yet write it into the file.
@@ -104,8 +104,8 @@ module Fit4Ruby
       io.seek(start_pos)
 
       unless crc == crc_ref
-        Log.critical "Checksum error in file '#{@file_name}'. " +
-                     "Computed #{"%04X" % crc} instead of #{"%04X" % crc_ref}."
+        Log.fatal "Checksum error in file '#{@file_name}'. " +
+                  "Computed #{"%04X" % crc} instead of #{"%04X" % crc_ref}."
       end
     end
 

data/lib/fit4ruby/GeoMath.rb

@@ -0,0 +1,55 @@
+#!/usr/bin/env ruby -w
+# encoding: UTF-8
+#
+# = Activity.rb -- Fit4Ruby - FIT file processing library for Ruby
+#
+# Copyright (c) 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.
+#
+
+module Fit4Ruby
+
+  module GeoMath
+
+    # This method uses the ellipsoidal earth projected to a plane formula
+    # prescribed by the FCC in 47 CFR 73.208 for distances not exceeding 475
+    # km /295 miles.
+    # @param p1_lat Latitude of the first point in polar degrees
+    # @param p1_lon Longitude of the first point in polar degrees
+    # @param p2_lat Latitude of the second point in polar degrees
+    # @param p2_lon Longitude of the second point in polar degrees
+    # @return Distance in meters
+    def GeoMath.distance(p1_lat, p1_lon, p2_lat, p2_lon)
+      # Difference in latitude and longitude
+      delta_lat = p2_lat - p1_lat
+      delta_lon = p2_lon - p1_lon
+
+      # Mean latitude
+      mean_lat = (p1_lat + p2_lat) / 2
+
+      # kilometers per degree of latitude difference
+      k1 = 111.13209 - 0.56606 * cos(2 * mean_lat) +
+           0.00120 * cos(4 * mean_lat)
+      # kilometers per degree of longitude difference
+      k2 = 111.41513 * cos(mean_lat) -
+           0.09455 * cos(3 * mean_lat) +
+           0.00012 * cos(5 * mean_lat)
+
+      Math.sqrt(((k1 * delta_lat)) ** 2 + (k2 * delta_lon) ** 2) * 1000.0
+    end
+
+    def GeoMath.cos(deg)
+      Math.cos(deg_to_rad(deg))
+    end
+
+    def GeoMath.deg_to_rad(deg)
+      deg * Math::PI / 180
+    end
+
+  end
+
+end
+

data/lib/fit4ruby/GlobalFitDictionaries.rb

@@ -67,7 +67,7 @@ module Fit4Ruby
     entry 5, 'critical'
 
     dict 'device_type'
-    entry 0, 'position' # Just a guess
+    entry 0, 'gps' # Just a guess
     entry 3, 'acceleration' # Just a guess
     entry 4, 'barometric_pressure' # Just a guess
     entry 1, 'antfs'

data/lib/fit4ruby/GlobalFitMessage.rb

@@ -3,7 +3,7 @@
 #
 # = GlobalFitMessage.rb -- Fit4Ruby - FIT file processing library for Ruby
 #
-# Copyright (c) 2014 by Chris Schlaeger <cs@taskjuggler.org>
+# 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

data/lib/fit4ruby/GlobalFitMessages.rb

@@ -3,7 +3,7 @@
 #
 # = GlobalFitMessages.rb -- Fit4Ruby - FIT file processing library for Ruby
 #
-# Copyright (c) 2014 by Chris Schlaeger <cs@taskjuggler.org>
+# 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
@@ -255,16 +255,16 @@ module Fit4Ruby
     field 253, 'uint32', 'timestamp', :type => 'date_time'
 
     # Possibly which device is used as metering source.
-    # Not documented in FIT SDK, so these are all guesses right now.
-    message 22, 'metering_devices'
-    field 0, 'uint8', 'speed'
-    field 1, 'uint8', 'distance'
+    # Not documented in FIT SDK, so the field names are all guesses right now.
+    message 22, 'data_sources'
+    field 0, 'uint8', 'distance'
+    field 1, 'uint8', 'speed'
     field 2, 'uint8', 'cadence'
-    field 3, 'uint8', 'altitude'
+    field 3, 'uint8', 'elevation'
     field 4, 'uint8', 'heart_rate'
-    field 5, 'enum', 'undocumented_field_5' # 0 or 3 seen
-    field 6, 'uint8', 'undocumented_field_6' # First found in FR920XT
-    field 14, 'uint8', 'undocumented_field_14' # First found in FR920XT
+    field 5, 'enum', 'mode' # 0 or 3 seen, unknown meaning
+    field 6, 'uint8', 'power' # First found in FR920XT
+    field 14, 'uint8', 'calories' # First found in FR920XT
     field 253, 'uint32', 'timestamp', :type => 'date_time'
 
     message 23, 'device_info'

data/lib/fit4ruby/Lap.rb

@@ -3,7 +3,7 @@
 #
 # = Lap.rb -- Fit4Ruby - FIT file processing library for Ruby
 #
-# Copyright (c) 2014 by Chris Schlaeger <cs@taskjuggler.org>
+# 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
@@ -43,17 +43,20 @@ module Fit4Ruby
       set_field_values(field_values)
     end
 
-    def check
+    def check(index)
+      unless @message_index == index
+        Log.fatal "message_index must be #{index}, not #{@message_index}"
+      end
       ts = Time.parse('1989-12-31')
       distance = nil
       @records.each do |r|
-        Log.error "Record has no timestamp" unless r.timestamp
+        Log.fatal "Record has no timestamp" unless r.timestamp
         if r.timestamp < ts
-          Log.error "Record has earlier timestamp than previous record"
+          Log.fatal "Record has earlier timestamp than previous record"
         end
         if r.distance
           if distance && r.distance < distance
-            Log.error "Record has smaller distance than previous record"
+            Log.fatal "Record has smaller distance than previous record"
           end
           distance = r.distance
         end

data/lib/fit4ruby/Log.rb

@@ -10,7 +10,9 @@
 # published by the Free Software Foundation.
 #
 
+require 'monitor'
 require 'logger'
+require 'singleton'
 
 module Fit4Ruby
 
@@ -18,24 +20,36 @@ module Fit4Ruby
   # errors.
   class Error < StandardError ; end
 
-  class ILogger < Logger
+  # The ILogger class is a singleton that provides a common logging mechanism
+  # to all objects. It exposes essentially the same interface as the Logger
+  # class, just as a singleton and with some additional methods like 'fatal'
+  # and 'cricital'.
+  class ILogger < Monitor
 
-    def fatal(msg)
-      super
-      exit 1
+    include Singleton
+
+    @@logger = Logger.new(STDOUT)
+
+    # Pass all calls to unknown methods to the @@logger object.
+    def method_missing(method, *args, &block)
+      @@logger.send(method, *args, &block)
     end
 
-    def critical(msg, exception = nil)
-      if exception
-        raise Error, "#{msg}: #{exception.message}", exception.backtrace
-      else
-        raise Error, msg
-      end
+    # Make it properly introspectable.
+    def respond_to?(method, include_private = false)
+      @@logger.respond_to?(method)
+    end
+
+    # Print an error message via the Logger and raise and Fit4Ruby::Error.
+    # code 1.
+    def fatal(msg)
+      @@logger.error(msg)
+      raise Error, msg
     end
 
   end
 
-  Log = ILogger.new(STDOUT)
+  Log = ILogger.instance
   Log.level = Logger::WARN
   Log.formatter = proc do |severity, time, progname, msg|
     msg + "\n"

data/lib/fit4ruby/Session.rb

@@ -3,7 +3,7 @@
 #
 # = Session.rb -- Fit4Ruby - FIT file processing library for Ruby
 #
-# Copyright (c) 2014 by Chris Schlaeger <cs@taskjuggler.org>
+# 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
@@ -54,20 +54,19 @@ module Fit4Ruby
     # are reported via the Log object.
     def check(activity)
       unless @first_lap_index
-        Log.error 'first_lap_index is not set'
+        Log.fatal 'first_lap_index is not set'
       end
       unless @num_laps
-        Log.error 'num_laps is not set'
+        Log.fatal 'num_laps is not set'
       end
       @first_lap_index.upto(@first_lap_index - @num_laps) do |i|
         if (lap = activity.lap[i])
           @laps << lap
         else
-          Log.error "Session references lap #{i} which is not contained in "
+          Log.fatal "Session references lap #{i} which is not contained in "
                     "the FIT file."
         end
       end
-      @laps.each { |l| l.check }
     end
 
     # Return true if the session contains geographical location data.

data/lib/fit4ruby/version.rb

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

data/spec/FileNameCoder_spec.rb

@@ -0,0 +1,61 @@
+#!/usr/bin/env ruby -w
+# encoding: UTF-8
+#
+# = FileNameCoder_spec.rb -- Fit4Ruby - FIT file processing library for Ruby
+#
+# Copyright (c) 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/FileNameCoder'
+
+describe Fit4Ruby::FileNameCoder do
+
+  before(:all) do
+    @data = [
+      [ '2015-10-23T21:18:00+0200', '5ANJ1800.FIT' ],
+      [ '2015-10-11T15:06:59+0000', '5ABF0659.FIT' ],
+      [ '2014-04-19T07:31:06+0100', '44J63106.FIT' ],
+      [ '2015-05-07T16:16:50+0000', '557G1650.FIT' ]
+    ]
+  end
+
+  it 'should convert a time stamps to a file names' do
+    @data.each do |t|
+      Fit4Ruby::FileNameCoder.encode(Time.parse(t[0])).should == t[1]
+    end
+  end
+
+  it 'should convert file names to time stamps' do
+    @data.each do |t|
+      Fit4Ruby::FileNameCoder.decode(t[1]).should == Time.parse(t[0]).utc
+    end
+  end
+
+  it 'should fail to encode dates before 2010' do
+    lambda {
+      Fit4Ruby::FileNameCoder.encode(Time.parse('2009-12-31T00:00'))
+    }.should raise_error
+  end
+
+  it 'should fail to encode dates after 2033' do
+    lambda {
+      Fit4Ruby::FileNameCoder.encode(Time.parse('2034-01-01T00:00+00:00'))
+    }.should raise_error
+  end
+
+  it 'should fail to decode illegal file names' do
+    [ 'A.FIT', '0123ABCD', '5ZNJ1800.FIT',
+      '44063106.FIT', '44W63106.FIT',
+      '557O1650.FIT', '557G6050.FIT', '557G1660.FIT' ].each do |name|
+      lambda {
+        Fit4Ruby::FileNameCoder.decode(name)
+      }.should raise_error
+    end
+  end
+
+end
+

data/spec/FitFile_spec.rb

@@ -15,6 +15,7 @@ require 'fit4ruby'
 describe Fit4Ruby do
 
   before(:each) do
+    ts = Time.now
     a = Fit4Ruby::Activity.new
     a.total_timer_time = 30 * 60.0
     a.new_user_profile({ :age => 33, :height => 1.78, :weight => 73.0,
@@ -22,10 +23,24 @@ describe Fit4Ruby do
                          :max_hr => 178 })
 
     a.new_event({ :event => 'timer', :event_type => 'start_time' })
-    a.new_device_info({ :device_index => 0, :manufacturer => 'development' })
-    a.new_device_info({ :device_index => 1, :manufacturer => 'development',
+    a.new_device_info({ :timestamp => ts,
+                        :device_index => 0, :manufacturer => 'garmin',
+                        :garmin_product => 'fenix3',
+                        :serial_number => 123456789 })
+    a.new_device_info({ :timestamp => ts,
+                        :device_index => 1, :manufacturer => 'garmin',
+                        :garmin_product => 'fenix3_gps'})
+    a.new_device_info({ :timestamp => ts,
+                        :device_index => 2, :manufacturer => 'garmin',
+                        :garmin_product => 'hrm_run',
                         :battery_status => 'ok' })
-    ts = Time.now
+    a.new_device_info({ :timestamp => ts,
+                        :device_index => 3, :manufacturer => 'garmin',
+                        :garmin_product => 'sdm4',
+                        :battery_status => 'ok' })
+    a.new_data_sources({ :timestamp => ts, :distance => 1,
+                         :speed => 1, :cadence => 3, :elevation => 1,
+                         :heart_rate => 2 })
     laps = 0
     0.upto(a.total_timer_time / 60) do |mins|
       ts += 60
@@ -59,11 +74,22 @@ describe Fit4Ruby do
                   :event_type => 'marker', :vo2max => 52 })
     a.new_event({ :timestamp => ts, :event => 'timer',
                   :event_type => 'stop_all' })
-    a.new_device_info({ :timestamp => ts, :device_index => 0,
-                        :manufacturer => 'development' })
     ts += 1
-    a.new_device_info({ :timestamp => ts, :manufacturer => 'development',
-                        :device_index => 1, :battery_status => 'low' })
+    a.new_device_info({ :timestamp => ts,
+                        :device_index => 0, :manufacturer => 'garmin',
+                        :garmin_product => 'fenix3',
+                        :serial_number => 123456789 })
+    a.new_device_info({ :timestamp => ts,
+                        :device_index => 1, :manufacturer => 'garmin',
+                        :garmin_product => 'fenix3_gps'})
+    a.new_device_info({ :timestamp => ts,
+                        :device_index => 2, :manufacturer => 'garmin',
+                        :garmin_product => 'hrm_run',
+                        :battery_status => 'low' })
+    a.new_device_info({ :timestamp => ts,
+                        :device_index => 3, :manufacturer => 'garmin',
+                        :garmin_product => 'sdm4',
+                        :battery_status => 'ok' })
     ts += 120
     a.new_event({ :timestamp => ts, :event => 'recovery_hr',
                   :event_type => 'marker', :recovery_hr => 132 })
@@ -79,7 +105,6 @@ describe Fit4Ruby do
     File.delete(fit_file) if File.exists?(fit_file)
     Fit4Ruby.write(fit_file, @activity)
     File.exists?(fit_file).should be_true
-    puts File.absolute_path(fit_file)
 
     b = Fit4Ruby.read(fit_file)
     b.should == @activity

data/spec/GeoMath_spec.rb

@@ -0,0 +1,34 @@
+#!/usr/bin/env ruby -w
+# encoding: UTF-8
+#
+# = FitFile_spec.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/GeoMath'
+
+describe Fit4Ruby::GeoMath do
+
+  it 'should compute a distance between 2 points' do
+    p0_lat = 48.180506536737084
+    p0_lon = 11.611978523433208
+    points = [
+      # latitude, longitude, distance to p0 in meters
+      [ 48.180506536737084, 11.611978523433208, 0.0 ],
+      [ 48.18047543987632, 11.61195664666593, 3.821 ],
+      [ 48.18034409545362, 11.611852794885635, 20.339 ],
+      [ 48.17970883101225, 11.611351054161787, 100.225 ]
+    ]
+    points.each do |p|
+      Fit4Ruby::GeoMath.distance(p0_lat, p0_lon,
+                                 p[0], p[1]).should be_within(0.001).of(p[2])
+    end
+  end
+
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fit4ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Chris Schlaeger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-12 00:00:00.000000000 Z
+date: 2015-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bindata
@@ -84,10 +84,12 @@ files:
 - lib/fit4ruby.rb
 - lib/fit4ruby/Activity.rb
 - lib/fit4ruby/Converters.rb
+- lib/fit4ruby/DataSources.rb
 - lib/fit4ruby/DeviceInfo.rb
 - lib/fit4ruby/Event.rb
 - lib/fit4ruby/FileCreator.rb
 - lib/fit4ruby/FileId.rb
+- lib/fit4ruby/FileNameCoder.rb
 - lib/fit4ruby/FitDataRecord.rb
 - lib/fit4ruby/FitDefinition.rb
 - lib/fit4ruby/FitDefinitionField.rb
@@ -99,6 +101,7 @@ files:
 - lib/fit4ruby/FitMessageRecord.rb
 - lib/fit4ruby/FitRecord.rb
 - lib/fit4ruby/FitRecordHeader.rb
+- lib/fit4ruby/GeoMath.rb
 - lib/fit4ruby/GlobalFitDictList.rb
 - lib/fit4ruby/GlobalFitDictionaries.rb
 - lib/fit4ruby/GlobalFitMessage.rb
@@ -115,7 +118,9 @@ files:
 - lib/fit4ruby/Software.rb
 - lib/fit4ruby/UserProfile.rb
 - lib/fit4ruby/version.rb
+- spec/FileNameCoder_spec.rb
 - spec/FitFile_spec.rb
+- spec/GeoMath_spec.rb
 - tasks/changelog.rake
 - tasks/gem.rake
 - tasks/rdoc.rake
@@ -145,5 +150,7 @@ signing_key:
 specification_version: 4
 summary: Library to read GARMIN FIT files.
 test_files:
+- spec/FileNameCoder_spec.rb
 - spec/FitFile_spec.rb
+- spec/GeoMath_spec.rb
 has_rdoc: