ratis 3.2.1 → 3.3.0

data/Gemfile.lock

@@ -1,37 +1,38 @@
 PATH
   remote: .
   specs:
-    ratis (3.1.8)
+    ratis (3.3.0)
       savon (< 2.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.2.6)
-      i18n (~> 0.6)
+    activesupport (3.2.13)
+      i18n (= 0.6.1)
       multi_json (~> 1.0)
-    addressable (2.2.8)
+    addressable (2.3.5)
     akami (1.2.0)
       gyoku (>= 0.4.0)
       nokogiri (>= 1.4.0)
-    builder (3.2.0)
+    builder (3.2.2)
     chronic (0.9.1)
     columnize (0.3.6)
-    crack (0.3.1)
-    diff-lcs (1.2.3)
+    crack (0.4.0)
+      safe_yaml (~> 0.9.0)
+    diff-lcs (1.2.4)
     gyoku (0.4.6)
       builder (>= 2.1.2)
-    hashdiff (0.0.5)
+    hashdiff (0.0.6)
     httpi (1.1.1)
       rack
-    i18n (0.6.0)
+    i18n (0.6.1)
     linecache (0.46)
       rbx-require-relative (> 0.0.4)
-    multi_json (1.3.6)
-    nokogiri (1.5.9)
+    multi_json (1.7.7)
+    nokogiri (1.5.10)
     nori (1.1.5)
     rack (1.5.2)
-    rake (10.0.4)
+    rake (10.1.0)
     rbx-require-relative (0.0.9)
     redcarpet (2.1.1)
     rspec (2.13.0)
@@ -48,6 +49,7 @@ GEM
       ruby-debug-base (~> 0.10.4.0)
     ruby-debug-base (0.10.4)
       linecache (>= 0.3)
+    safe_yaml (0.9.4)
     savon (1.2.0)
       akami (~> 1.2.0)
       builder (>= 2.1.2)
@@ -56,34 +58,30 @@ GEM
       nokogiri (>= 1.4.0)
       nori (~> 1.1.0)
       wasabi (~> 2.5.0)
-    simplecov (0.6.4)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.5.3)
-    simplecov-html (0.5.3)
-    vcr (2.4.0)
+    vcr (2.5.0)
     wasabi (2.5.1)
       httpi (~> 1.0)
       nokogiri (>= 1.4.0)
-    webmock (1.8.7)
+    webmock (1.13.0)
       addressable (>= 2.2.7)
