aixm 0.3.7 → 0.3.8

data/spec/lib/aixm/feature/organisation_spec.rb

@@ -7,36 +7,36 @@ describe AIXM::Feature::Organisation do
 
   describe :name= do
     it "fails on invalid values" do
-      [nil, :foobar, 123].wont_be_written_to subject, :name
+      _([nil, :foobar, 123]).wont_be_written_to subject, :name
     end
 
     it "upcases and transcodes valid values" do
-      subject.tap { |s| s.name = 'Nîmes-Alès' }.name.must_equal 'NIMES-ALES'
+      _(subject.tap { |s| s.name = 'Nîmes-Alès' }.name).must_equal 'NIMES-ALES'
     end
   end
 
   describe :type= do
     it "fails on invalid values" do
-      [nil, :foobar, 123].wont_be_written_to subject, :type
+      _([nil, :foobar, 123]).wont_be_written_to subject, :type
     end
 
     it "looks up valid values" do
-      subject.tap { |s| s.type = :state }.type.must_equal :state
-      subject.tap { |s| s.type = :IO }.type.must_equal :international_organisation
+      _(subject.tap { |s| s.type = :state }.type).must_equal :state
+      _(subject.tap { |s| s.type = :IO }.type).must_equal :international_organisation
     end
   end
 
   describe :id= do
     it "fails on invalid values" do
-      [:foobar, 123].wont_be_written_to subject, :id
+      _([:foobar, 123]).wont_be_written_to subject, :id
     end
 
     it "accepts nil value" do
-      [nil].must_be_written_to subject, :id
+      _([nil]).must_be_written_to subject, :id
     end
 
     it "upcases valid values" do
-      subject.tap { |s| s.id = 'lf' }.id.must_equal 'LF'
+      _(subject.tap { |s| s.id = 'lf' }.id).must_equal 'LF'
     end
   end
 
@@ -47,7 +47,7 @@ describe AIXM::Feature::Organisation do
   describe :to_xml do
     it "builds correct complete OFMX" do
       AIXM.ofmx!
-      subject.to_xml.must_equal <<~END
+      _(subject.to_xml).must_equal <<~END
         <!-- Organisation: FRANCE -->
         <Org source="LF|GEN|0.0 FACTORY|0|0">
           <OrgUid>
@@ -63,7 +63,7 @@ describe AIXM::Feature::Organisation do
     it "builds correct minimal OFMX" do
       AIXM.ofmx!
       subject.id = subject.remarks = nil
-      subject.to_xml.must_equal <<~END
+      _(subject.to_xml).must_equal <<~END
         <!-- Organisation: FRANCE -->
         <Org source="LF|GEN|0.0 FACTORY|0|0">
           <OrgUid>
@@ -73,5 +73,11 @@ describe AIXM::Feature::Organisation do
         </Org>
       END
     end
+
+    it "builds OFMX with mid" do
+      AIXM.ofmx!
+      AIXM.config.mid_region = 'LF'
+      _(subject.to_xml).must_match /<OrgUid mid="b5fef8e2-ea45-7326-6b2f-38cb45cd21a8">/
+    end
   end
 end

data/spec/lib/aixm/feature/service_spec.rb

@@ -10,19 +10,19 @@ describe AIXM::Feature::Service do
       subject = AIXM::Feature::Service.new(
         type: :approach_control_service
       )
-      subject.frequencies.must_equal []
+      _(subject.frequencies).must_equal []
     end
   end
 
   describe :type= do
     it "fails on invalid values" do
-      -> { subject.type = :foobar }.must_raise ArgumentError
-      -> { subject.type = nil }.must_raise ArgumentError
+      _{ subject.type = :foobar }.must_raise ArgumentError
+      _{ subject.type = nil }.must_raise ArgumentError
     end
 
     it "looks up valid values" do
-      subject.tap { |s| s.type = :area_control_service }.type.must_equal :area_control_service
-      subject.tap { |s| s.type = :ATIS }.type.must_equal :automated_terminal_information_service
+      _(subject.tap { |s| s.type = :area_control_service }.type).must_equal :area_control_service
+      _(subject.tap { |s| s.type = :ATIS }.type).must_equal :automated_terminal_information_service
     end
   end
 
@@ -36,23 +36,23 @@ describe AIXM::Feature::Service do
 
   describe :add_frequency do
     it "fails on invalid arguments" do
-      -> { subject.add_frequency nil }.must_raise ArgumentError
+      _{ subject.add_frequency nil }.must_raise ArgumentError
     end
 
     it "adds frequency to the array" do
       count = subject.frequencies.count
       subject.add_frequency(AIXM::Factory.frequency)
-      subject.frequencies.count.must_equal count + 1
+      _(subject.frequencies.count).must_equal count + 1
     end
   end
 
   describe :guess_unit_type do
     it "finds the probably unit type for a matchable service" do
-      subject.tap { |s| s.type = :flight_information_service }.guessed_unit_type.must_equal :flight_information_centre
+      _(subject.tap { |s| s.type = :flight_information_service }.guessed_unit_type).must_equal :flight_information_centre
     end
 
     it "returns nil for an unmatchable service" do
-      subject.tap { |s| s.type = :aeronautical_mobile_satellite_service }.guessed_unit_type.must_be_nil
+      _(subject.tap { |s| s.type = :aeronautical_mobile_satellite_service }.guessed_unit_type).must_be_nil
     end
   end
 

data/spec/lib/aixm/feature/unit_spec.rb

@@ -9,49 +9,49 @@ describe AIXM::Feature::Unit do
     macro :organisation
 
     it "fails on nil value" do
-      [nil].wont_be_written_to subject, :organisation
+      _([nil]).wont_be_written_to subject, :organisation
     end
   end
 
   describe :name= do
     it "fails on invalid values" do
-      [nil, :foobar, 123].wont_be_written_to subject, :name
+      _([nil, :foobar, 123]).wont_be_written_to subject, :name
     end
 
     it "upcases and transcodes valid values" do
-      subject.tap { |s| s.name = 'Nîmes-Alès APP' }.name.must_equal 'NIMES-ALES APP'
+      _(subject.tap { |s| s.name = 'Nîmes-Alès APP' }.name).must_equal 'NIMES-ALES APP'
     end
   end
 
   describe :type= do
     it "fails on invalid values" do
-      [nil, :foobar, 123].wont_be_written_to subject, :type
+      _([nil, :foobar, 123]).wont_be_written_to subject, :type
     end
 
     it "looks up valid values" do
-      subject.tap { |s| s.type = :flight_information_centre }.type.must_equal :flight_information_centre
-      subject.tap { |s| s.type = :MET }.type.must_equal :meteorological_office
+      _(subject.tap { |s| s.type = :flight_information_centre }.type).must_equal :flight_information_centre
+      _(subject.tap { |s| s.type = :MET }.type).must_equal :meteorological_office
     end
   end
 
   describe :class= do
     it "fails on invalid values" do
-      [nil, :foobar, 123].wont_be_written_to subject, :class
+      _([nil, :foobar, 123]).wont_be_written_to subject, :class
     end
 
     it "looks up valid values" do
-      subject.tap { |s| s.class = :icao }.class.must_equal :icao
-      subject.tap { |s| s.class = :OTHER }.class.must_equal :other
+      _(subject.tap { |s| s.class = :icao }.class).must_equal :icao
+      _(subject.tap { |s| s.class = :OTHER }.class).must_equal :other
     end
   end
 
   describe :airport= do
     it "fails on invalid values" do
-      [:foobar, 123].wont_be_written_to subject, :airport
+      _([:foobar, 123]).wont_be_written_to subject, :airport
     end
 
     it "accepts valid values" do
-      [nil, AIXM::Factory.airport].must_be_written_to subject, :airport
+      _([nil, AIXM::Factory.airport]).must_be_written_to subject, :airport
     end
   end
 
