nmea_plus 1.0.17 → 1.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e70e97e74e7f165b5009a4ecf770c7ed98a0dd9
-  data.tar.gz: 7661c27f641556f2bf18766f8fd2d21fbccb52ea
+  metadata.gz: 64c81ca17980fff6fb15d5aef4d45e19b49a3367
+  data.tar.gz: c47476023d1c6b162306587e5ee94e4f32bced7f
 SHA512:
-  metadata.gz: 94d5d256d78f0658e47d7337e6764877054030b809902373cb05cc65e35206c8571b259e9a191597fd2b796beae651fa3cc4662dd8322892c75cc9ca2e6bd1f6
-  data.tar.gz: cea08c301a05ade507d5bb8fe102255cb2cf174da7cca23e6bebb1548cfd6bdb3b2dfb7379e6f27b81a46422c09b67f7f55a3b1ce66f151618f81ed5df1f5881
+  metadata.gz: 9127ce5a96e7a6ec258628e3dc23a158f94e68f69981db4c2b0dd94b6e5bb39821b3ed97734aa9efaf4f17f76b6adf36e774896f39d65fb6ce7f1574493d6dcb
+  data.tar.gz: 04b0f32452147f58a0fcbf7c9fa46e6334ea659570aafb34102d4bcbd01821a7af91c4a28d7cbddeeec2c0fc8e713e6b6d5e5f60f6dea1524b59eb748554c18f

data/README.md

@@ -2,7 +2,7 @@
 
 [![Gem Version](https://badge.fury.io/rb/nmea_plus.svg)](https://rubygems.org/gems/nmea_plus)
 [![Build Status](https://travis-ci.org/ifreecarve/nmea_plus.svg)](https://travis-ci.org/ifreecarve/nmea_plus)
-[![Documentation](http://img.shields.io/badge/docs-rdoc.info-blue.svg)](http://www.rubydoc.info/gems/nmea_plus/1.0.17)
+[![Documentation](http://img.shields.io/badge/docs-rdoc.info-blue.svg)](http://www.rubydoc.info/gems/nmea_plus/1.0.18)
 
 [NMEA Plus](https://github.com/ifreecarve/nmea_plus) is a Ruby gem for parsing and decoding "GPS" messages: NMEA, AIS, and any other similar formats of short messaging typically used by marine equipment.  It provides convenient access (by name) to the fields of each message type, and a stream reader designed for use with Ruby Blocks.
 
@@ -104,7 +104,7 @@ http://catb.org/gpsd/AIVDM.html
 And some binary subtypes from the ITU spec found here:
 https://www.itu.int/dms_pubrec/itu-r/rec/m/R-REC-M.1371-4-201004-S!!PDF-E.pdf
 
-The AIS payload can be found in the payload field of a `VDM` message (aka `!AIVDM`, `!ABVDM`, `!SAVDM`).  Currently, the following AIS message types are supported:
+The AIS payload can be found in the payload field of a `VDM` message (aka `!AIVDM`, `!ABVDM`, `!SAVDM`) or `VDO` message (aka `!AIVDO`).  Currently, the following AIS message types are supported:
 
 > 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 18, 19, 20, 21, 24, 27
 

data/lib/nmea_plus/ais_message_factory.rb

@@ -16,10 +16,12 @@ module NMEAPlus
 
     # Match all AIS messages as their generic counterparts.  AIVDM becomes VDM, etc.
     # @param data_type [String] The data_type of the AIS message (e.g. the AIVDM of "$AIVDM,12,3,,4,5*00")
-    # @return [String] The data_type that we will attempt to use in decoding the message (e.g. VDM)
+    # @return [Array] Array of data_type strings that we will attempt to use in decoding the message
     def self.alternate_data_type(data_type)
       # match last 3 digits (get rid of talker)
-      data_type[2..4]
+      ret = [data_type[2..4]]
+      ret << "VDM" if data_type == "AIVDO"
+      ret
     end
   end
 end

data/lib/nmea_plus/message_factory.rb

@@ -21,9 +21,9 @@ module NMEAPlus
     # alternate type (like GPAAM) or a generic type (like AAM).  This is where we put that logic.
     # @abstract
     # @param data_type [String] The data_type of the NMEA message (e.g. the GPGLL of "$GPGLL,12,3,,4,5*00")
-    # @return [String] The data_type that we will attempt to use in decoding the message
+    # @return [Array] Array of data_type strings that we will attempt to use in decoding the message
     def self.alternate_data_type(data_type)
-      data_type # in basic implementation, there is no alternative.
+      [data_type] # in basic implementation, there is no alternative.
     end
 
     # Check whether a given object exists.  this will work for all consts but shhhhhhhhh
@@ -49,7 +49,10 @@ 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)
+      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
+      data_type
     end
 
     # Get a message class through reflection

data/lib/nmea_plus/nmea_message_factory.rb

@@ -107,10 +107,10 @@ end
 
     # Match all NMEA messages as their generic counterparts.  GPGLL becomes GLL, etc.
     # @param data_type [String] The data_type of the NMEA message (e.g. the GPGLL of "$GPGLL,12,3,,4,5*00")
-    # @return [String] The data_type that we will attempt to use in decoding the message (e.g. GLL)
+    # @return [Array] Array of data_type strings that we will attempt to use in decoding the message
     def self.alternate_data_type(data_type)
       # match last 3 digits (get rid of talker)
-      data_type[2..4]
+      [data_type[2..4]]
     end
   end
 

data/lib/nmea_plus/version.rb

@@ -1,3 +1,3 @@
 module NMEAPlus
-  VERSION = '1.0.17'.freeze
+  VERSION = '1.0.18'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nmea_plus
 version: !ruby/object:Gem::Version
-  version: 1.0.17
+  version: 1.0.18
 platform: ruby
 authors:
 - Ian Katz
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-05 00:00:00.000000000 Z
+date: 2017-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: racc