fit_parser 0.0.5 → 0.0.6

data/lib/fit_parser/file/record.rb

@@ -1,41 +1,28 @@
 module FitParser
   class File
     class Record
-      def self.read(io)
-        new.read(io)
-      end
-
-      def self.clear_definitions!
-        @definitions = {}
-      end
+      attr_reader :header, :content, :definitions
 
-      def self.definitions=(value)
-        @definitions = value
+      def initialize(definitions)
+        @definitions = definitions
       end
 
-      def self.definitions
-        @definitions
-      end
-
-      attr_reader :header, :content
-
       def read(io)
         @header = RecordHeader.read(io)
 
         @content = case @header.message_type.snapshot
         when 1
           Definition.read(io).tap do |definition|
-            Record.definitions[@header.local_message_type.snapshot] = Data.generate(definition)
+            @definitions[@header.local_message_type.snapshot] = Data.generate(definition)
           end
         when 0
-          definition = Record.definitions[@header.local_message_type.snapshot]
-          raise "No definition for local message type: #{@header.local_message_type}" if definition.nil?
+          definition = @definitions[@header.local_message_type.snapshot]
+          fail "No definition for local message type: #{@header.local_message_type}" if definition.nil?
           definition.read(io)
         end
 
         self
       end
-
     end
   end
 end

data/lib/fit_parser/file/type.rb

@@ -10,7 +10,7 @@ module FitParser
       end
 
       def self.get_type(name)
-        return Type.types[name] if Type.types.has_key? name
+        return Type.types[name] if Type.types.key?(name)
         type = Types.get_type_definition name
         Type.types[name] = type ? new(type) : nil
       end
@@ -20,8 +20,8 @@ module FitParser
       end
 
       def value(val)
-        return nil unless is_valid(val)
-        if @type.has_key? :method
+        return nil unless valid?(val)
+        if @type.key?(:method)
           Types.send(@type[:method], val, @type[:values], @type[:parameters])
         else
           values = @type[:values]
@@ -32,15 +32,16 @@ module FitParser
       end
 
       private
-        def is_valid(val)
-          if @type.has_key? :invalid
-            invalid_value = @type[:invalid]
-          else
-            invalid_value = Types.get_type_definition(@type[:basic_type])[:invalid]
-          end
-          return false if val == invalid_value
-          true
+
+      def valid?(val)
+        if @type.key?(:invalid)
+          invalid_value = @type[:invalid]
+        else
+          invalid_value = Types.get_type_definition(@type[:basic_type])[:invalid]
         end
+        return false if val == invalid_value
+        true
+      end
     end
   end
 end

data/lib/fit_parser/file/types.rb

@@ -48,23 +48,23 @@ module FitParser
 end
 
 # basic types
-FitParser::File::Types.add_type :enum, nil, :invalid => 0xFF
-FitParser::File::Types.add_type :sint8, nil, :invalid => 0x7F
-FitParser::File::Types.add_type :uint8, nil, :invalid => 0xFF
-FitParser::File::Types.add_type :sint16, nil, :invalid => 0x7FFF
-FitParser::File::Types.add_type :uint16, nil, :invalid => 0xFFFF
-FitParser::File::Types.add_type :sint32, nil, :invalid => 0x7FFFFFFF
-FitParser::File::Types.add_type :uint32, nil, :invalid => 0xFFFFFFFF
-FitParser::File::Types.add_type :string, nil, :invalid => 0x00
-FitParser::File::Types.add_type :float32, nil, :invalid => 0xFFFFFFFF
-FitParser::File::Types.add_type :float64, nil, :invalid => 0xFFFFFFFFFFFFFFFF
-FitParser::File::Types.add_type :uint8z, nil, :invalid => 0x00
-FitParser::File::Types.add_type :uint16z, nil, :invalid => 0x0000
-FitParser::File::Types.add_type :uint32z, nil, :invalid => 0x00000000
-FitParser::File::Types.add_type :byte, nil, :invalid => 0xFF
+FitParser::File::Types.add_type :enum, nil, invalid: 0xFF
+FitParser::File::Types.add_type :sint8, nil, invalid: 0x7F
+FitParser::File::Types.add_type :uint8, nil, invalid: 0xFF
+FitParser::File::Types.add_type :sint16, nil, invalid: 0x7FFF
+FitParser::File::Types.add_type :uint16, nil, invalid: 0xFFFF
+FitParser::File::Types.add_type :sint32, nil, invalid: 0x7FFFFFFF
+FitParser::File::Types.add_type :uint32, nil, invalid: 0xFFFFFFFF
+FitParser::File::Types.add_type :string, nil, invalid: 0x00
+FitParser::File::Types.add_type :float32, nil, invalid: 0xFFFFFFFF
+FitParser::File::Types.add_type :float64, nil, invalid: 0xFFFFFFFFFFFFFFFF
+FitParser::File::Types.add_type :uint8z, nil, invalid: 0x00
+FitParser::File::Types.add_type :uint16z, nil, invalid: 0x0000
+FitParser::File::Types.add_type :uint32z, nil, invalid: 0x00000000
+FitParser::File::Types.add_type :byte, nil, invalid: 0xFF
 
 # derived types
