ratis 2.5.2.1 → 2.5.2.2

data/lib/ratis.rb

@@ -10,15 +10,16 @@ require 'ratis/landmark_category'
 require 'ratis/location'
 require 'ratis/next_bus'
 require 'ratis/point_2_point'
+require 'ratis/point_2_point/standard_response'
+require 'ratis/point_2_point/group'
+require 'ratis/point_2_point/trip'
+require 'ratis/point_2_point/service'
+require 'ratis/point_2_point/stop'
 require 'ratis/request'
 require 'ratis/route'
 require 'ratis/route_stops'
-require 'ratis/schedule'
-require 'ratis/schedule_group'
+require 'ratis/route_stops/stop'
 require 'ratis/schedule_nearby'
-require 'ratis/schedule_trip'
-require 'ratis/service'
-require 'ratis/stop'
 require 'ratis/timetable'
 require 'ratis/walk'
 

data/lib/ratis/point_2_point.rb

@@ -3,7 +3,7 @@ module Ratis
   class Point2Point
 
     def self.where(conditions)
-      routes_only = conditions.delete(:routes_only)
+      routes_only = conditions.delete(:routes_only) || 'N'
 
       origin_lat = conditions.delete(:origin_lat).to_f
       origin_long = conditions.delete(:origin_long).to_f
@@ -11,7 +11,7 @@ module Ratis
       destination_long = conditions.delete(:destination_long).to_f
 
       date = conditions.delete :date
-      start_time = conditions.delete :start_time
+      start_time = conditions.delete(:start_time)
       end_time = conditions.delete :end_time
 
       raise ArgumentError.new("You must specify routes only with true, false, 'y' or 'n'") unless routes_only.y_or_n rescue false
@@ -44,7 +44,7 @@ module Ratis
 
     def self.parse_routes_only_yes(response)
       response.to_array(:point2point_response, :routes, :service).map do |service|
-        atis_service = Service.new
+        atis_service = Point2Point::RoutesOnlyResponse.new
         atis_service.route = service[:route]
         atis_service.direction = service[:direction]
         atis_service.service_type = service[:servicetype]
@@ -57,9 +57,9 @@ module Ratis
     def self.parse_routes_only_no(response)
       return nil unless response.success?
 
-      atis_schedule = Schedule.new
+      atis_schedule = Point2Point::StandardResponse.new
       atis_schedule.groups = response.to_array(:point2point_response, :groups, :group).map do |group|
-        atis_schedule_group = ScheduleGroup.new
+        atis_schedule_group = Point2Point::Group.new
 
         # Point2point 1.3 uses inconsistent tag naming, thus: <onstop> <onwalk...>, but <offstop> <offstopwalk...>
         # this docs says this is fixed in 1.4, so watch out
@@ -67,12 +67,12 @@ module Ratis
         atis_schedule_group.off_stop = atis_stop_from_hash 'offstop', group[:offstop]
 
         atis_schedule_group.trips = group.to_array(:trips, :trip).map do |trip|
-          atis_trip = ScheduleTrip.new
+          atis_trip = Point2Point::Trip.new
           atis_trip.on_time = trip[:ontime]
           atis_trip.off_time = trip[:offtime]
 
           atis_trip.service = trip.to_array(:service).map do |service|
-            atis_service = Service.new
+            atis_service = Point2Point::Service.new
 
             atis_service.route = service[:route]
             atis_service.direction = service[:direction]
@@ -95,7 +95,7 @@ module Ratis
     def self.atis_stop_from_hash(prefix, stop)
       return nil if stop.blank?
 
-      atis_stop = Stop.new
+      atis_stop = Point2Point::Stop.new
       atis_stop.description = stop[:description]
       atis_stop.atis_stop_id = stop[:atisstopid].to_i
       atis_stop.latitude = stop[:lat].to_f

data/lib/ratis/point_2_point/group.rb

@@ -0,0 +1,7 @@
+module Ratis
+
+  class Point2Point::Group < Struct.new(:on_stop, :off_stop, :trips)
+
+  end
+
+end

data/lib/ratis/point_2_point/service.rb

@@ -0,0 +1,7 @@
+module Ratis
+
+  class Point2Point::Service < Struct.new(:route, :direction, :service_type, :signage, :route_type, :exception)
+    
+  end
+
+end

data/lib/ratis/point_2_point/standard_response.rb

@@ -0,0 +1,7 @@
+module Ratis
+
+  class Point2Point::StandardResponse < Struct.new(:groups)
+
+  end
+
+end

data/lib/ratis/point_2_point/stop.rb

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

data/lib/ratis/point_2_point/trip.rb

@@ -0,0 +1,7 @@
+module Ratis
+
+  class Point2Point::Trip < Struct.new(:on_time, :off_time, :service)
+
+  end
+
+end

data/lib/ratis/route_stops.rb

@@ -25,7 +25,7 @@ module Ratis
       return [] unless response.success?
 
       response.to_hash[:routestops_response][:stops][:stop].map do |s|
-        stop = Stop.new
+        stop = RouteStops::Stop.new
         stop.description = s[:description]
         stop.area = s[:area]
         stop.atis_stop_id = s[:atisstopid]

data/lib/ratis/route_stops/stop.rb

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

data/lib/ratis/version.rb

@@ -4,7 +4,7 @@ module Ratis
 
   def version
     @version ||= begin
-      string = '2.5.2.1'
+      string = '2.5.2.2'
 
       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: 77
+  hash: 75
   prerelease: 
   segments: 
   - 2
   - 5
   - 2
-  - 1
-  version: 2.5.2.1
+  - 2
+  version: 2.5.2.2
 platform: ruby
 authors: 
 - AuthorityLabs
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-15 00:00:00 Z
+date: 2012-08-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: savon
@@ -164,16 +164,17 @@ files:
 - lib/ratis/landmark_category.rb
 - lib/ratis/location.rb
 - lib/ratis/next_bus.rb
+- lib/ratis/point_2_point/group.rb
+- lib/ratis/point_2_point/service.rb
+- lib/ratis/point_2_point/standard_response.rb
+- lib/ratis/point_2_point/stop.rb
+- lib/ratis/point_2_point/trip.rb
 - lib/ratis/point_2_point.rb
 - lib/ratis/request.rb
 - lib/ratis/route.rb
+- lib/ratis/route_stops/stop.rb
 - lib/ratis/route_stops.rb
-- lib/ratis/schedule.rb
-- lib/ratis/schedule_group.rb
 - lib/ratis/schedule_nearby.rb
-- lib/ratis/schedule_trip.rb
-- lib/ratis/service.rb
-- lib/ratis/stop.rb
 - lib/ratis/timetable.rb
 - lib/ratis/version.rb
 - lib/ratis/walk.rb

data/lib/ratis/schedule.rb

@@ -1,7 +0,0 @@
-module Ratis
-
-  class Schedule < Struct.new(:groups)
-
-  end
-
-end

data/lib/ratis/schedule_group.rb

@@ -1,7 +0,0 @@
-module Ratis
-
-  class ScheduleGroup < Struct.new(:on_stop, :off_stop, :trips)
-
-  end
-
-end

data/lib/ratis/schedule_trip.rb

@@ -1,7 +0,0 @@
-module Ratis
-
-  class ScheduleTrip < Struct.new(:on_time, :off_time, :service)
-
-  end
-
-end

data/lib/ratis/service.rb

@@ -1,7 +0,0 @@
-module Ratis
-
-  class Service < Struct.new(:route, :direction, :service_type, :signage, :route_type, :exception)
-    
-  end
-
-end

data/lib/ratis/stop.rb

@@ -1,12 +0,0 @@
-module Ratis
-
-  class Stop
-
-    attr_accessor :description, :atis_stop_id, :latitude, :longitude
-    attr_accessor :walk_dist, :walk_dir, :walk_hint
-    attr_accessor :stop_id, :side, :heading, :stop_position, :route_dir
-    attr_accessor :area, :stop_seq
-
-  end
-
-end