ratis 3.3.0 → 3.3.1

data/lib/ratis/pattern.rb

@@ -30,16 +30,16 @@ module Ratis
 
       return nil unless response.success?
 
-      routeinfos = response.to_hash[:getpatterns_response][:routes][:routeinfo].map do |r|
+      routeinfos = response.to_array(:getpatterns_response, :routes, :routeinfo).map do |rinfo|
                      info = Pattern::RouteInfo.new
-                     info.route     = r[:route]
-                     info.headsign  = r[:signage]
-                     info.operate   = r[:operator]
-                     info.effective = r[:effective]
-                     info.routeid   = r[:routeid]
-                     info.routetype = r[:routetype]
-                     info.tripcount = r[:tripcount]
-                     info.school    = r[:school]
+                     info.route     = rinfo[:route]
+                     info.headsign  = rinfo[:signage]
+                     info.operate   = rinfo[:operator]
+                     info.effective = rinfo[:effective]
+                     info.routeid   = rinfo[:routeid]
+                     info.routetype = rinfo[:routetype]
+                     info.tripcount = rinfo[:tripcount]
+                     info.school    = rinfo[:school]
                      info
                    end
 

data/lib/ratis/route_pattern.rb

@@ -26,7 +26,7 @@ module Ratis
 
       routepattern = RoutePattern.new
 
-      routepattern.stops = response.to_hash[:routepattern_response][:stops][:stop].map do |s|
+      routepattern.stops = response.to_array(:routepattern_response, :stops, :stop).map do |s|
         stop               = RoutePattern::Stop.new
         stop.desc          = s[:description]
         stop.area          = s[:area]
@@ -39,7 +39,7 @@ module Ratis
         stop
       end
 
-      routepattern.points = response.to_hash[:routepattern_response][:points][:point].map do |p|
+      routepattern.points = response.to_array(:routepattern_response, :points, :point).map do |p|
         point                = RoutePattern::Point.new
         point.lat, point.lng = p.split ','
         point

data/lib/ratis/version.rb

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

data/spec/ratis/next_bus_spec.rb

@@ -96,7 +96,7 @@ describe Ratis::NextBus do
         expect(service.times).to eq("05:49 AM, 06:09 AM, 06:29 AM, 06:49 AM")
         expect(service.direction).to eq('N')
         expect(service.servicetype).to eq('W')
-        expect(service.route).to eq('0')
+        expect(service.route).to eq('ZERO')
         expect(service.operator).to eq('AP')
       end
 
@@ -150,7 +150,7 @@ describe Ratis::NextBus do
         # Ratis::Errors::SoapError:
         # SOAP - no runs available
         response = Ratis::NextBus.where(@conditions.dup)
-        expect(response.services).to have(2).items
+        expect(response.services.size).to be_within(2).of(3)
       end
 
       it 'only makes one request' do
@@ -182,9 +182,9 @@ describe Ratis::NextBus do
         expect(service).to be_a(OpenStruct)
 
         expect(service.status).to eq('N')
-        expect(service.sign).to eq('108 Elliot West To Priest')
+        expect(service.sign).to eq('108 Elliot/48th St West To 40th St/Pecos')
         expect(service.routetype).to eq('B')
-        expect(service.times).to eq("01:46 PM, 03:46 PM, 04:46 PM, 05:46 PM")
+        expect(service.times).to eq("07:07 AM, 03:07 PM, 03:37 PM, 04:07 PM")
         expect(service.direction).to eq('W')
         expect(service.servicetype).to eq('W')
         expect(service.route).to eq('108')
@@ -194,9 +194,9 @@ describe Ratis::NextBus do
         expect(service).to be_a(OpenStruct)
 
         expect(service.status).to eq('N')
-        expect(service.sign).to eq('108 Elliot West To Priest Via Sosmn/Bsnln')
+        expect(service.sign).to eq('108 Elliot/48th St West To 48th St/Chandler Via Sosmn/Bsnln')
         expect(service.routetype).to eq('B')
-        expect(service.times).to eq("02:46 PM, 06:46 PM")
+        expect(service.times).to eq("02:37 PM, 06:37 PM")
         expect(service.direction).to eq('W')
         expect(service.servicetype).to eq('W')
         expect(service.route).to eq('108')

