vatsim 0.0.4 → 0.0.5

data/.travis.yml

@@ -1,9 +1,16 @@
 language: ruby
+matrix:
+  allow_failures:
+    - rvm: jruby-18mode
+    - rvm: rbx-18mode
+    - rvm: rbx-19mode
+    - rvm: ree
 rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
-  - jruby-18mode # JRuby in 1.8 mode
+  - jruby-18mode
   - rbx-18mode
   - rbx-19mode
+  - ree
 

data/lib/vatsim.rb

@@ -5,5 +5,6 @@ require 'vatsim/atc'
 require 'vatsim/prefile'
 require 'vatsim/server'
 require 'vatsim/voice_server'
+require 'vatsim/airport'
 require 'vatsim/version'
 

data/lib/vatsim/airport.rb

@@ -0,0 +1,53 @@
+require 'zlib'
+
+module Vatsim
+  # Airport
+  class Airport
+
+    attr_reader :icao, :latitude, :longitude
+
+    # Cache of Airports already looked up to prevent searching for it again.
+    @@airport_cache = Hash.new
+
+    # Start line for each ICAO prefix. Indexing to provide quick lookups.
+    @@line_numbers = {"0"=>0, "1"=>1156, "2"=>2313, "3"=>3558, "4"=>4622, "5"=>5595, "6"=>6569, "7"=>7481, "8"=>8370, "9"=>9195, "A"=>10031, "B"=>11250, "b"=>11249, "C"=>14238, "c"=>14237, "D"=>14702, "E"=>15055, "F"=>16696, "G"=>18544, "H"=>18935, "I"=>19392, "J"=>20249, "K"=>20325, "L"=>25378, "l"=>25377, "M"=>26275, "N"=>27968, "O"=>29427, "P"=>30384, "Q"=>31200, "q"=>31202, "R"=>31324, "r"=>31323, "S"=>32180, "T"=>38523, "U"=>39188, "V"=>40322, "W"=>41258, "X"=>42159, "Y"=>42387, "Z"=>44033}
+
+    # Initialize Airport with colon delimited line
+    def initialize line
+
+      attributes = [:icao, :latitude, :longitude]
+
+      line_split = line.strip.split(":")
+
+      attributes.each_with_index.map { |attribute, index|
+        instance_variable_set("@#{attribute}", line_split[index]) if self.respond_to?(attribute)
+      }
+    end
+
+    # Returns Airport with given icao, or nil if it can't be found
+    def self.get icao
+      airport = nil
+
+      return @@airport_cache[icao] if(@@airport_cache.has_key?(icao))
+
+      line_number = 0
+      start_line_number = @@line_numbers[icao[0]]
+      start_line_number = 0 if start_line_number.nil?
+
+      Zlib::GzipReader.open(File.dirname(__FILE__) + "/airports.gz").each_line { |line|
+        if(line_number >= start_line_number)
+          if line.start_with?("#{icao}:")
+            values = line.split(":")
+            airport = Airport.new(line)
+            @@airport_cache.store(icao, airport) if !@@airport_cache.has_key?(icao)
+            break
+          end
+        end
+        line_number += 1
+      }
+
+      airport
+    end
+  end
+end
+

data/lib/vatsim/pilot.rb

@@ -2,6 +2,27 @@ module Vatsim
   # Connected pilot
   class Pilot < Client
     attr_reader :callsign, :cid, :realname, :clienttype, :latitude, :longitude, :altitude, :groundspeed, :planned_aircraft, :planned_tascruise, :planned_depairport, :planned_altitude, :planned_destairport, :server, :protrevision, :rating, :transponder, :planned_revision, :planned_flighttype, :planned_deptime, :planned_actdeptime, :planned_hrsenroute, :planned_minenroute, :planned_hrsfuel, :planned_minfuel, :planned_altairport, :planned_remarks, :planned_route, :planned_depairport_lat, :planned_depairport_lon, :planned_destairport_lat, :planned_destairport_lon, :time_logon, :heading, :QNH_iHg, :QNH_Mb