@@ -69,7 +69,7 @@ describe AIXM::Feature::Unit do
     it "builds correct complete OFMX" do
       2.times { subject.add_service(service) }
       AIXM.ofmx!
-      subject.to_xml.must_equal <<~END
+      _(subject.to_xml).must_equal <<~END
         <!-- Unit: PUJAUT TWR -->
         <Uni source="LF|GEN|0.0 FACTORY|0|0">
           <UniUid>
@@ -212,7 +212,7 @@ describe AIXM::Feature::Unit do
       AIXM.ofmx!
       subject.airport = subject.remarks = nil
       subject.instance_variable_set(:'@services', [])
-      subject.to_xml.must_equal <<~END
+      _(subject.to_xml).must_equal <<~END
         <!-- Unit: PUJAUT TWR -->
         <Uni source="LF|GEN|0.0 FACTORY|0|0">
           <UniUid>
@@ -226,5 +226,13 @@ describe AIXM::Feature::Unit do
         </Uni>
       END
     end
+
+    it "builds OFMX with mid" do
+      AIXM.ofmx!
+      AIXM.config.mid_region = 'LF'
+      _(subject.to_xml).must_match /<UniUid mid="92534b75-1c12-edc5-351b-740cb82e87dd">/
+      _(subject.to_xml).must_match /<SerUid mid="9240cf80-9cba-7ea5-ae39-6b682305db78">/
+      _(subject.to_xml).must_match /<FqyUid mid="48d8e7db-88b1-8e2f-2f27-2c2521e7ac27">/      
+    end
   end
 end

data/spec/lib/aixm/feature_spec.rb

@@ -7,11 +7,11 @@ describe AIXM::Feature do
 
   describe :source= do
     it "fails on invalid values" do
-      [:foobar, 123].wont_be_written_to subject, :source
+      _([:foobar, 123]).wont_be_written_to subject, :source
     end
 
     it "accepts nil value" do
-      [nil].must_be_written_to subject, :source
+      _([nil]).must_be_written_to subject, :source
     end
   end
 
@@ -19,19 +19,19 @@ describe AIXM::Feature do
     it "recognizes features with identical UID as equal" do
       a = AIXM::Factory.organisation
       b = AIXM::Factory.organisation
-      a.must_equal b
+      _(a).must_equal b
     end
 
     it "recognizes features with different UID as unequal" do
       a = AIXM::Factory.polygon_airspace
       b = AIXM::Factory.circle_airspace
-      a.wont_equal b
+      _(a).wont_equal b
     end
 
     it "recognizes objects of different class as unequal" do
       a = AIXM::Factory.organisation
       b = :oggy
-      a.wont_equal b
+      _(a).wont_equal b
     end
   end
 

data/spec/lib/aixm/p_spec.rb

@@ -7,136 +7,136 @@ describe AIXM::P do
 
   describe :pres= do
     it "fails on invalid values" do
-      [:foobar, -1].wont_be_written_to subject, :pres
+      _([:foobar, -1]).wont_be_written_to subject, :pres
     end
 
     it "converts Numeric to Float" do
-      subject.tap { |s| s.pres = 5 }.pres.must_equal 5.0
+      _(subject.tap { |s| s.pres = 5 }.pres).must_equal 5.0
     end
   end
 
   describe :unit= do
     it "fails on invalid values" do
-      [:foobar, 123].wont_be_written_to subject, :unit
+      _([:foobar, 123]).wont_be_written_to subject, :unit
     end
 
     it "symbolizes and downcases values" do
-      subject.tap { |s| s.unit = "P" }.unit.must_equal :p
+      _(subject.tap { |s| s.unit = "P" }.unit).must_equal :p
     end
   end
 
   describe :to_p do
     it "leaves pascal untouched" do
       subject = AIXM.p(2, :p)
-      subject.to_p.must_be_same_as subject
+      _(subject.to_p).must_be_same_as subject
     end
 
     it "converts megapascal to pascal" do
