vatsim_online 0.8.3 → 0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d6ff206e783e76208736015dd0192e0e7a24b44
-  data.tar.gz: 8c4cf4a435d97a09f469318d5270f98366d03468
+  metadata.gz: 035ddd6e7d2e1bee0abb99bf0d3b0667899b83fc
+  data.tar.gz: ad7525ca904f1943bc6125b45775987ca05d0c1c
 SHA512:
-  metadata.gz: 183387efe4206e8e54deb92efbe38e7a9605067269e7eea960b5f024be39d416cac6795b7dae669f57957a1b9cbad04b0fcf05a9800cb4ead9e0569f5d146891
-  data.tar.gz: 47db87f81ad25fc410e237c7342c3b4fd21ab5841a106559529f5f927a27abe9e89302e6244dbd061c456e151ff85ed27c1aa9f5e4ff20ac0f3509db1bdd13fc
+  metadata.gz: c942853d19c893cec2418511796294a20afd803e717066e170cb174fbe21664639a7fc39572637d7b57d5f4248f7a452c739dc5b16efbfb8a3992807ff4779f6
+  data.tar.gz: 569aa9abcf055428dd36d8a7414886138eab6f7ed79d5e81835d231b950434ad88508ec1a0759762af1c8e29a43269ce3ab25eb39a5346ed1536d6aac3c76fcc

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Changelog
 
+### v. 0.9 - 20 June 2015
+
+* Fixed nil String bug, can select "ALL" (thanks to Pierre Ferran and Florian Rimoli)
+
 ### v. 0.8.3 - 10 April 2014
 
 * Fix stale data bug, change data fallback logic

data/README.md

@@ -332,6 +332,10 @@ the same result.
 
 ## Changelog
 
+### v. 0.9 - 20 June 2015
+
+* Fixed nil String bug, can select "ALL" (thanks to Pierre Ferran and Florian Rimoli)
+
 ### v. 0.8.3 - 10 April 2014
 
 * Fix stale data bug, change data fallback logic
@@ -452,12 +456,12 @@ original Vatsim data is re-encoded
 
 ## Credits
 
-Copyright © 2013 [Svilen Vassilev](http://svilen.rubystudio.net)
+Copyright © 2015 [Svilen Vassilev](http://svilen.rubystudio.net)
 
-*If you find my work useful or time-saving, you can endorse it or buy me a cup of coffee:*
+### Contributors
 
-[![endorse](http://api.coderwall.com/svilenv/endorsecount.png)](http://coderwall.com/svilenv)
-[![Donate](https://www.paypalobjects.com/en_US/i/btn/btn_donate_SM.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=5FR7AQA4PLD8A)
+* [Florian Rimoli](https://github.com/Flox06)
+* [Pierre Ferran](https://github.com/pierr3)
 
 Released under the [MIT LICENSE](https://github.com/tarakanbg/vatsim_online/blob/master/LICENSE)
 

data/lib/vatsim_online/station.rb

@@ -38,9 +38,9 @@ module VatsimTools
 
     def construct_gcmap_url
       if @origin && @latitude_humanized && @longitude_humanized && @destination
-        route = @origin + "-" + @latitude_humanized + "+" + @longitude_humanized + "-" + @destination
-        route += "%2C+\"" + @callsign + "%5Cn" + @altitude + "+ft%5Cn" + @groundspeed + "+kts"
-        route += "\"%2B%40" + @latitude_humanized + "+" + @longitude_humanized
+        route = @origin.to_s + "-" + @latitude_humanized.to_s + "+" + @longitude_humanized.to_s + "-" + @destination.to_s
+        route += "%2C+\"" + @callsign.to_s + "%5Cn" + @altitude.to_s + "+ft%5Cn" + @groundspeed.to_s + "+kts"
+        route += "\"%2B%40" + @latitude_humanized.to_s + "+" + @longitude_humanized.to_s
       else
         route = "Position undetermined"
       end

data/lib/vatsim_online/station_parser.rb

@@ -14,7 +14,11 @@ module VatsimTools
     def initialize(icao, args = nil)
       VatsimTools::DataDownloader.new
       args.class == Hash ? @role = determine_role(args) : @role = "all"
-      @icao = icao.upcase.split(',').each {|s| s.strip!}
+      if icao == "ALL"
+        @icao = nil
+      else
+        @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]
       @gcmap_height = args[:gcmap_height] if args && args[:gcmap_height]
@@ -31,9 +35,14 @@ module VatsimTools
       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 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"
+        unless @icao
+          stations << row if (client == "ATC") unless @role == "pilot"
+          stations << row 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"
+          end
         end
       end
       stations
@@ -51,10 +60,12 @@ module VatsimTools
     def sorted_station_objects
       atc = []; pilots = []; arrivals = []; departures = []
       station_objects.each {|sobj| sobj.role == "ATC" ? atc << sobj : pilots << sobj}
-      for icao in @icao
-        for pilot in pilots
-          departures << pilot if pilot.origin[0...icao.length] == icao
-          arrivals << pilot if pilot.destination[0...icao.length] == icao
+      if @icao
+        for icao in @icao
+          for pilot in pilots
+            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 }

data/lib/vatsim_online/version.rb

@@ -1,3 +1,3 @@
 module VatsimOnline
-  VERSION = "0.8.3"
+  VERSION = "0.9"
 end

data/vatsim_online.gemspec

@@ -22,8 +22,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "libnotify"
   gem.add_development_dependency "rb-inotify"
   gem.add_development_dependency "guard-rspec"
-  gem.add_dependency "curb", "~> 0.8.5"
+  gem.add_dependency "curb", "~> 0.8.8"
   gem.add_dependency "time_diff", "~> 0.3.0"
   gem.add_dependency "gcmapper", "~> 0.4.0"
 end
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vatsim_online
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: '0.9'
 platform: ruby
 authors:
 - Svilen Vassilev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-10 00:00:00.000000000 Z
+date: 2015-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.5
+        version: 0.8.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.5
+        version: 0.8.8
 - !ruby/object:Gem::Dependency
   name: time_diff
   requirement: !ruby/object:Gem::Requirement