flightstats 0.0.2 → 0.0.3

data/lib/flightstats/data_feed.rb

@@ -22,52 +22,5 @@ class FlightStats::DataFeed
       files
     end
   end
-    
-  # def self.get_gz_file(id)
-  #   id = id['id'] if id.class == Hash
-  #   FlightStats::raw_query({:file=>id}, '/development/feed')
-  # end
-  # 
-  # def self.get_file(id)
-  #   Zlib::GzipReader.new(FlightStats::DataFeed.get_gz_file(id))
-  # end
-  # 
-  # # passes each file to a block,
-  # # each file is the raw gzipped file from flightstats, StringIO object
-  # def each_gz_file(&block)
-  #   if block.arity == 1
-  #     @files.each{ |f| block.call(FlightStats::DataFeed.get_gz_file(f)) }
-  #   elsif block.arity == 2
-  #     @files.each { |f|
-  #       block.call(FlightStats::DataFeed.get_gz_file(f), f['timestamp'])
-  #     }
-  #   end
-  # end
-  # 
-  # # passes each file to a block, each file is a Zlib::GzipReader instance
-  # def each_file(&block)
-  #   if block.arity == 1
-  #     @files.each{ |f| block.call(FlightStats::DataFeed.get_file(f)) }
-  #   elsif block.arity == 2
-  #     @files.each { |f|
-  #       block.call(FlightStats::DataFeed.get_file(f), f['timestamp'])
-  #     }
-  #   end
-  # end
-  #       
-  # # passes each update to a block, each update is an instance of FlightStats::Flight
-  # def each(&block)
-  #   each_file { |file| FlightStats::DataFeed.process_file(file, &block) }
-  # end
-  # 
-  # def self.process_file(file, &block)
-  #   xml = LibXML::XML::Parser.string(file.read, PARSER_OPTIONS).parse.root
-  #   xml.children.each do |node|
-  #     flight = FlightStats::Flight.new(node.children[0])
-  #     time_updated = Time.parse(node.attributes['DateTimeRecorded'][0..18] + ' PT')
-  #     flight.attributes['updated_at'] = time_updated.utc
-  #     block.call(flight)
-  #   end
-  # end
-  # 
+
 end

data/lib/flightstats/data_feed/file.rb

@@ -3,8 +3,9 @@ class FlightStats::DataFeed::File
   attr_accessor :id, :message_count, :bytes, :timestamp
   alias :size :bytes
   
-  def initialize(content = nil)
+  def initialize(content = nil, timestamp = nil)
     @content = content if content.is_a?(StringIO) or content.is_a?(File)
+    @timestamp = timestamp
   end
   
   def content
@@ -18,11 +19,11 @@ class FlightStats::DataFeed::File
     parser = LibXML::XML::SaxParser.io(Zlib::GzipReader.new(content))
     
     if block_given?
-      parser.callbacks = SaxParser.new(&block)
+      parser.callbacks = SaxParser.new(@timestamp, &block)
       parser.parse
     else
       updates = []
-      parser.callbacks = SaxParser.new { |update| updates << update }
+      parser.callbacks = SaxParser.new(@timestamp) { |update| updates << update }
       parser.parse
       updates
     end

data/lib/flightstats/data_feed/file/sax_parser.rb

@@ -2,8 +2,9 @@ class FlightStats::DataFeed::File::SaxParser
 
   include LibXML::XML::SaxParser::Callbacks
 
-  def initialize(&on_update_block)
+  def initialize(file_timestamp_utc, &on_update_block)
     @stack = []
+    @file_timestamp_utc = file_timestamp_utc
     @on_update_block = on_update_block
   end
   
@@ -24,7 +25,13 @@ class FlightStats::DataFeed::File::SaxParser
       @update.event = attributes['Event']
       @update.data_updated = attributes['DataUpdated']
       tz = TZInfo::Timezone.get('America/Los_Angeles')
-      @update.timestamp = tz.local_to_utc(to_time(attributes['DateTimeRecorded']))
+      @update.timestamp = tz.local_to_utc(to_time(attributes['DateTimeRecorded'])) do |periods|
+        if @file_timestamp_utc
+          periods.select{ |period|
+            period.to_utc(to_time(attributes['DateTimeRecorded'])).hour == @file_timestamp_utc.utc.hour
+          }
+        end
+      end
     when 'FlightHistory'
       @flight = FlightStats::Flight.new
       @flight.id = attributes['FlightHistoryId']

data/lib/flightstats/data_feed/sax_parser.rb

@@ -20,6 +20,7 @@ class FlightStats::DataFeed::SaxParser
                                  attributes['DateTimeUTC'][14..15],
                                  attributes['DateTimeUTC'][17..18],
                                  attributes['DateTimeUTC'][20..22])
+                                 
       @on_file_block.call(file)
     end
   end

data/test/flightstats/data_feed/file_test.rb

@@ -11,10 +11,14 @@ class FlightStats::DataFeed::FileTest < Test::Unit::TestCase
                          :body => File.read("#{File.dirname(__FILE__)}/../../responses/test2.gz"))
 
     count = 0
-    FlightStats::DataFeed.new.files do |file|
-      file.updates do |update|
-        count += 1
+    begin
+      FlightStats::DataFeed.new.files do |file|
+        file.updates do |update|
+          count += 1
+        end
       end
+    rescue
+      GC.start
     end
     assert_equal 11, count
   end
@@ -43,6 +47,7 @@ class FlightStats::DataFeed::FileTest < Test::Unit::TestCase
         changes << update
       end
     end
+
     update = changes[0]
     assert_equal(Time.utc(2009,6,8,20,30,0,43), update.timestamp)
     assert_equal('ASDI', update.source)
@@ -143,4 +148,120 @@ class FlightStats::DataFeed::FileTest < Test::Unit::TestCase
     assert_equal('CM', update.flight.codeshares.first.airline.code)
     assert_equal('CM', update.flight.codeshares.first.airline.iata_code)
   end
+  
+  def test_convert_local_time_to_correct_utc_time_when_is_an_ambiguous_local_time
+    FakeWeb.register_uri(:get, "https://www.pathfinder-xml.com/development/feed?login.guid=test&useUTC=true&lastAccessed=#{Time.now.utc.strftime("%Y-%m-%dT%H:%M")}",
+                         :body => File.read("#{File.dirname(__FILE__)}/../../responses/feed_file_list_tz_fallback.xml"))
+    FakeWeb.register_uri(:get, "https://www.pathfinder-xml.com/development/feed?login.guid=test&file=4551477",
+                        :body => File.read("#{File.dirname(__FILE__)}/../../responses/test_tz_fallback1.gz"))
+    FakeWeb.register_uri(:get, "https://www.pathfinder-xml.com/development/feed?login.guid=test&file=4551480",
+                        :body => File.read("#{File.dirname(__FILE__)}/../../responses/test_tz_fallback2.gz"))
+                      
+    changes = Array.new
+    FlightStats::DataFeed.new.files do |file|
+      file.updates do |update|
+        changes << update
+      end
+    end
+
+    update = changes[0]
+    assert_equal(Time.utc(2009,11,1,8,37,0,43), update.timestamp)
+    assert_equal('ASDI', update.source)
+    assert_equal('STATUS-Active', update.event)
+    assert_equal('ARD- New=06/08/09 16:24, ERD- Old=06/08/09 16:26 New=06/08/09 16:24, ERA- Old=06/08/09 17:45 New=06/08/09 17:42, STATUS- Old=S New=A', update.data_updated)
+    
+    assert_equal('162197049', update.flight.id)
+    assert_equal('753', update.flight.number)
+    assert_equal(Time.utc(2009,6,8,16,26), update.flight.scheduled_local_runway_departure_time)
+    assert_equal(Time.utc(2009,6,8,16,24), update.flight.estimated_local_runway_departure_time)
+    assert_equal(Time.utc(2009,6,8,16,24,52), update.flight.actual_local_runway_departure_time)
+    assert_equal(Time.utc(2009,6,8,17,45), update.flight.scheduled_local_runway_arrival_time)
+    assert_equal(Time.utc(2009,6,8,17,42), update.flight.estimated_local_runway_arrival_time)
+    assert_equal('A', update.flight.creator_code)
+    assert_equal('A', update.flight.status_code)
+    assert_equal(79, update.flight.scheduled_air_time)
+    assert_equal(-4, update.flight.departure_airport_timezone_offset)
+    assert_equal(-4, update.flight.arrival_airport_timezone_offset)
+    assert_equal(Time.utc(2009,6,8,16,26), update.flight.local_departure_time)
+    assert_equal(Time.utc(2009,6,8,17,45), update.flight.local_arrival_time)
+
+    assert_equal('G4', update.flight.airline.code)
+    assert_equal('AAY', update.flight.airline.icao_code)
+    assert_nil(update.flight.airline.iata_code)
+    assert_nil(update.flight.airline.faa_code)
+    assert_nil(update.flight.airline.name)
+
+    assert_equal('SFB', update.flight.origin.code)
+    assert_equal('KSFB', update.flight.origin.icao_code)
+    assert_nil(update.flight.origin.iata_code)
+    assert_nil(update.flight.origin.faa_code)
+    assert_nil(update.flight.origin.name)
+    
+    assert_equal('GSO', update.flight.destination.code)
+    assert_equal('KGSO', update.flight.destination.icao_code)
+    assert_nil(update.flight.destination.iata_code)
+    assert_nil(update.flight.destination.faa_code)
+    assert_nil(update.flight.destination.name)    
+
+    assert_equal([], update.flight.codeshares)
+
+    update = changes[6]
+    assert_equal(Time.utc(2009,11,1,9,37,1,110), update.timestamp)
+    assert_equal('Airline (CO)', update.source)
+    assert_equal('Time Adjustment', update.event)
+    assert_equal('EGD- New=06/08/09 19:35, EGA- New=06/08/09 23:35, DGATE- New=C-30', update.data_updated)
+    
+    assert_equal('161861862', update.flight.id)
+    assert_equal('1417', update.flight.number)
+    assert_equal(Time.utc(2009,6,8,19,35), update.flight.published_local_departure_time)
+    assert_equal(Time.utc(2009,6,8,23,35), update.flight.published_local_arrival_time)
+    assert_equal(Time.utc(2009,6,8,19,35), update.flight.scheduled_local_gate_departure_time)
+    assert_equal(Time.utc(2009,6,8,19,35), update.flight.estimated_local_gate_departure_time)
+    assert_equal(Time.utc(2009,6,8,23,35), update.flight.scheduled_local_gate_arrival_time)
+    assert_equal(Time.utc(2009,6,8,23,35), update.flight.estimated_local_gate_arrival_time)    
+    assert_equal(Time.utc(2009,6,8,19,56), update.flight.scheduled_local_runway_departure_time)
+    assert_equal(Time.utc(2009,6,8,19,56), update.flight.estimated_local_runway_departure_time)
+    assert_equal(Time.utc(2009,6,8,23,21), update.flight.scheduled_local_runway_arrival_time)
+    assert_equal(Time.utc(2009,6,8,23,21), update.flight.estimated_local_runway_arrival_time)
+    assert_nil(update.flight.actual_local_runway_departure_time)
+    assert_equal('O', update.flight.creator_code)
+    assert_equal('S', update.flight.status_code)
+    assert_equal(145, update.flight.scheduled_air_time)
+    assert_equal(180, update.flight.scheduled_block_time)
+    assert_equal(-5, update.flight.departure_airport_timezone_offset)
+    assert_equal(-4, update.flight.arrival_airport_timezone_offset)
+    assert_equal(Time.utc(2009,6,8,19,35), update.flight.local_departure_time)
+    assert_equal(Time.utc(2009,6,8,23,35), update.flight.local_arrival_time)
+    assert_equal('735', update.flight.scheduled_aircraft_type)
+    assert_equal('C-30', update.flight.departure_gate)
+    assert_equal('C', update.flight.departure_terminal)
+    assert_nil(update.flight.arrival_terminal)
+    
+    assert_equal('CO', update.flight.airline.code)
+    assert_equal('COA', update.flight.airline.icao_code)
+    assert_nil(update.flight.airline.iata_code)
+    assert_nil(update.flight.airline.faa_code)
+    assert_nil(update.flight.airline.name)
+
+    assert_equal('IAH', update.flight.origin.code)
+    assert_equal('KIAH', update.flight.origin.icao_code)
+    assert_nil(update.flight.origin.iata_code)
+    assert_nil(update.flight.origin.faa_code)
+    assert_nil(update.flight.origin.name)
+    
+    assert_equal('PIT', update.flight.destination.code)
+    assert_equal('KPIT', update.flight.destination.icao_code)
+    assert_nil(update.flight.destination.iata_code)
+    assert_nil(update.flight.destination.faa_code)
+    assert_nil(update.flight.destination.name)    
+
+    assert_equal(1, update.flight.codeshares.size)
+    assert_equal('109977276', update.flight.codeshares.first.id)
+    assert_equal('2317', update.flight.codeshares.first.number)
+    assert_equal('L', update.flight.codeshares.first.designator)
+    assert_equal(Time.utc(2009,6,8,19,35), update.flight.codeshares.first.published_local_departure_time)
+    assert_equal(Time.utc(2009,6,8,23,35), update.flight.codeshares.first.published_local_arrival_time)
+    assert_equal('CM', update.flight.codeshares.first.airline.code)
+    assert_equal('CM', update.flight.codeshares.first.airline.iata_code)
+  end
 end

data/test/responses/feed_file_list_tz_fallback.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<FlightHistoryEventFeedResponse xmlns="http://pathfinder-xml/FlightHistoryEventFeedService.xsd"><File Bytes="265293" DateTime="2009-11-01T01:37:00.000" DateTimeUTC="2009-11-01T08:37:00.000" ID="4551477" Messages="1760"/><File Bytes="231618" DateTime="2009-11-01T01:37:00.000" DateTimeUTC="2009-11-01T09:37:00.000" ID="4551480" Messages="1505"/></FlightHistoryEventFeedResponse>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: flightstats
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - FlightCaster
@@ -60,8 +60,11 @@ files:
 - test/test_helper.rb
 - test/responses/test1.gz
 - test/responses/test2.gz
+- test/responses/test_tz_fallback1.gz
+- test/responses/test_tz_fallback2.gz
 - test/responses/error.xml
 - test/responses/feed_file_list.xml
+- test/responses/feed_file_list_tz_fallback.xml
 has_rdoc: true
 homepage: http://flightcaster.com/
 licenses: []