altflights 0.0.1 → 0.0.2

data/lib/altflights/kayak_wrapper.rb

@@ -2,27 +2,25 @@ class AltFlights::KayakWrapper
   HOSTNAME = 'api.kayak.com'
   PORT = 80
 
-  attr_accessor :last_count
+  attr_accessor :last_count, :sid, :searchid
 
   def api_key
     KAYAK_API_KEY
   end
 
   def get_session
-    sid = nil
+    self.sid = nil
     Net::HTTP.start(HOSTNAME, PORT) do |http|
       response = http.get("/k/ident/apisession?token=#{api_key}")
      Rails.logger.info "http://#{HOSTNAME}/k/ident/apisession?token=#{api_key}"
       body = response.body
       parser = LibXML::XML::Parser.string(body)
       doc = parser.parse
-      sid = doc.find('//sid').first.inner_xml
+      self.sid = doc.find('//sid').first.inner_xml
     end
-    sid
   end
 
-  def start_flight_search(sid,
-                          oneway, # y or n
+  def start_flight_search(oneway, # y or n
                           origin,
                           destination,
                           dep_date,
@@ -36,35 +34,33 @@ class AltFlights::KayakWrapper
   end
 
   def start_search(url)
-    searchid = nil
+    self.searchid = nil
     Net::HTTP.start(HOSTNAME, PORT) do |http|
       response = http.get(url)
-     Rails.logger.info "http://#{HOSTNAME}#{url}"
+      Rails.logger.info "http://#{HOSTNAME}#{url}"
       body = response.body
       parser = LibXML::XML::Parser.string(body)
       doc = parser.parse
-     Rails.logger.info searchid = doc.find('//searchid')
+      self.searchid = doc.find('//searchid')
       if searchid.first != nil
-        searchid = searchid.first.inner_xml
+        Rails.logger.info "searchid: #{self.searchid = self.searchid.first.inner_xml}"
       else
-       Rails.logger.info "search error:"
-       Rails.logger.info body
+        Rails.logger.info "search error:"
+        Rails.logger.info body
         return nil
       end
     end
-    return searchid
   end
 
 
-  def poll_results(sid, searchid, count)
+  def self.poll_results(sid, searchid, count)
     url = "/s/apibasic/flight?searchid=#{searchid}&apimode=1&_sid_=#{sid}"
-    more = nil
     Net::HTTP.start(HOSTNAME, PORT) do |http|
       if count
         url += "&c=#{count}"
       end
       response = http.get(url)
-     Rails.logger.info "http://#{HOSTNAME}#{url}"
+      Rails.logger.info "http://#{HOSTNAME}#{url}"
       body = response.body
       if count
         return handle_results(body)
@@ -76,20 +72,24 @@ class AltFlights::KayakWrapper
 
   # Load the xml feed from kayak.com and return the value of the more attribute
   # which indicates whether kayak is still processing the request.
-  def check_results(body)    
+  def self.check_results(body)    
     parser = LibXML::XML::Parser.string(body)
     doc = parser.parse
     more = doc.find('/searchresult/morepending')
 
-    Rails.logger.info "count: #{self.last_count = doc.find('/searchresult/count').first.inner_xml}"
+    Rails.logger.info "count: #{last_count = doc.find('/searchresult/count').first.inner_xml}"
     if more
       more = more.first.inner_xml
     end
 
-    return more
+    if more == 'false'
+      return 0
+    else
+      return last_count
+    end
   end
 
-  def handle_results(body)
+  def self.handle_results(body)
     parser = LibXML::XML::Parser.string(body)
     doc = parser.parse
 

data/lib/altflights.rb

@@ -4,24 +4,26 @@ require 'net/https'
 module AltFlights
 
   class << self
-    
-    def get_flights(origin, destination, date_string) # date_string format => '%m/%d/%y'
+
+    def start_search(origin, destination, date_string) # date_string format => '%m/%d/%y'
       kayak = AltFlights::KayakWrapper.new
-      sid = kayak.get_session()
-      searchid = kayak.start_flight_search(sid, 'y', origin, destination, date_string, 'a', nil, 'a', '1', 'e')
-      sleep(2)
-
-      more = kayak.poll_results(sid, searchid, nil)
-      while more == 'true' do
-        more = kayak.poll_results(sid, searchid, nil)
-        sleep(3)
-      end
+      kayak.get_session()
+      kayak.start_flight_search('y', origin, destination, date_string, 'a', nil, 'a', '1', 'e')
+
+      return kayak.to_json
+    end
+
+    def check_search(searchid, sid)
+      return AltFlights::KayakWrapper.poll_results(searchid, sid, nil)
+    end
+
+    def get_flights(searchid, sid, count) # date_string format => '%m/%d/%y'
 
-      if kayak.last_count.to_i > 50
-        kayak.last_count = 50
+      if count.to_i > 50
+        count = 50
       end
 
-      results = kayak.poll_results(sid, searchid, kayak.last_count)
+      results = AltFlights::KayakWrapper.poll_results(searchid, sid, count)
 
       return results
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: altflights
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - FlightCaster
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-15 00:00:00 -08:00
+date: 2010-01-06 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency