septa 1.0.1 → 1.0.2

data/lib/septa.rb

@@ -1,7 +1,7 @@
+require "septa/train"
 require "septa/bus"
 
 module Septa
   VERSION = '1.0.0'
-  extend Bus
 end
 

data/lib/septa/bus.rb

@@ -2,17 +2,38 @@ require 'resourceful'
 require 'json'
 
 module Septa
-  module Bus  
-    def get_bus_data(bus_number)
-      septa_url = 'http://www3.septa.org/transitview/bus_route_data/'+bus_number.to_s
-      resp = Resourceful.get(septa_url)
-      JSON.parse(resp.body)
+  class Bus
+    attr_accessor :bus_number
+    def initialize(bus_number)
+      @bus_number = bus_number
+    end
+
+    def locations
+      locations = {}
+      loc = self.bus_locations()
+      unless loc.nil?
+        loc.each do |l|
+          locations[l['VehicleID']] = [l['lat'].to_f, l['lng'].to_f]
+        end
+      end
+      locations
     end
 
-    def next_to_arrive(city1, city2)
-      septa_url = "http://www3.septa.org/api/nta/"
-      resp = Resourceful.get("#{septa_url}#{city1}/#{city2}")
-      JSON.parse(resp.body)
+    def format_locations(locations)
+      location = []
+      locations.each do |loc| 
+        loc['lat'] = loc['lat'].to_f
+        loc['lng'] = loc['lng'].to_f
+      end
+    end
+
+    def bus_locations
+      septa_url = "http://www3.septa.org/transitview/bus_route_data/#{@bus_number.to_s}"
+      resp = Resourceful.get(septa_url)
+      unless resp.body.downcase.include? 'invalid route'
+        locations = JSON.parse(resp.body)
+        return self.format_locations(locations['bus'])
+      end
     end
   end
 end

data/lib/septa/train.rb

@@ -0,0 +1,12 @@
+require 'resourceful'
+require 'json'
+
+module Septa
+  class Train 
+    def self.next_to_arrive(city1, city2)
+      septa_url = "http://www3.septa.org/api/nta/"
+      resp = Resourceful.get("#{septa_url}#{city1}/#{city2}")
+      JSON.parse(resp.body)
+    end
+  end
+end

metadata

@@ -1,71 +1,48 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: septa
-version: !ruby/object:Gem::Version 
-  hash: 21
+version: !ruby/object:Gem::Version
+  version: 1.0.2
   prerelease: 
-  segments: 
-  - 1
-  - 0
-  - 1
-  version: 1.0.1
 platform: ruby
-authors: 
+authors:
 - Joanne Cheng
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-09-12 00:00:00 -06:00
-default_executable: 
+date: 2012-10-16 00:00:00.000000000 Z
 dependencies: []
-
-description: An easier way to access SEPTA (Southeastern Pennsylvania Transit Authority) data.
-email: 
+description: Ruby wrapper for the septa api
+email:
 - chengjoanne2@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/septa.rb
 - lib/septa/bus.rb
-has_rdoc: true
+- lib/septa/train.rb
 homepage: http://github.com/joannecheng/septa-ruby
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: septa
-rubygems_version: 1.6.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Ruby wrapper for the septa api
 test_files: []
-