Alohaha 0.0.3 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5500a23f3a8ec2d0fb6bdbb9385e9b98f25ca1c3
-  data.tar.gz: 71a754e4b188b18bf24d2acdc35cba8854ff4c4b
+  metadata.gz: eba3048a00ea1fb3b68c9eaff2ad729d6ea3a8a1
+  data.tar.gz: 348e19efc00271490b902b58a3aadef12a49a037
 SHA512:
-  metadata.gz: 7bdec080320ad75fb2797f34dd87459e492e4c65f1195d9d7d95c293f540dbb1046ddc3399c49deeecdb8dde17e3763b6fd0c87fe8fbd0f5834519313636d750
-  data.tar.gz: f3b98242f517da1d524e543cf1c94247e9036f466b9c82e8fa6ff1820aa7455170cef39ffdb55d4a9c2effaeeba9a27b2c560ef827dc67a935959059f8e5e203
+  metadata.gz: ffb910580f30d22895fbe52eecc81e9de7a090a5186c7726d53d70642f71b305d95e9309851bce5d41c2187de414e3bf9aea77e1f852aaf620d8e16f5a1163be
+  data.tar.gz: ac35d75fe1de9a3ea1dd86a74ed379a2c78f44a459b07170998c795d0ac0409d70ee97cc160cf29a374dc9b8f29e6855970db78a601c6c0952477d5a7eb19ce8

data/README.md

@@ -1,6 +1,6 @@
 #Alohaha
 
-This API helper get Taoyuan airport flight info
+This API helper get Taoyuan International Airport flight info
 
 #Installation
 

data/alohaha.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
 
-  spec.add_dependency('open-uri')
+  spec.add_dependency('curb')
   spec.add_dependency('iconv')
   spec.add_dependency('virtus')
 end

data/lib/alohaha.rb

@@ -1,8 +1,9 @@
-require 'open-uri'
+require 'curb'
 require 'iconv'
 require 'virtus'
 
 require "alohaha/settings"
+require "alohaha/flight_helper"
 require "alohaha/flight"
 require "alohaha/flight_parse"
 
@@ -19,11 +20,26 @@ class Alohaha
   end
 
   def arrivals
-    @flights.select {|flights| flights.kind == 'Arrivals' }
+    @flights.arrivals
   end
 
   def departure
-    @flights.select {|flights| flights.kind == 'Departure' }
+    @flights.departure
+  end
+
+  def yesterday
+    @flights.yesterday
+  end
+
+  def today
+    @flights.today
   end
-end
 
+  def tomorrow
+    @flights.tomorrow
+  end
+
+  def by_datetime(datetime = DateTime.now)
+    @flights.by_datetime(datetime)
+  end
+end

data/lib/alohaha/flight.rb

@@ -1,4 +1,4 @@
-class Destination
+class DestinationHaha
   include Virtus.model
 
   attribute :iata,  String
@@ -6,7 +6,7 @@ class Destination
   attribute :zh,    String
 end
 
-class Flight
+class FlightHaha
   include Virtus.model
 
   attribute :terminal,          String    #1: T1, 2:T2
@@ -19,11 +19,11 @@ class Flight
   attribute :datetime,          DateTime
   attribute :expected_datetime, DateTime
 
-  attribute :destination,       Destination
+  attribute :destination,       DestinationHaha
   attribute :flight_status,     String
 
   attribute :aircraft_type,     String
-  attribute :other_route,       Destination
+  attribute :other_route,       DestinationHaha
   attribute :baggage_carousel,  String
   attribute :check_in_counter,  String
 
@@ -57,13 +57,13 @@ class Flight
     self.gate = raw_data[5]
 
     # datetime
-    self.datetime = "#{raw_data[6]} #{raw_data[7]}"
+    self.datetime = "#{raw_data[6]} #{raw_data[7]} +08:00"
 
     # expected_datetime
-    self.expected_datetime = "#{raw_data[8]} #{raw_data[9]}"
+    self.expected_datetime = "#{raw_data[8]} #{raw_data[9]} +08:00"
 
     # destination
-    self.destination = Destination.new(iata: raw_data[10], en: raw_data[11], zh: raw_data[12])
+    self.destination = DestinationHaha.new(iata: raw_data[10], en: raw_data[11], zh: raw_data[12])
 
     # flight_status
     self.flight_status = raw_data[13]
@@ -72,7 +72,7 @@ class Flight
     self.aircraft_type = raw_data[14]
 
     # other_route
-    self.other_route = Destination.new(iata: raw_data[15], en: raw_data[16], zh: raw_data[17])
+    self.other_route = DestinationHaha.new(iata: raw_data[15], en: raw_data[16], zh: raw_data[17])
 
     # baggage_carousel
     self.baggage_carousel = raw_data[18]

data/lib/alohaha/flight_helper.rb

@@ -0,0 +1,32 @@
+class Array
+  def arrivals
+    self.select {|flights| flights.kind == 'Arrivals' }
+  end
+
+  def departure
+    self.select {|flights| flights.kind == 'Departure' }
+  end
+
+  def yesterday
+    self.select {|flights| flights.datetime.to_time > Date.today.prev_day.to_time && flights.datetime.to_time < Date.today.to_time }
+  end
+
+  def today
+    self.select {|flights| flights.datetime.to_time > Date.today.to_time && flights.datetime.to_time < Date.today.next_day.to_time }
+  end
+
+  def tomorrow
+    self.select {|flights| flights.datetime.to_time > Date.today.next_day.to_time }
+  end
+
+  def by_datetime(datetime = DateTime.now)
+    self.select {|flights| flights.datetime > datetime }
+  end
+
+  def filter_kind
+    {
+      Arrivals: self.select {|flights| flights.kind == 'Arrivals'},
+      Departure: self.select {|flights| flights.kind == 'Departure'}
+    }
+  end
+end

data/lib/alohaha/flight_parse.rb

@@ -9,9 +9,9 @@ module FlightParse
     @flights = []
 
     ic = Iconv.new('UTF-8', 'BIG5')
-    row_data = ic.iconv(open(@url).read)
+    row_data = ic.iconv(Curl.get(@url).body_str)
     row_data.each_line do |line|
-      @flights << Flight.new(line.split(',').map {|al| al = al.strip})
+      @flights << FlightHaha.new(line.split(',').map {|al| al = al.strip})
     end
   end
 end

data/lib/alohaha/settings.rb

@@ -1,4 +1,4 @@
 module Settings
-  VERSION = "0.0.3"
+  VERSION = "0.0.5"
   FLIGHT_URL = 'http://www.taoyuan-airport.com/uploads/flightx/a_flight_v4.txt'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: Alohaha
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
 platform: ruby
 authors:
 - jiunjiun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-25 00:00:00.000000000 Z
+date: 2015-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: open-uri
+  name: curb
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,6 +95,7 @@ files:
 - alohaha.gemspec
 - lib/alohaha.rb
 - lib/alohaha/flight.rb
+- lib/alohaha/flight_helper.rb
 - lib/alohaha/flight_parse.rb
 - lib/alohaha/settings.rb
 homepage: ''
@@ -117,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Alohaha