aixm 0.2.3 → 0.3.0

data/spec/lib/aixm/xy_spec.rb

@@ -1,35 +1,22 @@
 require_relative '../../spec_helper'
 
 describe AIXM::XY do
-  describe :initialize do
-    it "must parse valid DD" do
-      subject = AIXM.xy(lat: 11.2233, long: 22.3344)
-      subject.lat.must_equal 11.2233
-      subject.long.must_equal 22.3344
-    end
-
-    it "must parse valid DMS N/E"  do
-      subject = AIXM.xy(lat: %q(11°22'33"N), long: %q(22°33'44"E))
-      subject.lat.must_equal 11.37583333
-      subject.long.must_equal 22.56222222
-    end
-
-    it "must parse valid DMS S/W"  do
-      subject = AIXM.xy(lat: %q(11°22'33"S), long: %q(22°33'44"W))
-      subject.lat.must_equal(-11.37583333)
-      subject.long.must_equal(-22.56222222)
-    end
+  subject do
+    AIXM::Factory.xy
+  end
 
-    it "won't parse invalid latitude" do
-      -> { AIXM.xy(lat: 91, long: 22.3344) }.must_raise ArgumentError
+  describe :lat= do
+    it "fails on invalid values" do
+      [91, "foobar"].wont_be_written_to subject, :lat
     end
 
-    it "won't parse invalid longitude" do
-      -> { AIXM.xy(lat: 11.2233, long: 181) }.must_raise ArgumentError
+    it "parses valid DD values" do
+      subject.tap { |s| s.lat = 11.2233 }.lat.must_equal 11.2233
     end
 
-    it "won't parse invalid DMS" do
-      -> { AIXM.xy(lat: "foo", long: "bar") }.must_raise ArgumentError
+    it "parses valid DMS values"  do
+      subject.tap { |s| s.lat = %q(11°22'33"N) }.lat.must_equal(11.37583333)
+      subject.tap { |s| s.lat = %q(11°22'33"S) }.lat.must_equal(-11.37583333)
     end
   end
 
@@ -48,7 +35,7 @@ describe AIXM::XY do
       end
 
       it "must format OFM correctly" do
-        subject.lat(:ofm).must_equal '1.12340000N'
+        subject.lat(:ofmx).must_equal '01.12340000N'
       end
     end
 
@@ -66,11 +53,26 @@ describe AIXM::XY do
       end
 
       it "must format OFM correctly" do
-        subject.lat(:ofm).must_equal '1.12340000S'
+        subject.lat(:ofmx).must_equal '01.12340000S'
       end
     end
   end
 
+  describe :long= do
+    it "fails on invalid values" do
+      [181, "foobar"].wont_be_written_to subject, :lat
+    end
+
+    it "parses valid DD values" do
+      subject.tap { |s| s.long = 22.3344 }.long.must_equal 22.3344
+    end
+
+    it "parses valid DMS values"  do
+      subject.tap { |s| s.long = %q(22°33'44"E) }.long.must_equal(22.56222222)
+      subject.tap { |s| s.long = %q(22°33'44"W) }.long.must_equal(-22.56222222)
+    end
+  end
+
   describe :long do
     context "east" do
       subject do
@@ -86,7 +88,7 @@ describe AIXM::XY do
       end
 
       it "must format OFM correctly" do
-        subject.long(:ofm).must_equal '1.12340000E'
+        subject.long(:ofmx).must_equal '001.12340000E'
       end
     end
 
@@ -104,17 +106,11 @@ describe AIXM::XY do
       end
 
       it "must format OFM correctly" do
-        subject.long(:ofm).must_equal '1.12340000W'
+        subject.long(:ofmx).must_equal '001.12340000W'
       end
     end
   end
 
-  describe :to_digest do
-    it "must return digest of payload" do
-      AIXM::Factory.xy.to_digest.must_equal 783044788
-    end
-  end
-
   describe :== do
     it "recognizes objects with identical latitude and longitude as equal" do
       a = AIXM.xy(lat: "112233N", long: "0223344E")
@@ -134,4 +130,19 @@ describe AIXM::XY do
       a.wont_equal b
     end
   end
+
+  describe :distance do
+    subject do
+      AIXM.xy(lat: %q(44°00'07.63"N), long: %q(004°45'07.81"E))
+    end
+
+    it "calculates the distance between the same point as zero" do
+      subject.distance(subject).must_equal 0
+    end
+
+    it "calculates the distance between two points correctly in meters" do
+      other = AIXM.xy(lat: %q(43°59'25.31"N), long: %q(004°45'23.24"E))
+      subject.distance(other).must_equal 1351
+    end
+  end
 end

data/spec/lib/aixm/z_spec.rb

@@ -1,21 +1,27 @@
 require_relative '../../spec_helper'
 
 describe AIXM::Z do
-  describe :initialize do
-    it "must parse valid Q code" do
-      subject = AIXM.z(111, 'QNH')
-      subject.alt.must_equal 111
-      subject.code.must_equal :qnh
+  subject do
+    AIXM::Factory.z
+  end
+
+  describe :alt= do
+    it "fails on invalid values" do
+      [:foobar].wont_be_written_to subject, :alt
     end
 
-    it "won't parse invalid Q code" do
-      -> { AIXM.z(111, :FOO) }.must_raise ArgumentError
+    it "converts Numeric to Integer" do
+      subject.tap { |s| s.alt = 5.5 }.alt.must_equal 5
     end
   end
 
-  describe :to_digest do
-    it "must return digest of payload" do
-      AIXM.z(111, :qnh).to_digest.must_equal 606000673
+  describe :code= do
+    it "fails on invalid values" do
+      [nil, :foobar].wont_be_written_to subject, :code
+    end
+
+    it "symbolizes and downcases values" do
+      subject.tap { |s| s.code = "QFE" }.code.must_equal :qfe
     end
   end
 
@@ -57,19 +63,11 @@ describe AIXM::Z do
     end
   end
 
-  describe :base do
-    it "must return the correct base" do
-      AIXM.z(0, :qfe).base.must_equal :ASFC
-      AIXM.z(0, :qnh).base.must_equal :AMSL
-      AIXM.z(0, :qne).base.must_equal :AMSL
-    end
-  end
-
   describe :unit do
     it "must return the correct unit" do
-      AIXM.z(0, :qfe).unit.must_equal :FT
-      AIXM.z(0, :qnh).unit.must_equal :FT
-      AIXM.z(0, :qne).unit.must_equal :FL
+      AIXM.z(0, :qfe).unit.must_equal :ft
+      AIXM.z(0, :qnh).unit.must_equal :ft
+      AIXM.z(0, :qne).unit.must_equal :fl
     end
   end
 end

data/spec/macros/organisation.rb

@@ -0,0 +1,11 @@
+describe nil do
+
+  it "fails on invalid values" do
+    [:foobar, 123].wont_be_written_to subject, :organisation
+  end
+
+  it "accepts valid values" do
+    [AIXM::Factory.organisation].must_be_written_to subject, :organisation
+  end
+
+end

data/spec/macros/remarks.rb

@@ -0,0 +1,12 @@
+describe nil do
+
+  it "accepts nil value" do
+    [nil].must_be_written_to subject, :remarks
+  end
+
+  it "stringifies valid values" do
+    subject.tap { |s| s.remarks = 'foobar' }.remarks.must_equal 'foobar'
+    subject.tap { |s| s.remarks = 123 }.remarks.must_equal '123'
+  end
+
+end

data/spec/macros/timetable.rb

@@ -0,0 +1,11 @@
+describe nil do
+
+  it "fails on invalid values" do
+    [:foobar, 123].wont_be_written_to subject, :timetable
+  end
+
+  it "accepts nil values" do
+    [nil].must_be_written_to subject, :timetable
+  end
+
+end

data/spec/macros/xy.rb

@@ -0,0 +1,11 @@
+describe nil do
+
+  it "fails on invalid values" do
+    [:foobar, 123].wont_be_written_to subject, :xy
+  end
+
+  it "accepts valid values" do
+    [AIXM::Factory.xy].must_be_written_to subject, :xy
+  end
+
+end

data/spec/macros/z_qnh.rb

@@ -0,0 +1,11 @@
+describe nil do
+
+  it "fails on invalid values" do
+    [:foobar, 123, AIXM.z(123, :qfe)].wont_be_written_to subject, :z
+  end
+
+  it "accepts valid values" do
+    [AIXM.z(123, :qnh)].must_be_written_to subject, :z
+  end
+
+end

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+$VERBOSE = nil   # silence warnings
+
 gem 'minitest'
 
 require 'pathname'
@@ -24,5 +26,29 @@ end
 class MiniTest::Spec
   class << self
     alias_method :context, :describe
+
+    def macro(name)
+      load Pathname(__dir__).join("macros/#{name}.rb")
+    end
+  end
+end
+
+module Minitest::Assertions
+  def assert_write(values, subject, attribute, msg=nil)
+    values.each do |value|
+      msg = message(msg) { "Expected #{mu_pp(value)} to be written to #{subject.class}##{attribute}" }
+      subject.send("#{attribute}=", value)
+      assert(subject.send(attribute) == value, msg)
+    end
+  end
+
+  def refute_write(values, subject, attribute, msg=nil)
+    values.each do |value|
+      msg = "Expected #{mu_pp(value)} to raise ArgumentError when written to #{subject.class}##{attribute}"
+      assert_raises(ArgumentError, msg) { subject.send("#{attribute}=", value) }
+    end
   end
 end
+
+Array.infect_an_assertion :assert_write, :must_be_written_to, :reverse
+Array.infect_an_assertion :refute_write, :wont_be_written_to, :reverse

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aixm
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Sven Schwyn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-29 00:00:00.000000000 Z
+date: 2018-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -160,6 +160,7 @@ files:
 - ".gitignore"
 - ".ruby-version"
 - ".travis.yml"
+- ".yardopts"
 - CHANGELOG.md
 - Gemfile
 - Guardfile
@@ -168,59 +169,84 @@ files:
 - Rakefile
 - aixm.gemspec
 - lib/aixm.rb
-- lib/aixm/base.rb
-- lib/aixm/component/base.rb
-- lib/aixm/component/class_layer.rb
+- lib/aixm/component.rb
+- lib/aixm/component/frequency.rb
 - lib/aixm/component/geometry.rb
 - lib/aixm/component/geometry/arc.rb
-- lib/aixm/component/geometry/base.rb
 - lib/aixm/component/geometry/border.rb
 - lib/aixm/component/geometry/circle.rb
 - lib/aixm/component/geometry/point.rb
-- lib/aixm/component/schedule.rb
+- lib/aixm/component/helipad.rb
+- lib/aixm/component/layer.rb
+- lib/aixm/component/runway.rb
+- lib/aixm/component/service.rb
+- lib/aixm/component/timetable.rb
 - lib/aixm/component/vertical_limits.rb
+- lib/aixm/config.rb
 - lib/aixm/document.rb
+- lib/aixm/errors.rb
 - lib/aixm/f.rb
+- lib/aixm/feature.rb
+- lib/aixm/feature/airport.rb
 - lib/aixm/feature/airspace.rb
-- lib/aixm/feature/base.rb
-- lib/aixm/feature/navigational_aid/base.rb
+- lib/aixm/feature/navigational_aid.rb
 - lib/aixm/feature/navigational_aid/designated_point.rb
 - lib/aixm/feature/navigational_aid/dme.rb
 - lib/aixm/feature/navigational_aid/marker.rb
 - lib/aixm/feature/navigational_aid/ndb.rb
 - lib/aixm/feature/navigational_aid/tacan.rb
 - lib/aixm/feature/navigational_aid/vor.rb
+- lib/aixm/feature/organisation.rb
+- lib/aixm/feature/unit.rb
 - lib/aixm/refinements.rb
-- lib/aixm/schemas/4.5/AIXM-DataTypes.xsd
-- lib/aixm/schemas/4.5/AIXM-Features.xsd
-- lib/aixm/schemas/4.5/AIXM-Snapshot.xsd
 - lib/aixm/shortcuts.rb
 - lib/aixm/version.rb
 - lib/aixm/xy.rb
 - lib/aixm/z.rb
+- schemas/aixm/4.5/AIXM-DataTypes.xsd
+- schemas/aixm/4.5/AIXM-Features.xsd
+- schemas/aixm/4.5/AIXM-Snapshot.xsd
+- schemas/ofmx/0/OFMX-DataTypes.xsd
+- schemas/ofmx/0/OFMX-Features.xsd
+- schemas/ofmx/0/OFMX-Snapshot.xsd
 - spec/factory.rb
-- spec/lib/aixm/component/class_layer_spec.rb
+- spec/lib/aixm/component/frequency_spec.rb
 - spec/lib/aixm/component/geometry/arc_spec.rb
 - spec/lib/aixm/component/geometry/border_spec.rb
 - spec/lib/aixm/component/geometry/circle_spec.rb
 - spec/lib/aixm/component/geometry/point_spec.rb
 - spec/lib/aixm/component/geometry_spec.rb
-- spec/lib/aixm/component/schedule_spec.rb
+- spec/lib/aixm/component/helipad_spec.rb
+- spec/lib/aixm/component/layer_spec.rb
+- spec/lib/aixm/component/runway_spec.rb
+- spec/lib/aixm/component/service_spec.rb
+- spec/lib/aixm/component/timetable_spec.rb
 - spec/lib/aixm/component/vertical_limits_spec.rb
+- spec/lib/aixm/config_spec.rb
 - spec/lib/aixm/document_spec.rb
+- spec/lib/aixm/errors_spec.rb
 - spec/lib/aixm/f_spec.rb
+- spec/lib/aixm/feature/airport_spec.rb
 - spec/lib/aixm/feature/airspace_spec.rb
-- spec/lib/aixm/feature/navigational_aid/base_spec.rb
 - spec/lib/aixm/feature/navigational_aid/designated_point_spec.rb
 - spec/lib/aixm/feature/navigational_aid/dme_spec.rb
 - spec/lib/aixm/feature/navigational_aid/marker_spec.rb
 - spec/lib/aixm/feature/navigational_aid/ndb_spec.rb
 - spec/lib/aixm/feature/navigational_aid/tacan_spec.rb
 - spec/lib/aixm/feature/navigational_aid/vor_spec.rb
+- spec/lib/aixm/feature/navigational_aid_spec.rb
+- spec/lib/aixm/feature/organisation_spec.rb
+- spec/lib/aixm/feature/unit_spec.rb
+- spec/lib/aixm/feature_spec.rb
 - spec/lib/aixm/refinements_spec.rb
 - spec/lib/aixm/version_spec.rb
 - spec/lib/aixm/xy_spec.rb
 - spec/lib/aixm/z_spec.rb
+- spec/macros/organisation.rb
+- spec/macros/remarks.rb
+- spec/macros/timetable.rb
+- spec/macros/xy.rb
+- spec/macros/z_qnh.rb
 - spec/sounds/failure.mp3
 - spec/sounds/success.mp3
 - spec/spec_helper.rb
@@ -244,34 +270,49 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Aeronautical Information Exchange Model (AIXM 4.5).
 test_files:
 - spec/factory.rb
-- spec/lib/aixm/component/class_layer_spec.rb
+- spec/lib/aixm/component/frequency_spec.rb
 - spec/lib/aixm/component/geometry/arc_spec.rb
 - spec/lib/aixm/component/geometry/border_spec.rb
 - spec/lib/aixm/component/geometry/circle_spec.rb
 - spec/lib/aixm/component/geometry/point_spec.rb
 - spec/lib/aixm/component/geometry_spec.rb
-- spec/lib/aixm/component/schedule_spec.rb
+- spec/lib/aixm/component/helipad_spec.rb
+- spec/lib/aixm/component/layer_spec.rb
+- spec/lib/aixm/component/runway_spec.rb
+- spec/lib/aixm/component/service_spec.rb
+- spec/lib/aixm/component/timetable_spec.rb
 - spec/lib/aixm/component/vertical_limits_spec.rb
+- spec/lib/aixm/config_spec.rb
 - spec/lib/aixm/document_spec.rb
+- spec/lib/aixm/errors_spec.rb
 - spec/lib/aixm/f_spec.rb
+- spec/lib/aixm/feature/airport_spec.rb
 - spec/lib/aixm/feature/airspace_spec.rb
-- spec/lib/aixm/feature/navigational_aid/base_spec.rb
 - spec/lib/aixm/feature/navigational_aid/designated_point_spec.rb
 - spec/lib/aixm/feature/navigational_aid/dme_spec.rb
 - spec/lib/aixm/feature/navigational_aid/marker_spec.rb
 - spec/lib/aixm/feature/navigational_aid/ndb_spec.rb
 - spec/lib/aixm/feature/navigational_aid/tacan_spec.rb
 - spec/lib/aixm/feature/navigational_aid/vor_spec.rb
+- spec/lib/aixm/feature/navigational_aid_spec.rb
+- spec/lib/aixm/feature/organisation_spec.rb
+- spec/lib/aixm/feature/unit_spec.rb
+- spec/lib/aixm/feature_spec.rb
 - spec/lib/aixm/refinements_spec.rb
 - spec/lib/aixm/version_spec.rb
 - spec/lib/aixm/xy_spec.rb
 - spec/lib/aixm/z_spec.rb
+- spec/macros/organisation.rb
+- spec/macros/remarks.rb
+- spec/macros/timetable.rb
+- spec/macros/xy.rb
+- spec/macros/z_qnh.rb
 - spec/sounds/failure.mp3
 - spec/sounds/success.mp3
 - spec/spec_helper.rb