-FitParser::File::Types.add_type :file, :enum, :values => {
+FitParser::File::Types.add_type :file, :enum, values: {
     1 => 'device',
     2 => 'settings',
     3 => 'sport',
@@ -80,7 +80,7 @@ FitParser::File::Types.add_type :file, :enum, :values => {
     20 => 'activity_summary',
     28 => 'monitoring_daily',
     32 => 'monitoring_b' }
-FitParser::File::Types.add_type :mesg_num, :uint16, :values => {
+FitParser::File::Types.add_type :mesg_num, :uint16, values: {
     0 => 'file_id',
     1 => 'capabilities',
     2 => 'device_settings',
@@ -125,31 +125,31 @@ FitParser::File::Types.add_type :mesg_num, :uint16, :values => {
     145 => 'memo_glob',
     65280 => 'mfg_range_min',
     65534 => 'mfg_range_max' }
-FitParser::File::Types.add_type :checksum, :uint8, :values => {
+FitParser::File::Types.add_type :checksum, :uint8, values: {
     0 => 'clear',
     1 => 'ok' }
-FitParser::File::Types.add_type :file_flags, :uint8z, :values => {
+FitParser::File::Types.add_type :file_flags, :uint8z, values: {
     0x02 => 'read',
     0x04 => 'write',
-    0x08 => 'erase' }, :method => :bitfield_value
-FitParser::File::Types.add_type :mesg_count, :enum, :values => {
+    0x08 => 'erase' }, method: :bitfield_value
+FitParser::File::Types.add_type :mesg_count, :enum, values: {
     0 => 'num_per_file',
     1 => 'max_per_file',
     2 => 'max_per_file_type' }
-FitParser::File::Types.add_type :date_time, :uint32, :values => {
-    268435456 => 'min' }, :method => :date_time_value, :parameters => {:utc => true}
-FitParser::File::Types.add_type :local_date_time, :uint32, :values => {
-    268435456 => 'min' }, :method => :date_time_value, :parameters => {:utc => false}
-FitParser::File::Types.add_type :message_index, :uint16, :values => {
+FitParser::File::Types.add_type :date_time, :uint32, values: {
+    268435456 => 'min' }, method: :date_time_value, parameters: {utc: true}
+FitParser::File::Types.add_type :local_date_time, :uint32, values: {
+    268435456 => 'min' }, method: :date_time_value, parameters: {utc: false}
+FitParser::File::Types.add_type :message_index, :uint16, values: {
     32768 => 'selected',
     26872 => 'reserved',
-    4095 => 'mask' }, :method => :message_index_value
-FitParser::File::Types.add_type :device_index, :uint8, :values => {
+    4095 => 'mask' }, method: :message_index_value
+FitParser::File::Types.add_type :device_index, :uint8, values: {
     0 => 'creator' }
-FitParser::File::Types.add_type :gender, :enum, :values => {
+FitParser::File::Types.add_type :gender, :enum, values: {
     0 => 'female',
     1 => 'male' }
-FitParser::File::Types.add_type :language, :enum, :values => {
+FitParser::File::Types.add_type :language, :enum, values: {
     0 => 'english',
     1 => 'french',
     2 => 'italian',
@@ -177,7 +177,7 @@ FitParser::File::Types.add_type :language, :enum, :values => {
     24 => 'bulgarian',
     25 => 'romanian',
     254 => 'custom' }
-FitParser::File::Types.add_type :time_zone, :enum, :values => {
+FitParser::File::Types.add_type :time_zone, :enum, values: {
     0 => 'almaty',
     1 => 'bangkok',
     2 => 'bombay',
@@ -284,17 +284,17 @@ FitParser::File::Types.add_type :time_zone, :enum, :values => {
     103 => 'santiago',
     253 => 'manual',
     254 => 'automatic' }
-FitParser::File::Types.add_type :display_measure, :enum, :values => {
+FitParser::File::Types.add_type :display_measure, :enum, values: {
     0 => 'metric',
     1 => 'statute' }
-FitParser::File::Types.add_type :display_heart, :enum, :values => {
+FitParser::File::Types.add_type :display_heart, :enum, values: {
     0 => 'bpm',
     1 => 'max',
     2 => 'reserve' }
-FitParser::File::Types.add_type :display_power, :enum, :values => {
+FitParser::File::Types.add_type :display_power, :enum, values: {
     0 => 'watts',
     1 => 'percent_ftp' }
-FitParser::File::Types.add_type :display_position, :enum, :values => {
+FitParser::File::Types.add_type :display_position, :enum, values: {
     0 => 'degree',
     1 => 'degree_minute',
     2 => 'degree_minute_second',
@@ -337,7 +337,7 @@ FitParser::File::Types.add_type :display_position, :enum, :values => {
     39 => 'estonian_grid',
     40 => 'latvian_grid',
     41 => 'swedish_ref_99_grid' }
-FitParser::File::Types.add_type :sport, :enum, :values => {
+FitParser::File::Types.add_type :sport, :enum, values: {
     0 => 'generic',
     1 => 'running',
     2 => 'cycling',
@@ -359,7 +359,7 @@ FitParser::File::Types.add_type :sport, :enum, :values => {
     18 => 'multisport',
     19 => 'paddling',
     254 => 'all' }
-FitParser::File::Types.add_type :sport_bits_0, :uint8z, :values => {
+FitParser::File::Types.add_type :sport_bits_0, :uint8z, values: {
     1 => 'generic',
     2 => 'running',
     4 => 'cycling',
@@ -368,7 +368,7 @@ FitParser::File::Types.add_type :sport_bits_0, :uint8z, :values => {
     32 => 'swimming',
     64 => 'basketball',
     128 => 'soccer' }
-FitParser::File::Types.add_type :sport_bits_1, :uint8z, :values => {
+FitParser::File::Types.add_type :sport_bits_1, :uint8z, values: {
     1 => 'tennis',
     2 => 'american_football',
     4 => 'training',
@@ -377,12 +377,12 @@ FitParser::File::Types.add_type :sport_bits_1, :uint8z, :values => {
     32 => 'alpine_skiing',
     64 => 'snowboarding',
     128 => 'rowing' }
-FitParser::File::Types.add_type :sport_bits_2, :uint8z, :values => {
+FitParser::File::Types.add_type :sport_bits_2, :uint8z, values: {
     1 => 'mountaineering',
     2 => 'hiking',
     4 => 'multisport',
     8 => 'paddling' }
-FitParser::File::Types.add_type :sub_sport, :enum, :values => {
+FitParser::File::Types.add_type :sub_sport, :enum, values: {
     0 => 'generic',
     1 => 'treadmill',
     2 => 'street',
@@ -411,20 +411,20 @@ FitParser::File::Types.add_type :sub_sport, :enum, :values => {
     25 => 'indoor_skiing',
     26 => 'cardio_training',
     254 => 'all' }
-FitParser::File::Types.add_type :activity, :enum, :values => {
+FitParser::File::Types.add_type :activity, :enum, values: {
     0 => 'manual',
     1 => 'auto_multi_sport' }
-FitParser::File::Types.add_type :intensity, :enum, :values => {
+FitParser::File::Types.add_type :intensity, :enum, values: {
     0 => 'active',
     1 => 'rest',
     2 => 'warmup',
     3 => 'cooldown' }
-FitParser::File::Types.add_type :session_trigger, :enum, :values => {
+FitParser::File::Types.add_type :session_trigger, :enum, values: {
     0 => 'activity_end',
     1 => 'manual',
     2 => 'auto_multi_sport',
     3 => 'fitness_equipment' }
-FitParser::File::Types.add_type :autolap_trigger, :enum, :values => {
+FitParser::File::Types.add_type :autolap_trigger, :enum, values: {
     0 => 'time',
     1 => 'distance',
     2 => 'position_start',
@@ -432,7 +432,7 @@ FitParser::File::Types.add_type :autolap_trigger, :enum, :values => {
     4 => 'position_waypoint',
     5 => 'position_marked',
     6 => 'off' }
-FitParser::File::Types.add_type :lap_trigger, :enum, :values => {
+FitParser::File::Types.add_type :lap_trigger, :enum, values: {
     0 => 'manual',
     1 => 'time',
     2 => 'distance',
@@ -442,7 +442,7 @@ FitParser::File::Types.add_type :lap_trigger, :enum, :values => {
     6 => 'position_marked',
     7 => 'session_end',
     8 => 'fitness_equipment' }
-FitParser::File::Types.add_type :event, :enum, :values => {
+FitParser::File::Types.add_type :event, :enum, values: {
     0 => 'timer',
     3 => 'workout',
     4 => 'workout_step',
@@ -477,7 +477,7 @@ FitParser::File::Types.add_type :event, :enum, :values => {
     43 => 'rear_gear_change',
     45 => 'elev_high_alert',
     46 => 'elev_low_alert' }
-FitParser::File::Types.add_type :event_type, :enum, :values => {
+FitParser::File::Types.add_type :event_type, :enum, values: {
     0 => 'start',
     1 => 'stop',
     2 => 'consecutive_depreciated',
@@ -488,27 +488,27 @@ FitParser::File::Types.add_type :event_type, :enum, :values => {
     7 => 'end_all_depreciated',
     8 => 'stop_disable',
     9 => 'stop_disable_all' }
-FitParser::File::Types.add_type :timer_trigger, :enum, :values => {
+FitParser::File::Types.add_type :timer_trigger, :enum, values: {
     0 => 'manual',
     1 => 'auto',
     2 => 'fitness_equipment' }
-FitParser::File::Types.add_type :fitness_equipment_state, :enum, :values => {
+FitParser::File::Types.add_type :fitness_equipment_state, :enum, values: {
     0 => 'ready',
     1 => 'in_use',
     2 => 'paused',
     3 => 'unknown' }
-FitParser::File::Types.add_type :activity_class, :enum, :values => {
+FitParser::File::Types.add_type :activity_class, :enum, values: {
     127 => 'level',
     100 => 'level_max',
     128 => 'athlete' }
-FitParser::File::Types.add_type :hr_zone_calc, :enum, :values => {
+FitParser::File::Types.add_type :hr_zone_calc, :enum, values: {
     0 => 'custom',
     1 => 'percent_max_hr',
     2 => 'percent_hrr' }
-FitParser::File::Types.add_type :pwr_zone_calc, :enum, :values => {
+FitParser::File::Types.add_type :pwr_zone_calc, :enum, values: {
     0 => 'custom',
     1 => 'percent_ftp' }
-FitParser::File::Types.add_type :wkt_step_duration, :enum, :values => {
+FitParser::File::Types.add_type :wkt_step_duration, :enum, values: {
     0 => 'time',
     1 => 'distance',
     2 => 'hr_less_than',
@@ -526,7 +526,7 @@ FitParser::File::Types.add_type :wkt_step_duration, :enum, :values => {
     14 => 'power_less_than',
     15 => 'power_greater_than',
     28 => 'repetition_time' }
-FitParser::File::Types.add_type :wkt_step_target, :enum, :values => {
+FitParser::File::Types.add_type :wkt_step_target, :enum, values: {
     0 => 'speed',
     1 => 'heart_rate',
     2 => 'open',
@@ -534,23 +534,23 @@ FitParser::File::Types.add_type :wkt_step_target, :enum, :values => {
     4 => 'power',
     5 => 'grade',
     6 => 'resistance' }
-FitParser::File::Types.add_type :goal, :enum, :values => {
+FitParser::File::Types.add_type :goal, :enum, values: {
     0 => 'time',
     1 => 'distance',
     2 => 'calories',
     3 => 'frequency',
     4 => 'steps' }
-FitParser::File::Types.add_type :goal_recurrence, :enum, :values => {
+FitParser::File::Types.add_type :goal_recurrence, :enum, values: {
     0 => 'off',
     1 => 'daily',
     2 => 'weekly',
     3 => 'monthly',
     4 => 'yearly',
     5 => 'custom' }
-FitParser::File::Types.add_type :schedule, :enum, :values => {
+FitParser::File::Types.add_type :schedule, :enum, values: {
     0 => 'workout',
     1 => 'course' }
-FitParser::File::Types.add_type :course_point, :enum, :values => {
+FitParser::File::Types.add_type :course_point, :enum, values: {
     0 => 'generic',
     1 => 'summit',
     2 => 'valley',
@@ -575,7 +575,7 @@ FitParser::File::Types.add_type :course_point, :enum, :values => {
     21 => 'slight_right',
     22 => 'sharp_right',
     23 => 'u_turn' }
-FitParser::File::Types.add_type :manufacturer, :uint16, :values => {
+FitParser::File::Types.add_type :manufacturer, :uint16, values: {
     1 => 'garmin',
     2 => 'garmin_fr405_antfs',
     3 => 'zephyr',
@@ -671,7 +671,7 @@ FitParser::File::Types.add_type :manufacturer, :uint16, :values => {
     258 => 'lezyne',
     259 => 'scribe_labs',
     5759 => 'actigraphcorp' }
-FitParser::File::Types.add_type :garmin_product, :uint16, :values => {
+FitParser::File::Types.add_type :garmin_product, :uint16, values: {
     1 => 'hrm1',
     2 => 'axh01',
     3 => 'axb01',
@@ -753,7 +753,7 @@ FitParser::File::Types.add_type :garmin_product, :uint16, :values => {
     20119 => 'training_center',
     65532 => 'android_antplus_plugin',
     65534 => 'connect' }
-FitParser::File::Types.add_type :antplus_device_type, :uint8, :values => {
+FitParser::File::Types.add_type :antplus_device_type, :uint8, values: {
     1 => 'antfs',
     11 => 'bike_power',
     12 => 'environment_sensor_legacy',
@@ -771,12 +771,12 @@ FitParser::File::Types.add_type :antplus_device_type, :uint8, :values => {
     122 => 'bike_cadence',
     123 => 'bike_speed',
     124 => 'stride_speed_distance' }
-FitParser::File::Types.add_type :ant_network, :enum, :values => {
+FitParser::File::Types.add_type :ant_network, :enum, values: {
     0 => 'public',
     1 => 'antplus',
     2 => 'antfs',
     3 => 'private' }
-FitParser::File::Types.add_type :workout_capabilities, :uint32z, :values => {
+FitParser::File::Types.add_type :workout_capabilities, :uint32z, values: {
     0x00000001 => 'interval',
     0x00000002 => 'custom',
     0x00000004 => 'fitness_equipment',
@@ -790,17 +790,17 @@ FitParser::File::Types.add_type :workout_capabilities, :uint32z, :values => {
     0x00000800 => 'power',
     0x00001000 => 'grade',
     0x00002000 => 'resistance',
-    0x00004000 => 'protected' }, :method => :bitfield_value
-FitParser::File::Types.add_type :battery_status, :uint8, :values => {
+    0x00004000 => 'protected' }, method: :bitfield_value
+FitParser::File::Types.add_type :battery_status, :uint8, values: {
     1 => 'new',
     2 => 'good',
     3 => 'ok',
     4 => 'low',
     5 => 'critical' }
-FitParser::File::Types.add_type :hr_type, :enum, :values => {
+FitParser::File::Types.add_type :hr_type, :enum, values: {
     0 => 'normal',
     1 => 'irregular' }
-FitParser::File::Types.add_type :course_capabilities, :uint32z, :values => {
+FitParser::File::Types.add_type :course_capabilities, :uint32z, values: {
     0x00000001 => 'processed',
     0x00000002 => 'valid',
     0x00000004 => 'time',
@@ -810,27 +810,27 @@ FitParser::File::Types.add_type :course_capabilities, :uint32z, :values => {
     0x00000040 => 'power',
     0x00000080 => 'cadence',
     0x00000100 => 'training',
-    0x00000200 => 'navigation' }, :method => :bitfield_value
-FitParser::File::Types.add_type :weight, :uint16, :values => {
+    0x00000200 => 'navigation' }, method: :bitfield_value
+FitParser::File::Types.add_type :weight, :uint16, values: {
     65534 => 'calculating' }
-FitParser::File::Types.add_type :workout_hr, :uint32, :values => {
+FitParser::File::Types.add_type :workout_hr, :uint32, values: {
     100 => 'bpm_offset' }
-FitParser::File::Types.add_type :workout_power, :uint32, :values => {
+FitParser::File::Types.add_type :workout_power, :uint32, values: {
     1000 => 'watts_offset' }
-FitParser::File::Types.add_type :bp_status, :enum, :values => {
+FitParser::File::Types.add_type :bp_status, :enum, values: {
     0 => 'no_error',
     1 => 'error_incomplete_data',
     2 => 'error_no_measurement',
     3 => 'error_data_out_of_range',
     4 => 'error_irregular_heart_rate' }
-FitParser::File::Types.add_type :user_local_id, :uint16, :values => {
+FitParser::File::Types.add_type :user_local_id, :uint16, values: {
     0 => 'local_min',
     15 => 'local_max',
     16 => 'stationary_min',
     255 => 'stationary_max',
     256 => 'portable_min',
     65534 => 'portable_max' }
-FitParser::File::Types.add_type :swim_stroke, :enum, :values => {
+FitParser::File::Types.add_type :swim_stroke, :enum, values: {
     0 => 'freestyle',
     1 => 'backstroke',
     2 => 'breaststroke',
@@ -838,7 +838,7 @@ FitParser::File::Types.add_type :swim_stroke, :enum, :values => {
     4 => 'drill',
     5 => 'mixed',
     6 => 'im' }
-FitParser::File::Types.add_type :activity_type, :enum, :values => {
+FitParser::File::Types.add_type :activity_type, :enum, values: {
     0 => 'generic',
     1 => 'running',
     2 => 'cycling',
@@ -847,7 +847,7 @@ FitParser::File::Types.add_type :activity_type, :enum, :values => {
     5 => 'swimming',
     6 => 'walking',
     254 => 'all' }
-FitParser::File::Types.add_type :activity_subtype, :enum, :values => {
+FitParser::File::Types.add_type :activity_subtype, :enum, values: {
     0 => 'generic',
     1 => 'treadmill',
     2 => 'street',
@@ -868,20 +868,20 @@ FitParser::File::Types.add_type :activity_subtype, :enum, :values => {
     17 => 'lap_swimming',
     18 => 'open_water',
     254 => 'all' }
-FitParser::File::Types.add_type :activity_level, :enum, :values => {
+FitParser::File::Types.add_type :activity_level, :enum, values: {
     0 => 'low',
     1 => 'medium',
     2 => 'high' }
-FitParser::File::Types.add_type :left_right_balance, :uint8, :values => {
+FitParser::File::Types.add_type :left_right_balance, :uint8, values: {
     127 => 'mask',
     128 => 'right' }
-FitParser::File::Types.add_type :left_right_balance_100, :uint16, :values => {
+FitParser::File::Types.add_type :left_right_balance_100, :uint16, values: {
     16383 => 'mask',
     32768 => 'right' }
-FitParser::File::Types.add_type :length_type, :enum, :values => {
+FitParser::File::Types.add_type :length_type, :enum, values: {
     0 => 'idle',
     1 => 'active' }
-FitParser::File::Types.add_type :connectivity_capabilities, :uint32z, :values => {
+FitParser::File::Types.add_type :connectivity_capabilities, :uint32z, values: {
     1 => 'bluetooth',
     2 => 'bluetooth_le',
     4 => 'ant',
@@ -896,14 +896,14 @@ FitParser::File::Types.add_type :connectivity_capabilities, :uint32z, :values =>
     2048 => 'setup_incomplete',
     4096 => 'continue_sync_after_software_update',
     8192 => 'connect_iq_app_download' }
-FitParser::File::Types.add_type :stroke_type, :enum, :values => {
+FitParser::File::Types.add_type :stroke_type, :enum, values: {
     0 => 'no_event',
     1 => 'other',
     2 => 'serve',
     3 => 'forehand',
     4 => 'backhand',
     5 => 'smash' }
-FitParser::File::Types.add_type :body_location, :enum, :values => {
+FitParser::File::Types.add_type :body_location, :enum, values: {
     0 => 'left_leg',
     1 => 'left_calf',
     2 => 'left_shin',
@@ -940,7 +940,7 @@ FitParser::File::Types.add_type :body_location, :enum, :values => {
     33 => 'right_forearm_extensors',
     34 => 'neck',
     35 => 'throat' }
-FitParser::File::Types.add_type :source_type, :enum, :values => {
+FitParser::File::Types.add_type :source_type, :enum, values: {
     0 => 'ant',
     1 => 'antplus',
     2 => 'bluetooth',
@@ -951,6 +951,6 @@ FitParser::File::Types.add_type :source_type, :enum, :values => {
 # the type below is assigned to some fileds, but
 # it is not defined in terms of values and basic type in FIT SDK as
 # of 2015-01-29
-FitParser::File::Types.add_type :bool, :uint8, :values => {
+FitParser::File::Types.add_type :bool, :uint8, values: {
     0 => false,
     1 => true }

data/lib/fit_parser/file.rb

@@ -1,6 +1,5 @@
 module FitParser
   class File
-
     def self.read(io)
       new.read(io)
     end
@@ -13,17 +12,14 @@ module FitParser
 
     def read(io)
       @header = Header.read(io)
-
-      Record.clear_definitions!
-
+      definitions = {}
       while io.pos < @header.end_pos
-        @records << Record.read(io)
+        record = Record.new(definitions)
+        @records << record.read(io)
+        definitions = record.definitions
       end
-
       @crc = io.read(2)
-
       self
     end
-
   end
 end

data/lib/fit_parser/version.rb

@@ -1,3 +1,3 @@
 module FitParser
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

data/lib/fit_parser.rb

@@ -14,6 +14,6 @@ require 'fit_parser/version'
 
 module FitParser
   def self.load_file(path)
-    File.read ::File.open(path)
+    File.read(::File.open(path))
   end
 end