notam 1.1.1 → 1.1.3.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 417d4bc6e661b8d3a79cf54a3f191eea69643e6e40de00152589b12bedf8e768
-  data.tar.gz: 51e949d622b8da7772b8dc1e2247ffe41529e787ec2ee133a7852d728bfdf251
+  metadata.gz: 18311585815e5dcf56f3d411ca05de397fa7cd02abc445d2e0a955b8a4184707
+  data.tar.gz: 0c96db85cdfe2813aa974087044b216f9ac9ced153d5b6661444a3bd74e8d239
 SHA512:
-  metadata.gz: 6717133961de80fed0c49d88af287526e71654ea04ac51baeb69e1fc7b4bfdda8149bddec3949dc1292ad9bec69d1c4aa395224e6db5f17973bf9dd01a915b7e
-  data.tar.gz: 1827871715ad368903c2a91bc8da784a248f7cb44bf926d982efab3243c3ddc3afde83e2fecd1474c8b7725bf8ca4e824fd00ecade6710e9447c1c7e2a98ec18
+  metadata.gz: 34c4edb2e848b573eab84636134291b6581dbfccc89eed657c785b6aa5afe8feb101ccee5277060fdc1efce095c6f5da14c8a455e9e5429ad608963747c03e74
+  data.tar.gz: e0ff937aa5b5d20dd429c837070ba9b8589f3cc1bda85f7fef959fba97d8199b727049acc60bf4f30fe26f70a331fd576193e41cc144391c5943f6f5867f4782

checksums.yaml.gz.sig

@@ -1,3 +1,2 @@
-��*-bxsk:� ��,�d'��������%3O��7$=B�ы�A�\�w�[�.�
-RCu�==���9=��4-fdqf&��j��x�P��\2�A�F���|�g��լ~ǵ7�ih��T��$nz�g���h��Ù��k�
-w&㛷r��G�۳��6�
+)և,��%��ßt�4�,�AW�V�UCC�g�az!� �@ֱ��L?�+�I�P�K����C��x�sȂ�B]�GI{��*�Co�.|����r�{��"���~]�����+{�Y�-�͡�K�Y*��X�?��ߤ���d_��w)��-��'L
+ȥ�u�i�E�,k/v�Ll�Q1����`�Q�q0;j��[�k\�V�ݪ�x�9����㕃�?�k�+���l:�����	�`��6`J�v�����

data/CHANGELOG.md

@@ -2,6 +2,16 @@
 
 Nothing so far
 
+## 1.1.3.pre1
+
+#### Changes
+* Don't wrap years when breaking down date ranges
+
+## 1.1.2
+
+#### Fixes
+* Carry over last base date instead of first base date
+
 ## 1.1.1
 
 #### Fixes

data/README.md

@@ -212,6 +212,7 @@ Parsed | `00:00`          | `24:00`    | the Ruby way
 ### References
 
 * [ICAO Doc 8126: Aeronautical Information Services Manual](https://www.icao.int/NACC/Documents/eDOCS/AIM/8126_unedited_en%20Jul2021.pdf)
+* [ICAO Doc 10066: Aeronautical Information Management](https://ffac.ch/wp-content/uploads/2020/11/ICAO-Doc-10066-Aeronautical-Information-Management.pdf)
 * [EUROCONTROL Guidelines Operating Procedures AIS Dynamic Data (OPADD)](https://www.eurocontrol.int/sites/default/files/2021-07/eurocontrol-guidelines-opadd-ed4-1.pdf)
 * [NOTAM Q Codes](https://www.faa.gov/air_traffic/publications/atpubs/notam_html/appendix_b.html)
 * [NOTAM Contractions](https://www.notams.faa.gov/downloads/contractions.pdf)

data/lib/notam/item/d.rb

@@ -16,9 +16,7 @@ module NOTAM
       base_date = AIXM.date(data[:effective_at])
       @schedules = text.sub(/\AD\)/, '').split(',').flat_map do |string|
         Schedule.parse(string, base_date: base_date).tap do |schedule|
-          if (date = schedule.first.actives.first).instance_of? AIXM::Schedule::Date
-            base_date = date   # carry over month
-          end
+          base_date = schedule.last.last_date || base_date   # carry over month
         end
       end
       self

data/lib/notam/schedule.rb

@@ -28,7 +28,7 @@ module NOTAM
 
     # Active dates or days
     #
-    # @note If {#active} lists dates, then {#inactive} must list days and
+    # @note If {#actives} lists dates, then {#inactives} must list days and
     #   vice versa.
     #
     # @return [Array<NOTAM::Schedule::Dates>, Array<NOTAM::Schedule::Days>]
@@ -41,7 +41,7 @@ module NOTAM
 
     # Inactive dates or days
     #
-    # @note If {#inactive} lists dates, then {#active} must list days and
+    # @note If {#inactives} lists dates, then {#actives} must list days and
     #   vice versa.
     #
     # @return [Array<NOTAM::Schedule::Dates>, Array<NOTAM::Schedule::Days>]
@@ -146,7 +146,7 @@ module NOTAM
           when /\A(?<day>#{DATE_RE})/   # single date
             array << base_date.at(day: $~[:day].to_i)
           when /\A(?<month>#{MONTH_RE})/
-            base_date = base_date.at(month: MONTHS.fetch($~[:month]), wrap: true)
+            base_date = base_date.at(month: MONTHS.fetch($~[:month]), wrap: false)
           else
             fail! "unrecognized date"
           end
@@ -274,6 +274,16 @@ module NOTAM
       resolve(on: date, xy: xy).slice(date).times.cover? AIXM.time(at)
     end
 
+    # Last +actives+ date of the schedule (+inatives+ are ignored).
+    #
+    # @return [AIXM::Date, nil] last date or +nil+ if schedule actives are days
+    def last_date
+      actives.last.then do |active|
+        active = active.last if active.respond_to? :last
+        active if active.instance_of? AIXM::Schedule::Date
+      end
+    end
+
     # @abstract
     class ScheduleArray < Array
       # @return [String]

data/lib/notam/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module NOTAM
-  VERSION = "1.1.1".freeze
+  VERSION = "1.1.3.pre1".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: notam
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.3.pre1
 platform: ruby
 authors:
 - Sven Schwyn
@@ -29,7 +29,7 @@ cert_chain:
   kAyiRqgxF4dJviwtqI7mZIomWL63+kXLgjOjMe1SHxfIPo/0ji6+r1p4KYa7o41v
   fwIwU1MKlFBdsjkd
   -----END CERTIFICATE-----
-date: 2023-06-07 00:00:00.000000000 Z
+date: 2023-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aixm
@@ -253,11 +253,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.4.13
+rubygems_version: 3.4.14
 signing_key:
 specification_version: 4
 summary: Parser for NOTAM (Notice to Airmen) messages