sfba_transit_api 1.1.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6597b3cf1f629829540a0503df53308c3c6a764b
-  data.tar.gz: 07120d0ce1547bceeed261d4ef95809cf5be3989
+  metadata.gz: 35b19935386f244406d8ed85553ed9d4912936c5
+  data.tar.gz: 4170489d7650a5fb9cea855de0eebcec093bf554
 SHA512:
-  metadata.gz: 6e158e713b3aff0d4fa48496bf0035a4b222116d2a8c558a7ff95f67bd4d9873e2b6795db135a4f7f88cdbd36e347a1e1441a335228dfaa43ab21a8c4cd9a746
-  data.tar.gz: 5d2aaf7b467f846560646b68b9dc74565f57adb8bac1502c252486f566713fb54b4a90bc9480016d8314fe2add67e782935b484be56eb34d33c53bacf1ab8e8a
+  metadata.gz: 628669216b20fe7ce44d0aeff9bd76b9a3d6b252570a0f14cbefbe046c5ade3ebcffbc2a479043f5af2b262a0cb5552ab7b4c79c9fb6c0f7c84c6edf2768f640
+  data.tar.gz: e3385d76eb53d1c2db0958c5a44d6a3bad6671978d7fbadb5514eb3abc0ffe6e1e6ceded45f4a2b978d6e40e1b3be1331d035907891108fcc8e936a38552fd51

data/lib/sfba_transit_api.rb

@@ -1,7 +1,3 @@
-require_relative "./sfba_transit_api/stop"
-require_relative "./sfba_transit_api/direction"
-require_relative "./sfba_transit_api/route"
-require_relative "./sfba_transit_api/agency"
 require_relative "./sfba_transit_api/connection"
 require_relative "./sfba_transit_api/client"
 

data/lib/sfba_transit_api/client.rb

@@ -1,3 +1,5 @@
+require 'active_support/core_ext/string'
+
 module SFBATransitAPI
   class Client
 
@@ -14,19 +16,19 @@ module SFBATransitAPI
     def get_agencies
       response = get(:get_agencies)
 
-      Agency.parse(response)
+      parse(response)
     end
 
     def get_routes_for_agency(agency_name)
       response = get(:get_routes_for_agency, {agency_name: agency_name})
 
-      Agency.parse(response).map { |agency| agency.routes }.flatten
+      parse(response)
     end
 
     def get_routes_for_agencies(agency_names)
       response = get(:get_routes_for_agencies, {agency_names: agency_names.join("|")})
 
-      Agency.parse(response).map { |agency| agency.routes }.flatten
+      parse(response)
     end
 
     def get_stops_for_route(route_info)
@@ -34,33 +36,13 @@ module SFBATransitAPI
 
       response = get(:get_stops_for_route, {route_idf: route_idf})
 
-      Agency.parse(response).map do |agency|
-        agency.routes.map do |route|
-          route.stops
-        end.flatten
-      end.flatten
-    end
-
-    def get_stops_for_routes(route_infos)
-      route_idf = route_infos.map { |route_info| makeRouteIDF(route_info) }.join("|")
-
-      response = get(:get_stops_for_routes, {route_idf: route_idf})
-
-      Agency.parse(response).map do |agency|
-        agency.routes.map do |route|
-          route.stops
-        end.flatten
-      end.flatten
+      parse(response)
     end
 
     def get_next_departures_by_stop_code(stopcode)
       response = get(:get_next_departures_by_stop_code, stopcode: stopcode)
 
-      Agency.parse(response).map do |agency|
-        agency.routes.map do |route|
-          route.stops
-        end.flatten
-      end.flatten
+      parse(response)
     end
 
     def makeRouteIDF(route_info)
@@ -72,5 +54,103 @@ module SFBATransitAPI
     def get(method, options={})
       self.connection.get(method, options)
     end
+
+    def parse(doc)
+      agency_list_node = doc.at_xpath("//AgencyList")
+      if agency_list_node
+        parse_agencies(agency_list_node)
+      else
+        nil
+      end
+    end
+
+    def parse_agencies(agency_list_node)
+      agency_list_node.xpath("./Agency").map do |agency_node|
+        result = { "type" => "agency" }
+
+        agency_node.attributes.each do |key, val|
+          result[key.underscore] = to_boolean_if_possible(val.value)
+        end
+
+        route_list_node = agency_node.at_xpath("./RouteList")
+        if route_list_node
+          result["routes"] = parse_routes(route_list_node)
+        end
+
+        result
+      end
+    end
+
+    def parse_routes(route_list_node)
+      route_list_node.xpath("./Route").map do |route_node|
+        result = { "type" => "route" }
+
+        route_node.attributes.each do |key, val|
+          result[key.underscore] = val.value
+        end
+
+        route_direction_list_node = route_node.at_xpath("./RouteDirectionList")
+        if route_direction_list_node
+          result["route_directions"] = parse_route_directions(route_direction_list_node)
+        else
+          stop_list_node = route_node.at_xpath("./StopList")
+          if stop_list_node
+            result["stops"] = parse_stops(stop_list_node)
+          end
+        end
+
+        result
+      end
+    end
+
+    def parse_route_directions(route_direction_list_node)
+      route_direction_list_node.xpath("./RouteDirection").map do |route_direction_node|
+        result = { "type" => "route_direction" }
+
+        route_direction_node.attributes.each do |key, val|
+          result[key.underscore] = val.value
+        end
+
+        stop_list_node = route_direction_node.at_xpath("./StopList")
+        if stop_list_node
+          result["stops"] = parse_stops(stop_list_node)
+        end
+
+        result
+      end
+    end
+
+    def parse_stops(stop_list_node)
+      stop_list_node.xpath("./Stop").map do |stop_node|
+        result = { "type" => "stop" }
+
+        stop_node.attributes.each do |key, val|
+          result[key.underscore] = val.value
+        end
+
+        departure_time_list_node = stop_node.at_xpath("./DepartureTimeList")
+        if departure_time_list_node
+          result["departure_times"] = parse_departure_times(departure_time_list_node)
+        end
+
+        result
+      end
+    end
+
+    def parse_departure_times(departure_time_list_node)
+      departure_time_list_node.xpath("./DepartureTime").map do |departure_time_node|
+        departure_time_node.text ? departure_time_node.text.to_i : nil
+      end
+    end
+
+    def to_boolean_if_possible(value)
+      if value.downcase == "true"
+        true
+      elsif value.downcase == "false"
+        false
+      else
+        value
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sfba_transit_api
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Frank Liu
@@ -115,12 +115,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/sfba_transit_api.rb
-- lib/sfba_transit_api/agency.rb
 - lib/sfba_transit_api/client.rb
 - lib/sfba_transit_api/connection.rb
-- lib/sfba_transit_api/direction.rb
-- lib/sfba_transit_api/route.rb
-- lib/sfba_transit_api/stop.rb
 homepage: https://github.com/gniquil/sfba_transit_api
 licenses:
 - MIT

data/lib/sfba_transit_api/agency.rb

@@ -1,30 +0,0 @@
-module SFBATransitAPI
-  class Agency
-    attr_accessor :name, :has_direction, :mode, :routes
-
-    def to_s
-      "#<SFBATransitAPI::Agency:#{object_id} @name=\"#{name}\", @has_direction=#{has_direction}, @mode=\"#{mode}\", routes.count=#{routes.count}>"
-    end
-
-    def has_direction=(has_direction)
-      if has_direction.is_a? String
-        @has_direction = has_direction.downcase == "true" ? true : false
-      else
-        @has_direction = has_direction ? true : false
-      end
-    end
-
-    def self.parse(node)
-      node.xpath("//Agency").map do |agency_node|
-        agency = new
-
-        agency.name = agency_node["Name"]
-        agency.has_direction = agency_node["HasDirection"]
-        agency.mode = agency_node["Mode"]
-        agency.routes = Route.parse(agency_node, agency)
-
-        agency
-      end
-    end
-  end
-end

data/lib/sfba_transit_api/direction.rb

@@ -1,27 +0,0 @@
-module SFBATransitAPI
-  class Direction
-    attr_accessor :name, :code, :route
-
-    def to_s
-      "#<SFBATransitAPI::Direction:#{object_id} @name=\"#{name}\", @code=\"#{code}\", @route=<SFBATransitAPI::Route:#{route.object_id}>>"
-    end
-
-    def self.parse(route_node, route)
-      route_node.xpath(".//RouteDirection").map do |direction_node|
-        parse_direction_node(direction_node, route)
-      end
-    end
-
-    def self.parse_direction_node(direction_node, route)
-      return nil if direction_node.nil? or direction_node.name != 'RouteDirection'
-
-      direction = new
-
-      direction.route = route
-      direction.name = direction_node["Name"]
-      direction.code = direction_node["Code"]
-
-      direction
-    end
-  end
-end

data/lib/sfba_transit_api/route.rb

@@ -1,29 +0,0 @@
-module SFBATransitAPI
-  class Route
-    attr_accessor :name, :code, :directions, :stops, :agency
-
-    def has_direction
-      directions.count > 0
-    end
-
-    def to_s
-      "#<SFBATransitAPI::Route:#{object_id} @name=\"#{name}\", @code=\"#{code}\", @direction_codes=\"#{direction_codes}\", @agency=<SFBATransitAPI::Agency:#{agency.object_id}>, directions.count=#{directions.count}, stops.count=#{stops.count}>"
-    end
-
-    def self.parse(agency_node, agency)
-      agency_node.xpath(".//Route").map do |route_node|
-        route = new
-
-
-        route.agency = agency
-        route.name = route_node["Name"]
-        route.code = route_node["Code"]
-
-        route.directions = Direction.parse(route_node, route)
-        route.stops = Stop.parse(route_node, route)
-
-        route
-      end
-    end
-  end
-end

data/lib/sfba_transit_api/stop.rb

@@ -1,30 +0,0 @@
-module SFBATransitAPI
-  class Stop
-    attr_accessor :name, :code, :departure_times, :route, :direction
-
-    def to_s
-      "#<SFBATransitAPI::Stop:#{object_id} @name=\"#{name}\", @code=\"#{code}\", @direction=<SFBATransitAPI::Direction:#{direction.object_id}>, @route=<SFBATransitAPI::Route:#{route.object_id}>, departure_times=#{departure_times}>"
-    end
-
-    def self.parse_departure_times(stop_node)
-      stop_node.xpath(".//DepartureTime").map do |departure_time_node|
-        departure_time_node.text ? departure_time_node.text.to_i : nil
-      end
-    end
-
-    def self.parse(route_node, route)
-      route_node.xpath(".//Stop").map do |stop_node|
-        stop = new
-
-        stop.route = route
-        stop.direction = Direction.parse_direction_node(stop_node.parent.parent, route)
-
-        stop.name = stop_node["name"]
-        stop.code = stop_node["StopCode"]
-        stop.departure_times = parse_departure_times(stop_node)
-
-        stop
-      end
-    end
-  end
-end