aixm 1.3.0 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af33154acb182006b0c9f4e048c305b2489cba22d15ee1bc9aa724ddec70ceab
-  data.tar.gz: 44c42b5e93537e33cb2623a19a043216853664358d5c616f59aa884ee4c3e80c
+  metadata.gz: 6fa3066c9e65afaa76e4327da9a11a42c27f1baad1a712de3fee6400765c0b6a
+  data.tar.gz: 6c0d4261d076fddc05b150b5c1851a61ffa011ff6b8f15f254492987e4f80fb4
 SHA512:
-  metadata.gz: e960a18401dd58557db667b01cb3f15683728798f3aee736fda794a18519d7b3fb99e0725154a01b564a4e35658cdde5310402fd1c2b6f2e4550880cf47db98b
-  data.tar.gz: 2855fb8f01ca9dd515e8c05b60e79d80f4d4af77b48f1b03cc4baaadd1451810b877c92cd9364cb5d84b80f6d99ebda3b8c21d2445143f9d078a9e4e7ef2cc76
+  metadata.gz: 88bcefbea10f86f6f5b3c483f546197409dcd06b8751b8f0ced1d2e3730e27559a248486015a0673685d24afb04f306df4ea0acf3f14fe5347c3c9f89d72e23c
+  data.tar.gz: 067ee1c2ffc6b251a9063982ee4e5d07492746aa0d780be020b46f549868992397348054c09d08704bb5e4744a0a78da8936ee739870822029a8eb32776c10c0

data/CHANGELOG.md

@@ -2,16 +2,32 @@
 
 Nothing so far
 
+## 1.3.2
+
+#### Changes
+* Add `#pred` (aliased `#prev`) and `#succ` (alias `#next`) to both
+  `AIXM::Date` and `AIXM::Day` in order to use them for iterations
+* Pretty print generic features only to prevent segfaults on large documents
+
+## 1.3.1
+
+#### Changes
+* Update certificate
+
 ## 1.3.0
 
 #### Breaking Changes
 * `Document#created_at` no longer falls back to `Document#effective_at`
+* Renamed `AIXM::Date#succ` to `AIXM::Date#next`
 
 #### Additions
 * Refinement to pretty print Nokogiri XML documents
 * XML comments on features (e.g. to include raw NOTAM)
 * `Document#expiration_at` for OFMX
 * Generic features as raw XML (e.g. extracted from another AIXM/OFMX file)
+* Convenience combinator `AIXM::Schedule::DateTime`
+* Shortcuts `AIXM::BEGINNING_OF_DAY` and `AIXM::END_OF_DAY`
+* `AIXM::Date#next` and `AIXM::Date#-`
 
 ## 1.2.1
 

data/README.md

@@ -187,6 +187,13 @@ AIXM.config.ignored_errors = /invalid date/i
 * [VASIS](https://www.rubydoc.info/gems/aixm/AIXM/Component/VASIS.html)
 * [Vertical limit](https://www.rubydoc.info/gems/aixm/AIXM/Component/VerticalLimit.html)
 
+### Schedule
+
+* [Date](https://www.rubydoc.info/gems/aixm/AIXM/Schedule/Date.html)
+* [Day](https://www.rubydoc.info/gems/aixm/AIXM/Schedule/Day.html)
+* [Time](https://www.rubydoc.info/gems/aixm/AIXM/Schedule/Time.html)
+* [DateTime](https://www.rubydoc.info/gems/aixm/AIXM/Schedule/DateTime.html)
+
 ## Associations
 
 The different models are interwoven with [`has_many` and `has_one` associations](https://www.rubydoc.info/gems/aixm/AIXM/Association).

data/lib/aixm/classes.rb

@@ -14,6 +14,7 @@ module AIXM
     date: 'AIXM::Schedule::Date',
     day: 'AIXM::Schedule::Day',
     time: 'AIXM::Schedule::Time',
+    datetime: 'AIXM::Schedule::DateTime',
     address: 'AIXM::Component::Address',
     approach_lighting: 'AIXM::Component::ApproachLighting',
     organisation: 'AIXM::Feature::Organisation',

data/lib/aixm/concerns/xml_builder.rb

@@ -10,11 +10,11 @@ module AIXM
       # @yield [Nokogiri::XML::Builder]
       # @return [Nokogiri::XML::DocumentFragment]
       def build_fragment
-        Nokogiri::XML::DocumentFragment.parse('').tap do |document|
-          Nokogiri::XML::Builder.with(document) do |fragment|
-            yield fragment
+        Nokogiri::XML::DocumentFragment.parse('').tap do |fragment|
+          Nokogiri::XML::Builder.with(fragment) do |builder|
+            yield builder
           end
-          document.elements.each { _1.add_next_sibling("\n") }   # add newline between tags on top level
+          fragment.elements.each { _1.add_next_sibling("\n") }   # add newline between tags on top level
         end
       end
 

data/lib/aixm/document.rb

@@ -168,10 +168,13 @@ module AIXM
         effective: @effective_at.xmlschema,
         expiration: (@expiration_at&.xmlschema if AIXM.ofmx?)
       }.compact
-      Nokogiri::XML::Builder.new do |builder|
+      Nokogiri::XML::Builder.new(encoding: 'UTF-8') do |builder|
         builder.send(AIXM.schema(:root), meta) do |root|
+          root.text("\n")
           AIXM::Concerns::Memoize.method :to_uid do
-            features.each { _1.add_to(root) }
+            # TODO: indent is lost if added directly to the builder
+            # features.each { _1.add_to(root) }
+            features.each { root << _1.to_xml.indent(2) }
           end
           if AIXM.ofmx? && AIXM.config.mid
             AIXM::PayloadHash::Mid.new(builder.doc).insert_mid
@@ -182,7 +185,7 @@ module AIXM
 
     # @return [String] AIXM or OFMX markup
     def to_xml
-      document.pretty.to_xml
+      document.to_xml
     end
   end
 end

data/lib/aixm/feature/airspace.rb

@@ -18,6 +18,8 @@ module AIXM
     #   airspace.add_layer(AIXM.layer)
     #   airspace.geometry.add_segment(AIXM.point or AIXM.arc or AIXM.border or AIXM.circle)
     #
+    # Timetables and remarks have to be set on the layer!
+    #
     # The +id+ is mandatory, however, you may omit it when initializing a new
     # airspace or assign +nil+ to an existing airspace which will generate a 8
     # character digest from +type+, +local_type+ and +name+.

data/lib/aixm/feature/generic.rb

@@ -59,7 +59,7 @@ module AIXM
             element['region'] ||= region if element.name.match?(/Uid$/)
           end
         end
-        builder << decorated_fragment.to_xml
+        builder << decorated_fragment.to_pretty_xml
       end
     end
 

data/lib/aixm/refinements.rb

@@ -129,33 +129,32 @@ module AIXM
       end
     end
 
-    # @!method pretty
-    #   Transform the XML document to be pretty when sending +to_xml+
+    # @!method to_pretty_xml
+    #   Pretty printing alternative of +to_xml+
     #
     #   @example
     #     xml = <<~END
-    #       <xml><aaa> AAA </aaa>
+    #       <aaa></aaa>
     #         <bbb/>
-    #         <ccc   foo="bar"  >
-    #           CCC
-    #         </ccc>
-    #       </xml>
+    #       <ccc   foo="bar"  >
+    #         <ddd>
+    #       </ddd>
+    #       </ccc>
     #     END
-    #     Nokogiri.XML(xml).pretty.to_xml
-    #     # => <?xml version=\"1.0\" encoding=\"UTF-8\"?>
-    #          <xml>
-    #            <aaa> AAA </aaa>
-    #            <bbb/>
-    #            <ccc foo="bar">
-    #              CCC
-    #            </ccc>
-    #          </xml>
-    #
-    #   @note This is a refinement for +Nokogiri::XML::Document+
-    #   @return [Nokogiri::XML::Document]
-    refine Nokogiri::XML::Document do
-      def pretty
-        PRETTY_XSLT.transform(self)
+    #     Nokogiri::XML::DocumentFragment.parse(xml).to_pretty_xml
+    #     # => <aaa/>
+    #          <bbb/>
+    #          <ccc foo="bar">
+    #            <ddd/>
+    #          </ccc>
+    #
+    #   @note This is a refinement for +Nokogiri::XML::DocumentFragment+
+    #   @return [String]
+    refine Nokogiri::XML::DocumentFragment do
+      def to_pretty_xml
+        builder = Nokogiri::XML::Builder.new
+        builder.DocumentFragment { _1 << self.to_html }
+        AIXM::Refinements::PRETTY_XSLT.transform(builder.doc).at_css('DocumentFragment').children.map(&:to_xml).join("\n")
       end
     end
 

data/lib/aixm/schedule/date.rb

@@ -83,12 +83,28 @@ module AIXM
         self.class.new(date.strftime(yearless? ? '%m-%d' : '%F'))
       end
 
+      # Create new date one day prior to this one.
+      #
+      # @return [AIXM::Schedule::Date]
+      def pred
+        self.class.new(date.prev_day.to_s.sub(/^-/, '')).at(year: (YEARLESS_YEAR if yearless?))
+      end
+      alias_method :prev, :pred
+
       # Create new date one day after this one.
       #
       # @return [AIXM::Schedule::Date]
       def succ
         self.class.new(date.next_day).at(year: (YEARLESS_YEAR if yearless?))
       end
+      alias_method :next, :succ
+
+      # Calculate difference in days between two dates.
+      #
+      # @return [Integer]
+      def -(date)
+        (self.date - date.date).to_i
+      end
 
       # Convert date to day
       #

data/lib/aixm/schedule/date_time.rb

@@ -0,0 +1,56 @@
+using AIXM::Refinements
+
+module AIXM
+  module Schedule
+
+    # Datetimes suitable for schedules
+    #
+    # This class combines +AIXM::Schedule::Date+ and +AIXM::Schedule::Time+:
+    #
+    # @example
+    #   datetime = AIXM.datetime('2022-04-20', '20:00')   # => 2022-04-20 20:00
+    #   datetime.date         # => 2022-04-20
+    #   datetime.date.class   # => AIXM::Schedule::Date
+    #   datetime.time         # => 20:00
+    #   datetime.time.class   # => AIXM::Schedule::Time
+    class DateTime
+
+      # Date part
+      #
+      # @return [AIXM::Schedule::Date]
+      attr_reader :date
+
+      # Time part
+      #
+      # @return [AIXM::Schedule::Time]
+      attr_reader :time
+
+      # Parse the given representation of date and time.
+      #
+      # @param date [AIXM::Schedule::Date]
+      # @param time [AIXM::Schedule::Time]
+      def initialize(date, time)
+        fail(ArgumentError, 'invalid date') unless date.instance_of? AIXM::Schedule::Date
+        fail(ArgumentError, 'invalid time') unless time.instance_of? AIXM::Schedule::Time
+        @date, @time = date, time
+      end
+
+      # Human readable representation such as "2002-05-19 20:00"
+      #
+      # @return [String]
+      def to_s
+        [@date.to_s, @time.to_s].join(' ')
+      end
+
+      def inspect
+        %Q(#<#{self.class} #{to_s}>)
+      end
+
+      # @see Object#hash
+      def hash
+         [@date.hash, @time.hash].hash
+      end
+    end
+
+  end
+end

data/lib/aixm/schedule/day.rb

@@ -13,8 +13,8 @@ module AIXM
       include AIXM::Concerns::HashEquality
       include Comparable
 
-      DAYS = %i(sunday monday tuesday wednesday thursday friday saturday workday day_preceding_workday day_following_workday holiday day_preceding_holiday day_following_holiday any).freeze
-      SORTABLE_DAYS = DAYS[0, 7]
+      WEEKDAYS = %i(sunday monday tuesday wednesday thursday friday saturday).freeze
+      DAYS =  (WEEKDAYS + %i(workday day_preceding_workday day_following_workday holiday day_preceding_holiday day_following_holiday any)).freeze
 
       # Day of the week or special named day
       #
@@ -31,7 +31,7 @@ module AIXM
           self.day = day
         when Integer
           fail ArgumentError unless day.between?(0, 6)
-          self.day = SORTABLE_DAYS[day]
+          self.day = WEEKDAYS[day]
         else
           fail ArgumentError
         end
@@ -44,10 +44,37 @@ module AIXM
         day.to_s.gsub('_', ' ')
       end
 
+      # Symbol used to initialize this day
+      #
+      # @return [Symbol]
+      def to_sym
+        day.to_s.to_sym
+      end
+
       def inspect
         %Q(#<#{self.class} #{to_s}>)
       end
 
+      # Create new day one day prior to this one.
+      #
+      # @return [AIXM::Schedule::Day]
+      def pred
+        return self if any?
+        fail(TypeError, "can't iterate from #{day}") unless wday
+        self.class.new(WEEKDAYS[wday.pred % 7])
+      end
+      alias_method :prev, :pred
+
+      # Create new day one day after this one.
+      #
+      # @return [AIXM::Schedule::Day]
+      def succ
+        return self if any?
+        fail(TypeError, "can't iterate from #{day}") unless wday
+        self.class.new(WEEKDAYS[wday.succ % 7])
+      end
+      alias_method :next, :succ
+
       # Whether two days are equal.
       #
       # @return [Boolean]
@@ -71,7 +98,7 @@ module AIXM
       #
       # @return [Boolean]
       def sortable?
-        SORTABLE_DAYS.include? day
+        WEEKDAYS.include? day
       end
 
       # Whether this schedule day falls within the given range of schedule
@@ -104,6 +131,10 @@ module AIXM
         fail ArgumentError unless DAYS.include? @day
       end
 
+      def wday
+        WEEKDAYS.index(day.to_sym)
+      end
+
       # @note Necessary to use this class in Range.
       def <=>(other)
         DAYS.index(day) <=> DAYS.index(other.day) || day.to_s <=> other.to_s

data/lib/aixm/schedule/time.rb

@@ -19,6 +19,10 @@ module AIXM
     # @example
     #   time = AIXM.time('21:30')                                  # => 21:30
     #   time.covered_by?(AIXM.time('20:00')..AIXM.time('02:00'))   # => true
+    #
+    # ===Shortcuts:
+    # * +AIXM::BEGINNING_OF_DAY+ - midnight expressed as "00:00"
+    # * +AIXM::END_OF_DAY+ - midnight expressed as "24:00"
     class Time
       include AIXM::Concerns::HashEquality
       extend Forwardable
@@ -73,7 +77,7 @@ module AIXM
         case time_or_event
         when Symbol
           self.event = time_or_event
-        when ::Time, DateTime
+        when ::Time, ::DateTime
           time_or_event = time_or_event.to_time
           set_time(time_or_event.hour, time_or_event.min, time_or_event.utc_offset)
         when /\A(\d{2}):?(\d{2}) ?([+-]\d{2}:?\d{2}|UTC)?\z/

data/lib/aixm/shortcuts.rb

@@ -15,10 +15,16 @@ module AIXM
   # Max flight level used to signal "no upper limit"
   UNLIMITED = z(999, :qne).freeze
 
+  # Day to signal "whatever date or day"
+  ANY_DAY = AIXM.day(:any).freeze
+
   # Timetable used to signal "always active"
   H24 = timetable(code: :H24).freeze
 
-  # Day to signal "whatever date or day"
-  ANY_DAY = AIXM.day(:any).freeze
+  # Time which marks midnight at beginning of the day
+  BEGINNING_OF_DAY = AIXM.time('00:00').freeze
+
+  # Time which marks midnight at end of the day
+  END_OF_DAY = AIXM.time('24:00').freeze
 
 end

data/lib/aixm/version.rb

@@ -1,3 +1,3 @@
 module AIXM
-  VERSION = "1.3.0".freeze
+  VERSION = "1.3.2".freeze
 end

data/lib/aixm.rb

@@ -45,6 +45,7 @@ require_relative 'aixm/p'
 require_relative 'aixm/schedule/date'
 require_relative 'aixm/schedule/day'
 require_relative 'aixm/schedule/time'
+require_relative 'aixm/schedule/date_time'
 
 require_relative 'aixm/component'
 require_relative 'aixm/component/address'

data.tar.gz.sig

@@ -1,3 +1 @@
-f���}fu���D`,F��E���Z�Q�{�FA��g\���f�,P�*��ϗ@P���;���:7���
ܫ�\俭��z	��-}����ʢ挰��N��A�ь�Z*��J�xÕ�smЖ�?Wd4��.7�7�)���
-=sZ���/���!wv���cU�p��#�����]��yY��R	�S�O�S
�	�����՚�af�5
-�?����"��8.�lCHv;���P�՗(��e.���m�v��7
+����mL��h\S��g���o>;i��w%*�Uk��R��0��]Fl�D����l�w��f�i�Z�,��9�`�6w�$@*�3����H������{�Ut���VWu�l���~N��ݥzh�=l�簣�n"G���dYh�,w�_�E���v�2�^m�<XZ��o6�$���ųQ9��"㗨�;���������Ow�]�cD�2�j�Ts��f�u%�S�����1�D*O?��q��P)C4̈t��Z��

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aixm
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.2
 platform: ruby
 authors:
 - Sven Schwyn
@@ -10,27 +10,26 @@ bindir: exe
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDcDCCAligAwIBAgIBATANBgkqhkiG9w0BAQUFADA/MQ0wCwYDVQQDDARydWJ5
-  MRkwFwYKCZImiZPyLGQBGRYJYml0Y2V0ZXJhMRMwEQYKCZImiZPyLGQBGRYDY29t
-  MB4XDTIxMTEwODE0MzIyM1oXDTIyMTEwODE0MzIyM1owPzENMAsGA1UEAwwEcnVi
-  eTEZMBcGCgmSJomT8ixkARkWCWJpdGNldGVyYTETMBEGCgmSJomT8ixkARkWA2Nv
-  bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANwuD4geNdhpSVNJTtHb
-  fmVAoPxmER4oyGgaVJSidn/OjU5PcpdypMI/WIxfvjfFizq6kQYAsJZbCr6fG+UN
-  2dZGMXcAC/uKQL5nYESjCPJ4IJP/SC+fiiEpxHQk7PNFoiUVRUieUZIAfHZAdnY3
-  ye1/niW7ud0vwKIMrysKWxjgkE0Y6Af1QLzV/6brVRRC5MvHIzYJd8BiSP+wY1O8
-  VElw1f6d90KEz2vaQfX7vCxrzIbvAnYiSvM0AIPy/zigTqpW6w3w4sQxQj81oQ9U
-  9vDYtQzXj0c9VrSLvb0DgiGug2cU2bDjA4L3cBE1szX4tbfo8syYqMq51/kTGDxW
-  YNUCAwEAAaN3MHUwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFJ8r
-  wy1HraZDqg3Khf9UonMWMtJUMB0GA1UdEQQWMBSBEnJ1YnlAYml0Y2V0ZXJhLmNv
-  bTAdBgNVHRIEFjAUgRJydWJ5QGJpdGNldGVyYS5jb20wDQYJKoZIhvcNAQEFBQAD
-  ggEBACI7lJKRbnRjz0T4Wb9jH4SE0A2yaHAoBzj96luVDjNyoRT3688trEZS75Sg
-  GKfChxqKncBrSpxJ0YfWbymNHfUrKhcdSifJ/TtUrTasm6LSnJYLOnLKDO3v8eL3
-  gRTq8a5wA7Xtijx3MJEyzdeUh7N+UMKuPps/flPgH5yabUxgxrvuhrXF7Z96nrsP
-  EOmNMTc8H7wo4BAKfuMcI/Gh2oCf+tAhr0bGsXyBikmJ6XA45mrOMgv19M1+aMpn
-  1+2Y1+i+4jd1B7qxIgOLxQTNIJiwE0sqU1itFfuesfgUACS7M0IV9u9Bp4hBGNEw
-  5JcY2h7owdMxXIvgk1oakgldFJc=
+  MIIDODCCAiCgAwIBAgIBATANBgkqhkiG9w0BAQsFADAjMSEwHwYDVQQDDBhydWJ5
+  L0RDPWJpdGNldGVyYS9EQz1jb20wHhcNMjIxMTA2MTIzNjUwWhcNMjMxMTA2MTIz
+  NjUwWjAjMSEwHwYDVQQDDBhydWJ5L0RDPWJpdGNldGVyYS9EQz1jb20wggEiMA0G
+  CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDcLg+IHjXYaUlTSU7R235lQKD8ZhEe
+  KMhoGlSUonZ/zo1OT3KXcqTCP1iMX743xYs6upEGALCWWwq+nxvlDdnWRjF3AAv7
+  ikC+Z2BEowjyeCCT/0gvn4ohKcR0JOzzRaIlFUVInlGSAHx2QHZ2N8ntf54lu7nd
+  L8CiDK8rClsY4JBNGOgH9UC81f+m61UUQuTLxyM2CXfAYkj/sGNTvFRJcNX+nfdC
+  hM9r2kH1+7wsa8yG7wJ2IkrzNACD8v84oE6qVusN8OLEMUI/NaEPVPbw2LUM149H
+  PVa0i729A4IhroNnFNmw4wOC93ARNbM1+LW36PLMmKjKudf5Exg8VmDVAgMBAAGj
+  dzB1MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQWBBSfK8MtR62mQ6oN
+  yoX/VKJzFjLSVDAdBgNVHREEFjAUgRJydWJ5QGJpdGNldGVyYS5jb20wHQYDVR0S
+  BBYwFIEScnVieUBiaXRjZXRlcmEuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQAYG2na
+  ye8OE2DANQIFM/xDos/E4DaPWCJjX5xvFKNKHMCeQYPeZvLICCwyw2paE7Otwk6p
+  uvbg2Ks5ykXsbk5i6vxDoeeOLvmxCqI6m+tHb8v7VZtmwRJm8so0eSX0WvTaKnIf
+  CAn1bVUggczVdNoBXw9WAILKyw9bvh3Ft740XZrR74sd+m2pGwjCaM8hzLvrVbGP
+  DyYhlBeRWyQKQ0WDIsiTSRhzK8HwSTUWjvPwx7SEdIU/HZgyrk0ETObKPakVu6bH
+  kAyiRqgxF4dJviwtqI7mZIomWL63+kXLgjOjMe1SHxfIPo/0ji6+r1p4KYa7o41v
+  fwIwU1MKlFBdsjkd
   -----END CERTIFICATE-----
-date: 2022-05-04 00:00:00.000000000 Z
+date: 2022-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -266,6 +265,7 @@ files:
 - lib/aixm/r.rb
 - lib/aixm/refinements.rb
 - lib/aixm/schedule/date.rb
+- lib/aixm/schedule/date_time.rb
 - lib/aixm/schedule/day.rb
 - lib/aixm/schedule/time.rb
 - lib/aixm/shortcuts.rb
@@ -312,7 +312,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.13
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: Builder for AIXM/OFMX aeronautical information