fit_parser 0.0.5 → 0.0.6

data/spec/file/data_spec.rb

@@ -1,16 +1,18 @@
 require 'spec_helper'
 
 describe FitParser::File::Data do
-  describe ".generate" do
+  describe '.generate' do
     context 'standard definition' do
       let(:definition) do
-        FitParser::File::Definition.read example_file('record/message/definition')
+        FitParser::File::Definition.read(
+          example_file('record/message/definition')
+        )
       end
 
       subject { described_class.generate(definition) }
 
       its(:ancestors) { should include(BinData::Record) }
-      its("new.record_type") { should eq(:file_id) }
+      its('new.record_type') { should eq(:file_id) }
     end
 
     context 'definition with multiple time the same field' do
@@ -18,7 +20,9 @@ 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.add_field 2, 2, "field_array", :type => 6, :scale => 10, :offset => 0
+        FitParser::File::Definitions.add_field(
+          2, 2, 'field_array', type: 6, scale: 10, offset: 0
+        )
       end
 
       after :all do
@@ -29,30 +33,32 @@ describe FitParser::File::Data do
       before :each do
         def_file = example_file('record/message/definition_field_array.fit')
         data_file = example_file('record/message/data_field_array.fit')
-        definition = described_class.generate(FitParser::File::Definition.read def_file)
-        @result = definition.read( data_file )
+        definition = described_class.generate(
+          FitParser::File::Definition.read(def_file)
+        )
+        @result = definition.read(data_file)
       end
 
-      it "reads the entire record" do
+      it 'reads the entire record' do
         # read first the record definition
-        expect(@result.raw_field_array).to be == [ 123456789, 987654321 ]
-        expect(@result.raw_field_4).to be == [ 1, 3 ]
+        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_field_8).to be == 1539
         expect(@result.raw_active_time_zone).to be == 0
       end
-    
-      it "does not apply the scale equal to 1 for integer" do
+
+      it 'does not apply the scale equal to 1 for integer' do
         expect(@result.raw_active_time_zone).to be == 0
         expect(@result.active_time_zone.to_s).to be_eql '0'
       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]'
+
+      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]')
       end
 
-      it "does apply scale on each element of an array" do
-        expect(@result.raw_field_array).to be == [ 123456789, 987654321 ]
+      it 'does apply scale on each element of an array' do
+        expect(@result.raw_field_array).to be == [123_456_789, 987_654_321]
         expect(@result.field_array.to_s).to be_eql '[12345678.9, 98765432.1]'
       end
     end
@@ -61,8 +67,10 @@ describe FitParser::File::Data do
       before :each do
         def_file = example_file('record/message/definition_dynamic_fields.fit')
         data_file = example_file('record/message/data_dynamic_fields.fit')
-        definition = described_class.generate(FitParser::File::Definition.read def_file)
-        @result = definition.read( data_file )
+        definition = described_class.generate(
+          FitParser::File::Definition.read(def_file)
+        )
+        @result = definition.read(data_file)
       end
 
       it 'uses dynamic field value' do
@@ -75,8 +83,10 @@ describe FitParser::File::Data do
       before :each do
         def_file = example_file('record/message/definition_dynamic_fields.fit')
         data_file = example_file('record/message/data_dynamic_fields.fit')
-        definition = described_class.generate(FitParser::File::Definition.read def_file)
-        @result = definition.read( data_file )
+        definition = described_class.generate(
+          FitParser::File::Definition.read(def_file)
+        )
+        @result = definition.read(data_file)
       end
 
       it 'returns the real value' do
@@ -87,13 +97,19 @@ describe FitParser::File::Data do
 
     context 'definition with bit field types' do
       before :each do
-        def_file = example_file('record/message/definition_file_capabilities.fit')
-        @definition = described_class.generate(FitParser::File::Definition.read def_file)
+        def_file = example_file(
+          'record/message/definition_file_capabilities.fit'
+        )
+        @definition = described_class.generate(
+          FitParser::File::Definition.read(def_file)
+        )
       end
 
       context 'when only 1 bit set' do
         it 'returns the single value' do
-          res = @definition.read( example_file('record/message/data_file_capabilities_activities.fit') )
+          res = @definition.read(
+            example_file('record/message/data_file_capabilities_activities.fit')
+          )
           expect(res.raw_flags).to eq(2)
           expect(res.flags).to eq('read')
         end
@@ -101,7 +117,9 @@ describe FitParser::File::Data do
 
       context 'when several bits set' do
         it 'returns the compound value' do
-          res = @definition.read( example_file('record/message/data_file_capabilities_settings.fit') )
+          res = @definition.read(
+            example_file('record/message/data_file_capabilities_settings.fit')
+          )
           expect(res.raw_flags).to eq(6)
           expect(res.flags).to eq('read/write')
         end

data/spec/file/definition_spec.rb

@@ -1,8 +1,8 @@
 require 'spec_helper'
 
 describe FitParser::File::Definition do
-  context "given a sample definition message" do
-    describe ".read" do
+  context 'given a sample definition message' do
+    describe '.read' do
       subject do
         described_class.read example_file('record/message/definition')
       end

data/spec/file/definitions_spec.rb

@@ -4,7 +4,7 @@ require 'spec_helper'
 # with already defined fields in definitions.rb and test are
 # not really independant of the code
 describe FitParser::File::Definitions do
-  describe ".add_field" do
+  describe '.add_field' do
     before :all do
       @fields = described_class.fields
       @dyn_fields = described_class.dyn_fields
@@ -15,16 +15,16 @@ describe FitParser::File::Definitions do
       FitParser::File::Definitions.dyn_fields = @dyn_fields
     end
 
-    context "without additional options" do
+    context 'without additional options' do
       before :each do
         FitParser::File::Definitions.fields = Hash.new { |h,k| h[k]={} }
         FitParser::File::Definitions.dyn_fields = Hash.new { |h,k| h[k]={} }
         described_class.add_field(999, 999, 'rspec_test')
       end
 
-      it "adds field data" do
-        expect(described_class.get_field(999,999)).to be_a(Hash)
-        expect(described_class.get_field(999,999)).to eql({ :name => 'rspec_test'})
+      it 'adds field data' do
+        expect(described_class.get_field(999, 999)).to be_a(Hash)
+        expect(described_class.get_field(999, 999)).to eql(name: 'rspec_test')
       end
 
       it 'raised an error for dynamic field data' do
@@ -32,29 +32,29 @@ describe FitParser::File::Definitions do
       end
     end
 
-    context "with additional options" do
+    context 'with additional options' do
       before :each do
-        FitParser::File::Definitions.fields = Hash.new { |h,k| h[k]={} }
-        FitParser::File::Definitions.dyn_fields = Hash.new { |h,k| h[k]={} }
-        described_class.add_field(999, 999, 'rspec_test', :scale => 100, :units => 'm')
-        described_class.add_field(999, 999, 'rspec_test_dyn', :type => 4, :scale => 10, :offset => 10, :ref_field_name => nil, :ref_field_values => nil)
+        FitParser::File::Definitions.fields = Hash.new { |h, k| h[k] = {} }
+        FitParser::File::Definitions.dyn_fields = Hash.new { |h, k| h[k] = {} }
+        described_class.add_field(999, 999, 'rspec_test', scale: 100, units: 'm')
+        described_class.add_field(999, 999, 'rspec_test_dyn', type: 4, scale: 10, offset: 10, ref_field_name: nil, ref_field_values: nil)
       end
 
-      it "adds field data" do
+      it 'adds field data' do
         expect(described_class.get_field(999, 999)).to be_a(Hash)
-        expect(described_class.get_field(999, 999)).to eql({ :name => 'rspec_test', :scale => 100, :units => 'm'})
+        expect(described_class.get_field(999, 999)).to eql(name: 'rspec_test', scale: 100, units: 'm')
       end
-      
+
       it 'adds dynamic field data' do
         expect(described_class.get_dynamic_fields(999, 999)).to be_a(Hash)
-        expect(described_class.get_dynamic_fields(999, 999)).to eql({ :rspec_test_dyn => {:type => 4, :scale => 10, :offset => 10, :ref_field_name => nil, :ref_field_values => nil} })
+        expect(described_class.get_dynamic_fields(999, 999)).to eql(rspec_test_dyn: { type: 4, scale: 10, offset: 10, ref_field_name: nil, ref_field_values: nil })
       end
     end
   end
 
-  describe ".get_field" do
-    it "returns nil if no field exists" do
-      expect(described_class.get_field(100,101)).to be_nil
+  describe '.get_field' do
+    it 'returns nil if no field exists' do
+      expect(described_class.get_field(100, 101)).to be_nil
     end
   end
 
@@ -65,15 +65,15 @@ describe FitParser::File::Definitions do
     end
   end
 
-  describe ".add_name" do
-    it "adds a name" do
+  describe '.add_name' do
+    it 'adds a name' do
       described_class.add_name(20, 'record')
       expect(described_class.get_name(20)).to eql('record')
     end
   end
 
-  describe ".get_name" do
-    it "returns nil if no name exists" do
+  describe '.get_name' do
+    it 'returns nil if no name exists' do
       expect(described_class.get_name(100)).to be_nil
     end
   end

data/spec/file/header_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe FitParser::File::Header do
-  context "given a sample FIT header" do
+  context 'given a sample FIT header' do
     subject do
       described_class.read example_file('file/header')
     end
@@ -9,11 +9,11 @@ describe FitParser::File::Header do
     its(:header_size) { should == 12 }
     its(:protocol_version) { should == 16 }
     its(:profile_version) { should == 64 }
-    its(:data_size) { should == 36069 }
-    its(:data_type) { should == ".FIT" }
+    its(:data_size) { should == 36_069 }
+    its(:data_type) { should == '.FIT' }
   end
 
-  context "given a sample header file of 14 bytes length" do
+  context 'given a sample header file of 14 bytes length' do
     subject do
       described_class.read example_file('file/header_14b.fit')
     end
@@ -22,7 +22,7 @@ describe FitParser::File::Header do
     its(:protocol_version) { should == 16 }
     its(:profile_version) { should == 411 }
     its(:data_size) { should == 325 }
-    its(:data_type) { should == ".FIT" }
-    its(:crc) { should == 17101 }
+    its(:data_type) { should == '.FIT' }
+    its(:crc) { should == 17_101 }
   end
 end

data/spec/file/record_header_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe FitParser::File::RecordHeader do
-  context "given a sample normal header" do
+  context 'given a sample normal header' do
     subject do
       described_class.read example_file('record/normal_header')
     end
@@ -14,7 +14,7 @@ describe FitParser::File::RecordHeader do
     it { is_expected.not_to be_a_compressed_timestamp }
   end
 
-  context "given a sample compressed timestamp header" do
+  context 'given a sample compressed timestamp header' do
     # TODO
   end
 end

data/spec/file/record_spec.rb

@@ -1,56 +1,45 @@
 require 'spec_helper'
 
 describe FitParser::File::Record do
-  before do
-    described_class.clear_definitions!
-    described_class.read(example_file('record/definition_record_2.fit'))
-  end
-
-  describe ".read" do
-    subject { described_class.read(file) }
-
-    context "given a sample definition record" do
-      let(:file) { example_file('record/definition_record') }
-
-      it { expect(subject.header).to be_a FitParser::File::RecordHeader }
-      it { expect(subject.content).to be_a FitParser::File::Definition }
-
-    end
-
-    context "given a sample data record" do
-      let(:file) { nil }
+  describe '#read' do
+    context 'given a sample definition record' do
+      it 'works' do
+        record = described_class.new({})
+        file = example_file('record/definition_record')
+        record.read(file)
+        expect(record.header).to be_a(FitParser::File::RecordHeader)
+        expect(record.content).to be_a(FitParser::File::Definition)
+      end
     end
-  
-    context "given a sample data record with a string non null terminated" do
 
+    context 'given a sample data record with a string non null terminated' do
       context 'string length is equal to field size' do
-      
-        let(:file) { example_file('record/data_record_2.fit') }
-
-        its(:header) { should be_a(FitParser::File::RecordHeader) }
-        it { expect(subject.content.raw_version).to be == 250 }
-        it { expect(subject.content.raw_part_number).to be == '123-A1234-00' }
+        it 'works' do
+          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)
+          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')
+        end
       end
 
-    context 'string length is smaller than field size' do
-      
-        let(:file) { example_file('record/data_record_2bis.fit') }
-
-        its(:header) { should be_a(FitParser::File::RecordHeader) }
-        it { expect(subject.content.raw_version).to be == 251 }
-        it { expect(subject.content.version).to be == 2.51 }
-        it { expect(subject.content.raw_part_number).to be == '123-A1234' }
-        it { expect(subject.content.part_number).to be == '123-A1234' }
+      context 'string length is smaller than field size' do
+        it 'works' do
+          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)
+          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)
+          expect(record.content.raw_part_number).to eql('123-A1234')
+          expect(record.content.part_number).to eql('123-A1234')
+        end
       end
     end
   end
-
-  describe ".clear_definitions" do
-    it "should clear the definitions class variable" do
-      described_class.read example_file('record/definition_record')
-      expect(described_class.definitions).to_not be_empty
-      described_class.clear_definitions!
-      expect(described_class.definitions).to be_empty
-    end
-  end
 end

data/spec/file/type_spec.rb

@@ -4,7 +4,11 @@ describe FitParser::File::Type do
   before :all do
     @types = FitParser::File::Types.types
     FitParser::File::Types.add_type(:int_type, :sint8)
-    FitParser::File::Types.add_type(:int_type_with_val, :uint8, :values => {1 => 'one', 2 => 'two', 3 => 'three'})
+    FitParser::File::Types.add_type(
+      :int_type_with_val,
+      :uint8,
+      values: { 1 => 'one', 2 => 'two', 3 => 'three' }
+    )
   end
 
   after :all do
@@ -14,11 +18,13 @@ describe FitParser::File::Type do
   describe '.get_type' do
     context 'when valid name' do
       it 'returns a type' do
-        expect(described_class.get_type(:int_type)).to be_a(FitParser::File::Type)
+        expect(described_class.get_type(:int_type))
+          .to be_a(FitParser::File::Type)
       end
 
       it 'returns always the same instance' do
-        expect(described_class.get_type(:int_type)).to equal described_class.get_type(:int_type)
+        expect(described_class.get_type(:int_type))
+          .to eql(described_class.get_type(:int_type))
       end
     end
 
@@ -31,7 +37,6 @@ describe FitParser::File::Type do
 
   describe '#value' do
     context 'when type has values' do
-
       let(:type) { described_class.get_type(:int_type_with_val) }
 
       context 'known value requested' do
@@ -39,7 +44,7 @@ describe FitParser::File::Type do
           expect(type.value(2)).to eql 'two'
         end
       end
-      
+
       context 'unknown value requested' do
         it 'returns the input value' do
           expect(type.value(999)).to eql 999
@@ -57,19 +62,18 @@ describe FitParser::File::Type do
     context 'when type has date_time value' do
       let(:type) { described_class.get_type(:date_time) }
       it 'returns the date' do
-        expect(type.value(790509304)).to eq('2015-01-18 09:55:04 UTC')
+        expect(type.value(790_509_304)).to eq('2015-01-18 09:55:04 UTC')
       end
     end
 
     context 'when type has message_index value' do
       let(:type) { described_class.get_type(:message_index) }
-      
+
       it 'returns the message_index' do
         expect(type.value(10)).to eq(10)
-        expect(type.value(32778)).to eq(10)
-        expect(type.value(28682)).to eq(10)
-      end 
-
+        expect(type.value(32_778)).to eq(10)
+        expect(type.value(28_682)).to eq(10)
+      end
     end
 
     context 'when type has file_flags value' do

data/spec/file/types_spec.rb

@@ -11,14 +11,15 @@ describe FitParser::File::Types do
 
   describe '.add_type' do
     before :each do
-      FitParser::File::Types.types = Hash.new { |h,k| h[k]={} }
+      FitParser::File::Types.types = Hash.new { |h, k| h[k] = {} }
     end
 
     context 'for enum type' do
       it 'add enum data' do
-        val = {:values => { 1 => 'val1', 2=> 'val2', 3 => 'val3'}}
+        val = { values: { 1 => 'val1', 2 => 'val2', 3 => 'val3' } }
         described_class.add_type(:test_enum, :enum, val)
-        expect(described_class.get_type_definition(:test_enum)).to eql val.merge({:basic_type => :enum})
+        expect(described_class.get_type_definition(:test_enum))
+          .to eql(val.merge(basic_type: :enum))
       end
     end
   end
@@ -28,34 +29,40 @@ describe FitParser::File::Types do
       expect(described_class.get_type_definition(:rspec_unknown)).to be_nil
     end
   end
-  
+
   describe '.date_time_value' do
     context 'wen value below min' do
       it 'returns system time in second' do
-        expect(described_class.date_time_value(9999, {268435456 => 'min'}, {:utc => true})).to eql '9999'
-        expect(described_class.date_time_value(9999, {268435456 => 'min'}, {:utc => false})).to eql '9999'
+        values = [9999, { 268_435_456 => 'min' }, utc: true]
+        expect(described_class.date_time_value(*values)).to eql('9999')
+        values = [9999, { 268_435_456 => 'min' }, utc:  false]
+        expect(described_class.date_time_value(*values)).to eql('9999')
       end
     end
 
     context 'when value is above min' do
       context 'with UTC mode' do
         it 'returns exact date UTC' do
-          expect(described_class.date_time_value(790509304, {268435456 => 'min'}, {:utc => true})).to eql '2015-01-18 09:55:04 UTC'
+          values = [790_509_304, { 268_435_456 => 'min' }, utc: true]
+          expect(described_class.date_time_value(*values))
+            .to eql('2015-01-18 09:55:04 UTC')
         end
       end
-      
+
       context 'with local mode' do
         it 'returns exact date in locale time zone' do
           # TODO: manage answer based on current system local
-          expect(described_class.date_time_value(790509304, {268435456 => 'min'}, {:utc => false})).not_to match(/UTC$/)
+          values = [790_509_304, { 268_435_456 => 'min' }, utc: false]
+          expect(described_class.date_time_value(*values)).not_to match(/UTC$/)
         end
       end
-
     end
   end
 
   describe '.message_index_value' do
-    let(:values) { {32768 => 'selected', 28672 => 'reserved', 4095 => 'mask' } }
+    let(:values) do
+      { 32_768 => 'selected', 28_672 => 'reserved', 4095 => 'mask' }
+    end
 
     context 'when value is not reserved or selected' do
       it 'returns the message index' do
@@ -65,20 +72,19 @@ describe FitParser::File::Types do
 
     context 'when value is reserved' do
       it 'returns real message index' do
-        expect(described_class.message_index_value(28682, values)).to eq(10)
+        expect(described_class.message_index_value(28_682, values)).to eq(10)
       end
     end
 
     context 'when value is selected' do
       it 'returns real message index' do
-        expect(described_class.message_index_value(32778, values)).to eq(10)
+        expect(described_class.message_index_value(32_778, values)).to eq(10)
       end
     end
-
   end
 
   describe '.bitfield_value' do
-    let(:values) { {0x02 => 'read', 0x04 => 'write', 0x08 => 'erase'} }
+    let(:values) { { 0x02 => 'read', 0x04 => 'write', 0x08 => 'erase' } }
 
     context 'when value is a single bit' do
       it 'returns the single value' do
@@ -95,6 +101,4 @@ describe FitParser::File::Types do
       end
     end
   end
-
 end
-

data/spec/fit_parser_spec.rb

@@ -1,10 +1,23 @@
 require 'spec_helper'
 
 describe FitParser do
-  describe "VERSION" do
+  describe 'VERSION' do
     subject{ FitParser::VERSION }
 
     it { is_expected.to be_a(String) }
     it { is_expected.to match(/\d{1,2}\.\d{1,2}\.\d{1,2}/) }
   end
+
+  describe '.load_file' do
+    it 'works with threads' do
+      threads = []
+      %w(3863374146 3110334490).each do |file|
+        threads << Thread.new(file) do |el|
+          data = FitParser.load_file("spec/support/examples/file/#{el}")
+          expect(data.records).to_not be_nil
+        end
+      end
+      threads.each { |thread| thread.join }
+    end
+  end
 end