ratis 3.1.8 → 3.2.0

data/CHANGELOG

@@ -25,4 +25,7 @@
 - Removed to_hash, instead use better named to_hash_for_xml for use with NextRide SMS service end-point
 
 3.1.8
-- Within to_hash_from_xml, pull route and sign attributes from the service instead of the realtime info (they always seem to be blank)
+- Within to_hash_from_xml, pull route and sign attributes from the service instead of the realtime info (they always seem to be blank)
+
+3.2.0
+- When querying Nextbus for a Light Rail stop, in most cases you will actually get back 2 stops for a single NextRide ID.  One for each side of the stop platform.  Made changes to handle this case.  Both stops services are flattened into the #services attribute.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ratis (3.1.5.1)
+    ratis (3.1.8)
       savon (< 2.0)
 
 GEM

data/lib/ratis/next_bus.rb

@@ -5,37 +5,47 @@ module Ratis
     attr_accessor :stop, :services, :success
 
     def initialize(response)
-      @success = response.success?
+      @success  = response.success?
+      @stop     = []
+      @services = []
 
       if @success
-        @stop     = response.body[:nextbus_response][:atstop]
-
-        _services = @stop.delete(:service)
-
-        unless _services.is_a?(Array)
-          _services = [_services]
-        end
-
-        @services = _services.map do |service|
-          OpenStruct.new(:status      => service[:status],
-                         :sign        => service[:sign],
-                         :routetype   => service[:routetype],
-                         :times       => service[:times],
-                         :direction   => service[:direction],
-                         :servicetype => service[:servicetype],
-                         :route       => service[:route],
-                         :operator    => service[:operator],
-                         :trips       => parse_trip_info(service[:tripinfo])
-                         )
+        @stop = response.body[:nextbus_response][:atstop]
+
+        # Only Light Rail stops will return 2 stops from ATIS for a single NextRide id
+        if @stop.is_a?(Array)
+          @stop.each do |_stop|
+            parse_stop(_stop)
+          end
+        else
+          parse_stop(@stop)
         end
 
-      else
-        @stop = {}
-        @services = []
       end
 
     end
 
+    def parse_stop(single_stop)
+      _services = single_stop.delete(:service)
+
+      _services = [_services] unless _services.is_a?(Array)
+
+      @services << _services.map do |service|
+                      OpenStruct.new(:status      => service[:status],
+                                     :sign        => service[:sign],
+                                     :routetype   => service[:routetype],
+                                     :times       => service[:times],
+                                     :direction   => service[:direction],
+                                     :servicetype => service[:servicetype],
+                                     :route       => service[:route],
+                                     :operator    => service[:operator],
+                                     :trips       => parse_trip_info(service[:tripinfo])
+                                     )
+                   end
+
+      @services.flatten!
+    end
+
     def parse_trip_info(trips)
       # can come back as an Array or single Hash...
       if trips.is_a?(Array)
@@ -95,11 +105,19 @@ module Ratis
       @success
     end
 
+    def stop_description
+      if @stop.is_a?(Array)
+        @stop.first[:description]
+      else
+        @stop[:description]
+      end
+    end
+
     # Used to create an XML response for the NextBus SMS services which hits
     # /nextride.xml?stop_id=<STOPID>
 
     def to_hash_for_xml
-      { :stopname => @stop[:description],
+      { :stopname => stop_description,
         :runs     => @services.map do |service|
                        service.trips.map do |trip|
 

data/lib/ratis/version.rb

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

data/spec/ratis/next_bus_spec.rb

@@ -8,7 +8,7 @@ describe Ratis::NextBus do
       config.namespace  = 'PX_WEB'
     end
 
-    @time    = Chronic.parse('tomorrow at 6am')
+    @time    = Chronic.parse('next monday at 6am')
   end
 
   let(:empty_body){ {:nextbus_response => {:atstop => {:service => []}}} }
@@ -20,6 +20,13 @@ describe Ratis::NextBus do
   end
 
   describe '#where' do
+    # TODO: Light Rails Stops can return 2 Atstop tags... how do we best handle this case
+    describe 'Light Rails stops' do
+      it "description" do
+        pending
+      end
+    end
+
     describe 'time formatting' do
       it 'should make requests with 24 hour time format' do
         @stop_id    = 10050
@@ -131,6 +138,7 @@ describe Ratis::NextBus do
     describe 'multiple services returned' do
       before do
         @stop_id = 15894
+        @time       = Chronic.parse('next monday at 3pm')
         @conditions = {:stop_id      => @stop_id,
                        :app_id       => 'ratis-specs', # a short string that can be used to separate requests from different applications or different modules with
                        :type         => 'N',
@@ -176,7 +184,7 @@ describe Ratis::NextBus do
         expect(service.status).to eq('N')
         expect(service.sign).to eq('108 Elliot West To Priest')
         expect(service.routetype).to eq('B')
-        expect(service.times).to eq("06:46 AM, 07:46 AM, 08:46 AM, 09:46 AM")
+        expect(service.times).to eq("01:46 PM, 03:46 PM, 04:46 PM, 05:46 PM")
         expect(service.direction).to eq('W')
         expect(service.servicetype).to eq('W')
         expect(service.route).to eq('108')
@@ -188,7 +196,7 @@ describe Ratis::NextBus do
         expect(service.status).to eq('N')
         expect(service.sign).to eq('108 Elliot West To Priest Via Sosmn/Bsnln')
         expect(service.routetype).to eq('B')
-        expect(service.times).to eq("10:46 AM, 02:46 PM, 06:46 PM")
+        expect(service.times).to eq("02:46 PM, 06:46 PM")
         expect(service.direction).to eq('W')
         expect(service.servicetype).to eq('W')
         expect(service.route).to eq('108')

data/spec/ratis/point_2_point_spec.rb

@@ -13,7 +13,7 @@ describe Ratis::Point2Point do
     describe '#where' do
       describe 'services from origin to destination', {:vcr => {:cassette_name => "Point2Point"}} do
         before do
-          @today      = Time.now.strftime("%m/%d/%Y")
+          @today      = Chronic.parse('next monday at 6am').strftime("%m/%d/%Y")
           @conditions = {:routes_only      => true,
                          :origin_lat       => 33.446931,
                          :origin_long      => -112.097903,
@@ -126,7 +126,7 @@ describe Ratis::Point2Point do
 
       it 'gets the trips within each group' do
         schedule = Ratis::Point2Point.where(@conditions.dup)
-        schedule.groups[0].should have(18).trips
+        schedule.groups[0].should have(15).trips
         schedule.groups[1].should have(16).trips
         schedule.groups[2].should have(4).trips
       end

data/spec/support/vcr_cassettes/Point2Point.yml

@@ -20,27 +20,27 @@ http_interactions:
         aW50MnBvaW50PjwvZW52OkJvZHk+PC9lbnY6RW52ZWxvcGU+
 
     headers: 
-      Soapaction: 
-      - "\"PX_WEB#Point2point\""
       Content-Type: 
       - text/xml;charset=UTF-8
-      Accept: 
-      - "*/*"
       Content-Length: 
       - "576"
+      Soapaction: 
+      - "\"PX_WEB#Point2point\""
+      Accept: 
+      - "*/*"
   response: 
     status: 
       code: 302
       message: Found
     headers: 
+      Content-Length: 
+      - "0"
+      Location: 
+      - http://www.iana.org/domains/example/
       Connection: 
       - Keep-Alive
       Server: 
       - BigIP
-      Location: 
-      - http://www.iana.org/domains/example/
-      Content-Length: 
-      - "0"
     body: 
       base64_string: ""
     http_version: 
@@ -55,41 +55,41 @@ http_interactions:
         Y2hlbWEiIHhtbG5zOnhzaT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS9YTUxT
         Y2hlbWEtaW5zdGFuY2UiIHhtbG5zOndzZGw9IlBYX1dFQiIgeG1sbnM6ZW52
         PSJodHRwOi8vc2NoZW1hcy54bWxzb2FwLm9yZy9zb2FwL2VudmVsb3BlLyI+
-        PGVudjpCb2R5PjxQb2ludDJwb2ludCB4bWxucz0iUFhfV0VCIj48T3JpZ2lu
-        bG9uZz4tMTEyLjA5NzkwMzwvT3JpZ2lubG9uZz48RGF0ZT4wNi8xMi8yMDEz
-        PC9EYXRlPjxPcmlnaW5sYXQ+MzMuNDQ2OTMxPC9PcmlnaW5sYXQ+PERlc3Rp
-        bmF0aW9ubGF0PjMzLjQ0NzA5ODwvRGVzdGluYXRpb25sYXQ+PFN0YXJ0dGlt
-        ZT4xNzAwPC9TdGFydHRpbWU+PFJvdXRlcz4xPC9Sb3V0ZXM+PFJvdXRlc29u
-        bHk+WTwvUm91dGVzb25seT48RGVzdGluYXRpb25sb25nPi0xMTIuMDc3MjEz
-        PC9EZXN0aW5hdGlvbmxvbmc+PEVuZHRpbWU+MTgwMDwvRW5kdGltZT48L1Bv
+        PGVudjpCb2R5PjxQb2ludDJwb2ludCB4bWxucz0iUFhfV0VCIj48RW5kdGlt
+        ZT4xODAwPC9FbmR0aW1lPjxEYXRlPjA2LzE3LzIwMTM8L0RhdGU+PE9yaWdp
+        bmxhdD4zMy40NDY5MzE8L09yaWdpbmxhdD48T3JpZ2lubG9uZz4tMTEyLjA5
+        NzkwMzwvT3JpZ2lubG9uZz48U3RhcnR0aW1lPjE3MDA8L1N0YXJ0dGltZT48
+        RGVzdGluYXRpb25sYXQ+MzMuNDQ3MDk4PC9EZXN0aW5hdGlvbmxhdD48Um91
+        dGVzb25seT5ZPC9Sb3V0ZXNvbmx5PjxSb3V0ZXM+MTwvUm91dGVzPjxEZXN0
+        aW5hdGlvbmxvbmc+LTExMi4wNzcyMTM8L0Rlc3RpbmF0aW9ubG9uZz48L1Bv
         aW50MnBvaW50PjwvZW52OkJvZHk+PC9lbnY6RW52ZWxvcGU+
 
     headers: 
-      Soapaction: 
-      - "\"PX_WEB#Point2point\""
       Content-Type: 
       - text/xml;charset=UTF-8
-      Accept: 
-      - "*/*"
+      Soapaction: 
+      - "\"PX_WEB#Point2point\""
       Content-Length: 
       - "576"
+      Accept: 
+      - "*/*"
   response: 
     status: 
       code: 200
       message: OK
     headers: 
+      Content-Type: 
+      - text/xml; charset=utf-8
       Date: 
-      - Wed, 12 Jun 2013 22:24:11 GMT
+      - Fri, 14 Jun 2013 17:03:34 GMT
+      Content-Length: 
+      - "4558"
       Connection: 
       - close
-      Soapserver: 
-      - SOAP::Lite/Perl/0.55
       Server: 
       - Apache/2.2.3 (CentOS)
-      Content-Type: 
-      - text/xml; charset=utf-8
-      Content-Length: 
-      - "4558"
+      Soapserver: 
+      - SOAP::Lite/Perl/0.55
     body: 
       base64_string: |
         PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48U09BUC1F
@@ -196,5 +196,5 @@ http_interactions:
         RU5WOkVudmVsb3BlPg==
 
     http_version: 
-  recorded_at: Wed, 12 Jun 2013 22:24:12 GMT
+  recorded_at: Fri, 14 Jun 2013 17:03:34 GMT
 recorded_with: VCR 2.4.0

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ratis
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 15
   prerelease: 
   segments: 
   - 3
-  - 1
-  - 8
-  version: 3.1.8
+  - 2
+  - 0
+  version: 3.2.0
 platform: ruby
 authors: 
 - Burst Software
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-06-13 00:00:00 Z
+date: 2013-06-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: savon