-      crack (>= 0.1.7)
-    yard (0.8.2.1)
+      crack (>= 0.3.2)
+    yard (0.8.6.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activesupport
+  activesupport (< 4.0)
   bundler (>= 1.0.0)
   chronic
   hashdiff
+  nokogiri (< 1.6.0)
   rake
   ratis!
-  redcarpet
+  redcarpet (~> 2.1.1)
   rspec (~> 2.13.0)
   rspec-instafail
   ruby-debug
-  simplecov
   vcr
   webmock
   yard

data/lib/ratis/point_2_point.rb

@@ -61,8 +61,6 @@ module Ratis
     end
 
     def self.parse_routes_only_no(response)
-      return nil unless response.success?
-
       atis_schedule = Point2Point::StandardResponse.new
 
       atis_schedule.groups = response.to_array(:point2point_response, :groups, :group).map do |group|
@@ -70,8 +68,8 @@ module Ratis
 
         # 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
-        atis_schedule_group.on_stop  = atis_stop_from_hash 'on', group[:onstop]
-        atis_schedule_group.off_stop = atis_stop_from_hash 'offstop', group[:offstop]
+        atis_schedule_group.on_stop  = atis_stop_from_hash('on', group[:onstop])
+        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          = Point2Point::Trip.new

data/lib/ratis/route.rb

@@ -1,23 +1,7 @@
 module Ratis
-
   class Route
-
     attr_accessor :short_name, :directions
 
-    def self.all
-      response = Request.get 'Allroutes'
-      return [] unless response.success?
-
-      routes = response.to_hash[:allroutes_response][:routes].split(/\n/)
-      atis_routes = routes.map do |r|
-        r.strip!
-        next if r.blank?
-        r = r.split(/,/)
-        Route.new r[0].strip, r[1..-1].map(&:strip)
-      end
-      atis_routes.compact
-    end
-
     def initialize(short_name, directions)
       self.short_name = short_name
       self.directions = directions
@@ -28,4 +12,26 @@ module Ratis
     end
   end
 
+  class Routes
+    def self.all
+      response = Request.get 'Allroutes2'
+
+      return [] unless response.success?
+
+      # {:hexcolor=>"0", :route=>"0", :operator=>"AP", :description=>"0 - route", :publicroute=>"0", :hasrealtime=>"Y", :direction=>"*", :operatorname=>"VEOLIA-PHOENIX", :color=>"#000000"}
+      routes = {}
+      response.to_hash[:allroutes2_response][:routes][:item].each do |item|
+        if routes.has_key? item[:route]
+          routes[item[:route]] << item
+        else
+          routes[item[:route]] = [item]
+        end
+      end
+
+      routes.map do |short_name, _routes|
+        directions = _routes.map{|rte| rte[:direction] }.reject{|dir| dir == '*' }
+        Route.new(short_name, directions)
+      end.compact.sort_by{|rte| rte.short_name }
+    end
+  end
 end

data/lib/ratis/routes.rb

@@ -0,0 +1,25 @@
+module Ratis
+  class Routes
+    def self.all
+      response = Request.get 'Allroutes2'
+
+      return [] unless response.success?
+
+      # {:hexcolor=>"0", :route=>"0", :operator=>"AP", :description=>"0 - route", :publicroute=>"0", :hasrealtime=>"Y", :direction=>"*", :operatorname=>"VEOLIA-PHOENIX", :color=>"#000000"}
+      routes = {}
+      response.to_hash[:allroutes2_response][:routes][:item].each do |item|
+        if routes.has_key? item[:route]
+          routes[item[:route]] << item
+        else
+          routes[item[:route]] = [item]
+        end
+      end
+
+      routes.map do |short_name, _routes|
+        directions = _routes.map{|rte| rte[:direction] }.reject{|dir| dir == '*' }
+        Route.new(short_name, directions)
+      end.compact.sort_by{|rte| rte.short_name }
+    end
+  end
+
+end

data/lib/ratis/version.rb

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

data/ratis.gemspec

@@ -16,16 +16,17 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'savon', '<2.0'
 
-  s.add_development_dependency 'activesupport'
+  s.add_development_dependency 'activesupport', '< 4.0'
   s.add_development_dependency 'bundler', '>= 1.0.0'
   s.add_development_dependency 'chronic'
   s.add_development_dependency 'hashdiff'
   s.add_development_dependency 'rake'
-  s.add_development_dependency 'redcarpet'
+  s.add_development_dependency 'redcarpet', '~> 2.1.1'
   s.add_development_dependency 'rspec', '~> 2.13.0'
   s.add_development_dependency 'rspec-instafail'
   s.add_development_dependency 'ruby-debug'
-  s.add_development_dependency 'simplecov'
+  s.add_development_dependency 'nokogiri', '< 1.6.0'
+  # s.add_development_dependency 'simplecov'
   s.add_development_dependency 'vcr'
   s.add_development_dependency 'webmock'
   s.add_development_dependency 'yard'

data/spec/ratis/next_bus_spec.rb

@@ -188,7 +188,7 @@ describe Ratis::NextBus do
         expect(service.direction).to eq('W')
         expect(service.servicetype).to eq('W')
         expect(service.route).to eq('108')
-        expect(service.operator).to eq('AT')
+        expect(service.operator).to eq('FTE')
 
         service = response.services.last
         expect(service).to be_a(OpenStruct)
@@ -200,7 +200,7 @@ describe Ratis::NextBus do
         expect(service.direction).to eq('W')
         expect(service.servicetype).to eq('W')
         expect(service.route).to eq('108')
-        expect(service.operator).to eq('AT')
+        expect(service.operator).to eq('FTE')
       end
 
       it "should raise error if datetime condition is not a DateTime or Time" do

data/spec/ratis/point_2_point_spec.rb

@@ -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(15).trips
+        schedule.groups[0].should have(18).trips
         schedule.groups[1].should have(16).trips
         schedule.groups[2].should have(4).trips
       end

data/spec/ratis/route_spec.rb

@@ -4,72 +4,21 @@ describe Ratis::Route do
   before do
     Ratis.reset
     Ratis.configure do |config|
-      config.endpoint  = 'http://example.com/soap.cgi'
-      config.namespace = 'TEST_NS'
+      config.endpoint   = 'http://soap.valleymetro.org/cgi-bin-soap-web-262/soap.cgi'
+      config.namespace  = 'PX_WEB'
     end
   end
 
-  describe '#all' do
 
-    before do
-      stub_atis_request.to_return( atis_response 'Allroutes', '1.5', '0', <<-BODY )
-        <Routes>
-          0, N, S
-          1, E, W
-        </Routes>
-      BODY
-
-      @all_routes = Ratis::Route.all
-    end
-
-    it 'only makes one request' do
-      an_atis_request.should have_been_made.times 1
+  describe '#initialize' do
+    it "description" do
+      pending
     end
-
-    it 'gets all routes' do
-      @all_routes.should have(2).items
-    end
-
-    it 'gets all route directions' do
-      @all_routes.each do |route|
-        route.should have(2).directions
-      end
-    end
-
   end
 
   describe '#timetable' do
-
-    let(:route) { Ratis::Route.new '0', ['N', 'S'] }
-
-    before do
-      resp = atis_response_timetable({ :route => '0', :direction => 'N', :service_type => 'W', :operator => 'OP', :effective => '01/15/12' })
-      stub_atis_request.to_return( atis_response 'Timetable', '1.1', '0', resp)
-
-      @timetable = route.timetable :direction => 'N', :service_type => 'W'
+    it "description" do
+      pending
     end
-
-    it 'only makes one request' do
-      an_atis_request.should have_been_made.times 1
-    end
-
-    it 'assigns settings correctly' do
-      @timetable.should_not be_nil
-
-      @timetable.route_short_name.should eql '0'
-      @timetable.direction.should eql 'N'
-      @timetable.service_type.should eql 'W'
-      @timetable.operator.should eql 'OP'
-      @timetable.effective.should eql '01/15/12'
-    end
-
   end
-
-  it 'should initialize' do
-    route = Ratis::Route.new '123', ['N', 'S']
-
-    route.short_name.should eql '123'
-    route.directions.should eql ['N', 'S']
-  end
-
-end
+end

data/spec/ratis/routes_spec.rb

@@ -0,0 +1,54 @@
+require 'spec_helper'
+
+describe Ratis::Routes 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){ {:allroutes2_response => {:routes => []}} }
+
+  describe '#all' do
+    it 'returns all routes' do
+      response = Ratis::Routes.all
+      expect(response).to have(111).items
+      expect(response.all?{|rte| rte.is_a?(Ratis::Route) }).to be_true
+    end
+
+    it 'only makes one request' do
+      Ratis::Request.should_receive(:get).once.and_call_original
+      Ratis::Routes.all
+    end
+
+    it 'requests the correct SOAP action' do
+      Ratis::Request.should_receive(:get) do |action, options|
+                       action.should eq('Allroutes2')
+                     end.and_return(double('response', :success? => false, :body => empty_body)) # false only to stop further running
+
+      Ratis::Routes.all
+    end
+
+    it 'should set directions and short_name to variables' do
+      response = Ratis::Routes.all
+      route    = response.first
+
+      expect(response).to be_a(Array)
+      expect(route).to be_a(Ratis::Route)
+      expect(route.short_name).to eq('0')
+      expect(route.directions).to have(2).directions
+      expect(route.directions).to include('N')
+      expect(route.directions).to include('S')
+    end
+
+  end
+
+  describe '#timetable' do
+    it "description" do
+      pending
+    end
+  end
+
+end

data/spec/spec_helper.rb

@@ -1,5 +1,5 @@
-require 'simplecov'
-SimpleCov.start
+# require 'simplecov'
+# SimpleCov.start
 
 project_root = File.expand_path(File.dirname(__FILE__) + "/..")
 $LOAD_PATH << "#{project_root}/lib"
@@ -12,6 +12,7 @@ require 'ratis'
 require 'vcr'
 require 'chronic'
 
+# Dir[("#{project_root}/lib/ratis/**/*.rb")].each { |f| require f }
 Dir[("#{project_root}/spec/support/**/*.rb")].each { |f| require f }
 
 RSpec.configure do |config|

data/spec/support/vcr_cassettes/Point2Point.yml

@@ -1,4 +1,5 @@
 --- 
+recorded_with: VCR 2.5.0
 http_interactions: 
 - request: 
     method: post
@@ -20,12 +21,12 @@ http_interactions:
         aW50MnBvaW50PjwvZW52OkJvZHk+PC9lbnY6RW52ZWxvcGU+
 
     headers: 
-      Content-Type: 
-      - text/xml;charset=UTF-8
-      Content-Length: 
-      - "576"
       Soapaction: 
       - "\"PX_WEB#Point2point\""
+      Content-Length: 
+      - "576"
+      Content-Type: 
+      - text/xml;charset=UTF-8
       Accept: 
       - "*/*"
   response: 
@@ -35,12 +36,12 @@ http_interactions:
     headers: 
       Content-Length: 
       - "0"
-      Location: 
-      - http://www.iana.org/domains/example/
       Connection: 
       - Keep-Alive
       Server: 
       - BigIP
+      Location: 
+      - http://www.iana.org/domains/example/
     body: 
       base64_string: ""
     http_version: 
@@ -51,26 +52,26 @@ http_interactions:
     body: 
       base64_string: |
         PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48ZW52OkVu
-        dmVsb3BlIHhtbG5zOnhzZD0iaHR0cDovL3d3dy53My5vcmcvMjAwMS9YTUxT
-        Y2hlbWEiIHhtbG5zOnhzaT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS9YTUxT
-        Y2hlbWEtaW5zdGFuY2UiIHhtbG5zOndzZGw9IlBYX1dFQiIgeG1sbnM6ZW52
-        PSJodHRwOi8vc2NoZW1hcy54bWxzb2FwLm9yZy9zb2FwL2VudmVsb3BlLyI+
-        PGVudjpCb2R5PjxQb2ludDJwb2ludCB4bWxucz0iUFhfV0VCIj48RW5kdGlt
-        ZT4xODAwPC9FbmR0aW1lPjxEYXRlPjA2LzE3LzIwMTM8L0RhdGU+PE9yaWdp
-        bmxhdD4zMy40NDY5MzE8L09yaWdpbmxhdD48T3JpZ2lubG9uZz4tMTEyLjA5
-        NzkwMzwvT3JpZ2lubG9uZz48U3RhcnR0aW1lPjE3MDA8L1N0YXJ0dGltZT48
-        RGVzdGluYXRpb25sYXQ+MzMuNDQ3MDk4PC9EZXN0aW5hdGlvbmxhdD48Um91
-        dGVzb25seT5ZPC9Sb3V0ZXNvbmx5PjxSb3V0ZXM+MTwvUm91dGVzPjxEZXN0
-        aW5hdGlvbmxvbmc+LTExMi4wNzcyMTM8L0Rlc3RpbmF0aW9ubG9uZz48L1Bv
+        dmVsb3BlIHhtbG5zOndzZGw9IlBYX1dFQiIgeG1sbnM6ZW52PSJodHRwOi8v
+        c2NoZW1hcy54bWxzb2FwLm9yZy9zb2FwL2VudmVsb3BlLyIgeG1sbnM6eHNk
+        PSJodHRwOi8vd3d3LnczLm9yZy8yMDAxL1hNTFNjaGVtYSIgeG1sbnM6eHNp
+        PSJodHRwOi8vd3d3LnczLm9yZy8yMDAxL1hNTFNjaGVtYS1pbnN0YW5jZSI+
+        PGVudjpCb2R5PjxQb2ludDJwb2ludCB4bWxucz0iUFhfV0VCIj48T3JpZ2lu
+        bGF0PjMzLjQ0NjkzMTwvT3JpZ2lubGF0PjxEZXN0aW5hdGlvbmxhdD4zMy40
+        NDcwOTg8L0Rlc3RpbmF0aW9ubGF0PjxSb3V0ZXNvbmx5Plk8L1JvdXRlc29u
+        bHk+PFN0YXJ0dGltZT4xNzAwPC9TdGFydHRpbWU+PE9yaWdpbmxvbmc+LTEx
+        Mi4wOTc5MDM8L09yaWdpbmxvbmc+PERlc3RpbmF0aW9ubG9uZz4tMTEyLjA3
+        NzIxMzwvRGVzdGluYXRpb25sb25nPjxEYXRlPjA3LzE1LzIwMTM8L0RhdGU+
+        PEVuZHRpbWU+MTgwMDwvRW5kdGltZT48Um91dGVzPjE8L1JvdXRlcz48L1Bv
         aW50MnBvaW50PjwvZW52OkJvZHk+PC9lbnY6RW52ZWxvcGU+
 
     headers: 
-      Content-Type: 
-      - text/xml;charset=UTF-8
       Soapaction: 
       - "\"PX_WEB#Point2point\""
       Content-Length: 
       - "576"
+      Content-Type: 
+      - text/xml;charset=UTF-8
       Accept: 
       - "*/*"
   response: 
@@ -78,18 +79,18 @@ http_interactions:
       code: 200
       message: OK
     headers: 
-      Content-Type: 
-      - text/xml; charset=utf-8
-      Date: 
-      - Fri, 14 Jun 2013 17:03:34 GMT
+      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)
-      Soapserver: 
-      - SOAP::Lite/Perl/0.55
     body: 
       base64_string: |
         PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48U09BUC1F
@@ -196,5 +197,4 @@ http_interactions:
         RU5WOkVudmVsb3BlPg==
 
     http_version: 
-  recorded_at: Fri, 14 Jun 2013 17:03:34 GMT
-recorded_with: VCR 2.4.0
+  recorded_at: Fri, 12 Jul 2013 00:35:04 GMT

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ratis
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 3
-  - 2
-  - 1
-  version: 3.2.1
+  - 3
+  - 0
+  version: 3.3.0
 platform: ruby
 authors: 
 - Burst Software
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-06-22 00:00:00 Z
+date: 2013-07-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: savon
@@ -38,12 +38,13 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - <
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 27
         segments: 
+        - 4
         - 0
-        version: "0"
+        version: "4.0"
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -110,12 +111,14 @@ dependencies:
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 9
         segments: 
-        - 0
-        version: "0"
+        - 2
+        - 1
+        - 1
+        version: 2.1.1
   type: :development
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
@@ -163,17 +166,19 @@ dependencies:
   type: :development
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  name: simplecov
+  name: nokogiri
   prerelease: false
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - <
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 15
         segments: 
+        - 1
+        - 6
         - 0
-        version: "0"
+        version: 1.6.0
   type: :development
   version_requirements: *id011
 - !ruby/object:Gem::Dependency 
@@ -263,6 +268,7 @@ files:
 - lib/ratis/route_pattern/stop.rb
 - lib/ratis/route_stops.rb
 - lib/ratis/route_stops/stop.rb
+- lib/ratis/routes.rb
 - lib/ratis/schedule_nearby.rb
 - lib/ratis/stop.rb
 - lib/ratis/timetable.rb
@@ -287,6 +293,7 @@ files:
 - spec/ratis/route_pattern_spec.rb
 - spec/ratis/route_spec.rb
 - spec/ratis/route_stops_spec.rb
+- spec/ratis/routes_spec.rb
 - spec/ratis/schedule_nearby_spec.rb
 - spec/ratis/timetable_spec.rb
 - spec/ratis/walk_spec.rb