notam 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ac9f9d9c891d07fa204936e712b43f3b872d0d79b07298e426e845916d8b20d
-  data.tar.gz: 33a5fdaadf77d20c37690e06147942c30167e296cb1e2c41f90d432c44a5f39d
+  metadata.gz: 03fe65745ed0b91b44076f79366f91858a1c08fc771259e28863d75b21f6f1e9
+  data.tar.gz: cb4cd5a830d4a6178850c6f1e86c4dc3102fa6a2b1c76345b565aae2a63a845a
 SHA512:
-  metadata.gz: a1d8eb8f529b8cfd2b0da1426093450451dffd85aa28e9ddee6e69e25ec993dc56f5035954c17e10e801dc9ecf90583a5e36306dab8ac4722c1c26305a557107
-  data.tar.gz: 17c930b744c09c3059592d8e859c8e3cb8a8e7dc805d847e8ef9eac4f43991f6125af70e5ae4e66f8d56217a922300ea69e7a5c7bc0a52e20dd8863411f350fe
+  metadata.gz: dfe364053662a70186cafba5a77a83dc889cd5b314f8e1ba88e84345dc7207cdcabd11add87772e56b3d3faed915fde3c0e5728c86cc60a383a6d24fdbc80f37
+  data.tar.gz: 441372ea6c5453504636766b10698e734023fd03cb326f75f7b34839f5532b057b7b3d89a95905aac21814086290d01205931dcd39c15e90543d607c008b26fe

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 Nothing so far
 
+## 1.1.3
+
+#### Changes
+* Don't wrap years when breaking down date ranges
+* Allow HJ and HN in schedules
+
 ## 1.1.2
 
 #### Fixes

data/lib/notam/schedule.rb

@@ -15,16 +15,18 @@ module NOTAM
     DATE_RE = /[0-2]\d|3[01]/.freeze
     DAY_RE = /#{DAYS.keys.join('|')}/.freeze
     MONTH_RE = /#{MONTHS.keys.join('|')}/.freeze
-    H24_RE = /(?<h24>H24)/.freeze
+    HCODE_RE = /(?<hcode>H24|HJ|HN)/.freeze
     HOUR_RE = /(?<hour>[01]\d|2[0-4])(?<minute>[0-5]\d)/.freeze
     OPERATIONS_RE = /#{OPERATIONS.keys.join('|')}/.freeze
     EVENT_RE = /(?<event>SR|SS)(?:\s(?<operation>#{OPERATIONS_RE})(?<delta>\d+))?/.freeze
     TIME_RE = /#{HOUR_RE}|#{EVENT_RE}/.freeze
-    TIME_RANGE_RE = /#{TIME_RE}-#{TIME_RE}|#{H24_RE}/.freeze
+    TIME_RANGE_RE = /#{TIME_RE}-#{TIME_RE}|#{HCODE_RE}/.freeze
     DATETIME_RE = /(?:(?<month>#{MONTH_RE}) )?(?<date>#{DATE_RE}) (?<time>#{TIME_RE})/.freeze
     DATETIME_RANGE_RE = /#{DATETIME_RE}-#{DATETIME_RE}/.freeze
 
     H24 = (AIXM::BEGINNING_OF_DAY..AIXM::END_OF_DAY).freeze
+    HJ = (AIXM.time(:sunrise)..AIXM.time(:sunset)).freeze
+    HN = (AIXM.time(:sunset)..AIXM.time(:sunrise)).freeze
 
     # Active dates or days
     #
@@ -146,7 +148,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
@@ -182,8 +184,8 @@ module NOTAM
       # @return [Range<AIXM::Schedule::Time>]
       def time_range_from(string)
         case string
-        when H24_RE
-          H24
+        when HCODE_RE
+          const_get($~[:hcode].upcase)
         else
           from, to = string.split('-')
           (time_from(from)..time_from(to))

data/lib/notam/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: notam
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Sven Schwyn
@@ -29,7 +29,7 @@ cert_chain:
   kAyiRqgxF4dJviwtqI7mZIomWL63+kXLgjOjMe1SHxfIPo/0ji6+r1p4KYa7o41v
   fwIwU1MKlFBdsjkd
   -----END CERTIFICATE-----
-date: 2023-06-17 00:00:00.000000000 Z
+date: 2023-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aixm
@@ -257,7 +257,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.14
+rubygems_version: 3.4.15
 signing_key:
 specification_version: 4
 summary: Parser for NOTAM (Notice to Airmen) messages