fit_parser 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db4819e337a07b93ef7ca45b6cfcea751d36b309
-  data.tar.gz: 106c81aefce23476ba864dd51cbd4251678ae441
+  metadata.gz: cfe16c1aae89815b69c6e91a5fdc5da00755a8a3
+  data.tar.gz: 37f28492ce843593331c48abd109359e80b290a0
 SHA512:
-  metadata.gz: a796b10d34467bec83a8670c08ded3e04844beafa96867ebb760ea38b6374dd4f21bf878cccb96bec8e6ef3afa8710b4d89f0a2827b8949f44f8a7d1589800b7
-  data.tar.gz: 9fa814a4fe95261918511cfc22b045146846a5912892965998653af19c53656eb9b528624b7a9cdc83db92ee0512a6794248787df2b793433346ea852342dcb6
+  metadata.gz: 8e6191854d0c785710063ca83ec4d4fda9fc0f2e39a4dde31a85595f2678037ef4a3d8fcfebcb175f97074207cff27ab86a521be9ee827847b138fb29200dcb9
+  data.tar.gz: 07caf2f96cde4c0f98386267cd4199f0c7c6a661794db9e51e7e76838f19bdf01753f8b31c26ea5e4e10b35e46e20c26678e054baed82a948920c14ab3afd395

data/.rspec

@@ -1 +1,2 @@
 --color
+--format documentation

data/README.md

@@ -1,27 +1,11 @@
-# fit
-
-A ruby gem for parsing [fit files](http://www.thisisant.com/pages/products/fit-sdk). It makes heavy use of the [bindata gem](http://bindata.rubyforge.org/).
+# FitParser
 
 ## Example usage
 
 ```ruby
-require 'fit'
+require 'fit_parser'
 
-fit_file = Fit.load_file(ARGV[0])
+fit_file = FitParser.load_file(ARGV[0])
 
 records = fit_file.records.select{ |r| r.content.record_type != :definition }.map{ |r| r.content }
 ```
-
-## Contributing to fit
- 
-* Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
-* Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it
-* Fork the project
-* Start a feature/bugfix branch
-* Commit and push until you are happy with your contribution
-* Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
-* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
-
-## Copyright
-
-Copyright (c) 2011 Jeff Wallace. See LICENSE.txt for further details.

data/lib/fit_parser/file/definitions.rb

@@ -1,46 +1,62 @@
 module FitParser
   class File
     module Definitions
+      def self.fields
+        @fields ||= Hash.new { |h, k| h[k]= {} }
+      end
 
-      @@fields = Hash.new{ |h,k| h[k]= {} }
-      @@dyn_fields = Hash.new{ |h,k| h[k]= {} }
-      @@names  = Hash.new
-
-      class << self
-        def add_field(global_msg_num, field_def_num, name, options = {})
-          if @@fields[global_msg_num].has_key? field_def_num
-            raise "bad definition of dynamic field  (#{name}) without :ref_field_name or :ref_field_values" unless options.has_key?(:ref_field_name) && options.has_key?(:ref_field_values)
-            @@dyn_fields[global_msg_num][field_def_num] ||= {}
-            @@dyn_fields[global_msg_num][field_def_num][name.to_sym] = options
-            # let's put the ref_field_values with the raw_value instead of the real value
-            type = Types.get_type_definition(options[:ref_field_name].to_sym) if options[:ref_field_name]
-            # basic types are not found and returns nil (also some rspec dummy tests)
-            if type
-              type = type[:values].invert
-              @@dyn_fields[global_msg_num][field_def_num][name.to_sym][:ref_field_values] = options[:ref_field_values].map { |elt| type[elt.to_s] }
-            end
-          else
-            @@fields[global_msg_num][field_def_num] = options.merge(:name => name)
-          end
-        end
+      def self.fields=(value)
+        @fields = value
+      end
 
-        def get_field(global_msg_num, field_def_num)
-          @@fields[global_msg_num][field_def_num]
-        end
+      def self.dyn_fields
+        @dyn_fields ||= Hash.new { |h, k| h[k]= {} }
+      end
 
-        def get_dynamic_fields(global_msg_num, field_def_num)
-          @@dyn_fields[global_msg_num][field_def_num] 
-        end
+      def self.dyn_fields=(value)
+        @dyn_fields = value
+      end
 
-        def add_name(global_msg_num, name)
-          @@names[global_msg_num] = name
-        end
+      def self.names
+        @names ||= Hash.new
+      end
 
-        def get_name(global_msg_num)
-          @@names[global_msg_num]
+      def self.names=(value)
+        @names = value
+      end
+
+      def self.add_field(global_msg_num, field_def_num, name, options = {})
+        if Definitions.fields[global_msg_num].has_key? field_def_num
+          raise "bad definition of dynamic field  (#{name}) without :ref_field_name or :ref_field_values" unless options.has_key?(:ref_field_name) && options.has_key?(:ref_field_values)
+          Definitions.dyn_fields[global_msg_num][field_def_num] ||= {}
+          Definitions.dyn_fields[global_msg_num][field_def_num][name.to_sym] = options
+          # let's put the ref_field_values with the raw_value instead of the real value
+          type = Types.get_type_definition(options[:ref_field_name].to_sym) if options[:ref_field_name]
+          # basic types are not found and returns nil (also some rspec dummy tests)
+          if type
+            type = type[:values].invert
+            Definitions.dyn_fields[global_msg_num][field_def_num][name.to_sym][:ref_field_values] = options[:ref_field_values].map { |elt| type[elt.to_s] }
+          end
+        else
+          Definitions.fields[global_msg_num][field_def_num] = options.merge(:name => name)
         end
       end
 
+      def self.get_field(global_msg_num, field_def_num)
+        Definitions.fields[global_msg_num][field_def_num]
+      end
+
+      def self.get_dynamic_fields(global_msg_num, field_def_num)
+        Definitions.dyn_fields[global_msg_num][field_def_num] 
+      end
+
+      def self.add_name(global_msg_num, name)
+        Definitions.names[global_msg_num] = name
+      end
+
+      def self.get_name(global_msg_num)
+        Definitions.names[global_msg_num]
+      end
     end
   end
 end
@@ -682,7 +698,7 @@ FitParser::File::Definitions.add_field 55, 5, 'activity_type', :type => :activit
 FitParser::File::Definitions.add_field 55, 6, 'activity_subtype', :type => :activity_subtype
 FitParser::File::Definitions.add_field 55, 7, 'activity_level', :type => :activity_level
 FitParser::File::Definitions.add_field 55, 8, 'distance_16', :type => :uint16, :unit => '100 * m'
-FitParser::File::Definitions.add_field 55, 9, 'cycles_16', :type => :uint16, :unit => '2 * cycles ', :unit => '(steps)'
+FitParser::File::Definitions.add_field 55, 9, 'cycles_16', :type => :uint16, :unit => '(steps)'
 FitParser::File::Definitions.add_field 55, 10, 'active_time_16', :type => :uint16, :unit => 's'
 FitParser::File::Definitions.add_field 55, 11, 'local_timestamp', :type => :local_date_time
 FitParser::File::Definitions.add_field 55, 12, 'temperature', :type => :sint16, :scale => 100, :unit => 'C'

data/lib/fit_parser/file/record.rb

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

data/lib/fit_parser/file/type.rb

@@ -1,13 +1,18 @@
 module FitParser
   class File
     class Type
+      def self.types
+        @types ||= {}
+      end
 
-      @@types = {}
+      def self.types=(value)
+        @types = value
+      end
 
       def self.get_type(name)
-        return @@types[name] if @@types.has_key? name
+        return Type.types[name] if Type.types.has_key? name
         type = Types.get_type_definition name
-        @@types[name] = type ? new(type) : nil
+        Type.types[name] = type ? new(type) : nil
       end
 
       def initialize(type)

data/lib/fit_parser/file/types.rb

@@ -1,46 +1,48 @@
 module FitParser
   class File
     module Types
+      def self.types=(value)
+        @types = value
+      end
 
-      @@types = {}
+      def self.types
+        @types ||= {}
+      end
 
-      class << self
-        def add_type(name, type, option = {})
-          @@types[name] = option.merge({:basic_type => type})
-        end
+      def self.add_type(name, type, option = {})
+        Types.types[name] = option.merge(basic_type: type)
+      end
 
-        def get_type_definition(name)
-          return @@types[name] if @@types.has_key? name
-          nil
-        end
+      def self.get_type_definition(name)
+        return Types.types[name] if Types.types.has_key?(name)
+        nil
+      end
 
-        def date_time_value(time, values, parameters)
-          val = values.invert
-          if time < val['min']
-            time.to_s
-          else
-            res= parameters[:utc] ? Time.utc(1989,12,31) + time : Time.local(1989,12,31) + time
-            res.to_s
-          end
+      def self.date_time_value(time, values, parameters)
+        val = values.invert
+        if time < val['min']
+          time.to_s
+        else
+          res= parameters[:utc] ? Time.utc(1989, 12, 31) + time : Time.local(1989, 12, 31) + time
+          res.to_s
         end
+      end
 
-        def message_index_value(msg_index, values, parameters = nil)
-          val = values.invert
-          msg_index & val['mask']
-        end
+      def self.message_index_value(msg_index, values, parameters = nil)
+        val = values.invert
+        msg_index & val['mask']
+      end
 
-        def bitfield_value(bitfield, values, parameters = nil)
-          res = ''
-          values.each do |key, val|
-            if key & bitfield != 0
-              res << '/' unless res.empty?
-              res << val
-            end
+      def self.bitfield_value(bitfield, values, parameters = nil)
+        res = ''
+        values.each do |key, val|
+          if key & bitfield != 0
+            res << '/' unless res.empty?
+            res << val
           end
-          res
         end
+        res
       end
-
     end
   end
 end

data/lib/fit_parser/version.rb

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

data/spec/file/data_spec.rb

@@ -15,15 +15,15 @@ describe FitParser::File::Data do
 
     context 'definition with multiple time the same field' do
       before :all do
-        @fields = FitParser::File::Definitions.class_variable_get :@@fields
-        @dyn_fields = FitParser::File::Definitions.class_variable_get :@@dyn_fields
+        @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
       end
 
       after :all do
-        FitParser::File::Definitions.class_variable_set :@@fields, @fields
-        FitParser::File::Definitions.class_variable_set :@@dyn_fields, @dyn_fields
+        FitParser::File::Definitions.fields = @fields
+        FitParser::File::Definitions.dyn_fields = @dyn_fields
       end
 
       before :each do

data/spec/file/definitions_spec.rb

@@ -6,19 +6,19 @@ require 'spec_helper'
 describe FitParser::File::Definitions do
   describe ".add_field" do
     before :all do
-      @fields = described_class.class_variable_get :@@fields
-      @dyn_fields = described_class.class_variable_get :@@dyn_fields
+      @fields = described_class.fields
+      @dyn_fields = described_class.dyn_fields
     end
 
     after :all do
-      FitParser::File::Definitions.class_variable_set(:@@fields, @fields)
-      FitParser::File::Definitions.class_variable_set(:@@dyn_fields, @dyn_fields)
+      FitParser::File::Definitions.fields = @fields
+      FitParser::File::Definitions.dyn_fields = @dyn_fields
     end
 
     context "without additional options" do
       before :each do
-        FitParser::File::Definitions.class_variable_set(:@@fields, Hash.new { |h,k| h[k]={} })
-        FitParser::File::Definitions.class_variable_set(:@@dyn_fields, Hash.new { |h,k| h[k]={} })
+        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
 
@@ -34,9 +34,8 @@ describe FitParser::File::Definitions do
 
     context "with additional options" do
       before :each do
-        FitParser::File::Definitions.class_variable_set(:@@fields, Hash.new { |h,k| h[k]={} })
-        FitParser::File::Definitions.class_variable_set(:@@dyn_fields, Hash.new { |h,k| h[k]={} })
-
+        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
@@ -55,7 +54,7 @@ describe FitParser::File::Definitions do
 
   describe ".get_field" do
     it "returns nil if no field exists" do
-      expect(described_class.get_field(100,100)).to be_nil
+      expect(described_class.get_field(100,101)).to be_nil
     end
   end
 

data/spec/file/type_spec.rb

@@ -2,26 +2,26 @@ require 'spec_helper'
 
 describe FitParser::File::Type do
   before :all do
-    @types = FitParser::File::Types.class_variable_get :@@types
+    @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'})
   end
 
   after :all do
-    FitParser::File::Types.class_variable_set(:@@types, @types)
+    FitParser::File::Types.types = @types
   end
 
   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)
       end
     end
