aipp 0.2.4 → 0.2.5

data/lib/aipp/regions/LF/helpers/{AD_radio.rb → radio_AD.rb}

@@ -1,7 +1,7 @@
 module AIPP
   module LF
     module Helpers
-      module ADRadio
+      module RadioAD
 
         # Service types to be ignored
         IGNORED_TYPES = %w(D-ATIS).freeze
@@ -15,16 +15,8 @@ module AIPP
           'SRE' => { type: :other, remarks: "SRE (elément radar de surveillance du PAR / surveillance radar element of PAR)" }
         }.freeze
 
-        def parts_from(tds)
-          {
-            f: AIXM.f(tds[2].css('span').first.text.to_f, tds[2].css('span').last.text),
-            callsign: tds[1].text.strip,
-            timetable: tds[3].text.strip,
-            remarks: tds[4].text.strip.sub(/Canal (8.33|25)/i, '')   # TEMP: ignore canal spacing warnings
-          }
-        end
-
         def addresses_from(trs)
+          return [] if trs.text.blank?
           trs.map do |tr|
             tds = tr.css('td')
             type = tds[0].text.strip
@@ -43,11 +35,20 @@ module AIPP
         end
 
         def units_from(trs)
+          return [] if trs.text.blank?
           trs.each_with_object({}) do |tr, services|
             tds = tr.css('td')
             type = tds[0].text.strip
             next if IGNORED_TYPES.include?(type) || ADDRESS_TYPES.include?(type)
-            f, callsign, timetable, remarks = parts_from(tds).values
+            f, callsigns, timetable, remarks = parts_from(tds).values
+            callsigns = if callsigns.match?(/\(\w{2}\)/)
+              callsigns.cleanup.split("\n").each_with_object({}) do |callsign, hash|
+                callsign =~ /^(.*)\s+\((\w{2})\)/
+                hash[$2.downcase.to_sym] = $1
+              end
+            else
+              { fr: callsigns }
+            end
             if SERVICE_TYPES.include? type
               type = SERVICE_TYPES.dig(type, :type)
               remarks = [SERVICE_TYPES.dig(type, :remarks), remarks.blank_to_nil].compact.join("\n")
