git-fit 0.7.9 → 0.8.0

data/lib/git_fit/parser/base.rb

@@ -1,4 +1,6 @@
-require "time"
+# frozen_string_literal: true
+
+require 'time'
 
 module GitFit
   module Parser
@@ -69,7 +71,7 @@ module GitFit
       end
 
       def default_sport
-        "other"
+        'other'
       end
 
       def simplify_polyline(points, max_points: 500)
@@ -83,13 +85,13 @@ module GitFit
       def normalize_sport_type(type)
         return default_sport if type.nil? || type.empty?
         mapping = {
-          "running" => "run", "run" => "run",
-          "cycling" => "ride", "biking" => "ride", "ride" => "ride",
-          "hiking" => "hike", "hike" => "hike",
-          "walking" => "walk", "walk" => "walk",
-          "swimming" => "swim", "swim" => "swim",
-          "skiing" => "ski", "ski" => "ski",
-          "workout" => "workout", "other" => "other"
+          'running' => 'run', 'run' => 'run',
+          'cycling' => 'ride', 'biking' => 'ride', 'ride' => 'ride',
+          'hiking' => 'hike', 'hike' => 'hike',
+          'walking' => 'walk', 'walk' => 'walk',
+          'swimming' => 'swim', 'swim' => 'swim',
+          'skiing' => 'ski', 'ski' => 'ski',
+          'workout' => 'workout', 'other' => 'other'
         }
         mapping[type.downcase.strip] || default_sport
       end
@@ -110,7 +112,7 @@ module GitFit
           average_heartrate: data[:average_heartrate]&.round(1),
           average_speed: data[:distance] && data[:moving_time].to_f.positive? ? (data[:distance].to_f / data[:moving_time]).round(2) : data[:average_speed],
           elevation_gain: data[:elevation_gain]&.round(1),
-          source: @source_name || data[:source]
+          source: @source_name || data[:source],
         }
       end
 

data/lib/git_fit/parser/fit.rb

@@ -1,6 +1,8 @@
-require "json"
-require "securerandom"
-require "time"
+# frozen_string_literal: true
+
+require 'json'
+require 'securerandom'
+require 'time'
 
 module GitFit
   module Parser
@@ -24,7 +26,7 @@ module GitFit
         sport_type = GitFit::FIT::Decoder.sport(path)
 
         [build_activity_attrs({
-          run_id: build_run_id("fit", SecureRandom.hex(8)),
+          run_id: build_run_id('fit', SecureRandom.hex(8)),
           name: nil,
           distance: total_distance(points),
           moving_time: moving_time_from_points(points),
@@ -37,19 +39,19 @@ module GitFit
           summary_polyline: simplify_polyline(points.map { |p| [p[0], p[1]] }),
           average_heartrate: average_heartrate(points),
           elevation_gain: elevation_gain(points),
-          source: "fit"
+          source: 'fit',
         })]
       end
 
       private
 
       def record_to_point(rec)
-        lat = rec["positionLat"]
-        lon = rec["positionLong"]
+        lat = rec['positionLat']
+        lon = rec['positionLong']
         return nil unless lat && lon
-        ts = rec["timestamp"]
+        ts = rec['timestamp']
         time = ts.is_a?(Numeric) ? FIT_EPOCH + ts : parse_time(ts)
-        [lat, lon, rec["altitude"], time, rec["heartRate"]]
+        [lat, lon, rec['altitude'], time, rec['heartRate']]
       end
 
       def average_heartrate(points)

data/lib/git_fit/parser/gpx.rb

@@ -1,15 +1,17 @@
-require "time"
-require "nokogiri"
+# frozen_string_literal: true
+
+require 'time'
+require 'nokogiri'
 
 module GitFit
   module Parser
     class GPX < Base
-      NS = { gpx: "http://www.topografix.com/GPX/1/1" }.freeze
+      NS = { gpx: 'http://www.topografix.com/GPX/1/1' }.freeze
 
       def call(input)
         doc = input.is_a?(String) ? Nokogiri::XML(input) : input
         doc.remove_namespaces!
-        tracks = doc.xpath("//trk")
+        tracks = doc.xpath('//trk')
         return [] if tracks.empty?
         tracks.filter_map { |trk| parse_track(trk) }
       end
@@ -17,8 +19,8 @@ module GitFit
       private
 
       def parse_track(trk)
-        name = trk.at_xpath("name")&.text
-        segments = trk.xpath("trkseg")
+        name = trk.at_xpath('name')&.text
+        segments = trk.xpath('trkseg')
         return nil if segments.empty?
         points = segments.flat_map { |seg| parse_segment(seg) }
         return nil if points.empty?
@@ -26,7 +28,7 @@ module GitFit
         start_date = times.min
         end_date = times.max
         data = {
-          run_id: build_run_id("gpx", start_date&.strftime("%Y%m%dT%H%M%S") || SecureRandom.hex(4)),
+          run_id: build_run_id('gpx', start_date&.strftime('%Y%m%dT%H%M%S') || SecureRandom.hex(4)),
           name: name,
           distance: total_distance(points),
           moving_time: moving_time_from_points(points),
@@ -39,27 +41,27 @@ module GitFit
           summary_polyline: simplify_polyline(points.map { |p| [p[0], p[1]] }),
           average_heartrate: average_heartrate(points),
           elevation_gain: elevation_gain(points),
-          source: "gpx"
+          source: 'gpx',
         }
         build_activity_attrs(data)
       end
 
       def parse_segment(seg)
-        seg.xpath("trkpt").filter_map do |pt|
-          lat = pt["lat"]&.to_f
-          lon = pt["lon"]&.to_f
+        seg.xpath('trkpt').filter_map do |pt|
+          lat = pt['lat']&.to_f
+          lon = pt['lon']&.to_f
           next unless lat && lon
-          elev = pt.at_xpath("ele")&.text&.to_f
-          time = parse_time(pt.at_xpath("time")&.text)
+          elev = pt.at_xpath('ele')&.text&.to_f
+          time = parse_time(pt.at_xpath('time')&.text)
           hr = parse_heartrate(pt)
           [lat, lon, elev, time, hr]
         end
       end
 
       def parse_heartrate(pt)
-        ext = pt.at_xpath("extensions")
+        ext = pt.at_xpath('extensions')
         return nil unless ext
-        hr = ext.at_xpath(".//hr")
+        hr = ext.at_xpath('.//hr')
         hr&.text&.to_f
       end
 

data/lib/git_fit/parser/tcx.rb

@@ -1,14 +1,16 @@
-require "time"
-require "nokogiri"
+# frozen_string_literal: true
+
+require 'time'
+require 'nokogiri'
 
 module GitFit
   module Parser
     class TCX < Base
-      NS = { tcx: "http://www.garmin.com/xmlschemas/TrainingCenterDatabase/v2" }.freeze
+      NS = { tcx: 'http://www.garmin.com/xmlschemas/TrainingCenterDatabase/v2' }.freeze
 
       def call(input)
         doc = input.is_a?(String) ? Nokogiri::XML(input) : input
-        activities = doc.xpath("//tcx:Activities/tcx:Activity", NS)
+        activities = doc.xpath('//tcx:Activities/tcx:Activity', NS)
         return [] if activities.empty?
         activities.filter_map { |act| parse_activity(act) }
       end
@@ -16,8 +18,8 @@ module GitFit
       private
 
       def parse_activity(act)
-        sport = act["Sport"]
-        laps = act.xpath("tcx:Lap", NS)
+        sport = act['Sport']
+        laps = act.xpath('tcx:Lap', NS)
         return nil if laps.empty?
         lap_data = laps.map { |lap| parse_lap(lap) }.compact
         return nil if lap_data.empty?
@@ -30,8 +32,8 @@ module GitFit
         times = all_points.map { |p| p[3] }.compact
         start_date = times.min
         data = {
-          run_id: build_run_id("tcx", start_date&.strftime("%Y%m%dT%H%M%S") || SecureRandom.hex(4)),
-          name: act.at_xpath("tcx:Notes", NS)&.text,
+          run_id: build_run_id('tcx', start_date&.strftime('%Y%m%dT%H%M%S') || SecureRandom.hex(4)),
+          name: act.at_xpath('tcx:Notes', NS)&.text,
           distance: total_distance,
           moving_time: total_moving_time,
           elapsed_time: total_elapsed_time,
@@ -43,7 +45,7 @@ module GitFit
           summary_polyline: simplify_polyline(all_points.map { |p| [p[0], p[1]] }),
           average_heartrate: avg_hr.empty? ? nil : (avg_hr.sum / avg_hr.size).round(1),
           elevation_gain: elevation_gain,
-          source: "tcx"
+          source: 'tcx',
         }
         build_activity_attrs(data)
       end
