aixm 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 486dafa5ec46b76f70a12053bdc29606c563136106cd25ffafc62906decec9e4
-  data.tar.gz: f154584ca3cc854eec2e715b76ff379b689ed51a0bd7887979445b3733a3e0d6
+  metadata.gz: 273c3a151ac0b4c91488692c47918ba3ca36e044e4d1392ba48b98d2ad45f08e
+  data.tar.gz: 4dca28d512bd61ea981ea7e24889e6796b5eeab8ee950e7859bb4b6604848d50
 SHA512:
-  metadata.gz: 68808eefa33113f2e57c5376156c5395711c80f447e9cb03584076d45f043b102f213450e6e2f438ec4a0480eff10708605c6bb623bcba2a55d629241a4d4a7a
-  data.tar.gz: 148345f24a85d5e5636d93175ea516c1266bd5277f0a13c301acb8762155f349a80a095c33856b8ff8234826e3301409b73b7b8fb681ac872463a8d9e596e272
+  metadata.gz: 87471ca95b1590688987f08d7c40c910f63395cb2ab109947acd8be0d28ad704e4a7ff82facb3c510253349dc083de93866f91cc9f750472ef8782019f36a628
+  data.tar.gz: f1004c94f130cdb333863701746b20eaa23fd36e7ddabfc60c37ad156d49c1f30753663bdcc2a32a60cc8ff3d462f6ad8b23ec649d0d0a4be4d9e3a1bb322463

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.2.2
+
+* Minor changes:
+  * Fix bad error classes
+  * Allow navigational aids without name
+
 ## 0.2.1
 
 * Major changes:

data/README.md

@@ -107,7 +107,7 @@ airspace.remarks = String
 ```ruby
 designated_point = AIXM.designated_point(
   id: String
-  name: String
+  name: String or nil
   xy: AIXM.xy
   z: AIXM.z or nil
   type: :icao or :adhp, or :coordinates

data/lib/aixm/feature/airspace.rb

@@ -23,17 +23,17 @@ module AIXM
       end
 
       def name=(value)
-        fail(AttributeError, "invalid name") unless value.is_a? String
+        fail(ArgumentError, "invalid name") unless value.is_a? String
         @name = value.uptrans
       end
 
       def short_name=(value)
-        fail(AttributeError, "invalid short name") unless value.nil? || value.is_a?(String)
+        fail(ArgumentError, "invalid short name") unless value.nil? || value.is_a?(String)
         @short_name = value&.uptrans
       end
 
       def type=(value)
-        fail(AttributeError, "invalid type") unless value.is_a?(String)
+        fail(ArgumentError, "invalid type") unless value.is_a?(String)
         @type = value.upcase
       end
 
@@ -43,7 +43,7 @@ module AIXM
       end
 
       def remarks=(value)
-        fail(AttributeError, "invalid remarks") unless value.is_a?(String)
+        fail(ArgumentError, "invalid remarks") unless value.is_a?(String)
         @remarks = value
       end
 

data/lib/aixm/feature/navigational_aid/base.rb

@@ -13,7 +13,7 @@ module AIXM
 
         private_class_method :new
 
-        def initialize(id:, name:, xy:, z: nil)
+        def initialize(id:, name: nil, xy:, z: nil)
           self.id, self.name, self.xy, self.z = id, name, xy, z
         end
 
@@ -23,8 +23,8 @@ module AIXM
         end
 
         def name=(value)
-          fail(ArgumentError, "invalid name") unless value.is_a? String
-          @name = value.upcase
+          fail(ArgumentError, "invalid name") unless value.nil? || value.is_a?(String)
+          @name = value&.upcase
         end
 
         def xy=(value)

data/lib/aixm/feature/navigational_aid/designated_point.rb

@@ -23,7 +23,7 @@ module AIXM
 
         public_class_method :new
 
-        def initialize(id:, name:, xy:, z: nil, type:)
+        def initialize(id:, name: nil, xy:, z: nil, type:)
           super(id: id, name: name, xy: xy, z: z)
           self.type = type
         end
@@ -60,7 +60,7 @@ module AIXM
           builder.Dpn do |dpn|
             dpn << to_uid(*extensions).indent(2)
             dpn.OrgUid
-            dpn.txtName(name)
+            dpn.txtName(name) if name
             dpn.codeDatum('WGE')
             dpn.codeType(type_key.to_s)
             if z

data/lib/aixm/feature/navigational_aid/dme.rb

@@ -54,7 +54,7 @@ module AIXM
             dme << to_uid(*extensions).indent(2)
             dme.OrgUid
             dme << vor.to_uid(*extensions).indent(2) if vor
-            dme.txtName(name)
+            dme.txtName(name) if name
             dme.codeChannel(channel)
             dme.codeDatum('WGE')
             if z

data/lib/aixm/feature/navigational_aid/marker.rb

@@ -37,7 +37,7 @@ module AIXM
             mkr.OrgUid
             mkr.valFreq(75)
             mkr.uomFreq('MHZ')
-            mkr.txtName(name)
+            mkr.txtName(name) if name
             mkr.codeDatum('WGE')
             if z
               mkr.valElev(z.alt)

data/lib/aixm/feature/navigational_aid/ndb.rb

@@ -48,7 +48,7 @@ module AIXM
           builder.Ndb do |ndb|
             ndb << to_uid(*extensions).indent(2)
             ndb.OrgUid
-            ndb.txtName(name)
+            ndb.txtName(name) if name
             ndb.valFreq(f.freq.trim)
             ndb.uomFreq(f.unit.upcase.to_s)
             ndb.codeDatum('WGE')

data/lib/aixm/feature/navigational_aid/tacan.rb

@@ -32,7 +32,7 @@ module AIXM
             tcn << to_uid(*extensions).indent(2)
             tcn.OrgUid
             tcn << vor.to_uid(*extensions).indent(2) if vor
-            tcn.txtName(name)
+            tcn.txtName(name) if name
             tcn.codeChannel(channel)
             tcn.codeDatum('WGE')
             if z

data/lib/aixm/feature/navigational_aid/vor.rb

@@ -104,7 +104,7 @@ module AIXM
           builder.Vor do |vor|
             vor << to_uid(*extensions).indent(2)
             vor.OrgUid
-            vor.txtName(name)
+            vor.txtName(name) if name
             vor.codeType(type_key.to_s)
             vor.valFreq(f.freq.trim)
             vor.uomFreq(f.unit.upcase.to_s)

data/lib/aixm/version.rb

@@ -1,3 +1,3 @@
 module AIXM
-  VERSION = "0.2.1".freeze
+  VERSION = "0.2.2".freeze
 end

data/spec/lib/aixm/feature/navigational_aid/base_spec.rb

@@ -12,6 +12,10 @@ describe AIXM::Feature::NavigationalAid::Base do
       -> { base.send(:new, id: 'id', name: 'name', xy: AIXM::Factory.xy, z: AIXM.z(1, :qne)) }.must_raise ArgumentError
     end
 
+    it "accepts name to be nil" do
+      base.send(:new, id: 'id', xy: AIXM::Factory.xy).name.must_be_nil
+    end
+
     context "downcase attributes" do
       subject do
         base.send(:new, id: 'id', name: 'name', xy: AIXM::Factory.xy)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aixm
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Sven Schwyn