-    
+
     context 'when invalid name' do
       it 'returns nil' do
         expect(described_class.get_type(:unknown_type)).to be_nil

data/spec/file/types_spec.rb

@@ -2,16 +2,16 @@ require 'spec_helper'
 
 describe FitParser::File::Types do
   before :all do
-    @types = described_class.class_variable_get :@@types
+    @types = described_class.types
   end
 
   after :all do
-    FitParser::File::Types.class_variable_set(:@@types, @types)
+    FitParser::File::Types.types = @types
   end
 
   describe '.add_type' do
     before :each do
-      FitParser::File::Types.class_variable_set(:@@types, Hash.new { |h,k| h[k]={} })
+      FitParser::File::Types.types = Hash.new { |h,k| h[k]={} }
     end
 
     context 'for enum type' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fit_parser
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Dima Mescheryakov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-19 00:00:00.000000000 Z
+date: 2016-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bindata
@@ -155,14 +155,12 @@ email: dima.mescheryakov@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files:
-- LICENSE.txt
 - README.md
 files:
 - .document
 - .rspec
 - Gemfile
 - Gemfile.lock
-- LICENSE.txt
 - README.md
 - Rakefile
 - lib/fit_parser.rb
@@ -223,7 +221,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: ''

data/LICENSE.txt

@@ -1,20 +0,0 @@
-Copyright (c) 2011 Jeff Wallace
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.