vatsim_online_redux 1.0.1 → 2.1.1

data/spec/support/vatsim_status.json

@@ -0,0 +1,13 @@
+{
+  "data": {
+    "v3": [
+      "https://data.vatsim.net/v3/vatsim-data.json"
+    ]
+  },
+  "user": [
+    "https://stats.vatsim.net/search_id.php"
+  ],
+  "metar": [
+    "http://metar.vatsim.net/metar.php"
+  ]
+}

data/spec/vatsim_online_spec.rb

@@ -1,54 +1,58 @@
 require 'spec_helper.rb'
-require 'vatsim_online_spec_helper.rb'
+require 'data_downloader_spec_helper'
 
 describe VatsimOnline do
 
-  describe "vatsim_online" do
-    it "should work :)" do
-      gem_data_file
-      "ZGGG".vatsim_online.class.should eq(Hash)
-      "LO".vatsim_online.class.should eq(Hash)
-      "WM".vatsim_online[:atc].size.should eq(4)
-      "LO".vatsim_online[:pilots].size.should eq(12)
-      "LO".vatsim_online(:pilots => true, :atc => true).class.should eq(Hash)
-      "LO".vatsim_online(:pilots => true, :atc => true)[:atc].size.should eq(0)
-      "LO".vatsim_online(:pilots => true, :atc => true)[:pilots].size.should eq(12)
-      "LO".vatsim_online(:atc => false)[:atc].size.should eq(0)
-      "LO".vatsim_online(:atc => false)[:pilots].size.should eq(12)
-      "WM".vatsim_online(:pilots => false)[:atc].size.should eq(4)
-      "LO".vatsim_online(:pilots => false)[:pilots].size.should eq(0)
-
-      "LO".vatsim_online[:pilots].first.callsign.should eq("AMZ1105")
-      "WM".vatsim_online[:atc].first.callsign.should eq("WMKK_APP")
-      "LO".vatsim_online(:gcmap_width => "400", :gcmap_height => "400")[:pilots].first.gcmap.should eq("http://www.gcmap.com/map?P=LOWW-N45.45676+E12.28972-LIPZ%2C+\"AMZ1105%5Cn1007+ft%5Cn128+kts\"%2B%40N45.45676+E12.28972%0d%0a&MS=wls&MR=120&MX=400x400&PM=b:disc7%2b\"%25U%25+%28N\"")
-      "LO".vatsim_online(:gcmap_width => 400, :gcmap_height => 400)[:pilots].first.gcmap.should eq("http://www.gcmap.com/map?P=LOWW-N45.45676+E12.28972-LIPZ%2C+\"AMZ1105%5Cn1007+ft%5Cn128+kts\"%2B%40N45.45676+E12.28972%0d%0a&MS=wls&MR=120&MX=400x400&PM=b:disc7%2b\"%25U%25+%28N\"")
+  before(:each) do
+    delete_local_files
+    stub_request(:get, 'https://status.vatsim.net/status.json').
+      to_return(body: File.read(File.join(File.dirname(__FILE__),  'support', 'vatsim_status.json')), status: :ok)
+    stub_request(:get, 'https://data.vatsim.net:443/v3/vatsim-data.json').
+      to_return(body: File.read(File.join(File.dirname(__FILE__), 'support', 'vatsim_data.json')), status: :ok)
+  end
+
+  describe 'vatsim_online' do
+    it 'should work :)' do
+      'ZGGG'.vatsim_online.class.should eq(Hash)
+      'LO'.vatsim_online.class.should eq(Hash)
+      'ED'.vatsim_online[:atc].size.should eq(4)
+      'EG'.vatsim_online[:pilots].size.should eq(1)
+      'EG'.vatsim_online(:pilots => true, :atc => true).class.should eq(Hash)
+      'EG'.vatsim_online(:pilots => true, :atc => true)[:atc].size.should eq(1)
+      'EG'.vatsim_online(:pilots => true, :atc => true)[:pilots].size.should eq(1)
+      'EG'.vatsim_online(:atc => false)[:atc].size.should eq(0)
+      'EG'.vatsim_online(:atc => false)[:pilots].size.should eq(1)
+      'EG'.vatsim_online(:pilots => false)[:atc].size.should eq(1)
+      'EG'.vatsim_online(:pilots => false)[:pilots].size.should eq(0)
+
+      'LO'.vatsim_online[:pilots].first.callsign.should eq('VFE1625')
+      'EG'.vatsim_online[:atc].first.callsign.should eq('EGAC_APP')
+      'LO'.vatsim_online(:gcmap_width => '400', :gcmap_height => '400')[:pilots].first.gcmap.should eq('http://www.gcmap.com/map?P=LOWS-N50.69043+E5.15406-EGBB%2C+"VFE1625%5Cn35669+ft%5Cn386+kts"%2B%40N50.69043+E5.15406%0d%0a&MS=wls&MR=120&MX=400x400&PM=b:disc7%2b"%25U%25+%28N"')
+      'LO'.vatsim_online(:gcmap_width => 400, :gcmap_height => 400)[:pilots].first.gcmap.should eq('http://www.gcmap.com/map?P=LOWS-N50.69043+E5.15406-EGBB%2C+"VFE1625%5Cn35669+ft%5Cn386+kts"%2B%40N50.69043+E5.15406%0d%0a&MS=wls&MR=120&MX=400x400&PM=b:disc7%2b"%25U%25+%28N"')
     end
 
-    it "should be case insensitive" do
-      gem_data_file
-      "wm".vatsim_online[:atc].size.should eq(4)
-      "lo".vatsim_online[:pilots].size.should eq(12)
-      "wm".vatsim_online(:pilots => true, :atc => true)[:atc].size.should eq(4)
-      "lo".vatsim_online(:pilots => true, :atc => true)[:pilots].size.should eq(12)
+    it 'should be case insensitive' do
+      'eg'.vatsim_online[:atc].size.should eq(1)
+      'eg'.vatsim_online[:pilots].size.should eq(1)
+      'eg'.vatsim_online(:pilots => true, :atc => true)[:atc].size.should eq(1)
+      'eg'.vatsim_online(:pilots => true, :atc => true)[:pilots].size.should eq(1)
     end
   end
 
-  describe "vatsim_callsign" do
-    it "should work :)" do
-      gem_data_file
-      "AMZ1105".vatsim_callsign.class.should eq(Array)
-      "AMZ1105".vatsim_callsign.size.should eq(1)
-      "AMZ1105".vatsim_callsign.first.callsign.should eq("AMZ1105")      
-      "BAW".vatsim_callsign.size.should eq(15)
-      "BAW".vatsim_callsign.last.callsign.should eq("BAW9DV")      
-      "BAW, AMZ1105".vatsim_callsign.size.should eq(16)
-      "BAW, QFA".vatsim_callsign.size.should eq(21)
+  describe 'vatsim_callsign' do
+    it 'should work :)' do
+      'VFE1625'.vatsim_callsign.class.should eq(Array)
+      'VFE1625'.vatsim_callsign.size.should eq(1)
+      'VFE1625'.vatsim_callsign.first.callsign.should eq('VFE1625')
+      'DAL'.vatsim_callsign.size.should eq(1)
+      'DAL'.vatsim_callsign.last.callsign.should eq('DAL2136')
+      'DAL, ARG1458'.vatsim_callsign.size.should eq(2)
+      'DAL, SX'.vatsim_callsign.size.should eq(2)
       
     end
 
-    it "should be case insensitive" do
-      gem_data_file
-      "amz1105".vatsim_callsign.first.callsign.should eq("AMZ1105")
+    it 'should be case insensitive' do
+      'vfe1625'.vatsim_callsign.first.callsign.should eq('VFE1625')
     end
   end
 
@@ -57,100 +61,101 @@ end
 
 describe VatsimTools::Station do
 