+
+    def planned_depairport_lat
+      depairport = Vatsim::Airport.get(planned_depairport)
+      return depairport.nil? ? 0 : depairport.latitude
+    end
+
+    def planned_depairport_lon
+      depairport = Vatsim::Airport.get(planned_depairport)
+      return depairport.nil? ? 0 : depairport.longitude
+    end
+
+    def planned_destairport_lat
+      destairport = Vatsim::Airport.get(planned_destairport)
+      return destairport.nil? ? 0 : destairport.latitude
+    end
+
+    def planned_destairport_lon
+      destairport = Vatsim::Airport.get(planned_destairport)
+      return destairport.nil? ? 0 : destairport.longitude
+    end
+
   end
 end
 

data/lib/vatsim/version.rb

@@ -1,4 +1,4 @@
 module Vatsim
-  VERSION = "0.0.4" # Current gem version
+  VERSION = "0.0.5" # Current gem version
 end
 

data/spec/vatsim_spec.rb

@@ -6,6 +6,20 @@ describe Vatsim::VERSION do
  end
 end
 
+describe Vatsim::Airport do
+  it "should return correct Airport" do
+    airport = Vatsim::Airport.get("CYYC")
+    airport.should_not == nil
+    airport.icao.should == "CYYC"
+    airport.latitude.should == "51.113899230957"
+    airport.longitude.should == "-114.019996643066"
+  end
+
+  it "should return nil Airport" do
+    Vatsim::Airport.get("NONE").should == nil
+  end
+
+end
 describe Vatsim::Data do
 
   before do
@@ -70,10 +84,10 @@ describe Vatsim::Data do
     pilot.planned_altairport.should == "LTBA"
     pilot.planned_remarks.should == " /T/"
     pilot.planned_route.should == "KS LUKOS 6E8 LO 6E18 DK CRDR6 FV R11 TS R808 UUOO R368 KUBOK UA279 GR UP29 SUMOL UW100 INB UM853 BUK UW71 ILHAN"
-    pilot.planned_depairport_lat.should == "0"
-    pilot.planned_depairport_lon.should == "0"
-    pilot.planned_destairport_lat.should == "0"
-    pilot.planned_destairport_lon.should == "0"
+    pilot.planned_depairport_lat.should == "55.972599029541"
+    pilot.planned_depairport_lon.should == "37.4146003723145"
+    pilot.planned_destairport_lat.should == "40.1281013489"
+    pilot.planned_destairport_lon.should == "32.995098114"
     pilot.time_logon.should == "20120503235431"
     pilot.heading.should == "169"
     pilot.QNH_iHg.should == "29.7"

data/vatsim.gemspec

@@ -4,7 +4,7 @@ Gem::Specification.new do |s|
   s.name        	= 'vatsim'
   s.version     	= Vatsim::VERSION
   s.summary     	= "Vatsim gem"
-  s.description 	= "Ruby gem to retrieve Pilot/ATC online status"
+  s.description 	= "Ruby library for retrieving online status for Pilots and ATC connections on the VATSIM network (www.vatsim.net)"
   s.authors     	= ["Trevor Dawe"]
   s.email       	= 'trevor.dawe@gmail.com'
   s.files       	= `git ls-files`.split("\n")
@@ -14,4 +14,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'webmock'
   s.add_development_dependency 'simplecov'
+  s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
 end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vatsim
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-30 00:00:00.000000000 Z
+date: 2012-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -75,7 +75,8 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Ruby gem to retrieve Pilot/ATC online status
+description: Ruby library for retrieving online status for Pilots and ATC connections
+  on the VATSIM network (www.vatsim.net)
 email: trevor.dawe@gmail.com
 executables: []
 extensions: []
@@ -88,6 +89,8 @@ files:
 - README.md
 - Rakefile
 - lib/vatsim.rb
+- lib/vatsim/airport.rb
+- lib/vatsim/airports.gz
 - lib/vatsim/atc.rb
 - lib/vatsim/client.rb
 - lib/vatsim/data.rb
@@ -113,17 +116,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -709285723652735854
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -709285723652735854
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Vatsim gem
 test_files: []
-has_rdoc: