fitreader 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9490e28bdb44736bc5545aad4bc74158a8665d5a
-  data.tar.gz: 2334e9c0bba34ebb3d73105988fea7f8bf88fb36
+  metadata.gz: 4b2be794be1509aea5735c90db8baa8069a6966f
+  data.tar.gz: d1021cb2f19661e464f82bec37de36681f3327df
 SHA512:
-  metadata.gz: ac9a75e0e674ae408c2889badb53404ac435856e32f59d98e289d44f1861e0f554b199f058621926248a4738d598d68fb2daf33ec1d673ece4f99983bc299fef
-  data.tar.gz: 0d3bed12f148a6ff80e458920883669b925df6ab79cf5c844ad1a290ece9df46f08a499dbe54183a87a2a89df3904372ba4fd3faf6e057c56d4a6574113a9e8d
+  metadata.gz: b22df5efadc25fce079ff005e6deace58614534db24ca7ec760d153e73fa36634c3e9b94b4aa4bc692cddd9d2e9cd1013ab22e5a5405bd7f63e49e28c9c91e3b
+  data.tar.gz: 0d73b699bc61bc794abc593027b84d70c8bc50a7fcc4be1aff9883057de1df5abd4fc4f2d428839f6e66c1f86d86e070bdeb74230bfe09d4d72e50dd6d2d2ae9

data/lib/fitreader/fitfile.rb

@@ -11,42 +11,43 @@ module Fitreader
     attr_reader :header, :messages, :file
 
     def initialize(path)
-      @file = File.open(path, 'rb')
+      if path.is_a? String
+        @file = File.open(path, 'rb')
+      elsif path.is_a? File
+        @file = path
+      end
       @header = FileHeader.new(@file.read(14))
       if valid?
         @defs = {}
         @messages = {}
-        while @file.pos < @header.num_records do
-          process_next_record
-        end
-        # puts "number of bad records found: #{@error_records.length}"
+        process_next_record while @file.pos < @header.num_records
       end
     end
 
     private
+
     def valid?
       @header.valid_file
     end
 
     def process_next_record
-      h = RecordHeader.new(@file.read(1).unpack("C").first)
+      h = RecordHeader.new(@file.read(1).unpack('C').first)
       dr = @defs[h.local_num]
       if h.header_type == :definition
         dr = Definition.new(h.local_num, @file.read(5))
-        dr.add_fields(@file.read(dr.num_fields*3))
+        dr.add_fields(@file.read(dr.num_fields * 3))
         @defs[h.local_num] = dr
-
         m = MessageType.new(dr)
-        @messages[dr.global_num] = m
+        (@messages[dr.global_num] ||= []).push m
       elsif h.header_type == :data
         unless dr.nil?
           begin
             data = @file.read(dr.content_length)
             datr = Record.new(dr, data)
-            @messages[dr.global_num].records.push datr
+            @messages[dr.global_num].last.records.push datr
           rescue UnknownMessageTypeError
             degraded = DegradedRecord.new(dr, data)
-            @messages[dr.global_num].undefined_records.push degraded
+            @messages[dr.global_num].last.undefined_records.push degraded
           end
         else
           msg = "no record def found! #{h.local_msg_num}"
@@ -55,7 +56,7 @@ module Fitreader
       elsif h.header_type == :timestamp
         raise "timestamp :: msg_num: #{h.local_msg_num}, offset: #{h.timestamp_offset}"
       else
-        raise "not a valid record"
+        raise 'not a valid record'
       end
     end
   end

data/lib/fitreader/message_type.rb

@@ -8,5 +8,17 @@ module Fitreader
       @records = []
       @undefined_records = []
     end
+
+    def record_values
+      records.flatten
+             .collect { |y|y.fields.values.collect { |z| [z.name, z.value] } }
+             .collect(&:to_h)
+    end
+
+    def error_fields
+      records.flatten
+             .select { |x| !x.error_fields.empty? }
+             .collect(&:error_fields)
+    end
   end
 end

data/lib/fitreader/version.rb

@@ -1,3 +1,3 @@
 module Fitreader
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/lib/fitreader.rb

@@ -14,35 +14,35 @@ module Fitreader
 
   def self.available_records
     @f.messages
