vatsim_online 0.5.3 → 0.6.0

data/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 ## Changelog
 
+### v. 0.6.0 - 08 October 2012
+
+* The `vatsim_online` method now also supports a comma-separated list of full or
+partial ICAO codes like this: `"LO,LB".vatsim_online`. This allows you to pull the
+information for multiple airports or FIRs in a single request
+* The comma-seprated list is not sensitive to whitespace, meaning you can use
+`"LO,LB".vatsim_online` or `"LO, LB".vatsim_online` or `"LO , LB".vatsim_online` with
+the same result
+
 ### v. 0.5.3 - 30 September 2012
 
 * fixed bug with exceptions on missing ATC remark

data/README.md

@@ -32,8 +32,8 @@ Or install it yourself as:
 
 This gem provides one public method: `vatsim_online`, which can be applied to
 any string (or variable containing a string) representing a full or partial ICAO
-code. The provided ICAO code or fragment will be used as a search criteria and
-matched against the current vatsim data.
+code or a comma-separated list of ICAO codes. The provided ICAO code or fragment
+will be used as a search criteria and matched against the current vatsim data.
 
 For example if you want to retrieve all active stations (ATC positions and pilots)
 for Vienna airport (ICAO: LOWW), then you can use:
@@ -42,6 +42,9 @@ for Vienna airport (ICAO: LOWW), then you can use:
 # Attaching the method directly to a string:
 "LOWW".vatsim_online
 
+# Attaching the method directly to a list of ICAOs:
+"LOWW, LOWK".vatsim_online
+
 # Attaching the method to a variable containing a string:
 icao = "LOWW"
 icao.vatsim_online
@@ -59,7 +62,12 @@ airports and ATC station callsigns start with `"LO"`:
 # Attaching the method to a variable containing a string:
 icao = "LO"
 icao.vatsim_online
+
+# Attaching the method to a list of ICAOs:
+icao = "LO, LB"
+icao.vatsim_online
 ```
+
 When parsing the pilot stations for particular airport or area, the library will
 return the pilots that are flying **to or from** the given area or airport,
 not the current enroute stations. The discovery algorithm is based on **origin
@@ -289,9 +297,23 @@ libraries too.
 * The ICAO string used as a search criteria **is not** case sensitive
 * Pilot stations returned are based on origin and destination airports, the
 current algorithm does not evaluate enroute flights.
+* When attaching the `vatsim_online` method to a comma-separated list of full or
+partial ICAO identifiers it does not matter whether there will be any spaces in
+front or after the identifiers or the commas, i.e. you can use
+`"LO,LB".vatsim_online` or `"LO, LB".vatsim_online` or `"LO , LB".vatsim_online` with
+the same result.
 
 ## Changelog
 
+### v. 0.6.0 - 08 October 2012
+
+* The `vatsim_online` method now also supports a comma-separated list of full or
+partial ICAO codes like this: `"LO,LB".vatsim_online`. This allows you to pull the
+information for multiple airports or FIRs in a single request
+* The comma-seprated list is not sensitive to whitespace, meaning you can use
+`"LO,LB".vatsim_online` or `"LO, LB".vatsim_online` or `"LO , LB".vatsim_online` with
+the same result
+
 ### v. 0.5.3 - 30 September 2012
 
 * fixed bug with exceptions on missing ATC remark

data/lib/vatsim_online/station_parser.rb

@@ -14,7 +14,7 @@ module VatsimTools
     def initialize(icao, args = nil)
       VatsimTools::DataDownloader.new
       args.class == Hash ? @role = determine_role(args) : @role = "all"
-      @icao = icao.upcase
+      @icao = icao.upcase.split(',').each {|s| s.strip!}
       @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,8 +31,10 @@ 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
-        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"
+        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
       stations
     end
@@ -49,7 +51,9 @@ module VatsimTools
     def sorted_station_objects
       atc = []; pilots = []; arrivals = []; departures = []
       station_objects.each {|sobj| sobj.role == "ATC" ? atc << sobj : pilots << sobj}
-      pilots.each {|p| p.origin[0...@icao.length] == @icao ? departures << p : arrivals << p }
+      for icao in @icao
+        pilots.each {|p| p.origin[0...icao.length] == icao ? departures << p : arrivals << p }
+      end
       atc.delete_if {|a| @excluded && a.callsign[0...@excluded.length] == @excluded }
       {:atc => atc, :pilots => pilots, :arrivals => arrivals, :departures => departures}
     end

data/lib/vatsim_online/version.rb

@@ -1,3 +1,3 @@
 module VatsimOnline
-  VERSION = "0.5.3"
+  VERSION = "0.6.0"
 end

data/spec/station_parser_spec.rb

@@ -134,6 +134,26 @@ describe VatsimTools::StationParser do
       target.new(icao, args).sorted_station_objects[:atc].size.should eq(2)
     end
 
+    it "should support multiple icaos" do
+      gem_data_file
+      icao = "LB"
+      target.new(icao).sorted_station_objects[:atc].size.should eq(4)
+      target.new(icao).sorted_station_objects[:pilots].size.should eq(2)
+      icao = "LO"
+      target.new(icao).sorted_station_objects[:pilots].size.should eq(12)
+      target.new(icao).sorted_station_objects[:atc].size.should eq(0)
+      gem_data_file
+      icao = "LO,LB"
+      target.new(icao).sorted_station_objects[:pilots].size.should eq(14)
+      target.new(icao).sorted_station_objects[:atc].size.should eq(4)
+      icao = "LO, LB"
+      target.new(icao).sorted_station_objects[:pilots].size.should eq(14)
+      target.new(icao).sorted_station_objects[:atc].size.should eq(4)
+      icao = "LO , LB"
+      target.new(icao).sorted_station_objects[:pilots].size.should eq(14)
+      target.new(icao).sorted_station_objects[:atc].size.should eq(4)
+    end
+
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vatsim_online
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-30 00:00:00.000000000 Z
+date: 2012-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec