notam 1.1.3.pre1 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18311585815e5dcf56f3d411ca05de397fa7cd02abc445d2e0a955b8a4184707
-  data.tar.gz: 0c96db85cdfe2813aa974087044b216f9ac9ced153d5b6661444a3bd74e8d239
+  metadata.gz: e2c4ccc31924d8944cb6b0f0be5d459c550671d3b4e558996f9e4fe970616338
+  data.tar.gz: b4516ec0dea483421d9af7dc290aebc4353951b3ee27e698cf9595d26d1e610c
 SHA512:
-  metadata.gz: 34c4edb2e848b573eab84636134291b6581dbfccc89eed657c785b6aa5afe8feb101ccee5277060fdc1efce095c6f5da14c8a455e9e5429ad608963747c03e74
-  data.tar.gz: e0ff937aa5b5d20dd429c837070ba9b8589f3cc1bda85f7fef959fba97d8199b727049acc60bf4f30fe26f70a331fd576193e41cc144391c5943f6f5867f4782
+  metadata.gz: ea182ba15cfb1550e4d83102eefbdfab50df6ba17bac70abe44c978ddac19265cc58d1e06394164a7a4b376d0313229533e86eaae58dc3bc3a3944e151a82e3c
+  data.tar.gz: 0467ca1270c65c10c78c611180c706dd18c347620b0b3242279c54030f3b50573a8dd6863a7a5de2772df20a0de2dc5fc983ffe768dbaf0f452ff0b89e907303

data/CHANGELOG.md

@@ -2,10 +2,16 @@
 
 Nothing so far
 
-## 1.1.3.pre1
+## 1.1.4
+
+#### Changes
+* Drop obsolete countries gem
+
+## 1.1.3
 
 #### Changes
 * Don't wrap years when breaking down date ranges
+* Allow HJ and HN in schedules
 
 ## 1.1.2
 

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
     #
@@ -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.3.pre1".freeze
+  VERSION = "1.1.4".freeze
 end

data/lib/notam.rb

@@ -2,7 +2,6 @@
 
 require 'aixm'
 require 'i18n'
-require 'countries'
 
 require_relative "notam/version"
 require_relative "notam/errors"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: notam
 version: !ruby/object:Gem::Version
-  version: 1.1.3.pre1
+  version: 1.1.4
 platform: ruby
 authors:
 - Sven Schwyn
@@ -29,7 +29,7 @@ cert_chain:
   kAyiRqgxF4dJviwtqI7mZIomWL63+kXLgjOjMe1SHxfIPo/0ji6+r1p4KYa7o41v
   fwIwU1MKlFBdsjkd
   -----END CERTIFICATE-----
-date: 2023-06-27 00:00:00.000000000 Z
+date: 2023-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aixm
@@ -65,20 +65,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
-- !ruby/object:Gem::Dependency
-  name: countries
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -122,7 +108,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest-sound
+  name: minitest-flash
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -253,11 +239,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: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.4.14
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: Parser for NOTAM (Notice to Airmen) messages