fit4ruby 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 144c1ecdd95c3891be340d4cf3d9aa8c772adbf3
-  data.tar.gz: 0a7597be881101646da02088686489571a586a2f
+  metadata.gz: 49de464c7356d1b55144fac48b0f6150371e29a9
+  data.tar.gz: 4b5e2057123c3e4a62c6f2335182cfd6cf8aa8ea
 SHA512:
-  metadata.gz: 3404459e10d9761a1385fcc4f4f48451a3e7b511889783c0cc700b7b98b06d4d9bbfa3618f0d9345a43f995a64a6cc7f949248df72ad0e095b617a4e92263fe9
-  data.tar.gz: f716083bb2fcc2eaad00e06b5d5b5e24f3169f9f22d1a21fad0104e7720a96bcf366a1cda5ee60de7b2e7821629b9b73f5cc79bf02ee1f5f7b53881a070051ba
+  metadata.gz: b8688224199cac6c1b024711d680bb98b33cb761e46d36af2d83e61aa04701a9f182fc70f5dd442f4a8311c6be43f7a6bf1ccf063034fd31e751191dfff8c2a2
+  data.tar.gz: 4c0bdd82555fb57d705d8992c21aa48a01b689d9596b61199894a89604d24dd4e159e55e86fcdd8b1327b4070270b688a78e0628e2caaad929f0308af4f88c4a

data/COPYING

@@ -1,12 +1,12 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                          675 Mass Ave, Cambridge, MA 02139, USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
-			    Preamble
+                            Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users.  This
 General Public License applies to most of the Free Software
 Foundation's software and to any other program whose authors commit to
 using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
+the GNU Lesser General Public License instead.)  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, not
@@ -55,8 +55,8 @@ patent must be licensed for everyone's free use or not licensed at all.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
+
+                    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License applies to any program or other work which contains
@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
     License.  (Exception: if the Program itself is interactive but
     does not normally print such an announcement, your work based on
     the Program is not required to print an announcement.)
-
+
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent
 access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
-
+
   4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License.  Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
@@ -225,7 +225,7 @@ impose that choice.
 
 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
-
+
   8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
@@ -255,7 +255,7 @@ make exceptions for this.  Our decision will be guided by the two goals
 of preserving the free status of all derivatives of our free software and
 of promoting the sharing and reuse of software generally.
 
-			    NO WARRANTY
+                            NO WARRANTY
 
   11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
@@ -277,4 +277,63 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
 PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
-		     END OF TERMS AND CONDITIONS
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.

data/Rakefile

@@ -4,6 +4,7 @@ $:.unshift File.join(File.dirname(__FILE__))
 lib = File.expand_path('../lib', __FILE__)
 $:.unshift lib unless $:.include?(lib)
 
+require "rspec/core/rake_task"
 require 'rake/clean'
 
 Dir.glob( 'tasks/*.rake').each do |fn|
@@ -14,6 +15,7 @@ Dir.glob( 'tasks/*.rake').each do |fn|
   end
 end
 
-task :default  => [ :test ]
+task :default  => :spec
+task :test => :spec
 
 desc 'Run all unit and spec tests'

data/lib/fit4ruby.rb

@@ -14,8 +14,8 @@ require 'fit4ruby/FitFile'
 
 module Fit4Ruby
 
-  def self.read(file, dump = false)
-    FitFile.new.read(file, dump)
+  def self.read(file, filter = nil)
+    FitFile.new.read(file, filter)
   end
 
   def self.write(file, activity)

data/lib/fit4ruby/Activity.rb

@@ -10,38 +10,50 @@
 # published by the Free Software Foundation.
 #
 
+require 'fit4ruby/FitDataRecord'
+require 'fit4ruby/FileId'
+require 'fit4ruby/FileCreator'
+require 'fit4ruby/DeviceInfo'
+require 'fit4ruby/UserProfile'
 require 'fit4ruby/Session'
 require 'fit4ruby/Lap'
 require 'fit4ruby/Record'
-require 'fit4ruby/FitDataRecord'
+require 'fit4ruby/Event'
+require 'fit4ruby/PersonalRecords'
 
 module Fit4Ruby
 
   class Activity < FitDataRecord
 
-    attr_accessor :start_time, :duration, :local_start_time,
-                  :sessions, :laps, :records
+    attr_accessor :file_id, :file_creator, :device_infos, :user_profiles,
+                  :sessions, :laps, :records, :events, :personal_records
 
     def initialize
       super('activity')
