nmea_plus 1.0.25 → 1.1.0

data/lib/nmea_plus/message/nmea/sys.rb

@@ -1,4 +1,4 @@
-require 'nmea_plus/message/nmea/base_nmea'
+require "nmea_plus/message/nmea/base_nmea"
 
 module NMEAPlus
   module Message
@@ -12,11 +12,11 @@ module NMEAPlus
         # @return [Array<Symbol>]
         def systems
           abbr = {
-            'L' => :loran_c,
-            'O' => :omega,
-            'T' => :transit,
-            'G' => :gps,
-            'D' => :decca
+            "L" => :loran_c,
+            "O" => :omega,
+            "T" => :transit,
+            "G" => :gps,
+            "D" => :decca
           }
 
           # drop blank fields and convert to symbol

data/lib/nmea_plus/message/nmea/tds.rb

@@ -1,4 +1,4 @@
-require 'nmea_plus/message/nmea/base_nmea'
+require "nmea_plus/message/nmea/base_nmea"
 
 module NMEAPlus
   module Message

data/lib/nmea_plus/message/nmea/tec.rb

@@ -1,4 +1,4 @@
-require 'nmea_plus/message/nmea/base_nmea'
+require "nmea_plus/message/nmea/base_nmea"
 
 module NMEAPlus
   module Message

data/lib/nmea_plus/message/nmea/tep.rb

@@ -1,4 +1,4 @@
-require 'nmea_plus/message/nmea/base_nmea'
+require "nmea_plus/message/nmea/base_nmea"
 
 module NMEAPlus
   module Message

data/lib/nmea_plus/message/nmea/tfi.rb

@@ -1,4 +1,4 @@
-require 'nmea_plus/message/nmea/base_nmea'
+require "nmea_plus/message/nmea/base_nmea"
 
 module NMEAPlus
   module Message

data/lib/nmea_plus/message/nmea/tga.rb

@@ -1,4 +1,4 @@
-require 'nmea_plus/message/nmea/base_nmea'
+require "nmea_plus/message/nmea/base_nmea"
 
 module NMEAPlus
   module Message

data/lib/nmea_plus/message/nmea/tif.rb

@@ -1,4 +1,4 @@
-require 'nmea_plus/message/nmea/base_nmea'
+require "nmea_plus/message/nmea/base_nmea"
 
 module NMEAPlus
   module Message
@@ -6,27 +6,30 @@ module NMEAPlus
       # TIF - TRANSIT Satellite Initial Flag
       # TRANSIT system is not operational, no recommended replacement
       class TIF < NMEAPlus::Message::NMEA::NMEAMessage
+        INITIAL_FLAGS = {
+          "A" => :normal_operation,
+          "V" => :set_initialization_data,
+          "J" => :initialization_data_complete
+        }.freeze
+
+        INITIAL_FLAG_DESCRIPTIONS = {
+          normal_operation: "Normal operation",
+          set_initialization_data: "Set initialization data",
+          initialization_data_complete: "Initialization data complete"
+        }.freeze
 
         # Satellite Initial Flag
         # @!parse attr_reader :initial_flag
         # @return [Symbol]
         def initial_flag
-          case @fields[1]
-          when 'A' then :normal_operation
-          when 'V' then :set_initialization_data
-          when 'J' then :initialization_data_complete
-          end
+          INITIAL_FLAGS[@fields[1]]
         end
 
         # Description of initial flag
         # @!parse attr_reader :initial_flag_description
         # @return [String]
         def initial_flag_description
-          case initial_flag
-          when :normal_operation then 'Normal operation'
-          when :set_initialization_data then 'Set initialization data'
-          when :initialization_data_complete then 'Initialization data complete'
-          end
+          INITIAL_FLAG_DESCRIPTIONS[initial_flag]
         end
 
       end

data/lib/nmea_plus/message/nmea/tpc.rb

@@ -1,4 +1,4 @@
-require 'nmea_plus/message/nmea/base_nmea'
+require "nmea_plus/message/nmea/base_nmea"
 
 module NMEAPlus
   module Message

data/lib/nmea_plus/message/nmea/tpr.rb

@@ -1,4 +1,4 @@
-require 'nmea_plus/message/nmea/base_nmea'
+require "nmea_plus/message/nmea/base_nmea"
 
 module NMEAPlus
   module Message

data/lib/nmea_plus/message/nmea/tpt.rb

@@ -1,4 +1,4 @@
-require 'nmea_plus/message/nmea/base_nmea'
+require "nmea_plus/message/nmea/base_nmea"
 
 module NMEAPlus
   module Message

