aixm 1.3.1 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4dd1d553f6bf8c1f704cd521b14f26e89dc1161d065b82fd867fde1a556d97e
-  data.tar.gz: 9fcba185054638267827d2e7a5eec09e849d237738455ec1bd9bb1cbabbabf5f
+  metadata.gz: 49f4c417f17321e81579c5ec2f63e94e95e3e5b466def5304051e508aac0db04
+  data.tar.gz: 78dcbe01cde6c2eac9bf49ed2f8828a96f1ea112393e2730e2e2a902177ee0b3
 SHA512:
-  metadata.gz: 0ab5bd974c993d0813e550c129040c6fac9f2d31f787f428e3582aef9486d1a2e95983dca76c822be9b621c97fe87c0263d571e92a485b0a3f9b2af76a7a6d0b
-  data.tar.gz: 2969d03eb3bf308ad19fd481c1ca5244525848a5802eea3b9d4a999bb3feeb826ef483dbfdec23b567a2e326a3704fe1c45a61a74825cd0483bc4bfb2c7e9b97
+  metadata.gz: f6901fd3474f200ef670161e5377c550c882e9adbc24fd34c3a790b6ca7c44157f5509ee737c85ad10187ce93acaba7b81635e385b461944f5cbf29436f522f5
+  data.tar.gz: 9a204bb3611c4405252dfff814ab5d10f628b85936067ccf10358786446ad719c25753cb1a9d8aafb26540311034e6c6c30994cad96fe44a73807ce847fe14ef

data/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 Nothing so far
 
+## 1.3.3
+
+#### Changes
+* Extend `ckmid` and `mkmid` to accept multiple files and globbing.
+
+## 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

data/README.md

@@ -1,5 +1,5 @@
 [![Version](https://img.shields.io/gem/v/aixm.svg?style=flat)](https://rubygems.org/gems/aixm)
-[![Tests](https://img.shields.io/github/workflow/status/svoop/aixm/Test.svg?style=flat&label=tests)](https://github.com/svoop/aixm/actions?workflow=Test)
+[![Tests](https://img.shields.io/github/actions/workflow/status/svoop/aixm/test.yml?style=flat&label=tests)](https://github.com/svoop/aixm/actions?workflow=Test)
 [![Code Climate](https://img.shields.io/codeclimate/maintainability/svoop/aixm.svg?style=flat)](https://codeclimate.com/github/svoop/aixm/)
 [![Donorbox](https://img.shields.io/badge/donate-on_donorbox-yellow.svg)](https://donorbox.org/bitcetera)
 
@@ -291,7 +291,7 @@ By `using AIXM::Refinements` you get a few handy [extensions to Ruby core classe
 
 ### mkmid
 
-The `mkmid` executable reads an OFMX file, adds [OFMX-compliant `mid` values](https://gitlab.com/openflightmaps/ofmx/wikis/Features#mid) into all `*Uid` elements and validates the result against the schema.
+The `mkmid` executable reads OFMX files, adds [OFMX-compliant `mid` values](https://gitlab.com/openflightmaps/ofmx/wikis/Features#mid) into all `*Uid` elements and validates the result against the schema.
 
 ```
 mkmid --help
@@ -299,7 +299,7 @@ mkmid --help
 
 ### ckmid
 
-The `chmid` executable reads an OFMX file, validates it against the schema and checks all `mid` attributes for [OFMX-compliance](https://gitlab.com/openflightmaps/ofmx/wikis/Features#mid).
+The `chmid` executable reads OFMX files, validates them against the schema and checks all `mid` attributes for [OFMX-compliance](https://gitlab.com/openflightmaps/ofmx/wikis/Features#mid).
 
 ```
 ckmid --help

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/executables.rb

@@ -8,36 +8,37 @@ module AIXM
         @options = options
         OptionParser.new do |o|
           o.banner = <<~END
-            Add mid attributes to a schema valid OFMX file.
-            Usage: #{File.basename($0)} infile.ofmx
+            Add mid attributes to OFMX files.
+            Usage: #{File.basename($0)} files
           END
           o.on('-i', '--[no-]in-place', 'overwrite file instead of dumping to STDOUT (default: false)') { @options[:in_place] = _1 }
           o.on('-f', '--[no-]force', 'ignore XML schema validation errors (default: false)') { @options[:force] = _1 }
           o.on('-A', '--about', 'show author/license information and exit') { AIXM::Executables.about }
           o.on('-V', '--version', 'show version and exit') { AIXM::Executables.version }
         end.parse!
-        @infile = ARGV.shift
+        @files = ARGV
       end
 
       def run
-        fail 'cannot read file' unless @infile && File.readable?(@infile)
-        fail 'file ist not OFMX' unless @infile.match?(/\.ofmx$/)
-        AIXM.ofmx!
-        document = File.open(@infile) { Nokogiri::XML(_1) }
-        AIXM::PayloadHash::Mid.new(document).insert_mid
-        errors = Nokogiri::XML::Schema(File.open(AIXM.schema(:xsd))).validate(document)
-        case
-        when errors.any? && !@options[:force]
-          puts errors
-          fail "OFMX file is not schema valid"
-        when @options[:in_place]
-          File.write(@infile, document.to_xml)
-        else
-          puts document.to_xml
+        @files.each do |file|
+          fail "cannot read #{file}" unless file && File.readable?(file)
+          fail "#{file} is not OFMX" unless file.match?(/\.ofmx$/)
+          AIXM.ofmx!
+          document = File.open(file) { Nokogiri::XML(_1) }
+          AIXM::PayloadHash::Mid.new(document).insert_mid
+          errors = Nokogiri::XML::Schema(File.open(AIXM.schema(:xsd))).validate(document)
+          case
+          when errors.any? && !@options[:force]
+            fail (["#{file} is not valid..."] + errors).join("\n")
+          when @options[:in_place]
+            File.write(file, document.to_xml)
+          else
+            puts document.to_xml
+          end
+        rescue => error
+          puts "ERROR: #{error.message}"
+          exit 1
         end
-      rescue => error
-        puts "ERROR: #{error.message}"
-        exit 1
       end
     end
 
@@ -45,29 +46,31 @@ module AIXM
       def initialize(**options)
         OptionParser.new do |o|
           o.banner = <<~END
-            Check mid attributes of an OFMX file.
-            Usage: #{File.basename($0)} infile.ofmx
+            Check mid attributes of OFMX files.
+            Usage: #{File.basename($0)} files
           END
           o.on('-A', '--about', 'show author/license information and exit') { AIXM::Executables.about }
           o.on('-V', '--version', 'show version and exit') { AIXM::Executables.version }
         end.parse!
-        @infile = ARGV.shift
+        @files = ARGV
       end
 
       def run
-        fail 'cannot read file' unless @infile && File.readable?(@infile)
-        fail 'file ist not OFMX' unless @infile.match?(/\.ofmx$/)
-        AIXM.ofmx!
-        document = File.open(@infile) { Nokogiri::XML(_1) }
-        errors = Nokogiri::XML::Schema(File.open(AIXM.schema(:xsd))).validate(document)
-        errors += AIXM::PayloadHash::Mid.new(document).check_mid
-        if errors.any?
-          puts errors
-          fail "OFMX file has errors"
-        end
-      rescue => error
-        puts "ERROR: #{error.message}"
-        exit 1
+        exit(
+          @files.reduce(true) do |success, file|
+            fail "cannot read #{file}" unless file && File.readable?(file)
+            fail "#{file} is not OFMX" unless file.match?(/\.ofmx$/)
+            AIXM.ofmx!
+            document = File.open(file) { Nokogiri::XML(_1) }
+            errors = Nokogiri::XML::Schema(File.open(AIXM.schema(:xsd))).validate(document)
+            errors += AIXM::PayloadHash::Mid.new(document).check_mid
+            fail (["#{file} is not valid..."] + errors).join("\n") if errors.any?
+            success && true
+          rescue RuntimeError => error
+            puts "ERROR: #{error.message}"
+            false
+          end
+        )
       end
     end
 

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

@@ -84,16 +84,20 @@ module AIXM
       end
 
       # Create new date one day prior to this one.
-      def prev
+      #
+      # @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 next
+      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.
       #

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/version.rb

@@ -1,3 +1,3 @@
 module AIXM
-  VERSION = "1.3.1".freeze
+  VERSION = "1.3.3".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aixm
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.3
 platform: ruby
 authors:
 - Sven Schwyn
@@ -29,7 +29,7 @@ cert_chain:
   kAyiRqgxF4dJviwtqI7mZIomWL63+kXLgjOjMe1SHxfIPo/0ji6+r1p4KYa7o41v
   fwIwU1MKlFBdsjkd
   -----END CERTIFICATE-----
-date: 2022-11-06 00:00:00.000000000 Z
+date: 2023-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -312,7 +312,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.25
+rubygems_version: 3.4.2
 signing_key:
 specification_version: 4
 summary: Builder for AIXM/OFMX aeronautical information

metadata.gz.sig

@@ -1,2 +1,2 @@
-Z���%ى��Z�0�~2[}O-'�B<Rg�WG��Rf
-���(����@B!�NB~�d,���~��q4�Q7W�w�V�E`fwA�`r�(e=���P��J�
+���Yw�����c�+˥w
Z�I9��~T������%�+-��uF0���V�������
+��\��% {����5�&x��vy����٤R?J$�O�/��9�?�
�IC��D��:H�o�@q"��E��YC��̅;\^�7�XZD2�_O�����Ĝ;.{���:�.�u��n�ۛw�$7��v�o�{���.�?C�O]�	��