ratis 2.5.2.4 → 2.5.2.5

data/README.md

@@ -92,7 +92,7 @@ Development
         ssh -i ~/.ssh/authoritylabs.pem -L 8080:localhost:3128 ubuntu@codingsanctum.com
 
  1. Run the test suite with `rake`
- 1. Test it out with `irb -r config/valley_metro.rb -I lib/ -r rubygems -r ratis`
+ 1. Test it out with `irb -I lib/ -r rubygems -r ratis`
 
 ### Extending
 

data/lib/ratis.rb

@@ -1,8 +1,8 @@
 require 'savon'
 
+require 'ratis/closest_stop'
 require 'ratis/config'
 require 'ratis/core_ext'
-require 'ratis/closest_stop'
 require 'ratis/errors'
 require 'ratis/itinerary'
 require 'ratis/landmark'
@@ -11,6 +11,7 @@ require 'ratis/location'
 require 'ratis/next_bus'
 require 'ratis/point_2_point'
 require 'ratis/point_2_point/group'
+require 'ratis/point_2_point/routes_only_response'
 require 'ratis/point_2_point/service'
 require 'ratis/point_2_point/standard_response'
 require 'ratis/point_2_point/stop'

data/lib/ratis/config.rb

@@ -2,7 +2,7 @@ module Ratis
 
   class Config
 
-    attr_accessor :endpoint, :namespace, :proxy, :timeout
+    attr_accessor :endpoint, :namespace, :proxy, :timeout, :log, :log_level
 
     def valid?
       return false if endpoint.nil? or namespace.nil?

data/lib/ratis/point_2_point.rb

@@ -44,13 +44,13 @@ module Ratis
 
     def self.parse_routes_only_yes(response)
       response.to_array(:point2point_response, :routes, :service).map do |service|
-        atis_service = Point2Point::RoutesOnlyResponse.new
-        atis_service.route = service[:route]
-        atis_service.direction = service[:direction]
-        atis_service.service_type = service[:servicetype]
-        atis_service.signage = service[:signage]
-        atis_service.route_type = service[:routetype]
-        atis_service
+        Point2Point::RoutesOnlyResponse.new({
+          :route        => service[:route],
+          :direction    => service[:direction],
+          :service_type => service[:servicetype],
+          :signage      => service[:signage],
+          :route_type   => service[:routetype]
+        })
       end
     end
 

data/lib/ratis/point_2_point/routes_only_response.rb

@@ -0,0 +1,16 @@
+module Ratis
+
+  class Point2Point::RoutesOnlyResponse
+
+    VALID_ATTRS = [:route, :direction, :service_type, :signage, :route_type]
+    VALID_ATTRS.each { |attr| attr_accessor attr }
+
+    def initialize(attrs = {})
+      VALID_ATTRS.each do |attr|
+        instance_variable_set "@#{attr.to_s}", attrs[attr] || attrs[attr.to_s]
+      end
+    end
+
+  end
+
+end

data/lib/ratis/point_2_point/service.rb

@@ -4,4 +4,4 @@ module Ratis
     
   end
 
-end
+end

data/lib/ratis/point_2_point/stop.rb

@@ -1,7 +1,6 @@
 module Ratis
 
-  class Point2Point::Stop < Struct.new(:description, :atis_stop_id, :latitude, :longitude,
-                          :walk_dist, :walk_dir, :walk_hint)
+  class Point2Point::Stop < Struct.new(:description, :atis_stop_id, :latitude, :longitude, :walk_dist, :walk_dir, :walk_hint)
 
   end
 

data/lib/ratis/route_stops/stop.rb

@@ -1,4 +1,6 @@
 module Ratis
-  class RouteStops::Stop < Struct.new(:description, :area, :stop_id, :atis_stop_id, :point, :alpha_seq, :stop_seq, :latitude, :longitude) 
+
+  class RouteStops::Stop < Struct.new(:description, :area, :stop_id, :atis_stop_id, :point, :alpha_seq, :stop_seq, :latitude, :longitude)
   end
-end
+
+end

data/lib/ratis/schedule_nearby.rb

@@ -55,6 +55,7 @@ module Ratis
             :walkdist       => atstop[:walkdist],
             :walkdir        => atstop[:walkdir],
             :stopid         => atstop[:stopid],
+            :heading        => atstop[:heading],
             :lat            => atstop[:lat],
             :long           => atstop[:long],
             :services       => atstop[:services].map do |service|

data/lib/ratis/timetable.rb

@@ -28,8 +28,13 @@ module Ratis
       timetable.service_type     = headway[:servicetype]
       timetable.operator         = headway[:operator]
       timetable.effective        = headway[:effective]
-      timetable.timepoints       = headway[:timepoints][:stop].collect{|tp| Timetable::Stop.new(tp[:atisstopid], tp[:stopid], tp[:description], tp[:area])}
-      timetable.trips            = headway[:times][:trip].collect{|t| Timetable::Trip.new(t[:time], t[:comment])}
+
+      stop = headway[:timepoints][:stop]
+      timetable.timepoints = [ Timetable::Stop.new(stop[:atisstopid], stop[:stopid], stop[:description], stop[:area]) ]
+
+      trip = headway[:times][:trip]
+      timetable.trips = [ Timetable::Trip.new(trip[:time], trip[:comment]) ]
+
       timetable
     end
 

data/lib/ratis/timetable/stop.rb

@@ -1,4 +1,6 @@
 module Ratis
+
   class Timetable::Stop < Struct.new(:atis_stop_id, :stop_id, :description, :area)
   end
-end
+
+end

data/lib/ratis/timetable/trip.rb

@@ -1,4 +1,6 @@
 module Ratis
+
   class Timetable::Trip < Struct.new(:times, :comment)
   end
-end
+
+end

data/lib/ratis/version.rb

@@ -4,7 +4,7 @@ module Ratis
 
   def version
     @version ||= begin
-      string = '2.5.2.4'
+      string = '2.5.2.5'
 
       def string.parts
         split('.').map { |p| p.to_i }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: ratis
 version: !ruby/object:Gem::Version 
-  hash: 71
+  hash: 69
   prerelease: 
   segments: 
   - 2
   - 5
   - 2
-  - 4
-  version: 2.5.2.4
+  - 5
+  version: 2.5.2.5
 platform: ruby
 authors: 
 - AuthorityLabs
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-26 00:00:00 Z
+date: 2013-01-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: savon
@@ -24,12 +24,13 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - <
       - !ruby/object:Gem::Version 
         hash: 3
         segments: 
+        - 2
         - 0
-        version: "0"
+        version: "2.0"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -165,6 +166,7 @@ files:
 - lib/ratis/location.rb
 - lib/ratis/next_bus.rb
 - lib/ratis/point_2_point/group.rb
+- lib/ratis/point_2_point/routes_only_response.rb
 - lib/ratis/point_2_point/service.rb
 - lib/ratis/point_2_point/standard_response.rb
 - lib/ratis/point_2_point/stop.rb