@@ -51,9 +53,9 @@ module GitFit
       def parse_lap(lap)
         points = parse_track(lap)
         return nil if points.empty?
-        distance = lap.at_xpath("tcx:DistanceMeters", NS)&.text&.to_f
-        total_time = lap.at_xpath("tcx:TotalTimeSeconds", NS)&.text&.to_f
-        avg_hr_node = lap.at_xpath("tcx:AverageHeartRateBpm/tcx:Value", NS)
+        distance = lap.at_xpath('tcx:DistanceMeters', NS)&.text&.to_f
+        total_time = lap.at_xpath('tcx:TotalTimeSeconds', NS)&.text&.to_f
+        avg_hr_node = lap.at_xpath('tcx:AverageHeartRateBpm/tcx:Value', NS)
         avg_hr = avg_hr_node&.text&.to_f
         elev_gain = points.length >= 2 ? elevation_gain(points) : 0.0
         moving_time = moving_time_from_points(points, threshold_s: 30)
@@ -63,17 +65,17 @@ module GitFit
       end
 
       def parse_track(lap)
-        track = lap.at_xpath("tcx:Track", NS)
+        track = lap.at_xpath('tcx:Track', NS)
         return [] unless track
-        track.xpath("tcx:Trackpoint", NS).filter_map do |tp|
-          pos = tp.at_xpath("tcx:Position", NS)
+        track.xpath('tcx:Trackpoint', NS).filter_map do |tp|
+          pos = tp.at_xpath('tcx:Position', NS)
           next unless pos
-          lat = pos.at_xpath("tcx:LatitudeDegrees", NS)&.text&.to_f
-          lon = pos.at_xpath("tcx:LongitudeDegrees", NS)&.text&.to_f
+          lat = pos.at_xpath('tcx:LatitudeDegrees', NS)&.text&.to_f
+          lon = pos.at_xpath('tcx:LongitudeDegrees', NS)&.text&.to_f
           next unless lat && lon
-          elev = tp.at_xpath("tcx:AltitudeMeters", NS)&.text&.to_f
-          time = parse_time(tp.at_xpath("tcx:Time", NS)&.text)
-          hr = tp.at_xpath("tcx:HeartRateBpm/tcx:Value", NS)&.text&.to_f
+          elev = tp.at_xpath('tcx:AltitudeMeters', NS)&.text&.to_f
+          time = parse_time(tp.at_xpath('tcx:Time', NS)&.text)
+          hr = tp.at_xpath('tcx:HeartRateBpm/tcx:Value', NS)&.text&.to_f
           [lat, lon, elev, time, hr]
         end
       end

data/lib/git_fit/parser.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module GitFit
   module Parser
   end
 end
 
-require_relative "parser/base"
-require_relative "parser/gpx"
-require_relative "parser/tcx"
-require_relative "parser/fit"
+require_relative 'parser/base'
+require_relative 'parser/gpx'
+require_relative 'parser/tcx'
+require_relative 'parser/fit'

data/lib/git_fit/privacy/polyline_filter.rb

@@ -1,11 +1,13 @@
+# frozen_string_literal: true
+
 module GitFit
   module Privacy
     class PolylineFilter
       def initialize(config: {})
-        @start_end_range = (config["start_end_range"] || 200).to_f / 1000.0
-        @ignore_polyline = decode_polyline(config["polyline"]) if config["polyline"]
-        @ignore_range = (config["range"] || 0).to_f / 1000.0
-        @before_saving = config["before_saving"] || false
+        @start_end_range = (config['start_end_range'] || 200).to_f / 1000.0
+        @ignore_polyline = decode_polyline(config['polyline']) if config['polyline']
+        @ignore_range = (config['range'] || 0).to_f / 1000.0
+        @before_saving = config['before_saving'] || false
       end
 
       def before_saving?

data/lib/git_fit/source/base.rb

@@ -1,4 +1,6 @@
-require "date"
+# frozen_string_literal: true
+
+require 'date'
 
 module GitFit
   module Source
@@ -45,28 +47,28 @@ module GitFit
 
       def build_progress_info(attrs)
         parts = []
-        sd = attrs["start_date"] || attrs[:start_date]
+        sd = attrs['start_date'] || attrs[:start_date]
         if sd
           d = Date.parse(sd.to_s) rescue nil
           if d
-            date_str = d.year == Date.today.year ? d.strftime("%m-%d") : d.strftime("%Y-%m-%d")
+            date_str = d.year == Date.today.year ? d.strftime('%m-%d') : d.strftime('%Y-%m-%d')
             parts << date_str
           end
         end
-        type = attrs["sport_category"] || attrs[:sport_category]
+        type = attrs['sport_category'] || attrs[:sport_category]
         parts << type if type
-        dist = attrs["distance"] || attrs[:distance]
+        dist = attrs['distance'] || attrs[:distance]
         if dist && dist.to_f > 0
           parts << "#{format('%.1f', dist.to_f / 1000)}km"
         end
-        source = attrs["source"] || attrs[:source] || source_label
-        name = attrs["name"] || attrs[:name]
+        source = attrs['source'] || attrs[:source] || source_label
+        name = attrs['name'] || attrs[:name]
         display_name = name.to_s.strip
         display_name = "#{source} Activity" if display_name.empty?
         chars = display_name.chars
-        display_name = chars.first(30).join + "…" if chars.size > 30
+        display_name = chars.first(30).join + '…' if chars.size > 30
         parts << display_name
-        parts.join(" | ") unless parts.empty?
+        parts.join(' | ') unless parts.empty?
       end
 
       protected
@@ -77,8 +79,8 @@ module GitFit
       end
 
       def raw_dir
-        src = self.class.name.split("::").last.downcase
-        File.join("data", "raw", src)
+        src = self.class.name.split('::').last.downcase
+        File.join('data', 'raw', src)
       end
 
       def raw_path(platform_id)
@@ -90,11 +92,11 @@ module GitFit
       end
 
       def std_dir
-        src = self.class.name.split("::").last.downcase
-        File.join("data", "std", src)
+        src = self.class.name.split('::').last.downcase
+        File.join('data', 'std', src)
       end
 
-      def std_path(platform_id, ext = "json")
+      def std_path(platform_id, ext = 'json')
         File.join(std_dir, "#{platform_id}.#{ext}")
       end
 
@@ -104,7 +106,7 @@ module GitFit
         line = "#{source_label}: #{count}"
         line += "/#{total}" if total
         line += " #{info}" if info
-        line += " "
+        line += ' '
         print "\r#{line}"
         $stdout.flush
       end
@@ -123,7 +125,7 @@ module GitFit
 
       def source_label
         name = self.class.name
-        name ? name.split("::").last : "Source"
+        name ? name.split('::').last : 'Source'
       end
 
       def upsert_activity(attrs)
@@ -131,17 +133,17 @@ module GitFit
         now = Time.now.utc
 
         if @privacy && !@privacy.before_saving?
-          attrs["summary_polyline"] = @privacy.filter(attrs["summary_polyline"])
+          attrs['summary_polyline'] = @privacy.filter(attrs['summary_polyline'])
         end
 
-        existing = @db[:activities].where(run_id: attrs["run_id"]).first
+        existing = @db[:activities].where(run_id: attrs['run_id']).first
         if existing
-          attrs.delete("created_at")
-          attrs["updated_at"] = now
-          @db[:activities].where(run_id: attrs["run_id"]).update(attrs)
+          attrs.delete('created_at')
+          attrs['updated_at'] = now
+          @db[:activities].where(run_id: attrs['run_id']).update(attrs)
         else
-          attrs["created_at"] ||= now
-          attrs["updated_at"] ||= now
+          attrs['created_at'] ||= now
+          attrs['updated_at'] ||= now
           @db[:activities].insert(attrs)
         end
       end

data/lib/git_fit/source/tally.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GitFit
   module Source
     class Tally
@@ -25,26 +27,26 @@ module GitFit
         return DIGITS[0] if n == 0
         return DIGITS[n] if n <= 10
 
-        result = ""
+        result = ''
         thousands = n / 1000
         n %= 1000
-        result += DIGITS[thousands] + "千" if thousands > 0
+        result += DIGITS[thousands] + '千' if thousands > 0
 
         hundreds = n / 100
         n %= 100
         if hundreds > 0
-          result += DIGITS[hundreds] + "百"
+          result += DIGITS[hundreds] + '百'
         elsif thousands > 0 && n > 0
-          result += "零"
+          result += '零'
         end
 
         tens = n / 10
         ones = n % 10
         if tens > 0
           join_ten = tens > 1 || !result.empty?
