RubyGems - vatsim_online_redux - Versions diffs - 1.0.1 → 2.0.1 - Mend

vatsim_online_redux 1.0.1 → 2.0.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (19) hide show

checksums.yaml +4 -4
data/lib/vatsim_online/callsign_parser.rb +13 -7
data/lib/vatsim_online/data_downloader.rb +131 -127
data/lib/vatsim_online/station.rb +37 -16
data/lib/vatsim_online/station_parser.rb +28 -19
data/lib/vatsim_online/version.rb +3 -3
data/spec/callsign_parser_spec.rb +13 -7
data/spec/data_downloader_spec.rb +16 -9
data/spec/data_downloader_spec_helper.rb +6 -4
data/spec/spec_helper.rb +1 -0
data/spec/station_parser_spec.rb +51 -53
data/spec/support/vatsim_data.json +796 -0
data/spec/support/vatsim_status.json +13 -0
data/spec/vatsim_online_spec.rb +106 -101
data/vatsim_online_redux.gemspec +1 -0
metadata +21 -9
data/spec/callsign_parser_spec_helper.rb +0 -10
data/spec/station_parser_spec_helper.rb +0 -10
data/spec/vatsim_online_spec_helper.rb +0 -10

checksums.yaml CHANGED

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a78e86307bec08f8b4dd9dbb4fefbb7178201c182fd79a636fb08779d638efc
-  data.tar.gz: 6d4cb6b9b60b1214539bc3b34a84b19970199f9cb54721f097e4ca8e3e3924f3
+  metadata.gz: 9b68e83fc9b674c716b6bc39a5c49ca70a9d111eb0222bc344d0dd60df8582e9
+  data.tar.gz: 22751c268f529366bd591a6b1d7ce6bd020390c521aacf6d1a72417ae90c59df
 SHA512:
-  metadata.gz: 8ecc57d54538a812f72ad152e9ef690b61ccf8be8c689997550d5c15d913c9b23e855b21ec746a0a0bc5732f92ba564b6f44d8110e55110564ee3c9a26f6717c
-  data.tar.gz: 83652fe1c4c98c5ca26a182e41b6e79583e4b0e5db8b95a57b51cf9759ecf3518db9cb172d0667018c3fcb4af6e11efd048c33accfbe3c66f971581f65b74ce9
+  metadata.gz: 2f7e76e654c1f4c87c58f33c84ac13b115e5811571b9f07fedb08804867d3a6ff591b993d56ae0d2d054b8ac8d9e0e7b7ffc8b854d7b682ce9941b15e79a43e9
+  data.tar.gz: f8a65ee499723d787f6c25c26ab9d4dcabc7d764c3c18441bd2a78bbec92ed385f9fd6718724193ef76901e62b28643a181c978e29b2c350cfbd08eb2e0f93e4

data/lib/vatsim_online/callsign_parser.rb CHANGED

@@ -9,7 +9,7 @@ module VatsimTools
     attributes = %w{role callsign gcmap_width gcmap_height}
     attributes.each {|attribute| attr_accessor attribute.to_sym }
-    LOCAL_DATA = "#{Dir.tmpdir}/vatsim_online/vatsim_data.txt"
+    LOCAL_DATA = "#{Dir.tmpdir}/vatsim_online/vatsim_data.json"
     def initialize(callsign, args = nil)
       VatsimTools::DataDownloader.new
@@ -29,15 +29,21 @@ module VatsimTools
     def stations
-      stations = []
-      CSV.foreach(LOCAL_DATA, :col_sep =>':') do |row|
-        callsign, origin, destination, client = row[0].to_s, row[11].to_s, row[13].to_s, row[3].to_s
-        for cs in @callsign
-          stations << row if callsign[0...cs.length] == cs # && client == "ATC") unless @role == "pilot"
+      matching_stations = []
+      raw_data = File.read(LOCAL_DATA)
+      data = JSON.parse(raw_data)
+      pilots = data['pilots'].each {|p| p['role'] = 'pilot'}
+      controllers = data['controllers'].each {|p| p['role'] = 'controller'}
+      atis = data['atis'].each {|p| p['role'] = 'atis'}
+      stations = pilots + controllers + atis
+      stations.each do |station|
+        callsign = station['callsign']
+        @callsign.each do |cs|
+          matching_stations << station if callsign[0...cs.length] == cs # && client == "ATC") unless @role == "pilot"
           # stations << row if (origin[0...icao.length] == icao || destination[0...icao.length] == icao) unless @role == "atc"
         end
       end
-      stations
+      matching_stations
     end
     def station_objects

data/lib/vatsim_online/data_downloader.rb CHANGED

@@ -1,127 +1,131 @@
-module VatsimTools
-require 'tempfile'
-require 'time_diff'
-require 'tmpdir'
-require 'net/http'
-require 'fileutils'
-  class DataDownloader
-    STATUS_URL = "http://status.vatsim.net/status.txt"
-    TEMP_DIR = "#{Dir.tmpdir}/vatsim_online"
-    LOCAL_STATUS = "#{Dir.tmpdir}/vatsim_online/vatsim_status.txt"
-    LOCAL_STATUS_BAK = "#{Dir.tmpdir}/vatsim_online/vatsim_status_bak.txt"
-    LOCAL_DATA = "#{Dir.tmpdir}/vatsim_online/vatsim_data.txt"
-    LOCAL_DATA_BAK = "#{Dir.tmpdir}/vatsim_online/vatsim_data_bak.txt"
-    def initialize
-      FileUtils.mkdir(TEMP_DIR) unless File.exist? TEMP_DIR
-      data_file
-    end
-    def create_status_tempfile
-      uri = URI(STATUS_URL)
-      http = Net::HTTP.new(uri.host, uri.port)
-      request = Net::HTTP::Get.new(uri.path)
-      data = http.request(request).body.gsub("\n", '')
-      create_status_backup if File.exists?(LOCAL_STATUS)
-      File.write(LOCAL_STATUS, data)
-      File.chmod(0777, LOCAL_STATUS)
-      dummy_status if data.include? "<html><head>"
-    rescue Exception => e
-      dummy_status
-    end
-    def create_status_backup
-      source = LOCAL_STATUS
-      target = LOCAL_STATUS_BAK
-      FileUtils.cp_r source, target
-      File.chmod(0777, LOCAL_STATUS_BAK)
-    end
-    def read_status_tempfile
-      status = File.open(LOCAL_STATUS)
-      difference = Time.diff(status.ctime, Time.now)[:hour]
-      if difference > 3
-        data = create_status_tempfile
-      else
-        data = status.read
-      end
-      status.close
-      data
-    end
-    def status_file
-      File.exists?(LOCAL_STATUS) ? read_status_tempfile : create_status_tempfile
-      LOCAL_STATUS
-    end
-    def servers
-      urls = []
-      CSV.foreach(status_file, :col_sep =>'=') do |row|
-        urls << row[1] if row[0] == "url0"
-      end
-      urls
-    end
-    def create_local_data_file
-      uri = URI(servers.sample)
-      http = Net::HTTP.new(uri.host, uri.port)
-      request = Net::HTTP::Get.new(uri.path)
-      req_data = http.request(request).body
-      create_data_backup if File.exists?(LOCAL_DATA)
-      data = req_data.gsub(/["]/, '\s').encode!('UTF-16', 'UTF-8', :invalid => :replace, :replace => '').encode!('UTF-8', 'UTF-16')
-      data = data.slice(0..(data.index('!PREFILE:')))
-      File.open(LOCAL_DATA, "w+") {|f| f.write(data)}
-      File.chmod(0777, LOCAL_DATA)
-      gem_data_file if req_data.include? "<html><head>"
-      file = File.open(LOCAL_DATA)
-      gem_data_file if file.size == 0
-      file.close
-    rescue Exception => e
-      gem_data_file
-    end
-    def create_data_backup
-      source = LOCAL_DATA
-      target = LOCAL_DATA_BAK
-      FileUtils.cp_r source, target
-      File.chmod(0777, LOCAL_DATA_BAK)
-    end
-    def read_local_datafile
-      data = File.open(LOCAL_DATA)
-      difference = Time.diff(data.ctime, Time.now)[:minute]
-      if difference > 2
-        d = create_local_data_file
-      else
-        d = data.read
-      end
-      data.close
-      d
-    end
-    def data_file
-      File.exists?(LOCAL_DATA) ? read_local_datafile : create_local_data_file
-      LOCAL_DATA
-    end
-    def gem_data_file
-      source = LOCAL_DATA_BAK
-      target = LOCAL_DATA
-      FileUtils.cp_r source, target
-      File.chmod(0777, LOCAL_DATA)
-    end
-    def dummy_status
-      source = LOCAL_STATUS_BAK
-      target = LOCAL_STATUS
-      FileUtils.cp_r source, target
-      File.chmod(0777, LOCAL_STATUS)
-    end
-    def get_data(url)
-      uri = URI(url)
-      Net::HTTP.get(uri)
-    end
-  end
-end
+module VatsimTools
+require 'tempfile'
+require 'time_diff'
+require 'tmpdir'
+require 'net/http'
+require 'fileutils'
+  class DataDownloader
+    STATUS_URL = "https://status.vatsim.net/status.json"
+    TEMP_DIR = "#{Dir.tmpdir}/vatsim_online"
+    LOCAL_STATUS = "#{Dir.tmpdir}/vatsim_online/vatsim_status.json"
+    LOCAL_STATUS_BAK = "#{Dir.tmpdir}/vatsim_online/vatsim_status_bak.json"
+    LOCAL_DATA = "#{Dir.tmpdir}/vatsim_online/vatsim_data.json"
+    LOCAL_DATA_BAK = "#{Dir.tmpdir}/vatsim_online/vatsim_data_bak.json"
+    def initialize
+      FileUtils.mkdir(TEMP_DIR) unless File.exist? TEMP_DIR
+      data_file
+    end
+    def create_status_tempfile
+      uri = URI(STATUS_URL)
+      http = Net::HTTP.new(uri.host, uri.port)
+      request = Net::HTTP::Get.new(uri.path)
+      http.use_ssl = (uri.scheme == 'https')
+      data = http.request(request).body.gsub("\n", '')
+      create_status_backup if File.exists?(LOCAL_STATUS)
+      File.write(LOCAL_STATUS, data)
+      File.chmod(0777, LOCAL_STATUS)
+      dummy_status if data.include? "<html><head>"
+    rescue Exception => e
+      if e.class == WebMock::NetConnectNotAllowedError
+        raise e
+      end
+      dummy_status
+    end
+    def create_status_backup
+      source = LOCAL_STATUS
+      target = LOCAL_STATUS_BAK
+      FileUtils.cp_r source, target
+      File.chmod(0777, LOCAL_STATUS_BAK)
+    end
+    def read_status_tempfile
+      status = File.open(LOCAL_STATUS)
+      difference = Time.diff(status.ctime, Time.now)[:hour]
+      if difference > 3
+        data = create_status_tempfile
+      else
+        data = status.read
+      end
+      status.close
+      data
+    end
+    def status_file
+      File.exists?(LOCAL_STATUS) ? read_status_tempfile : create_status_tempfile
+      LOCAL_STATUS
+    end
+    def servers
+      raw_data = File.read(status_file)
+      data = JSON.parse(raw_data)
+      data['data']['v3']
+    end
+    def create_local_data_file
+      uri = URI(servers.sample)
+      http = Net::HTTP.new(uri.host, uri.port)
+      request = Net::HTTP::Get.new(uri.path)
+      http.use_ssl = (uri.scheme == 'https')
+      req_data = http.request(request).body
+      create_data_backup if File.exists?(LOCAL_DATA)
+      File.open(LOCAL_DATA, "w+") {|f| f.write(req_data.force_encoding('UTF-8'))}
+      File.chmod(0777, LOCAL_DATA)
+      gem_data_file if req_data.include? "<html><head>"
+      file = File.open(LOCAL_DATA)
+      gem_data_file if file.size == 0
+      file.close
+    rescue Exception => e
+      if e.class == WebMock::NetConnectNotAllowedError
+        raise e
+      end
+      gem_data_file
+    end
+    def create_data_backup
+      source = LOCAL_DATA
+      target = LOCAL_DATA_BAK
+      FileUtils.cp_r source, target
+      File.chmod(0777, LOCAL_DATA_BAK)
+    end
+    def read_local_datafile
+      data = File.open(LOCAL_DATA)
+      difference = Time.diff(data.ctime, Time.now)[:minute]
+      if difference > 2
+        d = create_local_data_file
+      else
+        d = data.read
+      end
+      data.close
+      d
+    end
+    def data_file
+      File.exists?(LOCAL_DATA) ? read_local_datafile : create_local_data_file
+      LOCAL_DATA
+    end
+    def gem_data_file
+      source = LOCAL_DATA_BAK
+      target = LOCAL_DATA
+      FileUtils.cp_r source, target
+      File.chmod(0777, LOCAL_DATA)
+    end
+    def dummy_status
+      source = LOCAL_STATUS_BAK
+      target = LOCAL_STATUS
+      FileUtils.cp_r source, target
+      File.chmod(0777, LOCAL_STATUS)
+    end
+    def get_data(url)
+      uri = URI(url)
+      Net::HTTP.get(uri)
+    end
+  end
+end

data/lib/vatsim_online/station.rb CHANGED

@@ -12,27 +12,44 @@ module VatsimTools
     def initialize(station, args = nil)
-      @callsign, @cid,  @name, @role, @frequency, @latitude, @longitude,  @altitude, @groundspeed, @aircraft, @origin,
-        @planned_altitude, @destination, @transponder, @facility, @flight_type, @remarks, @route, @logon, @heading,
-        @qnh_in, @qnh_mb = station[0], station[1], station[2], station[3], station[4], station[5], station[6], station[7],
-        station[8], station[9], station[11], station[12], station[13], station[17], station[18], station[21], station[29],
-        station[30], station[37], station[38], station[39], station[40]
+      @callsign = station['callsign']
+      @cid = station['cid'].to_s
+      @name = station['name']
+      @role = station['role']
+      @frequency = station['frequency']
+      @latitude = station['latitude'].to_s
+      @longitude = station['longitude'].to_s
+      @altitude = station['altitude']
+      @groundspeed = station['groundspeed']
+      @aircraft = station['flight_plan']['aircraft'] rescue ''
+      @origin = station['flight_plan']['departure'] rescue ''
+      @planned_altitude = station['flight_plan']['altitude'] rescue ''
+      @destination = station['flight_plan']['arrival'] rescue ''
+      @transponder = station['transponder']
+      @facility = station['facility'].to_s
+      @flight_type = station['flight_plan']['flight_rules'] rescue ''
+      @remarks = station['flight_plan']['remarks'] rescue ''
+      @route  = station['flight_plan']['route'] rescue ''
+      @logon = station['logon_time']
+      @heading = station['heading'].to_s
+      @qnh_in = station['qnh_i_hg'].to_s
+      @qnh_mb = station['qnh_mb'].to_s
-      @atis = atis_cleaner(station[35]) if station[35]
-      @rating = humanized_rating(station[16])
-      @latitude_humanized = latitude_parser(station[5].to_f)
-      @longitude_humanized = longitude_parser(station[6].to_f)
+      @atis = atis_cleaner(station['text_atis']) if station['text_atis']
+      @rating = humanized_rating(station['rating'].to_s)
+      @latitude_humanized = latitude_parser(station['latitude'])
+      @longitude_humanized = longitude_parser(station['longitude'])
       @online_since = utc_logon_time if @logon
       @gcmap_width = args[:gcmap_width].to_i if args && args[:gcmap_width]
       @gcmap_height = args[:gcmap_height].to_i if args && args[:gcmap_height]
       @gcmap = gcmap_generator
-      @atis_message = construct_atis_message(station[35]) if station[35]
+      @atis_message = construct_atis_message(station['text_atis']) if station['text_atis']
     end
   private
     def gcmap_generator
-      return "No map for ATC stations" if @role != "PILOT"
+      return "No map for ATC stations" if @role != "pilot"
       construct_gcmap_url.gcmap(:width => @gcmap_width, :height => @gcmap_height)
     end
@@ -47,22 +64,26 @@ module VatsimTools
       route
     end
-    def latitude_parser(lat)
+    def latitude_parser(lat_s)
+      return nil if lat_s == nil
+      lat = lat_s.to_f
       lat > 0 ? hemisphere = "N" : hemisphere = "S"
       hemisphere + lat.abs.to_s
     end
-    def longitude_parser(lon)
+    def longitude_parser(lon_s)
+      return nil if lon_s == nil
+      lon = lon_s.to_f
       lon > 0 ? hemisphere = "E" : hemisphere = "W"
       hemisphere + lon.abs.to_s
     end
     def atis_cleaner(raw_atis)
-      raw_atis.gsub(/[\^]/, '. ')
+      raw_atis.join(' ').gsub(/[\^]/, '. ')
     end
     def utc_logon_time
-      Time.parse ("#{@logon[0...4]}-#{@logon[4...6]}-#{@logon[6...8]} #{@logon[8...10]}:#{@logon[10...12]}:#{@logon[12...14]} UTC")
+      Time.parse(@logon)
     end
     def humanized_rating(rating_number)
@@ -84,7 +105,7 @@ module VatsimTools
     end
     def construct_atis_message(raw_atis)
-      message = raw_atis.gsub(/[\^]/, '<br />')
+      message = raw_atis.join(' ').gsub(/[\^]/, '<br />')
       message.index('>') ? message = message[message.index('>')+1...message.length] : message = "No published remark"
     end

data/lib/vatsim_online/station_parser.rb CHANGED

@@ -7,9 +7,9 @@ module VatsimTools
     require_relative "station"
     attributes = %w{role icao excluded gcmap_width gcmap_height}
-    attributes.each {|attribute| attr_accessor attribute.to_sym }
+    attributes.each { |attribute| attr_accessor attribute.to_sym }
-    LOCAL_DATA = "#{Dir.tmpdir}/vatsim_online/vatsim_data.txt"
+    LOCAL_DATA = "#{Dir.tmpdir}/vatsim_online/vatsim_data.json"
     def initialize(icao, args = nil)
       VatsimTools::DataDownloader.new
@@ -17,7 +17,7 @@ module VatsimTools
       if icao == "ALL"
         @icao = nil
       else
-        @icao = icao.upcase.split(',').each {|s| s.strip!}
+        @icao = icao.upcase.split(',').each { |s| s.strip! }
       end
       @excluded = args[:exclude].upcase if args && args[:exclude]
       @gcmap_width = args[:gcmap_width] if args && args[:gcmap_width]
@@ -32,44 +32,53 @@ module VatsimTools
     end
     def stations
-      stations = []
-      CSV.foreach(LOCAL_DATA, :col_sep =>':') do |row|
-        callsign, origin, destination, client = row[0].to_s, row[11].to_s, row[13].to_s, row[3].to_s
+      matching_stations = []
+      raw_data = File.read(LOCAL_DATA)
+      data = JSON.parse(raw_data)
+      pilots = data['pilots'].each { |p| p['role'] = 'pilot' }
+      controllers = data['controllers'].each { |p| p['role'] = 'controller' }
+      atis = data['atis'].each { |p| p['role'] = 'atis' }
+      stations = pilots + controllers + atis
+      stations.each do |station|
+        callsign = station['callsign']
+        destination = station['flight_plan']['arrival'] rescue ''
+        origin = station['flight_plan']['departure'] rescue ''
+        client = station['role']
         unless @icao
-          stations << row if (client == "ATC") unless @role == "pilot"
-          stations << row if (client == "PILOT") unless @role == "atc"
+          matching_stations << station if (client == "controller") unless @role == "pilot"
+          matching_stations << station if (client == "pilot") unless @role == "atc"
         else
-          for icao in @icao
-            stations << row if (callsign[0...icao.length] == icao && client == "ATC") unless @role == "pilot"
-            stations << row if (origin[0...icao.length] == icao || destination[0...icao.length] == icao) unless @role == "atc"
+          @icao.each do |icao|
+            matching_stations << station if (callsign[0...icao.length] == icao && client == "controller") unless @role == "pilot"
+            matching_stations << station if (origin[0...icao.length] == icao || destination[0...icao.length] == icao) unless @role == "atc"
           end
         end
       end
-      stations
+      matching_stations
     end
     def station_objects
-      station_objects= []
+      station_objects = []
       args = {}
       args[:gcmap_width] = @gcmap_width if @gcmap_width
       args[:gcmap_height] = @gcmap_height if @gcmap_height
-      stations.each {|station| station_objects << VatsimTools::Station.new(station, args) }
+      stations.each { |station| station_objects << VatsimTools::Station.new(station, args) }
       station_objects
     end
     def sorted_station_objects
       atc = []; pilots = []; arrivals = []; departures = []
-      station_objects.each {|sobj| sobj.role == "ATC" ? atc << sobj : pilots << sobj}
+      station_objects.each { |sobj| sobj.role == "controller" ? atc << sobj : pilots << sobj }
       if @icao
-        for icao in @icao
-          for pilot in pilots
+        @icao.each do |icao|
+          pilots.each do |pilot|
             departures << pilot if pilot.origin[0...icao.length] == icao
             arrivals << pilot if pilot.destination[0...icao.length] == icao
           end
         end
       end
-      atc.delete_if {|a| @excluded && a.callsign[0...@excluded.length] == @excluded }
-      {:atc => atc, :pilots => pilots, :arrivals => arrivals, :departures => departures}
+      atc.delete_if { |a| @excluded && a.callsign[0...@excluded.length] == @excluded }
+      { :atc => atc, :pilots => pilots, :arrivals => arrivals, :departures => departures }
     end
   end