-  describe "new object" do
-    it "should return proper attributes" do
-      gem_data_file
-      icao = "WMKK"
+  before(:each) do
+    delete_local_files
+    stub_request(:get, 'https://status.vatsim.net/status.json').
+      to_return(body: File.read(File.join(File.dirname(__FILE__),  'support', 'vatsim_status.json')), status: :ok)
+    stub_request(:get, 'https://data.vatsim.net:443/v3/vatsim-data.json').
+      to_return(body: File.read(File.join(File.dirname(__FILE__), 'support', 'vatsim_data.json')), status: :ok)
+  end
+
+  describe 'new object' do
+    it 'should return proper attributes' do
+      icao = 'EGAC'
       station = VatsimTools::StationParser.new(icao).stations.first
       new_object = VatsimTools::Station.new(station)
-      new_object.callsign.should eq("WMKK_APP")
-      new_object.name.should eq("Adriel Loke")
-      new_object.role.should eq("ATC")
-      new_object.frequency.should eq("124.200")
-      new_object.rating.should eq("S2")
-      new_object.facility.should eq("5")
-      new_object.logon.should eq("20120722092836")
-      new_object.latitude.should eq("2.93968")
-      new_object.latitude_humanized.should eq("N2.93968")
-      new_object.longitude.should eq("101.39812")
-      new_object.longitude_humanized.should eq("E101.39812")
+      new_object.callsign.should eq('EGAC_APP')
+      new_object.name.should eq('Daniel Button')
+      new_object.role.should eq('controller')
+      new_object.frequency.should eq('130.850')
+      new_object.rating.should eq('C1')
+      new_object.facility.should eq('5')
+      new_object.logon.should eq('2021-01-29T19:11:14.4846565Z')
+      new_object.latitude.should eq('')
+      new_object.latitude_humanized.should eq(nil)
+      new_object.longitude.should eq('')
+      new_object.longitude_humanized.should eq(nil)
     end
 
-    it "should parse Ruby time with online_since attr" do
-      gem_data_file
-      icao = "LBWN"
+    it 'should parse Ruby time with online_since attr' do
+      icao = 'UMMS'
       station = VatsimTools::StationParser.new(icao).sorted_station_objects[:atc].first
-      station.logon.should eq("20120722091954")
+      station.logon.should eq('2021-01-29T19:11:13.0906448Z')
       station.online_since.class.should eq(Time)
       station.online_since.utc?.should eq(true)
-      station.online_since.should eq("2012-07-22 09:19:54 UTC")
-      station.rating.should eq("INS")
+      station.online_since.should eq('2021-01-29T19:11:13.0906448Z')
+      station.rating.should eq('S2')
     end
   end
 
-  describe "pilot object" do
-    it "should contain all attributes" do
-      gem_data_file
-      icao = "EGLL"
+  describe 'pilot object' do
+    it 'should contain all attributes' do
+      icao = 'LSGG'
       station = VatsimTools::StationParser.new(icao).stations.first
       new_object = VatsimTools::Station.new(station)
-      new_object.callsign.should eq("AAL026")
-      new_object.name.should eq("Manuel Santillan MMCU")
-      new_object.role.should eq("PILOT")
-      new_object.latitude.should eq("44.09780")
-      new_object.latitude_humanized.should eq("N44.0978")
-      new_object.longitude.should eq("-58.41483")
-      new_object.longitude_humanized.should eq("W58.41483")
-      new_object.planned_altitude.should eq("370")
-      new_object.transponder.should eq("4122")
-      new_object.heading.should eq("73")
-      new_object.qnh_in.should eq("30.12")
-      new_object.qnh_mb.should eq("1019")
-      new_object.flight_type.should eq("I")
-      new_object.cid.should eq("1210329")
+      new_object.callsign.should eq('AFR352')
+      new_object.name.should eq('Michel Matalon LSZH')
+      new_object.role.should eq('pilot')
+      new_object.latitude.should eq('44.99953')
+      new_object.latitude_humanized.should eq('N44.99953')
+      new_object.longitude.should eq('9.47403')
+      new_object.longitude_humanized.should eq('E9.47403')
+      new_object.planned_altitude.should eq('38000')
+      new_object.transponder.should eq('4107')
+      new_object.heading.should eq('300')
+      new_object.qnh_in.should eq('29.64')
+      new_object.qnh_mb.should eq('1004')
+      new_object.flight_type.should eq('I')
+      new_object.cid.should eq('1379490')
     end
 
-    it "should generate gcmap link" do
-      gem_data_file
-      icao = "EGLL"
+    it 'should generate gcmap link' do
+      icao = 'LSGG'
       station = VatsimTools::StationParser.new(icao).stations.first
       new_object = VatsimTools::Station.new(station)
-      new_object.gcmap.should eq("http://www.gcmap.com/map?P=KDFW-N44.0978+W58.41483-EGLL%2C+\"AAL026%5Cn37210+ft%5Cn543+kts\"%2B%40N44.0978+W58.41483%0d%0a&MS=wls&MR=120&MX=720x360&PM=b:disc7%2b\"%25U%25+%28N\"")
+      new_object.gcmap.should eq('http://www.gcmap.com/map?P=EDUU-N44.99953+E9.47403-LSGG%2C+"AFR352%5Cn37729+ft%5Cn425+kts"%2B%40N44.99953+E9.47403%0d%0a&MS=wls&MR=120&MX=720x360&PM=b:disc7%2b"%25U%25+%28N"')
     end
 
-    it "should handle resized gcmap" do
-      gem_data_file
-      icao = "EGLL"
+    it 'should handle resized gcmap' do
+      icao = 'LSGG'
       args = {}
-      args[:gcmap_width] = "400"
-      args[:gcmap_height] = "400"
+      args[:gcmap_width] = '400'
+      args[:gcmap_height] = '400'
       station = VatsimTools::StationParser.new(icao).stations.first
       new_object = VatsimTools::Station.new(station, args)
       new_object.gcmap_width.should eq(400)
       new_object.gcmap_height.should eq(400)
-      new_object.gcmap.should eq("http://www.gcmap.com/map?P=KDFW-N44.0978+W58.41483-EGLL%2C+\"AAL026%5Cn37210+ft%5Cn543+kts\"%2B%40N44.0978+W58.41483%0d%0a&MS=wls&MR=120&MX=400x400&PM=b:disc7%2b\"%25U%25+%28N\"")
+      new_object.gcmap.should eq('http://www.gcmap.com/map?P=EDUU-N44.99953+E9.47403-LSGG%2C+"AFR352%5Cn37729+ft%5Cn425+kts"%2B%40N44.99953+E9.47403%0d%0a&MS=wls&MR=120&MX=400x400&PM=b:disc7%2b"%25U%25+%28N"')
 
     end
 
   end
 
-  describe "atc object" do
-    it "should handle regular and humanized atis" do
-      gem_data_file
-      icao = "LBWN"
+  describe 'atc object' do
+    it 'should handle regular and humanized atis' do
+      icao = 'EDBB'
       station = VatsimTools::StationParser.new(icao).sorted_station_objects[:atc].first
-      station.logon.should eq("20120722091954")
-      station.rating.should eq("INS")
-      station.atis.should eq("$ voice2.vacc-sag.org/lfmn_app. Nice Approach. Charts at www.tinyurl.com/chartsfr. Visit www.vatfrance.org")
-      station.atis_message.should eq("Nice Approach<br />Charts at www.tinyurl.com/chartsfr<br />Visit www.vatfrance.org")
+      station.logon.should eq('2021-01-29T19:11:13.2762054Z')
+      station.rating.should eq('C1')
+      station.atis.should eq('BERLIN DIRECTOR ON INTIAL CONTACT, STATE YOUR CALLSIGN ONLY')
+      station.atis_message.should eq('No published remark')
     end
 
-     it "should handle no ATC remark" do
-      gem_data_file
-      icao = "NZAA"
+     it 'should handle no ATC remark' do
+      icao = 'EDBB'
       station = VatsimTools::StationParser.new(icao).sorted_station_objects[:atc].first
-      station.atis.should eq("$ rw1.vatpac.org/nzaa_twr")
-      station.atis_message.should eq("No published remark")
+      station.atis.should eq('BERLIN DIRECTOR ON INTIAL CONTACT, STATE YOUR CALLSIGN ONLY')
+      station.atis_message.should eq('No published remark')
     end
   end
 

data/vatsim_online_redux.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "rake"
   gem.add_development_dependency "libnotify"
   gem.add_development_dependency "rb-inotify"
+  gem.add_development_dependency "webmock"
   gem.add_dependency "time_diff", "~> 0.3.0"
   gem.add_dependency "gcmapper", "~> 0.4.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vatsim_online_redux
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 2.1.1
 platform: ruby
 authors:
 - Svilen Vassilev
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-30 00:00:00.000000000 Z
+date: 2022-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -67,6 +67,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: time_diff
   requirement: !ruby/object:Gem::Requirement
@@ -117,20 +131,21 @@ files:
 - Rakefile
 - lib/vatsim_online.rb
 - lib/vatsim_online/callsign_parser.rb
+- lib/vatsim_online/callsign_regex_parser.rb
 - lib/vatsim_online/data_downloader.rb
 - lib/vatsim_online/station.rb
 - lib/vatsim_online/station_parser.rb
 - lib/vatsim_online/version.rb
 - spec/callsign_parser_spec.rb
-- spec/callsign_parser_spec_helper.rb
+- spec/callsign_regex_parser_spec.rb
 - spec/data_downloader_spec.rb
 - spec/data_downloader_spec_helper.rb
 - spec/spec_helper.rb
 - spec/station_parser_spec.rb
-- spec/station_parser_spec_helper.rb
+- spec/support/vatsim_data.json
+- spec/support/vatsim_status.json
 - spec/vatsim_data.txt
 - spec/vatsim_online_spec.rb
-- spec/vatsim_online_spec_helper.rb
 - vatsim_online_redux.gemspec
 homepage: https://github.com/aldent95/vatsim_online_redux
 licenses:
@@ -151,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Updated version of original gem by Svilen Vassilev. Selectively pulls and
@@ -161,12 +176,12 @@ summary: Updated version of original gem by Svilen Vassilev. Selectively pulls a
   on preset intervals and cached locally to avoid flooding the servers.
 test_files:
 - spec/callsign_parser_spec.rb
-- spec/callsign_parser_spec_helper.rb
+- spec/callsign_regex_parser_spec.rb
 - spec/data_downloader_spec.rb
 - spec/data_downloader_spec_helper.rb
 - spec/spec_helper.rb
 - spec/station_parser_spec.rb
-- spec/station_parser_spec_helper.rb
+- spec/support/vatsim_data.json
+- spec/support/vatsim_status.json
 - spec/vatsim_data.txt
 - spec/vatsim_online_spec.rb
-- spec/vatsim_online_spec_helper.rb

data/spec/callsign_parser_spec_helper.rb

@@ -1,10 +0,0 @@
-def gem_data_file
-  path = File.realpath("spec/vatsim_data.txt")
-  data_file = File.open(path, :encoding => 'iso-8859-15')
-  gem_data = data_file.read
-  data_file.close
-  data = Tempfile.new('vatsim_data', :encoding => 'iso-8859-15')
-  data.write(gem_data.gsub(/["]/, '\s').force_encoding('iso-8859-15'))
-  data.close
-  File.rename data.path, "#{Dir.tmpdir}/vatsim_data.txt"
-end

data/spec/station_parser_spec_helper.rb

@@ -1,10 +0,0 @@
-def gem_data_file
-  path = File.realpath("spec/vatsim_data.txt")
-  data_file = File.open(path, :encoding => 'iso-8859-15')
-  gem_data = data_file.read
-  data_file.close
-  data = Tempfile.new('vatsim_data', :encoding => 'iso-8859-15')
-  data.write(gem_data.gsub(/["]/, '\s').force_encoding('iso-8859-15'))
-  data.close
-  File.rename data.path, "#{Dir.tmpdir}/vatsim_data.txt"
-end

data/spec/vatsim_online_spec_helper.rb

@@ -1,10 +0,0 @@
-def gem_data_file
-  path = File.realpath("spec/vatsim_data.txt")
-  data_file = File.open(path, :encoding => 'iso-8859-15')
-  gem_data = data_file.read
-  data_file.close
-  data = Tempfile.new('vatsim_data', :encoding => 'iso-8859-15')
-  data.write(gem_data.gsub(/["]/, '\s').force_encoding('iso-8859-15'))
-  data.close
-  File.rename data.path, "#{Dir.tmpdir}/vatsim_data.txt"
-end