vatsim_online 0.1 → 0.2

data/README.md

@@ -71,13 +71,13 @@ stations and pilots stations. Each of those is an **array**, cosnsisting of
 station **objects**. Each of these objects includes a number of **attributes**:
 
 ```ruby
-icao_vatsim_online # => {:atc => [a1, a2, a3 ...], :pilots => [p1, p2, p3 ...]}
+icao.vatsim_online # => {:atc => [a1, a2, a3 ...], :pilots => [p1, p2, p3 ...]}
 
-icao_vatsim_online[:atc] #=> [a1, a2, a3 ...]
-icao_vatsim_online[:pilots] #=> [p1, p2, p3 ...]
+icao.vatsim_online[:atc] #=> [a1, a2, a3 ...]
+icao.vatsim_online[:pilots] #=> [p1, p2, p3 ...]
 
-icao_vatsim_online[:atc].first #=> a1
-icao_vatsim_online[:pilots].first #=> p1
+icao.vatsim_online[:atc].first #=> a1
+icao.vatsim_online[:pilots].first #=> p1
 
 a1.callsign #=> "LQSA_TWR"
 a1.frequency #=> "118.25"
@@ -102,7 +102,7 @@ Here's a complete list of the station object attributes that can be accessed:
 * altitude
 * groundspeed
 * aircraft
-* departure
+* origin
 * destination
 * rating
 * facility
@@ -169,13 +169,13 @@ end
 - for pilot in @pilots
   %li
     = pilot.callsign
-    = atc.name
-    = atc.origin
-    = atc.destination
-    = atc.route
-    = atc.altitude
-    = atc.groundspeed
-    = atc.remarks
+    = pilot.name
+    = pilot.origin
+    = pilot.destination
+    = pilot.route
+    = pilot.altitude
+    = pilot.groundspeed
+    = pilot.remarks
 ```
 
 ### Notes
@@ -192,6 +192,16 @@ libraries too.
 * Pilot stations returned are based on origin and destination airports, the
 current algorithm does not evaluate enroute flights.
 
+## Changelog
+
+### v. 0.2 - 21 July 2012
+
+* Station attribute `departure` is now renamed to `origin`
+* UTF-8 is now enforced for all local caching and file/string manipulations, the
+original Vatsim data is re-encoded
+* Station ATIS is now cleaned of invalid and obscure characters
+* Improved documentation
+
 ## Contributing
 
 1. Fork it

data/lib/vatsim_online/data_downloader.rb

@@ -36,9 +36,9 @@ module VatsimTools
     end
 
     def create_local_data_file
-      data = Tempfile.new('vatsim_data', :encoding => 'iso-8859-15')
+      data = Tempfile.new('vatsim_data', :encoding => 'utf-8')
       File.rename data.path, LOCAL_DATA
-      data = Curl::Easy.perform(servers.sample).body_str.gsub(/["]/, '\s').force_encoding('iso-8859-15')
+      data = Curl::Easy.perform(servers.sample).body_str.gsub(/["]/, '\s').mb_chars.force_encoding('utf-8')
       File.open(LOCAL_DATA, "w+") {|f| f.write(data)}
     end
 

data/lib/vatsim_online/station.rb

@@ -1,7 +1,8 @@
+# encoding: utf-8
 module VatsimTools
   class Station
     attributes = %w{callsign name role frequency altitude groundspeed aircraft
-                 departure destination rating facility remarks route atis logon}
+                 origin destination rating facility remarks route atis logon}
     attributes.each {|attribute| attr_accessor attribute.to_sym }
 
 
@@ -13,15 +14,25 @@ module VatsimTools
       @altitude = station[7]
       @groundspeed = station[8]
       @aircraft = station[9]
-      @departure = station[11]
+      @origin = station[11]
       @destination = station[13]
       @rating = station[16]
       @facility = station[18]
       @remarks = station[29]
       @route = station[30]
-      @atis = station[35]
+      @atis = atis_cleaner(station[35]) if station[35]
       @logon = station[37]
     end
 
+    def atis_cleaner(raw_atis)
+      while raw_atis.index('^') != nil
+        raw_atis.insert(raw_atis.index('^'), '. ')
+        index = raw_atis.index('^')
+        raw_atis.slice!(index..index + 1)
+      end
+      raw_atis
+    end
+
+
   end
 end

data/lib/vatsim_online/station_parser.rb

@@ -26,7 +26,7 @@ module VatsimTools
 
     def stations
       stations = []
-      CSV.foreach(LOCAL_DATA, :col_sep =>':', encoding: "iso-8859-15") do |row|
+      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"

data/lib/vatsim_online/version.rb

@@ -1,3 +1,3 @@
 module VatsimOnline
-  VERSION = "0.1"
+  VERSION = "0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vatsim_online
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.2'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-20 00:00:00.000000000 Z
+date: 2012-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec