ratis 3.4.3 → 3.5.0

data/spec/ratis/next_bus2_spec.rb

@@ -1,15 +1,7 @@
 require 'spec_helper'
 
 describe Ratis::NextBus2 do
-  before do
-    Ratis.reset
-    Ratis.configure do |config|
-      config.endpoint   = 'http://soap.valleymetro.org/cgi-bin-soap-web-262/soap.cgi'
-      config.namespace  = 'PX_WEB'
-    end
-  end
-
-  let(:empty_body){ {:nextbus_response => {:atstop => {:service => []}}} }
+  let(:empty_body) { {:nextbus_response => {:atstop => {:service => []}}} }
 
   describe '#where', vcr: {} do
     before do
@@ -17,8 +9,7 @@ describe Ratis::NextBus2 do
       # a short string that can be used to separate requests from different applications or different modules with
       # Optional (highly recommended)
       @stop_id = 10040
-      @conditions = {:stop_id      => @stop_id,
-                     :app_id       => 'ratis-specs'}
+      @conditions = { :stop_id => @stop_id }
     end
 
     describe "Developer can find a late bus to a stop" do
@@ -32,10 +23,9 @@ describe Ratis::NextBus2 do
           # expect(response.runs).to_not be_empty
 
           response.runs.each do |run|
-            if run[:realtime][:valid] != 'N'
-              pp run[:realtime]
-            end
+            pp run[:realtime] if run[:realtime][:valid] != 'N'
           end
+        end
       end
     end
 
@@ -48,10 +38,9 @@ describe Ratis::NextBus2 do
 
       it 'requests the correct SOAP action with args' do
         Ratis::Request.should_receive(:get) do |action, options|
-                       action.should eq('Nextbus2')
-                       options["Stopid"].should eq(@stop_id)
-
-                     end.and_return(double('response', :success? => false, :body => empty_body)) # false only to stop further running
+          action.should eq('Nextbus2')
+          options["Stopid"].should eq(@stop_id)
+        end.and_return(double('response', :success? => false, :body => empty_body)) # false only to stop further running
 
         Ratis::NextBus2.where(@conditions.dup)
       end
@@ -71,9 +60,8 @@ describe Ratis::NextBus2 do
 
       it 'requests the correct SOAP action' do
         response = Ratis::NextBus2.where(@conditions.dup.merge(:stop_id => @stop_id))
-          expect(response.stops).to_not be_empty
-          expect(response.runs).to_not be_empty
-        end
+        expect(response.stops).to_not be_empty
+        expect(response.runs).to_not be_empty
       end
 
       it "should raise error when no stop id provided" do
@@ -81,72 +69,70 @@ describe Ratis::NextBus2 do
           Ratis::NextBus2.where(@conditions.dup.merge(:stop_id => nil))
         }.should raise_error(ArgumentError, 'You must provide a stop ID')
       end
+    end
 
-      describe 'stops' do
-        # TODO: should return Stops not hashes
-        it 'should set the stop values to instance vars' do
-          response = Ratis::NextBus2.where(@conditions.dup)
-          stop     = response.stops.first
-
-          expect(response).to be_a(Ratis::NextBus2)
-          expect(response.stops).to be_a(Array)
-
-          expect(stop[:area]).to eq("Phoenix")
-          expect(stop[:atisstopid]).to eq("6124")
-          expect(stop[:stopposition]).to eq("Y")
-          expect(stop[:description]).to eq("VAN BUREN ST & 16TH ST")
-          expect(stop[:stopstatustype]).to eq("N")
-          expect(stop[:lat]).to eq("33.451493")
-          expect(stop[:long]).to eq("-112.048207")
-          expect(stop[:side]).to eq("Far")
-          expect(stop[:stopid]).to eq("10040")
-          expect(stop[:heading]).to eq("WB")
-        end
-
-        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('Nextbus2')
-                           options["Stopid"].should eq(@stop_id)
+    describe 'stops' do
+      # TODO: should return Stops not hashes
+      it 'should set the stop values to instance vars' do
+        response = Ratis::NextBus2.where(@conditions.dup)
+        stop     = response.stops.first
+
+        expect(response).to be_a(Ratis::NextBus2)
+        expect(response.stops).to be_a(Array)
+
+        expect(stop[:area]).to eq("Phoenix")
+        expect(stop[:atisstopid]).to eq("6124")
+        expect(stop[:stopposition]).to eq("Y")
+        expect(stop[:description]).to eq("VAN BUREN ST & 16TH ST")
+        expect(stop[:stopstatustype]).to eq("N")
+        expect(stop[:lat]).to eq("33.451493")
+        expect(stop[:long]).to eq("-112.048207")
+        expect(stop[:side]).to eq("Far")
+        expect(stop[:stopid]).to eq("10040")
+        expect(stop[:heading]).to eq("WB")
+      end
 
-                         end.and_return(double('response', :success? => false, :body => empty_body)) # false only to stop further running
+      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('Nextbus2')
+          options["Stopid"].should eq(@stop_id)
+        end.and_return(double('response', :success? => false, :body => empty_body)) # false only to stop further running
 
-          response = Ratis::NextBus2.where(@conditions.dup)
-          expect(response).to be_a(Array)
-          expect(response).to be_empty
-        end
+        response = Ratis::NextBus2.where(@conditions.dup)
+        expect(response).to be_a(Array)
+        expect(response).to be_empty
       end
+    end
 
-      describe 'runs' do
-        # TODO: should return Runs not hashes
-        it "should set the run values to instance vars" do
-          response = Ratis::NextBus2.where(@conditions.dup)
-          run     = response.runs.first
-
-          expect(response).to be_a(Ratis::NextBus2)
-          expect(response.runs).to be_a(Array)
-
-          expect(run[:operator]).to eq "FT"
-          expect(run[:status]).to eq "D"
-          expect(run[:sign]).to eq "3 Van Buren To 75th Avenue"
-          expect(run[:triptime]).to_not be_nil #eq "12:29 PM"
-          expect(run[:triptime]).to_not be_empty
-          # expect(run.realtime=>{:valid=>nil, :estimatedminutes=>nil, :polltime=>nil, :lat=>nil, :trend=>nil, :vehicleid=>nil, :speed=>nil, :adherence=>nil, :long=>nil, :reliable=>nil, :estimatedtime=>"12:09 PM", :stopped=>nil}
-          expect(run[:exception]).to eq("N")
-          expect(run[:tripid]).to eq "11221-5"
-          expect(run[:routetype]).to eq "B"
-          expect(run[:skedtripid]).to be_nil
-          expect(run[:stopid]).to eq "10040"
-          expect(run[:servicetype]).to eq "W"
-          expect(run[:adherence]).to eq('16')
-          expect(run[:atisstopid]).to eq "6124"
-          # expect(run[:block]).to eq "5"
-          expect(run[:route]).to eq "3"
-          expect(run[:estimatedtime]).to_not be_nil
-          expect(run[:estimatedtime]).to_not be_empty
-          expect(run[:direction]).to eq "W"
-        end
+    describe 'runs' do
+      # TODO: should return Runs not hashes
+      it "should set the run values to instance vars" do
+        response = Ratis::NextBus2.where(@conditions.dup)
+        run     = response.runs.first
+
+        expect(response).to be_a(Ratis::NextBus2)
+        expect(response.runs).to be_a(Array)
+
+        expect(run[:operator]).to eq "FT"
+        expect(run[:status]).to eq "N"
+        expect(run[:sign]).to eq "3 VAN BUREN West to 51st Ave."
+        expect(run[:triptime]).to_not be_nil #eq "12:29 PM"
+        expect(run[:triptime]).to_not be_empty
+        # expect(run.realtime=>{:valid=>nil, :estimatedminutes=>nil, :polltime=>nil, :lat=>nil, :trend=>nil, :vehicleid=>nil, :speed=>nil, :adherence=>nil, :long=>nil, :reliable=>nil, :estimatedtime=>"12:09 PM", :stopped=>nil}
+        expect(run[:exception]).to eq("N")
+        expect(run[:tripid]).to eq "15765-9"
+        expect(run[:routetype]).to eq "B"
+        expect(run[:skedtripid]).to be_nil
+        expect(run[:stopid]).to eq "10040"
+        expect(run[:servicetype]).to eq "W"
+        expect(run[:adherence]).to eq('3')
+        expect(run[:atisstopid]).to eq "6124"
+        # expect(run[:block]).to eq "5"
+        expect(run[:route]).to eq "3"
+        expect(run[:estimatedtime]).to_not be_nil
+        expect(run[:estimatedtime]).to_not be_empty
+        expect(run[:direction]).to eq "W"
       end
-
     end
   end
 

data/spec/ratis/next_bus_spec.rb

@@ -1,24 +1,14 @@
 require 'spec_helper'
 
 describe Ratis::NextBus do
-  before do
-    Ratis.reset
-    Ratis.configure do |config|
-      config.endpoint   = 'http://soap.valleymetro.org/cgi-bin-soap-web-262/soap.cgi'
-      config.namespace  = 'PX_WEB'
-    end
-
-    @time    = Chronic.parse('next monday at 6am')
-  end
-
-  let(:empty_body){ {:nextbus_response => {:atstop => {:service => []}}} }
+  let(:empty_body) { {:nextbus_response => {:atstop => {:service => []}}} }
+  let(:time)       { Chronic.parse('next monday at 6am') }
 
   describe "Developer can find a late bus to a stop" do
     it "will give developer happiness :-)" do
       pending
-      @conditions = {:app_id       => 'ratis-specs', # a short string that can be used to separate requests from different applications or different modules with
-                     :type         => 'N',
-                     :datetime     => Chronic.parse('now') }
+      @conditions = {:type     => 'N',
+                     :datetime => Chronic.parse('now') }
 
       require 'pp'
       10000.upto(10100).each do |id|
@@ -53,15 +43,14 @@ describe Ratis::NextBus do
     describe 'time formatting' do
       it 'should make requests with 24 hour time format' do
         @stop_id    = 10050
-        @time       = Chronic.parse('tomorrow at 3pm')
+        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 }
+                       :datetime     => time }
 
         Ratis::Request.should_receive(:get) do |action, options|
                          action.should eq('Nextbus')
-                         options["Time"].should eq(@time.strftime("%H%M"))
+                         options["Time"].should eq(time.strftime("%H%M"))
 
                        end.and_return(double('response', :success? => false, :body => empty_body)) # false only to stop further running
 
@@ -73,9 +62,8 @@ describe Ratis::NextBus do
       before do
         @stop_id = 10050
         @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 }
+                       :datetime     => time }
 
       end
 
@@ -97,9 +85,8 @@ describe Ratis::NextBus do
         Ratis::Request.should_receive(:get) do |action, options|
                          action.should eq('Nextbus')
                          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("%H%M"))
+                         options["Date"].should eq(time.strftime("%m/%d/%Y"))
+                         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
@@ -113,7 +100,7 @@ describe Ratis::NextBus do
         expect(response).to be_a(Ratis::NextBus)
         expect(response.services).to be_a(Array)
 
-        expect(service.status).to eq('D')
+        expect(service.status).to eq('N')
         expect(service.sign).to eq('0 CENTRAL North to Dunlap/3rd St.')
         expect(service.routetype).to eq('B')
         expect(service.times).to eq("05:49 AM, 06:09 AM, 06:29 AM, 06:49 AM")
@@ -147,9 +134,8 @@ describe Ratis::NextBus do
         Ratis::Request.should_receive(:get) do |action, options|
                          action.should eq('Nextbus')
                          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("%H%M"))
+                         options["Date"].should eq(time.strftime("%m/%d/%Y"))
+                         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
@@ -163,7 +149,6 @@ describe Ratis::NextBus 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',
                        :datetime     => @time }
       end
@@ -186,7 +171,6 @@ describe Ratis::NextBus do
         Ratis::Request.should_receive(:get) do |action, options|
                          action.should eq('Nextbus')
                          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("%H%M"))
                          options["Type"].should eq('N')
@@ -248,14 +232,13 @@ 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("%H%M") )
-                        options["Type"].should eq("N")
-                        options["Stopid"].should eq(@stop_id)
-                        options["Date"].should eq(@time.strftime("%m/%d/%Y") )
-                        options["Appid"].should eq("ratis-specs")
-
-                      end.and_return(double('response', :success? => false, :body => empty_body))
+          action.should eq('Nextbus')
+          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") )
+
+        end.and_return(double('response', :success? => false, :body => empty_body))
 
         expect(Ratis::NextBus.where(@conditions.dup).services).to be_empty
       end

data/spec/ratis/pattern_spec.rb

@@ -1,14 +1,6 @@
 require 'spec_helper'
 
 describe Ratis::Pattern do
-  before do
-    Ratis.reset
-    Ratis.configure do |config|
-      config.endpoint   = 'http://soap.valleymetro.org/cgi-bin-soap-web-262/soap.cgi'
-      config.namespace  = 'PX_WEB'
-    end
-  end
-
   describe '#all', vcr: {} do
 
     before do
@@ -63,10 +55,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('123130')
+      expect(routeinfo.routeid).to eq('168930')
       expect(routeinfo.route).to eq('ZERO')
       expect(routeinfo.school).to be_nil
-      expect(routeinfo.effective).to eq("10/28/13")
+      expect(routeinfo.effective).to eq("04/28/14")
       expect(routeinfo.tripcount).to eq('51')
 
     end

data/spec/ratis/plantrip_spec.rb

@@ -2,12 +2,6 @@ require 'spec_helper'
 
 describe Ratis::Plantrip do
   before do
-    Ratis.reset
-    Ratis.configure do |config|
-      config.endpoint   = 'http://soap.valleymetro.org/cgi-bin-soap-web-262/soap.cgi'
-      config.namespace  = 'PX_WEB'
-    end
-
     @datetime    = Chronic.parse('next monday at 6am')
   end
 
@@ -33,7 +27,6 @@ describe Ratis::Plantrip do
     it 'requests the correct SOAP action' do
       Ratis::Request.should_receive(:get) do |action, options|
                        action.should eq('Plantrip')
-                       options["Appid"].should eq('ratis-gem')
                        options["Date"].should eq(@datetime.strftime("%m/%d/%Y"))
                        options["Time"].should eq(@datetime.strftime("%H%M"))
                        options["Minimize"].should eq('T')
@@ -64,23 +57,31 @@ describe Ratis::Plantrip do
       expect(plantrip.walkadjust).to eq(nil)
 
       input = {
-        :accessible            => "N",
-        :arrdep                => "D",
-        :date                  => "01/13/2014",
-        :destinationlandmarkid => "0",
-        :destinationlat        => "33.446347",
-        :destinationlong       => "-112.068689",
-        :destinationtext       => "Destination",
-        :minimize              => "T",
-        :originlandmarkid      => "0",
         :originlat             => "33.452082",
         :originlong            => "-112.074374",
+        :originlandmarkid      => "0",
         :origintext            => "Origin",
+        :destinationlat        => "33.446347",
+        :destinationlong       => "-112.068689",
+        :destinationlandmarkid => "0",
+        :destinationtext       => "Destination",
+        :date                  => "06/16/2014",
         :time                  => "06:00 AM",
-        :walkdestination       => "0.50",
+        :minimize              => "T",
+        :accessible            => "N",
+        :arrdep                => "D",
+        :maxtransfers          => "-1",
+        :maxanswers            => "3",
+        :lessttime             => "N",
+        :maxinitialwait        => "-1",
+        :maxtriptime           => "-1",
+        :walkspeed             => " 2.00 ",
         :walkdist              => "0.50",
         :walkorigin            => "0.50",
-        :walkspeed             => " 2.00 "
+        :walkdestination       => "0.50",
+        :walkincrease          => "N",
+        :allows2s              => "N",
+        :xmode                 => "BCFKLRSTX"
       }
 
       HashDiff.diff(plantrip.input, input).should eql []

data/spec/ratis/point_2_point_spec.rb

@@ -1,14 +1,6 @@
 require 'spec_helper'
 
 describe Ratis::Point2Point do
-  before do
-    Ratis.reset
-    Ratis.configure do |config|
-      config.endpoint   = 'http://soap.valleymetro.org/cgi-bin-soap-web-262/soap.cgi'
-      config.namespace  = 'PX_WEB'
-    end
-  end
-
   describe 'Routesonly => Y' do
     describe '#where', vcr: {} do
       describe 'services from origin to destination' do
@@ -142,7 +134,7 @@ describe Ratis::Point2Point do
         on_stop.latitude.should eql(33.4469)
         on_stop.longitude.should eql(-112.097897)
         on_stop.atis_stop_id.should eql(9469)
-        on_stop.walk_dist.should eql(0.013)
+        on_stop.walk_dist.should eql(0.0)
         on_stop.walk_dir.should eql('S')
         on_stop.walk_hint.should eql('N')
       end
@@ -154,11 +146,11 @@ describe Ratis::Point2Point do
 
         off_stop.should be_a(Ratis::Point2Point::Stop)
 
-        off_stop.description.should eql('JEFFERSON ST & 3RD AVE')
+        off_stop.description.should eql('JEFFERSON ST & 18TH AVE')
         off_stop.latitude.should eql(33.447029)
         off_stop.longitude.should eql(-112.077181)
         off_stop.atis_stop_id.should eql(1463)
-        off_stop.walk_dist.should eql(0.014)
+        off_stop.walk_dist.should eql(0.0)
         off_stop.walk_dir.should eql('SE')
         off_stop.walk_hint.should eql('N')
       end

data/spec/ratis/request_spec.rb

@@ -1,14 +1,6 @@
 require 'spec_helper'
 
 describe Ratis::Request do
-  before do
-    Ratis.reset
-    Ratis.configure do |config|
-      config.endpoint   = 'http://soap.valleymetro.org/cgi-bin-soap-web-262/soap.cgi'
-      config.namespace  = 'PX_WEB'
-    end
-  end
-
   context 'new Requests get config from Ratis.configure block' do
     it 'gets config from initializing' do
       pending
@@ -19,11 +11,8 @@ describe Ratis::Request do
 
   context 'configured incorrectly' do
     context 'without Ratis.configure being called' do
-      before do
-        Ratis.reset
-      end
-
       it 'raises an exception when initialized before configuring' do
+        expect(Ratis.config).to receive(:valid?).at_least(:once) { false }
         expect do
           Ratis::Request.get 'SomeAction'
         end.to raise_error Ratis::Errors::ConfigError, 'It appears that Ratis.configure has not been called or properly setup'
@@ -34,14 +23,6 @@ end
 
 describe Ratis::Request do
   describe '#get' do
-    before do
-      Ratis.reset
-      Ratis.configure do |config|
-        config.endpoint   = 'http://soap.valleymetro.org/cgi-bin-soap-web-262/soap.cgi'
-        config.namespace  = 'PX_WEB'
-      end
-    end
-
     describe 'with no parameters' do
       it 'only makes one request with the correct SOAP action' do