-      rename('timestamp', 'start_time')
-      rename('local_timestamp', 'local_start_time')
-      rename('total_timer_time', 'duration')
-      @start_time = nil
-      @local_start_time = nil
-      @duration = nil
       @num_sessions = 0
+
+      @file_id = FileId.new
+      @file_creator = FileCreator.new
+      @device_infos = []
+      @user_profiles = []
+      @events = []
       @sessions = []
       @laps = []
       @records = []
+      @personal_records = []
+
+      @cur_session_laps = []
+      @cur_lap_records = []
+
+      @lap_counter = 1
     end
 
     def check
-      unless @start_time && @start_time >= Time.parse('1990-01-01')
-        Log.error "Activity has no valid start time"
+      unless @timestamp && @timestamp >= Time.parse('1990-01-01')
+        Log.error "Activity has no valid timestamp"
       end
-      unless @duration
-        Log.error "Activity has no valid duration"
+      unless @total_timer_time
+        Log.error "Activity has no valid total_timer_time"
       end
       unless @num_sessions == @sessions.count
         Log.error "Activity record requires #{@num_sessions}, but "
@@ -51,66 +63,132 @@ module Fit4Ruby
       @sessions.each { |s| s.check(self) }
     end
 
-    def set(field, value)
-      case field
-      when 'timestamp'
-        @start_time = value
-      when 'local_timestamp'
-        @local_start_time = value
-      when 'total_timer_time'
-        @duration = value
-      when 'num_sessions'
-        @num_sessions = value
+    def total_distance
+      d = 0.0
+      @sessions.each { |s| d += s.total_distance }
+      d
+    end
+
+    def aggregate
+      @sessions.each { |s| s.aggregate }
+    end
+
+    def avg_speed
+      speed = 0.0
+      @sessions.each { |s| speed += s.avg_speed }
+      speed / @sessions.length
+    end
+
+    def recovery_time
+      @events.each do |e|
+        return e.data if e.event == 'recovery_time'
       end
+
+      nil
     end
 
-    def method_missing(method_name, *args, &block)
-      acc_fields = [ :distance ]
-      avg_fields = [ :avg_speed ]
+    def vo2max
+      @events.each do |e|
+        return e.data if e.event == 'vo2max'
+      end
 
-      if acc_fields.include?(method_name)
-        total = 0
-        @sessions.each do |s|
-          total += s.send(method_name, *args, &block)
-        end
-        return total
-      elsif avg_fields.include?(method_name)
-        total = 0
-        count = 0
-        return 0 if @sessions.empty?
-
-        @sessions.each do |s|
-          total += s.send(method_name, *args, &block)
-          count += 1
-        end
-        return total / count
-      else
-        Log.fatal "Unknown data field: #{method_name}"
+      nil
+    end
+
+    def write(io, id_mapper)
+      @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|
+        s.write(io, id_mapper)
       end
+      super
     end
 
-    def new_session
-      @sessions << (session = Session.new)
-      session
+    def new_file_id(field_values = {})
+      new_fit_data_record('file_id', field_values)
     end
 
-    def new_lap
-      @laps << (lap = Lap.new)
-      lap
+    def new_file_creator(field_values = {})
+      new_fit_data_record('file_creator', field_values)
     end
 
-    def new_record
-      @records << (record = Record.new)
-      record
+    def new_device_info(field_values = {})
+      new_fit_data_record('device_info', field_values)
+    end
+
+    def new_user_profile(field_values = {})
+      new_fit_data_record('user_profile', field_values)
+    end
+
+    def new_event(field_values = {})
+      new_fit_data_record('event', field_values)
     end
 
-    def to_s
-      str = ''
-      @sessions.each do |s|
-        str << "\n\n" unless str.empty?
-        str << s.to_s
+    def new_session(field_values = {})
+      new_fit_data_record('session', field_values)
+    end
+
+    def new_lap(field_values = {})
+      new_fit_data_record('lap', field_values)
+    end
+
+    def new_personal_record(field_values = {})
+      new_fit_data_record('personal_record', field_values)
+    end
+
+    def new_record(field_values = {})
+      new_fit_data_record('record', field_values)
+    end
+
+    def ==(a)
+      super(a) && @file_id == a.file_id &&
+        @file_creator == a.file_creator &&
+        @device_infos == a.device_infos && @user_profiles == a.user_profiles &&
+        @events == a.events &&
+        @sessions == a.sessions && personal_records == a.personal_records
+    end
+
+    def new_fit_data_record(record_type, field_values = {})
+      case record_type
+      when 'file_id'
+        @file_id = (record = FileId.new(field_values))
+      when 'file_creator'
+        @file_creator = (record = FileCreator.new(field_values))
+      when 'device_info'
+        @device_infos << (record = DeviceInfo.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?
+          # Ensure that all previous records have been assigned to a lap.
+          @lap_counter += 1
+          @cur_session_laps << (lap = Lap.new(@cur_lap_records, field_values))
+          @laps << lap
+          @cur_lap_records = []
+        end
+        @num_sessions += 1
+        @sessions << (record = Session.new(@cur_session_laps, @lap_counter,
+                                           field_values))
+        @cur_session_laps = []
+      when 'lap'
+        @lap_counter += 1
+        @cur_session_laps << (record = Lap.new(@cur_lap_records, field_values))
+        @laps << record
+        @cur_lap_records = []
+      when 'record'
+        @cur_lap_records << (record = Record.new(field_values))
+        @records << record
+      when 'personal_records'
+        @personal_records << (record = PersonalRecords.new(field_values))
+      else
+        record = nil
       end
-      str
+
+      record
     end
 
   end

data/lib/fit4ruby/DeviceInfo.rb

@@ -0,0 +1,27 @@
+#!/usr/bin/env ruby -w
+# encoding: UTF-8
+#
+# = DeviceInfo.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.
+#
+
+require 'fit4ruby/FitDataRecord'
+
+module Fit4Ruby
+
+  class DeviceInfo < FitDataRecord
+
+    def initialize(field_values = {})
+      super('device_info')
+      set_field_values(field_values)
+    end
+
+  end
+
+end
+

data/lib/fit4ruby/Event.rb

@@ -0,0 +1,27 @@
+#!/usr/bin/env ruby -w
+# encoding: UTF-8
+#
+# = Event.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.
+#
+
+require 'fit4ruby/FitDataRecord'
+
+module Fit4Ruby
+
+  class Event < FitDataRecord
+
+    def initialize(field_values = {})
+      super('event')
+      set_field_values(field_values)
+    end
+
+  end
+
+end
+

data/lib/fit4ruby/FileCreator.rb

@@ -0,0 +1,30 @@
+#!/usr/bin/env ruby -w
+# encoding: UTF-8
+#
+# = FileCreator.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.
+#
+
+require 'fit4ruby/version'
+require 'fit4ruby/FitDataRecord'
+
+module Fit4Ruby
+
+  class FileCreator < FitDataRecord
+
+    def initialize(field_values = {})
+      super('file_creator')
+      @software_version = VERSION.split('.').join('').to_i
+
+      set_field_values(field_values)
+    end
+
+  end
+
+end
+

data/lib/fit4ruby/{FitFileId.rb → FileId.rb}

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby -w
 # encoding: UTF-8
 #
-# = FitFileId.rb -- Fit4Ruby - FIT file processing library for Ruby
+# = FileId.rb -- Fit4Ruby - FIT file processing library for Ruby
 #
 # Copyright (c) 2014 by Chris Schlaeger <cs@taskjuggler.org>
 #
@@ -10,19 +10,21 @@
 # published by the Free Software Foundation.
 #
 
-require 'fit4ruby/Converters'
 require 'fit4ruby/FitDataRecord'
 
 module Fit4Ruby
 
-  class FitFileId < FitDataRecord
+  class FileId < FitDataRecord
 
-    def initialize
+    def initialize(field_values = {})
       super('file_id')
       @serial_number = 1234567890
-      @time_created = Time.now
+      # Ignore the sub-seconds to avoid problems when comparing records.
+      @time_created = Time.at(Time.now.to_i)
       @manufacturer = 'development'
       @type = 'activity'
+
+      set_field_values(field_values)
     end
 
   end

data/lib/fit4ruby/FitDataRecord.rb

@@ -19,11 +19,49 @@ module Fit4Ruby
 
     def initialize(record_id)
       @message = GlobalFitMessages.find_by_name(record_id)
-      @renames = {}
+
+      # Create instance variables that correspond to every field of the
+      # corresponding FIT # data record.
+      @message.fields.each do |field_number, field|
+        create_instance_variable(field.name)
+      end
+      @timestamp = Time.now
+    end
+
+    def set_field_values(field_values)
+      field_values.each do |field, value|
+        set(field.to_s, value)
+      end
     end
 
-    def rename(fit_var, var)
-      @renames[fit_var] = var
+    def set(name, value)
+      ivar_name = '@' + name
+      unless instance_variable_defined?(ivar_name)
+        Log.warn("Unknown FIT record field '#{ivar_name}'")
+        return
+      end
+      instance_variable_set('@' + name, value)
+    end
+
+    def ==(fdr)
+      @message.fields.each do |field_number, field|
+        ivar_name = '@' + field.name
+        v1 = field.fit_to_native(field.native_to_fit(
+          instance_variable_get(ivar_name)))
+        v2 = field.fit_to_native(field.native_to_fit(
+          fdr.instance_variable_get(ivar_name)))
+
+        unless v1 == v2
+          Log.error "#{field.name}: #{v1} != #{v2}"
+          return false
+        end
+      end
+
+      true
+    end
+
+    def <=>(fdr)
+      @timestamp <=> fdr.timestamp
     end
 
     def write(io, id_mapper)
@@ -57,7 +95,7 @@ module Fit4Ruby
       # Fill the BinData::Struct object with the values from the corresponding
       # instance variables.
       @message.fields.each do |field_number, field|
-        iv = "@#{@renames[field.name] || field.name}"
+        iv = "@#{field.name}"
         if instance_variable_defined?(iv) &&
            !(iv_value = instance_variable_get(iv)).nil?
           value = field.native_to_fit(iv_value)
@@ -73,6 +111,25 @@ module Fit4Ruby
       bd.write(io)
     end
 
+    def inspect
+      fields = {}
+      @message.fields.each do |field_number, field|
+        ivar_name = '@' + field.name
+        fields[field.name] = instance_variable_get(ivar_name)
+      end
+      fields.inspect
+    end
+
+    private
+
+    def create_instance_variable(name)
+      # Create a new instance variable for 'name'. We initialize it with a
+      # provided default value or nil.
+      instance_variable_set('@' + name, nil)
+      # And create an accessor method for it as well.
+      self.class.__send__(:attr_accessor, name)
+    end
+
   end
 
 end

data/lib/fit4ruby/FitFile.rb

@@ -15,7 +15,6 @@ require 'fit4ruby/FitHeader'
 require 'fit4ruby/FitRecord'
 require 'fit4ruby/FitFilter'
 require 'fit4ruby/FitMessageIdMapper'
-require 'fit4ruby/FitFileId'
 require 'fit4ruby/GlobalFitMessages'
 require 'fit4ruby/GlobalFitDictionaries'
 
@@ -32,7 +31,7 @@ module Fit4Ruby
       definitions = {}
       begin
         io = ::File.open(file_name, 'rb')
-      rescue RuntimeError => e
+      rescue StandardError => e
         Log.critical("Cannot open FIT file '#{file_name}'", e)
       end
       header = FitHeader.read(io)
@@ -75,7 +74,6 @@ module Fit4Ruby
       # Move the pointer behind the header section.
       io.seek(start_pos)
       id_mapper = FitMessageIdMapper.new
-      FitFileId.new.write(io, id_mapper)
       activity.write(io, id_mapper)
       end_pos = io.pos
 

data/lib/fit4ruby/FitMessageIdMapper.rb

@@ -23,7 +23,6 @@ module Fit4Ruby
 
     def add_global(id)
       unless (slot = @entries.index { |e| e.nil? })
-        puts @entries.inspect
         # No more free slots. We have to find the least recently used one.
         slot = 0
         0.upto(15) do |i|

data/lib/fit4ruby/FitMessageRecord.rb

@@ -36,16 +36,7 @@ module Fit4Ruby
     def read(io, activity, filter = nil, fields_dump = nil)
       @message_record.read(io)
 
-      obj = case @name
-            when 'activity'
-              activity
-            when 'session'
-              activity.new_session
-            when 'record'
-              activity.new_record
-            else
-              nil
-            end
+      obj = @name == 'activity' ? activity : activity.new_fit_data_record(@name)
 
       @definition.fields.each do |field|
         value = @message_record[field.name].snapshot

data/lib/fit4ruby/GlobalFitMessage.rb

@@ -12,6 +12,7 @@
 
 require 'fit4ruby/GlobalFitDictList'
 require 'fit4ruby/Converters'
+require 'fit4ruby/FitDefinitionField'
 
 module Fit4Ruby
 
@@ -36,7 +37,7 @@ module Fit4Ruby
 
         if @opts.include?(:dict) &&
            (dict = GlobalFitDictionaries[@opts[:dict]])
-          return [ dict.name(value) || "Undocumented value #{value}", nil ]
+          return dict.name(value) || "Undocumented value #{value}"
         end
 
         case @opts[:type]
@@ -72,19 +73,44 @@ module Fit4Ruby
         [ value, @opts[:unit] ]
       end
 
+      def fit_to_native(value)
+        return nil if value == FitDefinitionField.undefined_value(@type)
+
+        if @opts.include?(:dict) && (dict = GlobalFitDictionaries[@opts[:dict]])
+          return dict.name(value) || "Undocumented value #{value}"
+        end
+
+        value /= @opts[:scale].to_f if @opts[:scale]
+        value -= @opts[:offset] if @opts[:offset]
+
+        case @opts[:type]
+        when 'coordinate'
+          value *= 180.0 / 2147483648
+        when 'date_time'
+          value = fit_time_to_time(value)
+        end
+
+        value
+      end
+
       def native_to_fit(value)
-        return nil if value.nil?
+        return FitDefinitionField.undefined_value(@type) if value.nil?
 
         if @opts.include?(:dict) && (dict = GlobalFitDictionaries[@opts[:dict]])
-          return dict.value_by_name(value)
+          unless (dv = dict.value_by_name(value))
+            Log.error "Unknown value '#{value}' assigned to field #{@name}"
+            return FitDefinitionField.undefined_value(@type)
+          else
+            return dv
+          end
         end
 
-        value = (value * @opts[:scale].to_f).to_i if @opts[:scale]
         value += @opts[:offset] if @opts[:offset]
+        value = (value * @opts[:scale].to_f).to_i if @opts[:scale]
 
         case @opts[:type]
         when 'coordinate'
-          value *= 2147483648.0 / 180.0
+          value = (value * 2147483648.0 / 180.0).to_i
         when 'date_time'
           value = time_to_fit_time(value)
         end

data/lib/fit4ruby/GlobalFitMessages.rb

@@ -43,7 +43,7 @@ module Fit4Ruby
     field 17, 'uint8', 'max_heart_rate', :unit => 'bpm'
     field 18, 'uint8', 'avg_running_cadence', :unit => 'strides/min'
     field 19, 'uint8', 'max_running_cadence', :unit => 'strides/min'
-    field 22, 'uint16', 'total_ascent', :unit => 'm'
+    field 22, 'uint16', 'total_ascend', :unit => 'm'
     field 23, 'uint16', 'total_descent', :unit => 'm'
     field 24, 'uint8', 'total_training_effect', :scale => 10
     field 25, 'uint16', 'first_lap_index'

data/lib/fit4ruby/Lap.rb

@@ -10,32 +10,81 @@
 # published by the Free Software Foundation.
 #
 
+require 'fit4ruby/FitDataRecord'
+
 module Fit4Ruby
 
-  class Lap
-
-    def set(field, value)
-      case field
-      when 'start_time'
-        @start_time = value
-      when 'total_timer_time'
-        @duration = value
-      when 'avg_speed'
-        @avg_speed = value
-      when 'avg_heart_rate'
-        @avg_heart_rate = value
-      when 'max_heart_rate'
-        @max_heart_rate = value
-      when 'avg_vertical_oscillation'
-        @avg_vertical_oscillation = value
-      when 'avg_stance_time'
-        @avg_stance_time = value
-      when 'avg_running_cadence'
-        @avg_running_cadence = 2 * value
-      when 'avg_fraction_cadence'
-        @avg_running_cadence += 2 * value
-      else
+  class Lap < FitDataRecord
+
+    attr_reader :records
+
+    def initialize(records, field_values)
+      super('lap')
+      @records = records
+      set_field_values(field_values)
+    end
+
+    def check
+      ts = Time.parse('1989-12-31')
+      distance = nil
+      @records.each do |r|
+        Log.error "Record has no timestamp" unless r.timestamp
+        if r.timestamp < ts
+          Log.error "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"
+          end
+          distance = r.distance
+        end
+        ts = r.timestamp
+      end
+    end
+
+    def aggregate
+      return if @records.empty?
+
+      r = @records[0]
+      @start_time = r.timestamp
+      @start_position_lat = r.position_lat
+      @start_position_long = r.position_long
+
+      r = @records[-1]
+      @end_position_lat = r.position_lat
+      @end_position_long = r.position_long
+      @total_elapsed_time = r.timestamp - @start_time
+      @total_timer_time = @total_elapsed_time
+      @avg_speed = ((@total_distance.to_f / @total_elapsed_time) * 1000).to_i
+
+      @max_speed = 0
+      first_distance, last_distance = nil, nil
+      @records.each do |r|
+        first_distance = r.distance if first_distance.nil? && r.distance
+        last_distance = r.distance if r.distance
+        @max_speed = r.speed if r.speed && @max_speed < r.speed
+
+        if r.position_lat
+          if (@swc_lat.nil? || r.position_lat < @swc_lat)
+            @swc_lat = r.position_lat
+          end
+          if (@nec_lat.nil? || r.position_lat > @nec_lat)
+            @nec_lat = r.position_lat
+          end
+        end
+        if r.position_long
+          if (@swc_long.nil? || r.position_long < @swc_long)
+            @swc_long = r.position_long
+          end
+          if (@nec_long.nil? || r.position_long > @nec_long)
+            @nec_long = r.position_long
+          end
+        end
+
       end
+
+      @total_distance = last_distance && first_distance ?
+        last_distance - first_distance : 0
     end
 
   end

data/lib/fit4ruby/PersonalRecords.rb

@@ -0,0 +1,27 @@
+#!/usr/bin/env ruby -w
+# encoding: UTF-8
+#
+# = PersonalRecords.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.
+#
+
+require 'fit4ruby/FitDataRecord'
+
+module Fit4Ruby
+
+  class PersonalRecords < FitDataRecord
+
+    def initialize(field_values = {})
+      super('personal_records')
+      set_field_values(field_values)
+    end
+
+  end
+
+end
+

data/lib/fit4ruby/Record.rb

@@ -10,40 +10,15 @@
 # published by the Free Software Foundation.
 #
 
-module Fit4Ruby
-
-  class Record
+require 'fit4ruby/FitDataRecord'
 
-    attr_reader :timestamp, :latitude, :longitude, :altitude, :distance,
-                :speed, :vertical_oscillation, :cadence, :stance_time
+module Fit4Ruby
 
-    def initialize
-    end
+  class Record < FitDataRecord
 
-    def set(field, value)
-      case field
-      when 'timestamp'
-        @timestamp = value
-      when 'position_lat'
-        @latitude = value
-      when 'position_long'
-        @longitude = value
-      when 'altitude'
-        @altitude = value
-      when 'distance'
-        @distance = value
-      when 'speed'
-        @speed = value
-      when 'vertical_oscillation'
-        @vertical_oscillation = value
-      when 'cadence'
-        @cadence = 2 * value
-      when 'fractional_cadence'
-        @cadence += 2 * value if @cadence
-      when 'stance_time'
-        @stance_time = value
-      else
-      end
+    def initialize(field_values = {})
+      super('record')
+      set_field_values(field_values)
     end
 
     def pace

data/lib/fit4ruby/Session.rb

@@ -11,24 +11,31 @@
 #
 
 require 'fit4ruby/Converters'
+require 'fit4ruby/FitDataRecord'
 
 module Fit4Ruby
 
-  class Session
+  class Session < FitDataRecord
 
     include Converters
 
-    attr_reader :start_time, :duration, :distance, :strides, :ascend,
-                :descent, :calories, :avg_speed, :avg_heart_rate,
-                :max_heart_rate, :avg_vertical_oscillation, :avg_stance_time,
-                :avg_running_cadence, :avg_running_cadence, :training_effect,
-                :first_lap_index, :num_laps
+    attr_reader :laps
 
-    def initialize
-      @laps = []
+    def initialize(laps, first_lap_index, field_values)
+      super('session')
+      @laps = laps
+      @first_lap_index = first_lap_index
+      @num_laps = @laps.length
+      set_field_values(field_values)
     end
 
     def check(activity)
+      unless @first_lap_index
+        Log.error 'first_lap_index is not set'
+      end
+      unless @num_laps
+        Log.error 'num_laps is not set'
+      end
       @first_lap_index.upto(@first_lap_index - @num_laps) do |i|
         if (lap = activity.lap[i])
           @laps << lap
@@ -37,71 +44,36 @@ module Fit4Ruby
                     "the FIT file."
         end
       end
+      @laps.each { |l| l.check }
     end
 
-    def set(field, value)
-      return unless value
+    def aggregate
+      @total_distance = 0
+      @total_elapsed_time = 0
+      @laps.each do |lap|
+        lap.aggregate
+        @total_distance += lap.total_distance if lap.total_distance
+        @total_elapsed_time += lap.total_elapsed_time if lap.total_elapsed_time
+      end
+      if (l = @laps[0])
+        @start_time = l.start_time
+        @start_position_lat = l.start_position_lat
+        @start_position_long = l.start_position_long
+      end
+      if (l = @laps[-1])
+        @end_position_lat = l.end_position_lat
+        @end_position_long = l.end_position_long
+      end
 
-      case field
-      when 'start_time'
-        @start_time = value
-      when 'total_timer_time'
-        @duration = value
-      when 'total_distance'
-        @distance = value
-      when 'total_strides'
-        @strides = value
-      when 'total_ascent'
-        @ascend = value
-      when 'total_descent'
-        @descent = value
-      when 'total_calories'
-        @calories = value
-      when 'avg_speed'
-        @avg_speed = value
-      when 'avg_heart_rate'
-        @avg_heart_rate = value
-      when 'max_heart_rate'
-        @max_heart_rate = value
-      when 'avg_vertical_oscillation'
-        @avg_vertical_oscillation = value
-      when 'avg_stance_time'
-        @avg_stance_time = value
-      when 'avg_running_cadence'
-        @avg_running_cadence = 2 * value
-      when 'avg_fraction_cadence'
-        @avg_running_cadence += 2 * value
-      when 'total_training_effect'
-        @training_effect = value
-      when 'first_lap_index'
-        @first_lap_index = value
-      when 'num_laps'
-        @num_laps = value
-      else
+      if @total_distance && @total_elapsed_time
+        @avg_speed = @total_distance / @total_elapsed_time
       end
     end
 
     def avg_stride_length
-      @distance / @strides
-    end
+      return nil unless @total_strides
 
-    def to_s
-      <<"EOT"
-Date:                     #{@start_time}
-Distance:                 #{'%.2f' % (@distance / 1000.0)} km
-Time:                     #{secsToHMS(@duration)}
-Avg Pace:                 #{speedToPace(@avg_speed)} min/km
-Total Ascend:             #{@ascend} m
-Total Descend:            #{@descent} m
-Calories:                 #{@calories} kCal
-Avg HR:                   #{@avg_heart_rate} bpm
-Max HR:                   #{@max_heart_rate} bpm
-Training Effect:          #{@training_effect}
-Avg Run Cadence:          #{@avg_running_cadence.round} spm
-Avg Vertical Oscillation: #{'%.1f' % (@avg_vertical_oscillation / 10)} cm
-Avg Ground Contact Time:  #{@avg_stance_time.round} ms
-Avg Stride Length:        #{'%.2f' % (avg_stride_length / 2)} m
-EOT
+      @total_distance / @total_strides
     end
 
   end

data/lib/fit4ruby/UserProfile.rb

@@ -0,0 +1,27 @@
+#!/usr/bin/env ruby -w
+# encoding: UTF-8
+#
+# = UserProfile.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.
+#
+
+require 'fit4ruby/FitDataRecord'
+
+module Fit4Ruby
+
+  class UserProfile < FitDataRecord
+
+    def initialize(field_values = {})
+      super('user_profile')
+      set_field_values(field_values)
+    end
+
+  end
+
+end
+

data/lib/fit4ruby/version.rb

@@ -1,3 +1,3 @@
 module Fit4Ruby
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/spec/FitFile_spec.rb

@@ -0,0 +1,84 @@
+#!/usr/bin/env ruby -w
+# encoding: UTF-8
+#
+# = FitFile_spec.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.
+#
+
+require 'fit4ruby'
+
+describe Fit4Ruby do
+
+  before(:each) do
+    a = Fit4Ruby::Activity.new
+    a.total_timer_time = 30 * 60
+    a.new_user_profile({ :age => 33, :height => 1.78, :weight => 73.0,
+                         :gender => 'male', :activity_class => 4.0,
+                         :max_hr => 178 })
+
+    a.new_event({ :event => 'timer', :event_type => 'start_time' })
+    a.new_device_info({ :device_index => 0 })
+    a.new_device_info({ :device_index => 1, :battery_status => 'ok' })
+    ts = Time.now
+    0.upto(a.total_timer_time / 60) do |mins|
+      ts += 60
+      a.new_record({
+        :timestamp => ts,
+        :position_lat => 51.5512 - mins * 0.0008,
+        :position_long => 11.647 + mins * 0.002,
+        :distance => 200.0 * mins,
+        :altitude => 100 + mins * 0.5,
+        :speed => 3.1,
+        :vertical_oscillation => 9 + mins * 0.02,
+        :stance_time => 235.0 * mins * 0.01,
+        :stance_time_percent => 32.0,
+        :heart_rate => 140 + mins,
+        :cadence => 75,
+        :activity_type => 'running',
+        :fractional_cadence => (mins % 2) / 2.0
+      })
+
+      if mins > 0 && mins % 5 == 0
+        a.new_lap({ :timestamp => ts })
+      end
+    end
+    a.new_session({ :timestamp => ts })
+    a.new_event({ :timestamp => ts, :event => 'recovery_time',
+                  :event_type => 'marker',
+                  :data => 2160 })
+    a.new_event({ :timestamp => ts, :event => 'vo2max',
+                  :event_type => 'marker', :data => 52 })
+    a.new_event({ :timestamp => ts, :event => 'timer',
+                  :event_type => 'stop_all' })
+    a.new_device_info({ :timestamp => ts, :device_index => 0 })
+    ts += 1
+    a.new_device_info({ :timestamp => ts, :device_index => 1,
+                        :battery_status => 'low' })
+    ts += 120
+    a.new_event({ :timestamp => ts, :event => 'recovery_hr',
+                  :event_type => 'marker', :data => 132 })
+
+    a.aggregate
+
+    @activity = a
+  end
+
+  it 'should write a simple FIT file and read it back' do
+    fit_file = 'test.fit'
+
+    File.delete(fit_file) if File.exists?(fit_file)
+    Fit4Ruby.write(fit_file, @activity)
+    File.exists?(fit_file).should be_true
+
+    b = Fit4Ruby.read(fit_file)
+    b.should == @activity
+    #File.delete(fit_file)
+  end
+
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fit4ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Chris Schlaeger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-20 00:00:00.000000000 Z
+date: 2014-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bindata
@@ -84,11 +84,14 @@ files:
 - lib/fit4ruby.rb
 - lib/fit4ruby/Activity.rb
 - lib/fit4ruby/Converters.rb
+- lib/fit4ruby/DeviceInfo.rb
+- lib/fit4ruby/Event.rb
+- lib/fit4ruby/FileCreator.rb
+- lib/fit4ruby/FileId.rb
 - lib/fit4ruby/FitDataRecord.rb
 - lib/fit4ruby/FitDefinition.rb
 - lib/fit4ruby/FitDefinitionField.rb
 - lib/fit4ruby/FitFile.rb
-- lib/fit4ruby/FitFileId.rb
 - lib/fit4ruby/FitFilter.rb
 - lib/fit4ruby/FitHeader.rb
 - lib/fit4ruby/FitMessageIdMapper.rb
@@ -101,14 +104,16 @@ files:
 - lib/fit4ruby/GlobalFitMessages.rb
 - lib/fit4ruby/Lap.rb
 - lib/fit4ruby/Log.rb
+- lib/fit4ruby/PersonalRecords.rb
 - lib/fit4ruby/Record.rb
 - lib/fit4ruby/Session.rb
+- lib/fit4ruby/UserProfile.rb
 - lib/fit4ruby/version.rb
+- spec/FitFile_spec.rb
 - tasks/changelog.rake
 - tasks/gem.rake
 - tasks/rdoc.rake
 - tasks/test.rake
-- test/FitFile_spec.rb
 homepage: https://github.com/scrapper/fit4ruby
 licenses:
 - GNU GPL version 2
@@ -134,4 +139,4 @@ signing_key:
 specification_version: 4
 summary: Library to read GARMIN FIT files.
 test_files:
-- test/FitFile_spec.rb
+- spec/FitFile_spec.rb

data/test/FitFile_spec.rb

@@ -1,31 +0,0 @@
-#!/usr/bin/env ruby -w
-# encoding: UTF-8
-#
-# = FitFile_spec.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.
-#
-
-require 'fit4ruby'
-
-describe Fit4Ruby do
-
-  it 'should write a simple .fit file' do
-    fit_file = 'test.fit'
-
-    a = Fit4Ruby::Activity.new
-    a.start_time = Time.parse('2014-07-14-21:00')
-    a.duration = 30 * 60
-    Fit4Ruby.write(fit_file, a)
-    b = Fit4Ruby.read(fit_file)
-    a.start_time.should == b.start_time
-    a.duration.should == b.duration
-    File.delete(fit_file)
-  end
-
-end
-