fit_parser 0.0.8 → 1.0.0

data/lib/fit_parser/file.rb

@@ -13,9 +13,15 @@ module FitParser
     def read(io)
       @header = Header.read(io)
       definitions = {}
+      dev_definitions = {}
       while io.pos < @header.end_pos
-        record = Record.new(definitions)
+        record = Record.new(definitions, dev_definitions)
         @records << record.read(io)
+        content = record.content
+        if content[:raw_field_0] == 0
+          dev_definitions[content[:raw_field_0].to_s] ||= {}
+          dev_definitions[content[:raw_field_0].to_s][content[:raw_field_1].to_s] = content
+        end
         definitions = record.definitions
       end
       @crc = io.read(2)

data/lib/fit_parser/version.rb

@@ -1,3 +1,3 @@
 module FitParser
-  VERSION = '0.0.8'
+  VERSION = '1.0.0'
 end

data/lib/fit_parser.rb

@@ -11,6 +11,7 @@ require 'fit_parser/file/definition'
 require 'fit_parser/file/data'
 require 'fit_parser/file/definitions'
 require 'fit_parser/version'
+require 'bindata/dsl_field_validator'
 
 module FitParser
   def self.load_file(path)

data/spec/file/data_spec.rb

@@ -20,6 +20,7 @@ describe FitParser::File::Data do
         @fields = FitParser::File::Definitions.fields
         @dyn_fields = FitParser::File::Definitions.dyn_fields
         # force a fake definition for scaling of arrays
+        FitParser::File::Definitions.fields[2].delete(2)
         FitParser::File::Definitions.add_field(
           2, 2, 'field_array', type: 6, scale: 10, offset: 0
         )
@@ -42,7 +43,7 @@ describe FitParser::File::Data do
       it 'reads the entire record' do
         # read first the record definition
         expect(@result.raw_field_array).to be == [123_456_789, 987_654_321]
-        expect(@result.raw_field_4).to be == [1, 3]
+        expect(@result.raw_time_mode).to be == [1, 3]
         expect(@result.raw_field_8).to be == 1539
         expect(@result.raw_active_time_zone).to be == 0
       end
@@ -53,8 +54,8 @@ describe FitParser::File::Data do
       end
 
       it 'does not apply the scale equal to 1 for arrays' do
-        expect(@result.raw_field_4).to be == [1, 3]
-        expect(@result.field_4.to_s).to be_eql('[1, 3]')
+        expect(@result.raw_time_mode).to be == [1, 3]
+        expect(@result.time_mode.to_s).to be_eql('[1, 3]')
       end
 
       it 'does apply scale on each element of an array' do

data/spec/file/record_spec.rb

@@ -4,7 +4,7 @@ describe FitParser::File::Record do
   describe '#read' do
     context 'given a sample definition record' do
       it 'works' do
-        record = described_class.new({})
+        record = described_class.new({}, {})
         file = example_file('record/definition_record')
         record.read(file)
         expect(record.header).to be_a(FitParser::File::RecordHeader)
@@ -15,11 +15,11 @@ describe FitParser::File::Record do
     context 'given a sample data record with a string non null terminated' do
       context 'string length is equal to field size' do
         it 'works' do
-          record = described_class.new({})
+          record = described_class.new({}, {})
           record.read(example_file('record/definition_record_2.fit'))
           definitions = record.definitions
           file = example_file('record/data_record_2.fit')
-          record = described_class.new(definitions).read(file)
+          record = described_class.new(definitions, {}).read(file)
           expect(record.header).to be_a(FitParser::File::RecordHeader)
           expect(record.content.raw_version).to eql(250)
           expect(record.content.raw_part_number).to eql('123-A1234-00')
@@ -28,11 +28,11 @@ describe FitParser::File::Record do
 
       context 'string length is smaller than field size' do
         it 'works' do
-          record = described_class.new({})
+          record = described_class.new({}, {})
           record.read(example_file('record/definition_record_2.fit'))
           definitions = record.definitions
           file = example_file('record/data_record_2bis.fit')
-          record = described_class.new(definitions).read(file)
+          record = described_class.new(definitions, {}).read(file)
           expect(record.header).to be_a(FitParser::File::RecordHeader)
           expect(record.content.raw_version).to eql(251)
           expect(record.content.version).to eql(2.51)

data/spec/fit_parser_spec.rb

@@ -40,4 +40,30 @@ describe FitParser do
     data = FitParser.load_file(path)
     expect(data.records).to_not be_nil
   end
+
+  context 'with IQ datafields' do
+    it 'works 1375670253.fit' do
+      path = 'spec/support/examples/1375670253.fit'
+      data = FitParser.load_file(path)
+      expect(data.records).to_not be_nil
+    end
+
+    it 'works 1379311720.fit' do
+      path = 'spec/support/examples/1379311720.fit'
+      data = FitParser.load_file(path)
+      expect(data.records).to_not be_nil
+    end
+
+    it 'works 6AUI5200.FIT' do
+      path = 'spec/support/examples/6AUI5200.fit'
+      data = FitParser.load_file(path)
+      expect(data.records).to_not be_nil
+    end
+
+    it 'works 1426768070-2.fit' do
+      path = 'spec/support/examples/1426768070-2.fit'
+      data = FitParser.load_file(path)
+      expect(data.records).to_not be_nil
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fit_parser
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 1.0.0
 platform: ruby
 authors:
 - Dima Mescheryakov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-11 00:00:00.000000000 Z
+date: 2016-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bindata
@@ -143,6 +143,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/bindata/dsl_field_validator.rb
 - lib/fit_parser.rb
 - lib/fit_parser/file.rb
 - lib/fit_parser/file/data.rb
@@ -165,6 +166,10 @@ files:
 - spec/file_spec.rb
 - spec/fit_parser_spec.rb
 - spec/spec_helper.rb
+- spec/support/examples/1375670253.fit
+- spec/support/examples/1379311720.fit
+- spec/support/examples/1426768070-2.fit
+- spec/support/examples/6AUI5200.FIT
 - spec/support/examples/file/3110334490
 - spec/support/examples/file/3863374146
 - spec/support/examples/file/be470628-c34a-4189-aae3-42bef36436ce.fit