-      .select { |x,y| !y.definition.name.nil? }
-      .select { |x,y| !y.records.length.zero? }
-      .collect { |x| [x[0], x[1].definition.name, x[1].records.length] }
+      .select { |_,v| !v.any? { |z| z.definition.name.nil? } }
+      .select { |_,v| !v.any? { |z| z.records.length.zero? } }
+      .collect { |x| [x[0], x[1].first.definition.name, x[1].collect(&:records).flatten.length] }
       .sort
   end
 
   def self.get_message_type(filter)
     if filter.is_a?(Symbol)
-      res = @f.messages.find { |_,y| y.definition.name == filter}
+      res = @f.messages.find { |_,y| y.any? { |z| z.definition.name == filter } }
       res[1] unless res.nil?
     elsif filter.is_a?(Integer)
       @f.messages[filter]
     else
-      raise ArgumentError, "needs a string or a symbol"
+      raise ArgumentError, 'needs a string or a symbol'
     end
   end
 
   def self.record_values(filter)
     message = get_message_type filter
-    message.records.collect {|x| x.fields.values.collect{|z| [z.name, z.value]}}.collect{|y| y.to_h}
+    message.collect(&:record_values).flatten
   end
 
   def self.error_messages
-    @f.messages.select { |_,v| !v.undefined_records.empty? }
+    @f.messages.select { |_, v| !v.any? { |x| x.undefined_records.empty? } }
   end
 
   def self.error_fields(filter)
     message = get_message_type filter
-    message.records.select{|x| !x.error_fields.empty?}.collect{|y| y.error_fields}
+    message.collect(&:error_fields).flatten
   end
 
   # def self.filter_by_scope(filter)

data/spec/fitreader_interfaces_spec.rb

@@ -4,13 +4,14 @@ require 'fitreader'
 describe Fitreader do
   describe 'has functioning interfaces' do
     before do
-      @path = File.join(File.dirname(__FILE__), '2016-04-09-13-19-18.fit')
+      # @path = File.join(File.dirname(__FILE__), '2016-04-09-13-19-18.fit')
+      @path = File.join(File.dirname(__FILE__), '1471568492.fit')
       Fitreader.read(@path)
     end
 
     it 'has a valid header' do
       expect(Fitreader.header).not_to be_nil
-      expect(Fitreader.header.num_records).to be(89139)
+      expect(Fitreader.header.num_records).to be(191877)
     end
 
     it 'has valid records' do
@@ -19,10 +20,12 @@ describe Fitreader do
     end
 
     it 'can fetch an existing message by number' do
-      expect(Fitreader.get_message_type 18).to be_a(Fitreader::MessageType)
+      expect(Fitreader.get_message_type 18).to be_a(Array)
+      expect(Fitreader.get_message_type(18).first).to be_a(Fitreader::MessageType)
     end
     it 'can fetch an existing message by name' do
-      expect(Fitreader.get_message_type :session).to be_a(Fitreader::MessageType)
+      expect(Fitreader.get_message_type :session).to be_a(Array)
+      expect(Fitreader.get_message_type(:session).first).to be_a(Fitreader::MessageType)
     end
     it 'cannot fetch a non existing message by number' do
       expect(Fitreader.get_message_type 1234).to be(nil)
@@ -31,6 +34,10 @@ describe Fitreader do
       expect(Fitreader.get_message_type :non_existant).to be(nil)
     end
 
+    it 'has the right number of records' do
+      expect(Fitreader.record_values(:record).length).to be(4988)
+    end
+
     it 'can return name-value data' do
       expect(Fitreader.record_values :session).to be_a(Array)
     end
@@ -41,5 +48,10 @@ describe Fitreader do
     it 'can return error-messages' do
       expect(Fitreader.error_messages).to be_a(Hash)
     end
+
+    it 'can test something' do
+      # expect(Fitreader.record_values :activity).to be_a(Array)
+      # expect(Fitreader.record_values :session).to be_a(Array)
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fitreader
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Richard Brodie
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-26 00:00:00.000000000 Z
+date: 2017-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -99,6 +99,7 @@ files:
 - lib/fitreader/static.rb
 - lib/fitreader/version.rb
 - schema
+- spec/1471568492.fit
 - spec/2016-04-09-13-19-18.fit
 - spec/fitreader_interfaces_spec.rb
 - spec/fitreader_readfile_spec.rb
@@ -130,6 +131,7 @@ signing_key:
 specification_version: 4
 summary: Library for reading FIT files generated by Garmin devices.
 test_files:
+- spec/1471568492.fit
 - spec/2016-04-09-13-19-18.fit
 - spec/fitreader_interfaces_spec.rb
 - spec/fitreader_readfile_spec.rb