@@ -62,7 +63,7 @@ module AIPP
             services[type].add_frequency(
               AIXM.frequency(
                 transmission_f: f,
-                callsigns: { fr: callsign }
+                callsigns: callsigns
               ).tap do |frequency|
                 frequency.type = :standard
                 frequency.type = :alternative if remarks.sub!(%r{fréquence supplétive/auxiliary frequency\S*}i, '')
@@ -84,6 +85,17 @@ module AIPP
           end
         end
 
+        private
+
+        def parts_from(tds)
+          {
+            f: AIXM.f(tds[2].css('span').first.text.to_f, tds[2].css('span').last.text),
+            callsign: tds[1].text.strip,
+            timetable: tds[3].text.strip,
+            remarks: tds[4].text.strip.sub(/Canal (8.33|25)/i, '')   # TEMP: ignore canal spacing warnings
+          }
+        end
+
       end
     end
   end

data/lib/aipp/version.rb

@@ -1,3 +1,3 @@
 module AIPP
-  VERSION = "0.2.4".freeze
+  VERSION = "0.2.5".freeze
 end

data/lib/core_ext/object.rb

@@ -15,7 +15,7 @@ class Object
   # @param message [String] warning message
   # @param pry [Exception, Binding, nil] attach the Pry session to this error
   #   or binding
-  def warn(message, pry:)
+  def warn(message, pry: nil)
     $WARN_COUNTER = $WARN_COUNTER.to_i + 1
     Kernel.warn "WARNING #{$WARN_COUNTER}: #{message}".red
     if $PRY_ON_WARN == true || $PRY_ON_WARN == $WARN_COUNTER

data/spec/lib/aipp/airac_spec.rb

@@ -3,8 +3,8 @@ require_relative '../../spec_helper'
 describe AIPP::AIRAC do
   describe :initialize do
     it "won't accept invalid arguments" do
-      -> { AIPP::AIRAC.new(0) }.must_raise ArgumentError
-      -> { AIPP::AIRAC.new(AIPP::AIRAC::ROOT_DATE - 1) }.must_raise ArgumentError
+      _{ AIPP::AIRAC.new(0) }.must_raise ArgumentError
+      _{ AIPP::AIRAC.new(AIPP::AIRAC::ROOT_DATE - 1) }.must_raise ArgumentError
     end
   end
 
@@ -14,19 +14,19 @@ describe AIPP::AIRAC do
     end
 
     it "must calculate correct #date" do
-      subject.date.must_equal Date.parse('2018-01-04')
+      _(subject.date).must_equal Date.parse('2018-01-04')
     end
 
     it "must calculate correct #id" do
-      subject.id.must_equal 1801
+      _(subject.id).must_equal 1801
     end
 
     it "must calculate correct #next_date" do
-      subject.next_date.must_equal Date.parse('2018-02-01')
+      _(subject.next_date).must_equal Date.parse('2018-02-01')
     end
 
     it "must calculate correct #next_id" do
-      subject.next_id.must_equal 1802
+      _(subject.next_id).must_equal 1802
     end
   end
 
@@ -36,19 +36,19 @@ describe AIPP::AIRAC do
     end
 
     it "must calculate correct #date" do
-      subject.date.must_equal Date.parse('2017-12-07')
+      _(subject.date).must_equal Date.parse('2017-12-07')
     end
 
     it "must calculate correct #id" do
-      subject.id.must_equal 1713
+      _(subject.id).must_equal 1713
     end
 
     it "must calculate correct #next_date" do
-      subject.next_date.must_equal Date.parse('2018-01-04')
+      _(subject.next_date).must_equal Date.parse('2018-01-04')
     end
 
     it "must calculate correct #next_id" do
-      subject.next_id.must_equal 1801
+      _(subject.next_id).must_equal 1801
     end
   end
 
@@ -58,19 +58,19 @@ describe AIPP::AIRAC do
     end
 
     it "must calculate correct #date" do
-      subject.date.must_equal Date.parse('2018-01-04')
+      _(subject.date).must_equal Date.parse('2018-01-04')
     end
 
     it "must calculate correct #id" do
-      subject.id.must_equal 1801
+      _(subject.id).must_equal 1801
     end
 
     it "must calculate correct #next_date" do
-      subject.next_date.must_equal Date.parse('2018-02-01')
+      _(subject.next_date).must_equal Date.parse('2018-02-01')
     end
 
     it "must calculate correct #next_id" do
-      subject.next_id.must_equal 1802
+      _(subject.next_id).must_equal 1802
     end
   end
 
@@ -80,19 +80,19 @@ describe AIPP::AIRAC do
     end
 
     it "must calculate correct #date" do
-      subject.date.must_equal Date.parse('2020-12-31')
+      _(subject.date).must_equal Date.parse('2020-12-31')
     end
 
     it "must calculate correct #id" do
-      subject.id.must_equal 2014
+      _(subject.id).must_equal 2014
     end
 
     it "must calculate correct #next_date" do
-      subject.next_date.must_equal Date.parse('2021-01-28')
+      _(subject.next_date).must_equal Date.parse('2021-01-28')
     end
 
     it "must calculate correct #next_id" do
-      subject.next_id.must_equal 2101
+      _(subject.next_id).must_equal 2101
     end
   end
 end

data/spec/lib/aipp/border_spec.rb

@@ -14,15 +14,15 @@ describe AIPP::Border::Position do
 
   describe :xy do
     it "returns the coordinates" do
-      subject.xy.must_equal AIXM.xy(long: 0, lat: 0)
+      _(subject.xy).must_equal AIXM.xy(long: 0, lat: 0)
     end
 
     it "returns nil if the geometry index is out of bounds" do
-      subject.tap { |s| s.geometry_index = 2 }.xy.must_be_nil
+      _(subject.tap { |s| s.geometry_index = 2 }.xy).must_be_nil
     end
 
     it "returns nil if the coordinates index is out of bounds" do
-      subject.tap { |s| s.coordinates_index = 3 }.xy.must_be_nil
+      _(subject.tap { |s| s.coordinates_index = 3 }.xy).must_be_nil
     end
   end
 end
@@ -43,25 +43,25 @@ describe AIPP::Border do
 
   describe :initialize do
     it "fails for files unless the extension is .geojson" do
-      -> { AIPP::Border.new("/path/to/another.txt") }.must_raise ArgumentError
+      _{ AIPP::Border.new("/path/to/another.txt") }.must_raise ArgumentError
     end
   end
 
   describe :name do
     it "returns the upcased file name" do
-      subject.name.must_equal 'BORDER'
+      _(subject.name).must_equal 'BORDER'
     end
   end
 
   describe :closed? do
     it "returns true for closed geometries" do
-      subject.closed?(geometry_index: 0).must_equal true
-      subject.closed?(geometry_index: 1).must_equal true
+      _(subject.closed?(geometry_index: 0)).must_equal true
+      _(subject.closed?(geometry_index: 1)).must_equal true
     end
 
     it "returns false for unclosed geometries" do
-      subject.closed?(geometry_index: 2).must_equal false
-      subject.closed?(geometry_index: 3).must_equal false
+      _(subject.closed?(geometry_index: 2)).must_equal false
+      _(subject.closed?(geometry_index: 3)).must_equal false
     end
   end
 
@@ -72,16 +72,16 @@ describe AIPP::Border do
 
     it "finds the nearest position on any geometry" do
       position = subject.nearest(xy: point)
-      position.geometry_index.must_equal 1
-      position.coordinates_index.must_equal 12
-      position.xy.must_equal AIXM.xy(lat: 44.01065725159039, long: 4.760427474975586)
+      _(position.geometry_index).must_equal 1
+      _(position.coordinates_index).must_equal 12
+      _(position.xy).must_equal AIXM.xy(lat: 44.01065725159039, long: 4.760427474975586)
     end
 
     it "finds the nearest postition on a given geometry" do
       position = subject.nearest(xy: point, geometry_index: 0)
-      position.geometry_index.must_equal 0
-      position.coordinates_index.must_equal 2
-      position.xy.must_equal AIXM.xy(lat: 44.00269350325321, long: 4.7519731521606445)
+      _(position.geometry_index).must_equal 0
+      _(position.coordinates_index).must_equal 2
+      _(position.xy).must_equal AIXM.xy(lat: 44.00269350325321, long: 4.7519731521606445)
     end
   end
 
@@ -89,13 +89,13 @@ describe AIPP::Border do
     it "fails if positions are not on the same geometry" do
       from_position = AIPP::Border::Position.new(geometries: subject.geometries, geometry_index: 0, coordinates_index: 0)
       to_position = AIPP::Border::Position.new(geometries: subject.geometries, geometry_index: 1, coordinates_index: 0)
-      -> { subject.segment(from_position: from_position, to_position: to_position) }.must_raise ArgumentError
+      _{ subject.segment(from_position: from_position, to_position: to_position) }.must_raise ArgumentError
     end
 
     it "returns shortest segment on an unclosed I-shaped geometry" do
       from_position = subject.nearest(xy: AIXM.xy(lat: 44.002940457248556, long: 4.734249114990234))
       to_position = subject.nearest(xy: AIXM.xy(lat: 44.07155380033749, long: 4.7687530517578125), geometry_index: from_position.geometry_index)
-      subject.segment(from_position: from_position, to_position: to_position).must_equal [
+      _(subject.segment(from_position: from_position, to_position: to_position)).must_equal [
         AIXM.xy(lat: 44.00516299694704, long: 4.7371673583984375),
         AIXM.xy(lat: 44.02195282780904, long: 4.743347167968749),
         AIXM.xy(lat: 44.037503870182896, long: 4.749870300292969),
@@ -107,7 +107,7 @@ describe AIPP::Border do
     it "returns shortest segment on an unclosed U-shaped geometry" do
       from_position = subject.nearest(xy: AIXM.xy(lat: 43.96563876212758, long: 4.8126983642578125))
       to_position = subject.nearest(xy: AIXM.xy(lat: 43.956989327857265, long: 4.83123779296875), geometry_index: from_position.geometry_index)
-      subject.segment(from_position: from_position, to_position: to_position).must_equal [
+      _(subject.segment(from_position: from_position, to_position: to_position)).must_equal [
         AIXM.xy(lat: 43.9646503190861, long: 4.815788269042969),
         AIXM.xy(lat: 43.98614524381678, long: 4.82025146484375),
         AIXM.xy(lat: 43.98491011404692, long: 4.840850830078125),
@@ -122,7 +122,7 @@ describe AIPP::Border do
     it "returns shortest segment ignoring endings on a closed geometry" do
       from_position = subject.nearest(xy: AIXM.xy(lat: 44.00022390676026, long: 4.789009094238281))
       to_position = subject.nearest(xy: AIXM.xy(lat: 43.99800118202362, long: 4.765834808349609), geometry_index: from_position.geometry_index)
-      subject.segment(from_position: from_position, to_position: to_position).must_equal [
+      _(subject.segment(from_position: from_position, to_position: to_position)).must_equal [
         AIXM.xy(lat: 44.00077957493397, long: 4.787635803222656),
         AIXM.xy(lat: 43.99818641226534, long: 4.784030914306641),
         AIXM.xy(lat: 43.994111213373934, long: 4.78205680847168),

data/spec/lib/aipp/downloader_spec.rb

@@ -7,8 +7,8 @@ describe AIPP::Downloader do
 
   let :tmp_dir do
     Pathname(Dir.mktmpdir).tap do |tmp_dir|
-      (archives_dir = tmp_dir.join('archives')).mkpath
-      FileUtils.cp(fixtures_dir.join('archive.zip'), archives_dir)
+      (sources_dir = tmp_dir.join('sources')).mkpath
+      FileUtils.cp(fixtures_dir.join('source.zip'), sources_dir)
     end
   end
 
@@ -17,58 +17,58 @@ describe AIPP::Downloader do
   end
 
   describe :read do
-    context "archive does not exist" do
-      it "creates the archive" do
+    context "source archive does not exist" do
+      it "creates the source archive" do
         Spy.on(Kernel, open: File.open(fixtures_dir.join('new.html')))
-        subject = AIPP::Downloader.new(storage: tmp_dir, archive: 'new-archive') do |downloader|
-          File.exist?(tmp_dir.join('work')).must_equal true
+        subject = AIPP::Downloader.new(storage: tmp_dir, source: 'new-source') do |downloader|
+          _(File.exist?(tmp_dir.join('work'))).must_equal true
           downloader.read(document: 'new', url: 'http://localhost/new.html')
         end
-        zip_entries(subject.archive_file).must_equal %w(new.html)
-        subject.send(:archives_path).children.count.must_equal 2
+        _(zip_entries(subject.source_file)).must_equal %w(new.html)
+        _(subject.send(:sources_path).children.count).must_equal 2
       end
     end
 
-    context "archive does exist" do
-      it "unzips and uses the archive" do
+    context "source archive does exist" do
+      it "unzips and uses the source archive" do
         Spy.on(Kernel, open: File.open(fixtures_dir.join('new.html')))
-        subject = AIPP::Downloader.new(storage: tmp_dir, archive: 'archive') do |downloader|
-          File.exist?(tmp_dir.join('work')).must_equal true
+        subject = AIPP::Downloader.new(storage: tmp_dir, source: 'source') do |downloader|
+          _(File.exist?(tmp_dir.join('work'))).must_equal true
           downloader.read(document: 'new', url: 'http://localhost/new.html').tap do |content|
-            content.must_be_instance_of Nokogiri::HTML5::Document
-            content.text.must_match /fixture-html-new/
+            _(content).must_be_instance_of Nokogiri::HTML5::Document
+            _(content.text).must_match /fixture-html-new/
           end
         end
-        zip_entries(subject.archive_file).must_equal %w(new.html one.html two.html)
-        subject.send(:archives_path).children.count.must_equal 1
+        _(zip_entries(subject.source_file)).must_equal %w(new.html one.html two.html)
+        _(subject.send(:sources_path).children.count).must_equal 1
       end
 
       it "downloads HTML documents to Nokogiri::HTML5::Document" do
         Spy.on(Kernel, open: File.open(fixtures_dir.join('new.html')))
-        AIPP::Downloader.new(storage: tmp_dir, archive: 'archive') do |downloader|
+        AIPP::Downloader.new(storage: tmp_dir, source: 'source') do |downloader|
           downloader.read(document: 'new', url: 'http://localhost/new.html').tap do |content|
-            content.must_be_instance_of Nokogiri::HTML5::Document
-            content.text.must_match /fixture-html-new/
+            _(content).must_be_instance_of Nokogiri::HTML5::Document
+            _(content.text).must_match /fixture-html-new/
           end
         end
       end
 
       it "downloads and caches PDF documents to AIPP::PDF" do
         Spy.on(Kernel, open: File.open(fixtures_dir.join('new.pdf')))
-        AIPP::Downloader.new(storage: tmp_dir, archive: 'archive') do |downloader|
+        AIPP::Downloader.new(storage: tmp_dir, source: 'source') do |downloader|
           downloader.read(document: 'new', url: 'http://localhost/new.pdf').tap do |content|
-            content.must_be_instance_of AIPP::PDF
-            content.text.must_match /fixture-pdf-new/
+            _(content).must_be_instance_of AIPP::PDF
+            _(content.text).must_match /fixture-pdf-new/
           end
         end
       end
 
       it "downloads explicitly specified type" do
         Spy.on(Kernel, open: File.open(fixtures_dir.join('new.pdf')))
-        AIPP::Downloader.new(storage: tmp_dir, archive: 'archive') do |downloader|
+        AIPP::Downloader.new(storage: tmp_dir, source: 'source') do |downloader|
           downloader.read(document: 'new', url: 'http://localhost/new', type: :pdf).tap do |content|
-            content.must_be_instance_of AIPP::PDF
-            content.text.must_match /fixture-pdf-new/
+            _(content).must_be_instance_of AIPP::PDF
+            _(content.text).must_match /fixture-pdf-new/
           end
         end
       end

data/spec/lib/aipp/patcher_spec.rb

@@ -25,22 +25,22 @@ describe AIPP::Patcher do
     end
 
     it "overwrites with non-nil values" do
-      subject.tap { |s| s.size = 'S' }.size.must_equal 36
+      _(subject.tap { |s| s.size = 'S' }.size).must_equal 36
     end
 
     it "overwrite with nil values" do
-      subject.tap { |s| s.size = 'one-size-fits-all' }.size.must_be_nil
+      _(subject.tap { |s| s.size = 'one-size-fits-all' }.size).must_be_nil
     end
 
     it "skips overwrite if abort is thrown" do
-      subject.tap { |s| s.size = 42 }.size.must_equal 42
+      _(subject.tap { |s| s.size = 42 }.size).must_equal 42
     end
   end
 
   context "with patches detached" do
     it "removes patches" do
       subject.detach_patches
-      subject.tap { |s| s.size = 'S' }.size.must_equal 'S'
+      _(subject.tap { |s| s.size = 'S' }.size).must_equal 'S'
     end
   end
 end

data/spec/lib/aipp/pdf_spec.rb

@@ -11,47 +11,47 @@ describe AIPP::PDF do
 
   describe :@page_ranges do
     it "returns an array of page end positions" do
-      subject.instance_variable_get(:@page_ranges).must_equal [74, 149, 225]
+      _(subject.instance_variable_get(:@page_ranges)).must_equal [74, 149, 225]
     end
   end
 
   describe :page_for do
     it "finds the page for any given position" do
-      subject.send(:page_for, index: 0).must_equal 1
-      subject.send(:page_for, index: 50).must_equal 1
-      subject.send(:page_for, index: 74).must_equal 1
-      subject.send(:page_for, index: 75).must_equal 2
-      subject.send(:page_for, index: 149).must_equal 2
-      subject.send(:page_for, index: 150).must_equal 3
-      subject.send(:page_for, index: 223).must_equal 3
+      _(subject.send(:page_for, index: 0)).must_equal 1
+      _(subject.send(:page_for, index: 50)).must_equal 1
+      _(subject.send(:page_for, index: 74)).must_equal 1
+      _(subject.send(:page_for, index: 75)).must_equal 2
+      _(subject.send(:page_for, index: 149)).must_equal 2
+      _(subject.send(:page_for, index: 150)).must_equal 3
+      _(subject.send(:page_for, index: 223)).must_equal 3
     end
   end
 
   describe :from do
     it "fences beginning to any position" do
-      subject.from(100).range.must_equal (100..223)
+      _(subject.from(100).range).must_equal (100..223)
     end
 
     it "fences beginning to first existing position" do
-      subject.from(:begin).range.must_equal (0..223)
+      _(subject.from(:begin).range).must_equal (0..223)
     end
   end
 
   describe :to do
     it "fences beginning to any position" do
-      subject.to(100).range.must_equal (0..100)
+      _(subject.to(100).range).must_equal (0..100)
     end
 
     it "fences beginning to first existing position" do
-      subject.to(:end).range.must_equal (0..223)
+      _(subject.to(:end).range).must_equal (0..223)
     end
   end
 
   context "without boundaries" do
     describe :text do
       it "returns the entire text" do
-        subject.text.must_match /\Apage 1, line 1/
-        subject.text.must_match /page 3, line 5\z/
+        _(subject.text).must_match /\Apage 1, line 1/
+        _(subject.text).must_match /page 3, line 5\z/
       end
     end
 
@@ -76,14 +76,14 @@ describe AIPP::PDF do
         ]
         subject.each_line do |line, page, last|
           target_line, target_page, target_last = target.shift
-          line.must_equal target_line
-          page.must_equal target_page
-          last.must_equal target_last
+          _(line).must_equal target_line
+          _(page).must_equal target_page
+          _(last).must_equal target_last
         end
       end
 
       it "returns an enumerator if no block is given" do
-        subject.each_line.must_be_instance_of Enumerator
+        _(subject.each_line).must_be_instance_of Enumerator
       end
     end
   end
@@ -95,8 +95,8 @@ describe AIPP::PDF do
 
     describe :text do
       it "returns the entire text" do
-        subject.text.must_match /\Ane 2/
-        subject.text.must_match /page 3\z/
+        _(subject.text).must_match /\Ane 2/
+        _(subject.text).must_match /page 3\z/
       end
     end
 
@@ -114,9 +114,9 @@ describe AIPP::PDF do
         ]
         subject.each_line do |line, page, last|
           target_line, target_page, target_last = target.shift
-          line.must_equal target_line
-          page.must_equal target_page
-          last.must_equal target_last
+          _(line).must_equal target_line
+          _(page).must_equal target_page
+          _(last).must_equal target_last
         end
       end
     end