data/spec/ratis/pattern_spec.rb

@@ -13,7 +13,7 @@ describe Ratis::Pattern do
 
     before do
       @today      = Chronic.parse('tomorrow at 8am') # Time.now.strftime("%m/%d/%Y")
-      @conditions = {:route_short_name => '0',
+      @conditions = {:route_short_name => 'ZERO',
                      :direction        => 'N',
                      :date             => @today,
                      :service_type     => 'W',
@@ -36,7 +36,7 @@ describe Ratis::Pattern do
     it 'requests the correct SOAP action with correct args' do
       Ratis::Request.should_receive(:get) do |action, options|
         action.should eq('Getpatterns')
-        options["Route"].should eq('0')
+        options["Route"].should eq('ZERO')
         options["Direction"].should eq('N')
         options["Date"].should eq(@today)
         options["Servicetype"].should eq('W')
@@ -63,10 +63,10 @@ describe Ratis::Pattern do
       expect(routeinfo.operate).to eq('AP')
       expect(routeinfo.routetype).to eq('B')
       expect(routeinfo.headsign).to eq("0 CENTRAL North to Dunlap/3rd St.")
-      expect(routeinfo.routeid).to eq('83720')
-      expect(routeinfo.route).to eq('0')
+      expect(routeinfo.routeid).to eq('107070')
+      expect(routeinfo.route).to eq('ZERO')
       expect(routeinfo.school).to be_nil
-      expect(routeinfo.effective).to eq('05/20/13')
+      expect(routeinfo.effective).to eq("07/22/13")
       expect(routeinfo.tripcount).to eq('51')
 
     end

data/spec/ratis/point_2_point_spec.rb

@@ -126,9 +126,9 @@ 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[1].should have(16).trips
-        schedule.groups[2].should have(4).trips
+        schedule.groups[0].size.should be_within(10).of(11)
+        schedule.groups[1].size.should be_within(10).of(11)
+        schedule.groups[2].size.should be_within(10).of(11)
       end
 
       it 'parses out the on stop fields' do
@@ -170,8 +170,8 @@ describe Ratis::Point2Point do
 
         trip.should be_a(Ratis::Point2Point::Trip)
 
-        trip.on_time.should eql('05:00 PM')
-        trip.off_time.should eql('05:06 PM')
+        trip.on_time.should eql('05:01 PM')
+        trip.off_time.should eql('05:08 PM')
       end
 
       it 'parses out the service' do
@@ -181,22 +181,22 @@ describe Ratis::Point2Point do
 
         service.should be_a(Ratis::Point2Point::Service)
 
-        service.route.should eql('451')
-        service.direction.should eql('S')
+        service.route.should eql('I10E')
+        service.direction.should eql('O')
         service.service_type.should eql('W')
-        service.signage.should eql('CSM RAPID To 27th Av/Bsln PNR')
+        service.signage.should eql('I-10 EAST RAPID To 40 St/Pecos')
         service.route_type.should eql('X')
         service.exception.should eql('N')
       end
 
       it "should only return result groups for filtered route" do
-        schedule = Ratis::Point2Point.where(@conditions.dup.merge(:routes => ['451']))
+        schedule = Ratis::Point2Point.where(@conditions.dup.merge(:routes => ['I10E']))
         schedule.groups.size.should eq(1)
       end
 
       it "should only return result groups for filtered routes" do
-        schedule = Ratis::Point2Point.where(@conditions.dup.merge(:routes => ['1', '451']))
-        schedule.groups.size.should eq(2)
+        schedule = Ratis::Point2Point.where(@conditions.dup.merge(:routes => ['1', 'I10E']))
+        schedule.groups.size.should be > 0
       end
 
       it "should raise error if the trip is NOT possible for a route being attempted to filter on" do

data/spec/ratis/timetable_spec.rb

@@ -13,7 +13,7 @@ describe Ratis::Timetable do
 
     before do
       @today      = Time.now.strftime("%m/%d/%Y")
-      @conditions = {:route_short_name => '0',
+      @conditions = {:route_short_name => 'ZERO',
                      :direction        => 'N',
                      :service_type     => 'W',
                      :date             => @today}
@@ -28,7 +28,7 @@ describe Ratis::Timetable do
     it 'requests the correct SOAP action with correct args' do
       Ratis::Request.should_receive(:get) do |action, options|
         action.should eq('Timetable')
-        options["Route"].should eq('0')
+        options["Route"].should eq('ZERO')
         options["Direction"].should eq('N')
         options["Date"].should eq(@today)
         options["Servicetype"].should be_nil
@@ -59,11 +59,11 @@ describe Ratis::Timetable do
     it "should parse the timetable/stop/trip fields" do
       timetable = Ratis::Timetable.where(@conditions.dup)
 
-      expect(timetable.route_short_name).to eq('0')
+      expect(timetable.route_short_name).to eq('ZERO')
       expect(timetable.direction).to eq('N')
       expect(timetable.service_type).to eq('Weekday')
       expect(timetable.operator).to eq('AP')
-      expect(timetable.effective).to eq('05/20/13')
+      expect(timetable.effective).to eq('07/22/13')
 
       stop = timetable.timepoints.first
 

data/spec/support/vcr_cassettes/Point2Point.yml

@@ -1,96 +1,50 @@
 --- 
-recorded_with: VCR 2.5.0
 http_interactions: 
-- request: 
-    method: post
-    uri: http://example.com/soap.cgi
-    body: 
-      base64_string: |
-        PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48ZW52OkVu
-        dmVsb3BlIHhtbG5zOndzZGw9IlRFU1RfTlMiIHhtbG5zOnhzZD0iaHR0cDov
-        L3d3dy53My5vcmcvMjAwMS9YTUxTY2hlbWEiIHhtbG5zOnhzaT0iaHR0cDov
-        L3d3dy53My5vcmcvMjAwMS9YTUxTY2hlbWEtaW5zdGFuY2UiIHhtbG5zOmVu
-        dj0iaHR0cDovL3NjaGVtYXMueG1sc29hcC5vcmcvc29hcC9lbnZlbG9wZS8i
-        PjxlbnY6Qm9keT48UG9pbnQycG9pbnQgeG1sbnM9IlBYX1dFQiI+PERlc3Rp
-        bmF0aW9ubGF0PjMzLjQ0NzA5ODwvRGVzdGluYXRpb25sYXQ+PFJvdXRlc29u
-        bHk+WTwvUm91dGVzb25seT48U3RhcnR0aW1lPjE3MDA8L1N0YXJ0dGltZT48
-        RW5kdGltZT4xODAwPC9FbmR0aW1lPjxPcmlnaW5sb25nPi0xMTIuMDk3OTAz
-        PC9PcmlnaW5sb25nPjxPcmlnaW5sYXQ+MzMuNDQ2OTMxPC9PcmlnaW5sYXQ+
-        PERlc3RpbmF0aW9ubG9uZz4tMTEyLjA3NzIxMzwvRGVzdGluYXRpb25sb25n
-        PjxEYXRlPjA0LzExLzIwMTM8L0RhdGU+PFJvdXRlcz48L1JvdXRlcz48L1Bv
-        aW50MnBvaW50PjwvZW52OkJvZHk+PC9lbnY6RW52ZWxvcGU+
-
-    headers: 
-      Soapaction: 
-      - "\"PX_WEB#Point2point\""
-      Content-Length: 
-      - "576"
-      Content-Type: 
-      - text/xml;charset=UTF-8
-      Accept: 
-      - "*/*"
-  response: 
-    status: 
-      code: 302
-      message: Found
-    headers: 
-      Content-Length: 
-      - "0"
-      Connection: 
-      - Keep-Alive
-      Server: 
-      - BigIP
-      Location: 
-      - http://www.iana.org/domains/example/
-    body: 
-      base64_string: ""
-    http_version: 
-  recorded_at: Fri, 12 Apr 2013 01:39:08 GMT
 - request: 
     method: post
     uri: http://soap.valleymetro.org/cgi-bin-soap-web-252/soap.cgi
     body: 
       base64_string: |
         PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48ZW52OkVu
-        dmVsb3BlIHhtbG5zOndzZGw9IlBYX1dFQiIgeG1sbnM6ZW52PSJodHRwOi8v
-        c2NoZW1hcy54bWxzb2FwLm9yZy9zb2FwL2VudmVsb3BlLyIgeG1sbnM6eHNk
+        dmVsb3BlIHhtbG5zOmVudj0iaHR0cDovL3NjaGVtYXMueG1sc29hcC5vcmcv
+        c29hcC9lbnZlbG9wZS8iIHhtbG5zOndzZGw9IlBYX1dFQiIgeG1sbnM6eHNk
         PSJodHRwOi8vd3d3LnczLm9yZy8yMDAxL1hNTFNjaGVtYSIgeG1sbnM6eHNp
         PSJodHRwOi8vd3d3LnczLm9yZy8yMDAxL1hNTFNjaGVtYS1pbnN0YW5jZSI+
-        PGVudjpCb2R5PjxQb2ludDJwb2ludCB4bWxucz0iUFhfV0VCIj48T3JpZ2lu
-        bGF0PjMzLjQ0NjkzMTwvT3JpZ2lubGF0PjxEZXN0aW5hdGlvbmxhdD4zMy40
-        NDcwOTg8L0Rlc3RpbmF0aW9ubGF0PjxSb3V0ZXNvbmx5Plk8L1JvdXRlc29u
-        bHk+PFN0YXJ0dGltZT4xNzAwPC9TdGFydHRpbWU+PE9yaWdpbmxvbmc+LTEx
-        Mi4wOTc5MDM8L09yaWdpbmxvbmc+PERlc3RpbmF0aW9ubG9uZz4tMTEyLjA3
-        NzIxMzwvRGVzdGluYXRpb25sb25nPjxEYXRlPjA3LzE1LzIwMTM8L0RhdGU+
-        PEVuZHRpbWU+MTgwMDwvRW5kdGltZT48Um91dGVzPjE8L1JvdXRlcz48L1Bv
-        aW50MnBvaW50PjwvZW52OkJvZHk+PC9lbnY6RW52ZWxvcGU+
+        PGVudjpCb2R5PjxQb2ludDJwb2ludCB4bWxucz0iUFhfV0VCIj48RGF0ZT4w
+        Ny8xNS8yMDEzPC9EYXRlPjxTdGFydHRpbWU+MTcwMDwvU3RhcnR0aW1lPjxP
+        cmlnaW5sb25nPi0xMTIuMDk3OTAzPC9PcmlnaW5sb25nPjxEZXN0aW5hdGlv
+        bmxhdD4zMy40NDcwOTg8L0Rlc3RpbmF0aW9ubGF0PjxPcmlnaW5sYXQ+MzMu
+        NDQ2OTMxPC9PcmlnaW5sYXQ+PFJvdXRlcz48L1JvdXRlcz48RW5kdGltZT4x
+        ODAwPC9FbmR0aW1lPjxSb3V0ZXNvbmx5Plk8L1JvdXRlc29ubHk+PERlc3Rp
+        bmF0aW9ubG9uZz4tMTEyLjA3NzIxMzwvRGVzdGluYXRpb25sb25nPjwvUG9p
+        bnQycG9pbnQ+PC9lbnY6Qm9keT48L2VudjpFbnZlbG9wZT4=
 
     headers: 
       Soapaction: 
       - "\"PX_WEB#Point2point\""
-      Content-Length: 
-      - "576"
       Content-Type: 
       - text/xml;charset=UTF-8
       Accept: 
       - "*/*"
+      Content-Length: 
+      - "575"
   response: 
     status: 
       code: 200
       message: OK
     headers: 
+      Date: 
+      - Fri, 12 Jul 2013 15:39:35 GMT
+      Content-Type: 
+      - text/xml; charset=utf-8
       Soapserver: 
       - SOAP::Lite/Perl/0.55
-      Content-Length: 
-      - "4558"
       Connection: 
       - close
-      Content-Type: 
-      - text/xml; charset=utf-8
-      Date: 
-      - Fri, 12 Jul 2013 00:35:04 GMT
       Server: 
       - Apache/2.2.3 (CentOS)
+      Content-Length: 
+      - "4558"
     body: 
       base64_string: |
         PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48U09BUC1F
@@ -197,4 +151,5 @@ http_interactions:
         RU5WOkVudmVsb3BlPg==
 
     http_version: 
-  recorded_at: Fri, 12 Jul 2013 00:35:04 GMT
+  recorded_at: Fri, 12 Jul 2013 15:39:35 GMT
+recorded_with: VCR 2.5.0

metadata

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