sfba_transit_api 0.1.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a91205825ff83f8ee86dc627a40aa701baebb01c
-  data.tar.gz: 1cfe169dd87692a8c4a3ce72f83e0cf45aedb929
+  metadata.gz: 796458b4667230a01f72ea9cee597bcb7f4b79be
+  data.tar.gz: 4722380939015647e710458b905d2aa028753f16
 SHA512:
-  metadata.gz: 297a294c2863f724ee4c21bc3663c57fcda7862d52b11a59f3ce507b4b4bccf471c62a581867e3df3e13efeaf3291c3fbe586d37509da12d3a690501f15039a6
-  data.tar.gz: e2957283da7b6633349ba7bb02209773b81227e8e06902b70f355a15f1ce8a2b601d8c88a46301c8a5e46c492a375b565845d2985e73afe3a6603102097ace4e
+  metadata.gz: 371598d1829ec0d90dc64631f6b0f14e6acddbe66a3ec60acdca657aeda7c0e7c6abcde40ebdacd3baa3d2b359f191e86e29afd7d2515ee76504f467018ff742
+  data.tar.gz: 0fb60957bad9401ec6392c7cc9096fa68b3dafc0553c7288feed37683500d7f91f7c1b835619c7a18da59295e0acc9d0200a09c1b13d8906c9db2c4b504aebc7

data/lib/sfba_transit_api/client.rb

@@ -65,8 +65,7 @@ module SFBATransitAPI
 
     def makeRouteIDF(route_info)
       route_idf = "#{route_info[:agency_name]}~#{route_info[:route_code]}"
-      route_idf += "~Inbound" if route_info[:route_direction] == :inbound
-      route_idf += "~Outbound" if route_info[:route_direction] == :outbound
+      route_idf += "~#{route_info[:route_direction_code]}" if route_info[:route_direction_code]
       route_idf
     end
 

data/lib/sfba_transit_api/direction.rb

@@ -0,0 +1,27 @@
+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,13 +1,13 @@
 module SFBATransitAPI
   class Route
-    attr_accessor :name, :code, :inbound_name, :outbound_name, :stops, :agency
+    attr_accessor :name, :code, :directions, :stops, :agency
 
     def has_direction
-      not (inbound_name.nil? and outbound_name.nil?)
+      directions.count > 0
     end
 
     def to_s
-      "#<SFBATransitAPI::Route:#{object_id} @name=\"#{name}\", @code=\"#{code}\", @inbound_name=\"#{inbound_name}\", @outbound_name=\"#{outbound_name}\", @agency=<SFBATransitAPI::Agency:#{agency.object_id}>, stops.count=#{stops.count}>"
+      "#<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)
@@ -19,17 +19,7 @@ module SFBATransitAPI
         route.name = route_node["Name"]
         route.code = route_node["Code"]
 
-        direction_nodes = route_node.xpath(".//RouteDirection")
-        if direction_nodes.count > 0
-          direction_nodes.each do |direction_node|
-            if direction_node["Code"] == "Inbound"
-              route.inbound_name = direction_node["Name"]
-            elsif direction_node["Code"] == "Outbound"
-              route.outbound_name = direction_node["Name"]
-            end
-          end
-        end
-
+        route.directions = Direction.parse(route_node, route)
         route.stops = Stop.parse(route_node, route)
 
         route

data/lib/sfba_transit_api/stop.rb

@@ -1,9 +1,9 @@
 module SFBATransitAPI
   class Stop
-    attr_accessor :name, :code, :direction, :direction_name, :departure_times, :route
+    attr_accessor :name, :code, :departure_times, :route, :direction
 
     def to_s
-      "#<SFBATransitAPI::Stop:#{object_id} @name=\"#{name}\", @code=\"#{code}\", @direction=\"#{direction}\", @direction_name=\"#{direction_name}\", @route=<SFBATransitAPI::Route:#{route.object_id}>, departure_times=#{departure_times}>"
+      "#<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)
@@ -13,32 +13,15 @@ module SFBATransitAPI
     end
 
     def self.parse(route_node, route)
-      if route.has_direction
-        route_node.xpath(".//RouteDirection").map do |direction_node|
-
-          if direction_node["Code"] == "Inbound"
-            direction = :inbound
-          elsif direction_node["Code"] == "Outbound"
-            direction = :outbound
-          end
-
-          parse_stop(direction_node, route, direction, direction_node["Name"])
-        end.flatten
-      else
-        parse_stop(route_node, route)
-      end
-    end
-
-    def self.parse_stop(node, route, direction=nil, direction_name=nil)
-      node.xpath(".//Stop").map do |stop_node|
+      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.direction = direction
-        stop.direction_name = direction_name
 
         stop
       end

data/lib/sfba_transit_api.rb

@@ -1,4 +1,5 @@
 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"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sfba_transit_api
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Frank Liu
@@ -14,101 +14,101 @@ dependencies:
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.10'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.5'
 - !ruby/object:Gem::Dependency
   name: dotenv
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-description: A Simple Way to Query the 511 RTT API
+        version: '1.0'
+description: San Francisco Bay Area 511 Real-time Transit Data Services API
 email: gniquil@gmail.com
 executables: []
 extensions: []
@@ -118,6 +118,7 @@ files:
 - 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
@@ -143,5 +144,5 @@ rubyforge_project:
 rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
-summary: San Francisco Bay Area 511 Real-time Transit Data Services API
+summary: SF Bay Area 511 Real-time Transit Data Services API
 test_files: []