-      AIXM.p(0.01, :mpa).to_p.must_equal AIXM.p(10_000, :p)
+      _(AIXM.p(0.01, :mpa).to_p).must_equal AIXM.p(10_000, :p)
     end
 
     it "converts psi to pascal" do
-      AIXM.p(0.03, :psi).to_p.must_equal AIXM.p(206.8427187, :p)
+      _(AIXM.p(0.03, :psi).to_p).must_equal AIXM.p(206.8427187, :p)
     end
 
     it "converts bar to pascal" do
-      AIXM.p(0.02, :bar).to_p.must_equal AIXM.p(2000, :p)
+      _(AIXM.p(0.02, :bar).to_p).must_equal AIXM.p(2000, :p)
     end
 
     it "converts mmhg to pascal" do
-      AIXM.p(0.02, :torr).to_p.must_equal AIXM.p(2.66644, :p)
+      _(AIXM.p(0.02, :torr).to_p).must_equal AIXM.p(2.66644, :p)
     end
   end
 
   describe :to_mpa do
     it "leaves megapascal untouched" do
       subject = AIXM.p(2, :mpa)
-      subject.to_mpa.must_be_same_as subject
+      _(subject.to_mpa).must_be_same_as subject
     end
 
     it "converts pascal to megapascal" do
-      AIXM.p(10_000, :p).to_mpa.must_equal AIXM.p(0.01, :mpa)
+      _(AIXM.p(10_000, :p).to_mpa).must_equal AIXM.p(0.01, :mpa)
     end
 
     it "converts psi to megapascal" do
-      AIXM.p(300, :psi).to_mpa.must_equal AIXM.p(2.06842719, :mpa)
+      _(AIXM.p(300, :psi).to_mpa).must_equal AIXM.p(2.06842719, :mpa)
     end
 
     it "converts bar to megapascal" do
-      AIXM.p(22, :bar).to_mpa.must_equal AIXM.p(2.2, :mpa)
+      _(AIXM.p(22, :bar).to_mpa).must_equal AIXM.p(2.2, :mpa)
     end
 
     it "converts mmhg to megapascal" do
-      AIXM.p(205, :torr).to_mpa.must_equal AIXM.p(0.02733101, :mpa)
+      _(AIXM.p(205, :torr).to_mpa).must_equal AIXM.p(0.02733101, :mpa)
     end
   end
 
   describe :to_psi do
     it "leaves psi untouched" do
       subject = AIXM.p(2, :psi)
-      subject.to_psi.must_be_same_as subject
+      _(subject.to_psi).must_be_same_as subject
     end
 
     it "converts pascal to psi" do
-      AIXM.p(500, :p).to_psi.must_equal AIXM.p(0.07251887, :psi)
+      _(AIXM.p(500, :p).to_psi).must_equal AIXM.p(0.07251887, :psi)
     end
 
     it "converts megapascal to psi" do
-      AIXM.p(0.1, :mpa).to_psi.must_equal AIXM.p(14.5037738, :psi)
+      _(AIXM.p(0.1, :mpa).to_psi).must_equal AIXM.p(14.5037738, :psi)
     end
 
     it "converts bar to psi" do
-      AIXM.p(30, :bar).to_psi.must_equal AIXM.p(435.113214, :psi)
+      _(AIXM.p(30, :bar).to_psi).must_equal AIXM.p(435.113214, :psi)
     end
 
     it "converts mmhg to psi" do
-      AIXM.p(20, :torr).to_psi.must_equal AIXM.p(0.38673443, :psi)
+      _(AIXM.p(20, :torr).to_psi).must_equal AIXM.p(0.38673443, :psi)
     end
   end
 
   describe :to_bar do
     it "leaves bars untouched" do
       subject = AIXM.p(2, :bar)
-      subject.to_bar.must_be_same_as subject
+      _(subject.to_bar).must_be_same_as subject
     end
 
     it "converts pascal to bars" do
-      AIXM.p(10_000, :p).to_bar.must_equal AIXM.p(0.1, :bar)
+      _(AIXM.p(10_000, :p).to_bar).must_equal AIXM.p(0.1, :bar)
     end
 
     it "converts megapascal to bars" do
-      AIXM.p(0.1, :mpa).to_bar.must_equal AIXM.p(1, :bar)
+      _(AIXM.p(0.1, :mpa).to_bar).must_equal AIXM.p(1, :bar)
     end
 
     it "converts psi to bars" do
-      AIXM.p(90, :psi).to_bar.must_equal AIXM.p(6.20528156, :bar)
+      _(AIXM.p(90, :psi).to_bar).must_equal AIXM.p(6.20528156, :bar)
     end
 
     it "converts mmhg to bars" do
-      AIXM.p(7000, :torr).to_bar.must_equal AIXM.p(9.33254, :bar)
+      _(AIXM.p(7000, :torr).to_bar).must_equal AIXM.p(9.33254, :bar)
     end
   end
 
   describe :to_torr do
     it "leaves mmhg untouched" do
       subject = AIXM.p(2, :torr)
-      subject.to_torr.must_be_same_as subject
+      _(subject.to_torr).must_be_same_as subject
     end
 
     it "converts pascal to mmhg" do
-      AIXM.p(12_000, :p).to_torr.must_equal AIXM.p(90.0072, :torr)
+      _(AIXM.p(12_000, :p).to_torr).must_equal AIXM.p(90.0072, :torr)
     end
 
     it "converts megapascal to mmhg" do
-      AIXM.p(0.1, :mpa).to_torr.must_equal AIXM.p(750.06, :torr)
+      _(AIXM.p(0.1, :mpa).to_torr).must_equal AIXM.p(750.06, :torr)
     end
 
     it "converts psi to mmhg" do
-      AIXM.p(2, :psi).to_torr.must_equal AIXM.p(103.42963306, :torr)
+      _(AIXM.p(2, :psi).to_torr).must_equal AIXM.p(103.42963306, :torr)
     end
 
     it "converts bar to mmhg" do
-      AIXM.p(0.35, :bar).to_torr.must_equal AIXM.p(262.521, :torr)
+      _(AIXM.p(0.35, :bar).to_torr).must_equal AIXM.p(262.521, :torr)
     end
   end
 
@@ -144,46 +144,46 @@ describe AIXM::P do
     it "recognizes objects with identical unit and pressure as equal" do
       a = AIXM.p(12, :bar)
       b = AIXM.p(12.0, 'BAR')
-      a.must_equal b
+      _(a).must_equal b
     end
 
     it "recognizes objects with different units and converted pressure as equal" do
       a = AIXM.p(12, :bar)
       b = AIXM.p(174.0452856, 'PSI')
-      a.must_equal b
+      _(a).must_equal b
     end
 
     it "recognizes objects with different units and identical pressure as unequal" do
       a = AIXM.p(12, :bar)
       b = AIXM.p(12, :p)
-      a.wont_equal b
+      _(a).wont_equal b
     end
 
     it "recognizes objects of different class as unequal" do
       a = AIXM.p(12, :bar)
       b = :oggy
-      a.wont_equal b
+      _(a).wont_equal b
     end
   end
 
   describe :hash do
     it "returns an integer" do
-      subject.hash.must_be_instance_of Integer
+      _(subject.hash).must_be_instance_of Integer
     end
 
     it "allows for the use of instances as hash keys" do
       dupe = subject.dup
-      { subject => true }[dupe].must_equal true
+      _({ subject => true }[dupe]).must_equal true
     end
   end
 
   describe :zero? do
     it "returns true for zero pressure" do
-      subject.tap { |s| s.pres = 0 }.must_be :zero?
+      _(subject.tap { |s| s.pres = 0 }).must_be :zero?
     end
 
     it "returns false for non-zero pressure" do
-      subject.tap { |s| s.pres = 1 }.wont_be :zero?
+      _(subject.tap { |s| s.pres = 1 }).wont_be :zero?
     end
   end
 end