data/lib/nmea_plus/message/nmea/trf.rb

@@ -1,4 +1,4 @@
-require 'nmea_plus/message/nmea/base_nmea'
+require "nmea_plus/message/nmea/base_nmea"
 
 module NMEAPlus
   module Message

data/lib/nmea_plus/message/nmea/trp.rb

@@ -1,4 +1,4 @@
-require 'nmea_plus/message/nmea/base_nmea'
+require "nmea_plus/message/nmea/base_nmea"
 
 module NMEAPlus
   module Message

data/lib/nmea_plus/message/nmea/trs.rb

@@ -1,4 +1,4 @@
-require 'nmea_plus/message/nmea/base_nmea'
+require "nmea_plus/message/nmea/base_nmea"
 
 module NMEAPlus
   module Message
@@ -6,33 +6,36 @@ module NMEAPlus
       # TRS - TRANSIT Satellite Operating Status
       # TRANSIT system is not operational, no recommended replacement.
       class TRS < NMEAPlus::Message::NMEA::NMEAMessage
+        STATUS_FLAGS = {
+          "A" => :acquiring,
+          "c" => :calculating,
+          "e" => :error,
+          "m" => :message,
+          "T" => :test,
+          "U" => :dead_reckoning
+        }.freeze
+
+        STATUS_DESCRIPTIONS = {
+          acquiring: "Acquiring",
+          calculating: "Calculating",
+          error: "Error",
+          message: "Message",
+          test: "Test",
+          dead_reckoning: "Dead reckoning"
+        }.freeze
 
         # TRANSIT system operating status
         # @!parse attr_reader :status
         # @return [Symbol]
         def status
-          case @fields[1]
-          when 'A' then :acquiring
-          when 'c' then :calculating
-          when 'e' then :error
-          when 'm' then :message
-          when 'T' then :test
-          when 'U' then :dead_reckoning
-          end
+          STATUS_FLAGS[@fields[1]]
         end
 
         # Description of status
         # @!parse attr_reader :status_description
         # @return [String]
         def status_description
-          case status
-          when :acquiring then 'Acquiring'
-          when :calculating then 'Calculating'
-          when :error then 'Error'
-          when :message then 'Message'
-          when :test then 'Test'
-          when :dead_reckoning then 'Dead reckoning'
-          end
+          STATUS_DESCRIPTIONS[status]
         end
 
       end

data/lib/nmea_plus/message/nmea/ttm.rb

@@ -1,4 +1,4 @@
-require 'nmea_plus/message/nmea/base_nmea'
+require "nmea_plus/message/nmea/base_nmea"
 
 module NMEAPlus
   module Message

data/lib/nmea_plus/message/nmea/vbw.rb

@@ -1,4 +1,4 @@
-require 'nmea_plus/message/nmea/base_nmea'
+require "nmea_plus/message/nmea/base_nmea"
 
 module NMEAPlus
   module Message

data/lib/nmea_plus/message/nmea/vcd.rb

@@ -1,4 +1,4 @@
-require 'nmea_plus/message/nmea/base_nmea'
+require "nmea_plus/message/nmea/base_nmea"
 
 module NMEAPlus
   module Message

data/lib/nmea_plus/message/nmea/vdr.rb

@@ -1,4 +1,4 @@
-require 'nmea_plus/message/nmea/base_nmea'
+require "nmea_plus/message/nmea/base_nmea"
 
 module NMEAPlus
   module Message

data/lib/nmea_plus/message/nmea/vhw.rb

@@ -1,4 +1,4 @@
-require 'nmea_plus/message/nmea/base_nmea'
+require "nmea_plus/message/nmea/base_nmea"
 
 module NMEAPlus
   module Message

data/lib/nmea_plus/message/nmea/vlw.rb

@@ -1,4 +1,4 @@
-require 'nmea_plus/message/nmea/base_nmea'
+require "nmea_plus/message/nmea/base_nmea"
 
 module NMEAPlus
   module Message

data/lib/nmea_plus/message/nmea/vpe.rb

@@ -1,4 +1,4 @@
-require 'nmea_plus/message/nmea/base_nmea'
+require "nmea_plus/message/nmea/base_nmea"
 
 module NMEAPlus
   module Message

data/lib/nmea_plus/message/nmea/vpw.rb

@@ -1,4 +1,4 @@
-require 'nmea_plus/message/nmea/base_nmea'
+require "nmea_plus/message/nmea/base_nmea"
 
 module NMEAPlus
   module Message

data/lib/nmea_plus/message/nmea/vta.rb

@@ -1,4 +1,4 @@
-require 'nmea_plus/message/nmea/base_nmea'
+require "nmea_plus/message/nmea/base_nmea"
 
 module NMEAPlus
   module Message

data/lib/nmea_plus/message/nmea/vtg.rb

@@ -1,4 +1,4 @@
-require 'nmea_plus/message/nmea/base_nmea'
+require "nmea_plus/message/nmea/base_nmea"
 
 module NMEAPlus
   module Message
@@ -8,7 +8,7 @@ module NMEAPlus
         # whether this is the new format.  docs say check field #2 for value "2"
         # @return [bool]
         def new_format?
-          'T' == @fields[2]
+          "T" == @fields[2]
         end
 
         field_reader :track_degrees_true, 1, :_float
@@ -19,6 +19,7 @@ module NMEAPlus
         def track_degrees_magnetic
           f = new_format? ? 3 : 2
           return nil if @fields[f].nil? || @fields[f].empty?
+
           @fields[f].to_f
         end
 
@@ -28,6 +29,7 @@ module NMEAPlus
         def speed_knots
           f = new_format? ? 5 : 3
           return nil if @fields[f].nil? || @fields[f].empty?
+
           @fields[f].to_f
         end
 
@@ -37,6 +39,7 @@ module NMEAPlus
         def speed_kmh
           f = new_format? ? 7 : 4
           return nil if @fields[f].nil? || @fields[f].empty?
+
           @fields[f].to_f
         end
 
@@ -46,6 +49,7 @@ module NMEAPlus
         def faa_mode
           f = new_format? ? 9 : 100
           return nil if @fields[f].nil? || @fields[f].empty?
+
           @fields[f]
         end
 

data/lib/nmea_plus/message/nmea/vti.rb

@@ -1,4 +1,4 @@
-require 'nmea_plus/message/nmea/base_nmea'
+require "nmea_plus/message/nmea/base_nmea"
 
 module NMEAPlus
   module Message

data/lib/nmea_plus/message/nmea/vwe.rb

@@ -1,4 +1,4 @@
-require 'nmea_plus/message/nmea/base_nmea'
+require "nmea_plus/message/nmea/base_nmea"
 
 module NMEAPlus
   module Message

data/lib/nmea_plus/message/nmea/vwr.rb

@@ -1,4 +1,4 @@
-require 'nmea_plus/message/nmea/base_nmea'
+require "nmea_plus/message/nmea/base_nmea"
 
 module NMEAPlus
   module Message

data/lib/nmea_plus/message/nmea/vwt.rb

@@ -1,4 +1,4 @@
-require 'nmea_plus/message/nmea/base_nmea'
+require "nmea_plus/message/nmea/base_nmea"
 
 module NMEAPlus
   module Message

data/lib/nmea_plus/message/nmea/wcv.rb

@@ -1,4 +1,4 @@
-require 'nmea_plus/message/nmea/base_nmea'
+require "nmea_plus/message/nmea/base_nmea"
 
 module NMEAPlus
   module Message

data/lib/nmea_plus/message/nmea/wdc.rb

@@ -1,4 +1,4 @@
-require 'nmea_plus/message/nmea/base_nmea'
+require "nmea_plus/message/nmea/base_nmea"
 
 module NMEAPlus
   module Message

data/lib/nmea_plus/message/nmea/wdr.rb

@@ -1,4 +1,4 @@
-require 'nmea_plus/message/nmea/wdc'
+require "nmea_plus/message/nmea/wdc"
 
 module NMEAPlus
   module Message

data/lib/nmea_plus/message/nmea/wfm.rb

@@ -1,4 +1,4 @@
-require 'nmea_plus/message/nmea/base_nmea'
+require "nmea_plus/message/nmea/base_nmea"
 
 module NMEAPlus
   module Message

data/lib/nmea_plus/message/nmea/wnc.rb

@@ -1,4 +1,4 @@
-require 'nmea_plus/message/nmea/base_nmea'
+require "nmea_plus/message/nmea/base_nmea"
 
 module NMEAPlus
   module Message

data/lib/nmea_plus/message/nmea/wnr.rb

@@ -1,4 +1,4 @@
-require 'nmea_plus/message/nmea/wnc'
+require "nmea_plus/message/nmea/wnc"
 
 module NMEAPlus
   module Message

data/lib/nmea_plus/message/nmea/wpl.rb

@@ -1,4 +1,4 @@
-require 'nmea_plus/message/nmea/base_nmea'
+require "nmea_plus/message/nmea/base_nmea"
 
 module NMEAPlus
   module Message

data/lib/nmea_plus/message/nmea/xdr.rb

@@ -1,4 +1,4 @@
-require 'nmea_plus/message/nmea/base_nmea'
+require "nmea_plus/message/nmea/base_nmea"
 
 module NMEAPlus
   module Message

data/lib/nmea_plus/message/nmea/xte.rb

@@ -1,4 +1,4 @@
-require 'nmea_plus/message/nmea/base_nmea'
+require "nmea_plus/message/nmea/base_nmea"
 
 module NMEAPlus
   module Message

data/lib/nmea_plus/message/nmea/xtr.rb

@@ -1,4 +1,4 @@
-require 'nmea_plus/message/nmea/base_nmea'
+require "nmea_plus/message/nmea/base_nmea"
 
 module NMEAPlus
   module Message

data/lib/nmea_plus/message/nmea/ywp.rb

@@ -1,4 +1,4 @@
-require 'nmea_plus/message/nmea/base_nmea'
+require "nmea_plus/message/nmea/base_nmea"
 
 module NMEAPlus
   module Message

data/lib/nmea_plus/message/nmea/yws.rb

@@ -1,4 +1,4 @@
-require 'nmea_plus/message/nmea/base_nmea'
+require "nmea_plus/message/nmea/base_nmea"
 
 module NMEAPlus
   module Message

data/lib/nmea_plus/message/nmea/zaa.rb

@@ -1,4 +1,4 @@
-require 'nmea_plus/message/nmea/zzu'
+require "nmea_plus/message/nmea/zzu"
 
 module NMEAPlus
   module Message

data/lib/nmea_plus/message/nmea/zcd.rb

@@ -1,4 +1,4 @@
-require 'nmea_plus/message/nmea/base_nmea'
+require "nmea_plus/message/nmea/base_nmea"
 
 module NMEAPlus
   module Message
@@ -6,6 +6,12 @@ module NMEAPlus
       # ZCD - Timer
       # Limited utility, no recommended replacement.
       class ZCD < NMEAPlus::Message::NMEA::NMEAMessage
+        CONTROL_FLAGS = {
+          "+" => :up,
+          "-" => :down,
+          "V" => :stop
+        }.freeze
+
         # Timer initial value, seconds
         field_reader :initial_time_seconds, 1, :_integer
 
@@ -13,11 +19,7 @@ module NMEAPlus
         # @!parse attr_reader :control
         # @return [Symbol]
         def control
-          case @fields[2]
-          when '+' then :up
-          when '-' then :down
-          when 'V' then :stop
-          end
+          CONTROL_FLAGS[@fields[2]]
         end
       end
     end

data/lib/nmea_plus/message/nmea/zda.rb

@@ -1,4 +1,4 @@
-require 'nmea_plus/message/nmea/base_nmea'
+require "nmea_plus/message/nmea/base_nmea"
 
 module NMEAPlus
   module Message
@@ -14,10 +14,12 @@ module NMEAPlus
           hms = re_format.match(@fields[1])
           begin
             tz_h = @fields[5].to_i
-            tz = "%s%0.02d:%0.02d" % [tz_h >= 0 ? '+' : '', tz_h, @fields[6].to_i]
+            tz = format("%<sign>s%02<hour>d:%02<minute>d", sign: tz_h >= 0 ? "+" : "-", hour: tz_h.abs, minute: @fields[6].to_i)
             Time.new(@fields[4].to_i, @fields[3].to_i, @fields[2].to_i,
                      hms[1].to_i, hms[2].to_i, hms[3].to_f, tz)
-          rescue
+          rescue ArgumentError
+            # Assume invalid fields.
+            # TODO: handle this better, last time I got tripped up with %02d and minus sign chars
             nil
           end
         end

data/lib/nmea_plus/message/nmea/zev.rb

@@ -1,4 +1,4 @@
-require 'nmea_plus/message/nmea/zzu'
+require "nmea_plus/message/nmea/zzu"
 
 module NMEAPlus
   module Message
@@ -6,6 +6,12 @@ module NMEAPlus
       # ZEV - Event Timer
       # Limited utility, no recommended replacement.
       class ZEV < NMEAPlus::Message::NMEA::ZZU
+        CONTROL_FLAGS = {
+          "+" => :up,
+          "-" => :down,
+          "V" => :stop
+        }.freeze
+
         # Timer initial value
         field_reader :initial_time, 2, :_interval_hms
 
@@ -13,11 +19,7 @@ module NMEAPlus
         # @!parse attr_reader :control
         # @return [Symbol]
         def control
-          case @fields[3]
-          when '+' then :up
-          when '-' then :down
-          when 'V' then :stop
-          end
+          CONTROL_FLAGS[@fields[3]]
         end
       end
     end

data/lib/nmea_plus/message/nmea/zfi.rb

@@ -1,4 +1,4 @@
-require 'nmea_plus/message/nmea/zaa'
+require "nmea_plus/message/nmea/zaa"
 
 module NMEAPlus
   module Message

data/lib/nmea_plus/message/nmea/zfo.rb

@@ -1,4 +1,4 @@
-require 'nmea_plus/message/nmea/base_nmea'
+require "nmea_plus/message/nmea/base_nmea"
 
 module NMEAPlus
   module Message

data/lib/nmea_plus/message/nmea/zlz.rb

@@ -1,4 +1,4 @@
-require 'nmea_plus/message/nmea/zzu'
+require "nmea_plus/message/nmea/zzu"
 
 module NMEAPlus
   module Message

data/lib/nmea_plus/message/nmea/zpi.rb

@@ -1,4 +1,4 @@
-require 'nmea_plus/message/nmea/zaa'
+require "nmea_plus/message/nmea/zaa"
 
 module NMEAPlus
   module Message

data/lib/nmea_plus/message/nmea/zta.rb

@@ -1,4 +1,4 @@
-require 'nmea_plus/message/nmea/zaa'
+require "nmea_plus/message/nmea/zaa"
 
 module NMEAPlus
   module Message

data/lib/nmea_plus/message/nmea/zte.rb

@@ -1,4 +1,4 @@
-require 'nmea_plus/message/nmea/zaa'
+require "nmea_plus/message/nmea/zaa"
 
 module NMEAPlus
   module Message

data/lib/nmea_plus/message/nmea/ztg.rb

@@ -1,4 +1,4 @@
-require 'nmea_plus/message/nmea/base_nmea'
+require "nmea_plus/message/nmea/base_nmea"
 
 module NMEAPlus
   module Message

data/lib/nmea_plus/message/nmea/zti.rb

@@ -1,4 +1,4 @@
-require 'nmea_plus/message/nmea/zte'
+require "nmea_plus/message/nmea/zte"
 
 module NMEAPlus
   module Message

data/lib/nmea_plus/message/nmea/zwp.rb

@@ -1,4 +1,4 @@
-require 'nmea_plus/message/nmea/zpi'
+require "nmea_plus/message/nmea/zpi"
 
 module NMEAPlus
   module Message

data/lib/nmea_plus/message/nmea/zzu.rb

@@ -1,4 +1,4 @@
-require 'nmea_plus/message/nmea/base_nmea'
+require "nmea_plus/message/nmea/base_nmea"
 
 module NMEAPlus
   module Message

data/lib/nmea_plus/message_factory.rb

@@ -1,4 +1,3 @@
-
 module NMEAPlus
 
   # The base class for MessageFactory objects, which are instantiated in the Parser.  MessageFactory objects
@@ -31,9 +30,9 @@ module NMEAPlus
     # @return [bool]
     def self.message_class_exists?(class_identifier)
       Object::const_get(class_identifier)
-      return true
+      true
     rescue ::NameError
-      return false
+      false
     end
 
     # Shortcut for the full name to a message class built from this factory.
@@ -49,6 +48,7 @@ module NMEAPlus
     # @return [String] The fully qualified message class name
     def self.best_match_for_data_type(data_type)
       return data_type if self.message_class_exists?(self.message_class_name(data_type))
+
       self.alternate_data_type(data_type).each do |alternate_type|
         return alternate_type if self.message_class_exists?(self.message_class_name(alternate_type))
       end
@@ -72,7 +72,7 @@ module NMEAPlus
     # @return [NMEAPlus::Message] A message object
     def self.create(message_prefix, fields, checksum)
       # get the data type and adjust it if necessary (e.g. support for NMEA standard sentences like __AAM)
-      data_type = fields.split(',', 2)[0].upcase  # assumed to be 'GPGGA', etc
+      data_type = fields.split(",", 2)[0].upcase  # assumed to be 'GPGGA', etc
       interpreted_type = self.best_match_for_data_type(data_type)
       class_name = self.message_class_name(interpreted_type)