-          result += (join_ten ? DIGITS[tens] : "") + "十"
-        elsif !result.empty? && tens == 0 && ones > 0 && !result.end_with?("零")
-          result += "零"
+          result += (join_ten ? DIGITS[tens] : '') + '十'
+        elsif !result.empty? && tens == 0 && ones > 0 && !result.end_with?('零')
+          result += '零'
         end
 
         result += DIGITS[ones] if ones > 0

data/lib/git_fit/source.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module GitFit
   module Source
   end
 end
 
-require_relative "util/tally"
-require_relative "source/base"
+require_relative 'util/tally'
+require_relative 'source/base'
 
 GitFit::Source::Tally = GitFit::Util::Tally

data/lib/git_fit/sport_mapper.rb

@@ -1,28 +1,30 @@
+# frozen_string_literal: true
+
 module GitFit
   module SportMapper
     ALIASES = {
-      "running" => "run", "trailrun" => "run", "trail_run" => "run",
-      "virtualrun" => "run", "virtual_run" => "run",
-      "indoorrun" => "run", "indoor_run" => "run",
-      "cycling" => "ride", "biking" => "ride",
-      "mountainbike" => "ride", "gravelride" => "ride", "ebikeride" => "ride",
-      "virtualride" => "ride", "virtual_ride" => "ride",
-      "indoor_ride" => "ride", "indoorride" => "ride",
-      "hiking" => "hike",
-      "walking" => "walk",
-      "swimming" => "swim",
-      "skiing" => "ski", "backcountryski" => "ski", "nordicski" => "ski",
-      "strengthtraining" => "workout"
+      'running' => 'run', 'trailrun' => 'run', 'trail_run' => 'run',
+      'virtualrun' => 'run', 'virtual_run' => 'run',
+      'indoorrun' => 'run', 'indoor_run' => 'run',
+      'cycling' => 'ride', 'biking' => 'ride',
+      'mountainbike' => 'ride', 'gravelride' => 'ride', 'ebikeride' => 'ride',
+      'virtualride' => 'ride', 'virtual_ride' => 'ride',
+      'indoor_ride' => 'ride', 'indoorride' => 'ride',
+      'hiking' => 'hike',
+      'walking' => 'walk',
+      'swimming' => 'swim',
+      'skiing' => 'ski', 'backcountryski' => 'ski', 'nordicski' => 'ski',
+      'strengthtraining' => 'workout'
     }.freeze
 
     KEYWORDS = [
-      [/\b(?:run|jog|sprint|marathon)\w*\b/i, "run"],
-      [/\b(?:ride|cycl|bike|mountain\.?bike|gravel|ebike)\w*\b/i, "ride"],
-      [/\b(?:hike|climb|mountaineer|trek)\w*\b/i, "hike"],
-      [/\b(?:walk|stroll)\w*\b/i, "walk"],
-      [/\b(?:swim|pool|laps?)\w*\b/i, "swim"],
-      [/\b(?:ski|snowboard|nordic)\w*\b/i, "ski"],
-      [/\b(?:workout|train|gym|fitness|yoga|pilates|crossfit|elliptical|strength)\w*\b/i, "workout"]
+      [/\b(?:run|jog|sprint|marathon)\w*\b/i, 'run'],
+      [/\b(?:ride|cycl|bike|mountain\.?bike|gravel|ebike)\w*\b/i, 'ride'],
+      [/\b(?:hike|climb|mountaineer|trek)\w*\b/i, 'hike'],
+      [/\b(?:walk|stroll)\w*\b/i, 'walk'],
+      [/\b(?:swim|pool|laps?)\w*\b/i, 'swim'],
+      [/\b(?:ski|snowboard|nordic)\w*\b/i, 'ski'],
+      [/\b(?:workout|train|gym|fitness|yoga|pilates|crossfit|elliptical|strength)\w*\b/i, 'workout']
     ].freeze
 
     LEV_REFERENCES = %w[
@@ -36,13 +38,13 @@ module GitFit
     LEV_THRESHOLD = 3
 
     def self.canonicalize(str)
-      return "other" if str.nil? || str.empty?
+      return 'other' if str.nil? || str.empty?
       key = str.to_s.downcase.strip
       return ALIASES[key] if ALIASES.key?(key)
       KEYWORDS.each { |regex, sport| return sport if regex.match?(str) }
       best = lev_match(key)
       return best if best
-      "other"
+      'other'
     end
 
     def self.lev_match(str)