teecket 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c3396f2293552a045170611b47b36723263fe7b
-  data.tar.gz: 753f68a799c698bce3b52b32a3d3506ff57a9f92
+  metadata.gz: 57c92eceaf9a55c6c3a22d20da7be1932df95af0
+  data.tar.gz: f83435a571f2e25883307edeec8217ee64014f58
 SHA512:
-  metadata.gz: 8f202fad648a31be25acb4fca10b004f6323c5ae2107a27a9717dc00495f7006a61e58101c00df0f2359efc62c304ab947ad8d6f6ee9137d5dae746b400ba7b0
-  data.tar.gz: cb41d1873292670762b7f70fa7059d0cbeb0167b55311517f3be66b10dd90c5ed2c512df27dc2b73bb6c094e9996d70cb361259f162344e037879a5b1781f761
+  metadata.gz: 30574e2b933d4cb8d6739cc4f00c332de083abb94d6afa4c22e9afa31f57bf33877270a37dab1657bc5b042e7f6a4131f3e4e30e3b6f2015b984c244d6174969
+  data.tar.gz: d8be300d172bfecbd602a6c27fb6933b729b4d4175b7b791e9dffcb4234939d7c2b532d79dd75ec57d6701be3a1a098cbbd551e45f11e65bedca3708d72d3335

data/bin/teecket

@@ -7,5 +7,5 @@ if ARGV.count == 3
   output = Teecket.search(from: ARGV[0], to: ARGV[1], date: ARGV[2])
   puts Printer.table(output)
 else
-  puts "Example: teecket KBR KUL 30-07-2015"
+  puts "Example: teecket KBR KUL 31-12-2015"
 end

data/lib/teecket/firefly.rb

@@ -21,52 +21,66 @@ class Firefly < Flight
   end
 
   def get_main_page
-    uri = URI("https://m.fireflyz.com.my/")
+    uri = URI("http://fireflymobile.me-tech.com.my/fylive3/search.php")
 
     req = Net::HTTP::Get.new(uri.path)
 
-    self.res = request(uri, req)
+    self.res = request(uri, req, false)
 
     self.cookie = res["Set-Cookie"]
   end
 
   def get_search_page
-    uri = URI("https://m.fireflyz.com.my/Search")
+    uri = URI("http://fireflymobile.me-tech.com.my/fylive3/search.php")
+
+    date_object = Date.strptime(date, "%d-%m-%Y")
+    date_year = date_object.strftime("%Y")
+    date_month = date_object.strftime("%m")
+    date_day = date_object.strftime("%d")
 
     req = Net::HTTP::Post.new(uri.path, "Cookie" => cookie)
     req.body = URI.encode_www_form([
+      ["action", "search"],
       ["type", 2],
-      ["return_date", date],
+      ["departing", from],
+      ["arriving", to],
+      ["d10", date_day],
+      ["d11", date_month],
+      ["d12", date_year],
+      ["departuredate", date],
+      ["d20", date_day],
+      ["d21", date_month],
+      ["d22", date_year],
+      ["returndate", date],
       ["adult", 1],
-      ["infant", 0],
-      ["departure_station", from],
-      ["arrival_station", to],
-      ["departure_date", date]
+      ["infant", 0]
     ])
 
-    self.res = request(uri, req)
+    self.res = request(uri, req, false)
   end
 
   def get_result_page
     if res["location"]
-      uri = URI(res["location"])
+      uri = URI("http://fireflymobile.me-tech.com.my/fylive3/" + res["location"])
 
       req = Net::HTTP::Get.new(uri.path, "Cookie" => cookie)
 
-      self.res = request(uri, req)
+      self.res = request(uri, req, false)
     end
   end
 
   def process
     html = Nokogiri::HTML(res.body)
 
-    flights(html).each do |flight|
+    origin, destination = origin_destination_selector(html)
+
+    flights(html).each_with_index do |flight, i|
+      next if i == 0
+
       depart_at = depart_at_selector(flight)
       arrive_at = arrive_at_selector(flight)
       fare = fare_selector(flight)
       flight_number = flight_number_selector(flight)
-      origin = origin_selector(flight)
-      destination = destination_selector(flight)
       transit = "NO"
 
       add_to_fares(flight_name: "Firefly",
@@ -81,6 +95,6 @@ class Firefly < Flight
   end
 
   def flights(data)
-    data.css("div.market1")
+    data.css("form table:last tr")
   end
 end

data/lib/teecket/page_requester.rb

@@ -1,9 +1,11 @@
   module PageRequester
-    def request(uri, req)
+    def request(uri, req, use_ssl = true)
       http = Net::HTTP.new(uri.host, uri.port)
 
-      http.use_ssl = true
-      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      if use_ssl
+        http.use_ssl = true
+        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      end
 
       http.request(req)
     end

data/lib/teecket/selectors/firefly.rb

@@ -2,60 +2,42 @@ module Selectors
   module Firefly
     def depart_at_selector(flight)
       value = flight
-              .css("div.visible-xs")
-              .css("table")[1]
-              .css("td")[0]
+              .css("td")[1]
+              .css("div")[0]
 
-      depart_arrive_at_formatter(value)
+      time_formatter(value)
     end
 
     def arrive_at_selector(flight)
       value = flight
-              .css("div.visible-xs")
-              .css("table")[1]
               .css("td")[1]
+              .css("div")[1]
 
-      depart_arrive_at_formatter(value)
+      time_formatter(value)
     end
 
     def fare_selector(flight)
       value = flight
-              .css("div.visible-xs > div")
-
-      fare_formatter(value)
+              .css("td")[2]
+              .css("div")[1]
+              .text
     end
 
     def flight_number_selector(flight)
       value = flight
-              .css("div.visible-xs")
-              .css("table")[0]
-
-      flight_number_formatter(value)
-    end
-
-    def origin_selector(flight)
-      flight["onclick"]
-        .scan(/~[A-Z]{3}~/)[0]
-        .gsub("~", "")
-    end
-
-    def destination_selector(flight)
-      flight["onclick"]
-        .scan(/~[A-Z]{3}~/)[1]
-        .gsub("~", "")
+              .css("td")[0]
+              .text
     end
 
-    def depart_arrive_at_formatter(datetime)
-      datetime = datetime.text.strip.gsub(/\t/, "").match(/^(.*?)(AM|PM)/)[0]
-      DateTime.parse("#{date} #{datetime}").strftime("%I:%M %p")
+    def origin_destination_selector(html)
+      text = html.css('form > div')[1].text
+      text.scan(/[A-Z]{3}/)
     end
 
-    def fare_formatter(fare)
-      fare.text.strip.gsub(/ MYR/, "")
-    end
 
-    def flight_number_formatter(flight_number)
-      flight_number.text.strip.gsub(/ /, "").gsub(/FLIGHTNO\./, "")
+    def time_formatter(element)
+      DateTime.strptime(element.text, "%l:%M%p")
+              .strftime("%I:%M %p")
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: teecket
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Amree Zaid
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-13 00:00:00.000000000 Z
+date: 2015-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: terminal-table
@@ -118,3 +118,4 @@ signing_key:
 specification_version: 4
 summary: Search for flights fare in Malaysia
 test_files: []
+has_rdoc: