ratis 3.1.4 → 3.1.5

data/CHANGELOG

@@ -13,4 +13,7 @@
 - Turns out that in the NextBus calls the <service> tag can come back as either a single node or list of nodes.  In one case savon turns this into an array, in the other case it's just a single entity.  Rewrote NextBus.where to handle these two cases, this also means NextBus would never really represent a single service.  Created a NextBus.services method that returns all these entities in a similar manner.  Update test specs
 
 3.1.4
-- Bug Fix: NextBus trips returned can be an array or a single hash
+- Bug Fix: NextBus trips returned can be an array or a single hash
+
+3.1.5
+- Bug Fix: NextBus where was incorrectly sending Time in 12 hour format when ATIS needs it in 24 hour format.

data/Gemfile.lock

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

data/lib/ratis/next_bus.rb

@@ -5,27 +5,37 @@ module Ratis
     attr_accessor :stop, :services, :success
 
     def initialize(response)
-      @success  = response.success?
-      @stop     = response.body[:nextbus_response][:atstop]
-      _services = @stop.delete(:service)
+      @success = response.success?
 
-      unless _services.is_a?(Array)
-        _services = [_services]
-      end
+      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])
-                       )
+        @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
+
+      else
+        @stop = {}
+        @services = []
       end
 
+      debugger
+      x = 1
     end
 
     def parse_trip_info(trips)
@@ -77,7 +87,7 @@ module Ratis
       response = Request.get 'Nextbus', {'Stopid' => stop_id,
                                          'Appid' => app_id,
                                          'Date' => datetime.strftime("%m/%d/%Y"),
-                                         'Time' => datetime.strftime("%I%M"),
+                                         'Time' => datetime.strftime("%H%M"),
                                          'Type' => type }
 
       NextBus.new(response)

data/lib/ratis/version.rb

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

data/spec/ratis/next_bus_spec.rb

@@ -20,6 +20,25 @@ describe Ratis::NextBus do
   end
 
   describe '#where' do
+    describe 'time formatting' do
+      it 'should make requests with 24 hour time format' do
+        @stop_id    = 10050
+        @time       = Chronic.parse('tomorrow 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',
+                       :datetime     => @time }
+
+        Ratis::Request.should_receive(:get) do |action, options|
+                         action.should eq('Nextbus')
+                         options["Time"].should eq(@time.strftime("%H%M"))
+
+                       end.and_return(double('response', :success? => false, :body => empty_body)) # false only to stop further running
+
+        Ratis::NextBus.where(@conditions.dup)
+      end
+    end
+
     describe 'single service return' do
       before do
         @stop_id = 10050
@@ -27,9 +46,10 @@ describe Ratis::NextBus do
                        :app_id       => 'ratis-specs', # a short string that can be used to separate requests from different applications or different modules with
                        :type         => 'N',
                        :datetime     => @time }
+
       end
 
-      it 'returns the next 4 bus times' do
+      it 'returns the next bus times' do
         # raises exception when no runs available:
         # Ratis::Errors::SoapError:
         # SOAP - no runs available
@@ -49,7 +69,7 @@ describe Ratis::NextBus do
                          options["Stopid"].should eq(@stop_id)
                          options["Appid"].should eq('ratis-specs')
                          options["Date"].should eq(@time.strftime("%m/%d/%Y"))
-                         options["Time"].should eq(@time.strftime("%I%M"))
+                         options["Time"].should eq(@time.strftime("%H%M"))
                          options["Type"].should eq('N')
 
                        end.and_return(double('response', :success? => false, :body => empty_body)) # false only to stop further running
@@ -99,7 +119,7 @@ describe Ratis::NextBus do
                          options["Stopid"].should eq(@stop_id)
                          options["Appid"].should eq('ratis-specs')
                          options["Date"].should eq(@time.strftime("%m/%d/%Y"))
-                         options["Time"].should eq(@time.strftime("%I%M"))
+                         options["Time"].should eq(@time.strftime("%H%M"))
                          options["Type"].should eq('N')
 
                        end.and_return(double('response', :success? => false, :body => empty_body)) # false only to stop further running
@@ -137,7 +157,7 @@ describe Ratis::NextBus do
                          options["Stopid"].should eq(@stop_id)
                          options["Appid"].should eq('ratis-specs')
                          options["Date"].should eq(@time.strftime("%m/%d/%Y"))
-                         options["Time"].should eq(@time.strftime("%I%M"))
+                         options["Time"].should eq(@time.strftime("%H%M"))
                          options["Type"].should eq('N')
 
                        end.and_return(double('response', :success? => false, :body => empty_body)) # false only to stop further running
@@ -198,7 +218,7 @@ describe Ratis::NextBus do
       it "should return an empty array if the api request isn't successful" do
         Ratis::Request.should_receive('get') do |action, options|
                         action.should eq('Nextbus')
-                        options["Time"].should eq(@time.strftime("%I%M") )
+                        options["Time"].should eq(@time.strftime("%H%M") )
                         options["Type"].should eq("N")
                         options["Stopid"].should eq(@stop_id)
                         options["Date"].should eq(@time.strftime("%m/%d/%Y") )

data/spec/support/vcr_cassettes/Point2Point.yml

@@ -1,4 +1,5 @@
 --- 
+recorded_with: VCR 2.4.0
 http_interactions: 
 - request: 
     method: post
@@ -20,25 +21,25 @@ http_interactions:
         aW50MnBvaW50PjwvZW52OkJvZHk+PC9lbnY6RW52ZWxvcGU+
 
     headers: 
-      Soapaction: 
-      - "\"PX_WEB#Point2point\""
       Content-Type: 
       - text/xml;charset=UTF-8
       Accept: 
       - "*/*"
       Content-Length: 
       - "576"
+      Soapaction: 
+      - "\"PX_WEB#Point2point\""
   response: 
     status: 
       code: 302
       message: Found
     headers: 
-      Server: 
-      - BigIP
-      Content-Length: 
-      - "0"
       Connection: 
       - Keep-Alive
+      Content-Length: 
+      - "0"
+      Server: 
+      - BigIP
       Location: 
       - http://www.iana.org/domains/example/
     body: 
@@ -55,41 +56,41 @@ http_interactions:
         c29hcC9lbnZlbG9wZS8iIHhtbG5zOndzZGw9IlBYX1dFQiIgeG1sbnM6eHNk
         PSJodHRwOi8vd3d3LnczLm9yZy8yMDAxL1hNTFNjaGVtYSIgeG1sbnM6eHNp
         PSJodHRwOi8vd3d3LnczLm9yZy8yMDAxL1hNTFNjaGVtYS1pbnN0YW5jZSI+
-        PGVudjpCb2R5PjxQb2ludDJwb2ludCB4bWxucz0iUFhfV0VCIj48RW5kdGlt
-        ZT4xODAwPC9FbmR0aW1lPjxEZXN0aW5hdGlvbmxhdD4zMy40NDcwOTg8L0Rl
-        c3RpbmF0aW9ubGF0PjxEZXN0aW5hdGlvbmxvbmc+LTExMi4wNzcyMTM8L0Rl
-        c3RpbmF0aW9ubG9uZz48RGF0ZT4wNi8wNi8yMDEzPC9EYXRlPjxPcmlnaW5s
-        b25nPi0xMTIuMDk3OTAzPC9PcmlnaW5sb25nPjxTdGFydHRpbWU+MTcwMDwv
-        U3RhcnR0aW1lPjxSb3V0ZXNvbmx5Plk8L1JvdXRlc29ubHk+PFJvdXRlcz4x
-        PC9Sb3V0ZXM+PE9yaWdpbmxhdD4zMy40NDY5MzE8L09yaWdpbmxhdD48L1Bv
+        PGVudjpCb2R5PjxQb2ludDJwb2ludCB4bWxucz0iUFhfV0VCIj48RGVzdGlu
+        YXRpb25sYXQ+MzMuNDQ3MDk4PC9EZXN0aW5hdGlvbmxhdD48U3RhcnR0aW1l
+        PjE3MDA8L1N0YXJ0dGltZT48RW5kdGltZT4xODAwPC9FbmR0aW1lPjxSb3V0
+        ZXM+MTwvUm91dGVzPjxSb3V0ZXNvbmx5Plk8L1JvdXRlc29ubHk+PE9yaWdp
+        bmxhdD4zMy40NDY5MzE8L09yaWdpbmxhdD48T3JpZ2lubG9uZz4tMTEyLjA5
+        NzkwMzwvT3JpZ2lubG9uZz48RGVzdGluYXRpb25sb25nPi0xMTIuMDc3MjEz
+        PC9EZXN0aW5hdGlvbmxvbmc+PERhdGU+MDYvMTAvMjAxMzwvRGF0ZT48L1Bv
         aW50MnBvaW50PjwvZW52OkJvZHk+PC9lbnY6RW52ZWxvcGU+
 
     headers: 
-      Soapaction: 
-      - "\"PX_WEB#Point2point\""
       Content-Type: 
       - text/xml;charset=UTF-8
       Accept: 
       - "*/*"
       Content-Length: 
       - "576"
+      Soapaction: 
+      - "\"PX_WEB#Point2point\""
   response: 
     status: 
       code: 200
       message: OK
     headers: 
-      Server: 
-      - Apache/2.2.3 (CentOS)
-      Date: 
-      - Thu, 06 Jun 2013 23:02:44 GMT
       Content-Type: 
       - text/xml; charset=utf-8
+      Connection: 
+      - close
       Soapserver: 
       - SOAP::Lite/Perl/0.55
+      Server: 
+      - Apache/2.2.3 (CentOS)
       Content-Length: 
       - "4558"
-      Connection: 
-      - close
+      Date: 
+      - Tue, 11 Jun 2013 00:18:05 GMT
     body: 
       base64_string: |
         PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48U09BUC1F
@@ -196,5 +197,4 @@ http_interactions:
         RU5WOkVudmVsb3BlPg==
 
     http_version: 
-  recorded_at: Thu, 06 Jun 2013 23:02:44 GMT
-recorded_with: VCR 2.4.0
+  recorded_at: Tue, 11 Jun 2013 00:18:06 GMT

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ratis
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 3
   - 1
-  - 4
-  version: 3.1.4
+  - 5
+  version: 3.1.5
 platform: ruby
 authors: 
 - Burst Software
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-06-07 00:00:00 Z
+date: 2013-06-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: savon