ratis 3.0.0 → 3.1.0

data/lib/ratis/next_bus.rb

@@ -2,58 +2,50 @@ module Ratis
 
   class NextBus
 
-    attr_accessor :stops, :runs
-
-    # Initializes a NextBus object with stops and runs.
-    # @return     [NextBus]
-    #
-    # == Parameters:
-    #
-    # [stops]    <em>Optional</em> - 
-    #            An array of stops. Defaults to empty array.
-    # [runs]     <em>Optional</em> - 
-    #            An array of runs. Defaults to empty array.
-
-    def initialize(_stops = [], _runs = [])
-      @stops, @runs = _stops, _runs
-    end
+    attr_accessor :runs, :status, :sign, :routetype, :times, :direction
+
+    def initialize(service, _runs = [])
+      @runs      = _runs
 
-    # Returns results of NextBus query containing arrays of stops and runs.
-    # @return     [NextBus] containing next buses.
-    #
-    # == Parameters:
-    #
-    # Takes hash of conditions
-    #
-    # [option1]      <b>Required</b> - 
-    #                Description of required param
-    # [option2]      <em>Optional</em> - 
-    #                Description of optional param
-    # [option3]      <em>Optional</em> - 
-    #                Description of optional param
-    # [option4]      <em>Optional</em> - 
-    #                Description of optional param
+      @status    = service[:status]
+      @sign      = service[:sign]
+      @routetype = service[:routetype]
+      @times     = service[:times]
+      @direction = service[:direction]
+    end
 
     def self.where(conditions)
-      stop_id = conditions.delete :stop_id
-      app_id  = conditions.delete(:app_id) || 'na'
+      stop_id = conditions.delete(:stop_id)
+      app_id  = conditions.delete(:app_id) || 'ratis-specs'
+      type    = conditions.delete(:type) || 'N' # N for Next Bus
+
+      if datetime = conditions.delete(:datetime)
+        raise ArgumentError.new('If datetime supplied it should be a Time or DateTime instance, otherwise it defaults to Time.now') unless datetime.is_a?(DateTime) || datetime.is_a?(Time)
+      else
+        datetime = Time.now
+      end
 
       raise ArgumentError.new('You must provide a stop ID') unless stop_id
+
       Ratis.all_conditions_used? conditions
 
-      response = Request.get 'Nextbus2', { 'Stopid' => stop_id, 'Appid' => app_id }
+      response = Request.get 'Nextbus', {'Stopid' => stop_id,
+                                         'Appid' => app_id,
+                                         'Date' => datetime.strftime("%m/%d/%Y"),
+                                         'Time' => datetime.strftime("%I%M"),
+                                         'Type' => type }
       return [] unless response.success?
 
-      stops = response.to_array :nextbus2_response, :stops, :stop
-      runs  = response.to_array :nextbus2_response, :runs, :run
-
-      NextBus.new stops, runs
+      service = response.body[:nextbus_response][:atstop][:service]
+      runs    = response.to_array :nextbus_response, :atstop, :service, :tripinfo
+      NextBus.new service, runs
     end
 
     # Gets description of first stop
     # @return [String] Description of first stop or nil.
 
     def first_stop_description
+      raise 'Not yet implemented'
       stops.first ? stops.first[:description] : nil
     end
 
@@ -61,6 +53,7 @@ module Ratis
     # @return     [Hash] NextBus details in a hash.
 
     def to_hash
+      raise 'Not yet implemented'
       { :stopname => first_stop_description,
         :signs    => runs.map { |run| run[:sign] }.uniq,
         :runs     => runs.map do |run|
@@ -77,6 +70,7 @@ module Ratis
     # @private
 
     def to_hash_for_xml
+      raise 'Not yet implemented'
       { :stopname => first_stop_description,
         :runs     => runs.map do |run|
           { :time           => run[:estimatedtime],

data/lib/ratis/next_bus2.rb

@@ -0,0 +1,93 @@
+module Ratis
+
+  class NextBus2
+
+    attr_accessor :stops, :runs
+
+    # Initializes a NextBus object with stops and runs.
+    # @return     [NextBus]
+    #
+    # == Parameters:
+    #
+    # [stops]    <em>Optional</em> -
+    #            An array of stops. Defaults to empty array.
+    # [runs]     <em>Optional</em> -
+    #            An array of runs. Defaults to empty array.
+
+    def initialize(_stops = [], _runs = [])
+      @stops, @runs = _stops, _runs
+    end
+
+    # Returns results of NextBus query containing arrays of stops and runs.
+    # @return     [NextBus] containing next buses.
+    #
+    # == Parameters:
+    #
+    # Takes hash of conditions
+    #
+    # [option1]      <b>Required</b> -
+    #                Description of required param
+    # [option2]      <em>Optional</em> -
+    #                Description of optional param
+    # [option3]      <em>Optional</em> -
+    #                Description of optional param
+    # [option4]      <em>Optional</em> -
+    #                Description of optional param
+
+    def self.where(conditions)
+      stop_id = conditions.delete :stop_id
+      app_id  = conditions.delete(:app_id) || 'na'
+
+      raise ArgumentError.new('You must provide a stop ID') unless stop_id
+      Ratis.all_conditions_used? conditions
+
+      response = Request.get 'Nextbus2', { 'Stopid' => stop_id, 'Appid' => app_id }
+      return [] unless response.success?
+      debugger
+      stops = response.to_array :nextbus2_response, :stops, :stop
+      runs  = response.to_array :nextbus2_response, :runs, :run
+
+      NextBus.new stops, runs
+    end
+
+    # Gets description of first stop
+    # @return [String] Description of first stop or nil.
+
+    def first_stop_description
+      stops.first ? stops.first[:description] : nil
+    end
+
+    # Details of NextBus instance in a hash.
+    # @return     [Hash] NextBus details in a hash.
+
+    def to_hash
+      { :stopname => first_stop_description,
+        :signs    => runs.map { |run| run[:sign] }.uniq,
+        :runs     => runs.map do |run|
+          { :time      => run[:estimatedtime],
+            :sign      => run[:sign],
+            :adherence => run[:adherence],
+            :route     => run[:route]
+          }
+        end
+      }
+    end
+
+    # Details of NextBus instance in a hash to be transformed to xml
+    # @private
+
+    def to_hash_for_xml
+      { :stopname => first_stop_description,
+        :runs     => runs.map do |run|
+          { :time           => run[:estimatedtime],
+            :scheduled_time => run[:triptime],
+            :sign           => run[:sign],
+            :adherence      => run[:adherence],
+            :route          => run[:route]
+          }
+        end
+      }
+    end
+  end
+
+end

data/lib/ratis/version.rb

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

data/lib/ratis.rb

@@ -9,6 +9,7 @@ require 'ratis/landmark'
 require 'ratis/landmark_category'
 require 'ratis/location'
 require 'ratis/next_bus'
+require 'ratis/next_bus2'
 require 'ratis/pattern'
 require 'ratis/pattern/routeinfo'
 require 'ratis/point_2_point'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ratis
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 3
   prerelease: 
   segments: 
   - 3
+  - 1
   - 0
-  - 0
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors: 
 - Burst Software
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-05-15 00:00:00 Z
+date: 2013-06-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: savon
@@ -190,6 +190,34 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id012
+- !ruby/object:Gem::Dependency 
+  name: rspec-instafail
+  prerelease: false
+  requirement: &id013 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id013
+- !ruby/object:Gem::Dependency 
+  name: chronic
+  prerelease: false
+  requirement: &id014 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id014
 description: 
 email: irish@burstdev.com
 executables: []
@@ -209,6 +237,7 @@ files:
 - lib/ratis/landmark_category.rb
 - lib/ratis/location.rb
 - lib/ratis/next_bus.rb
+- lib/ratis/next_bus2.rb
 - lib/ratis/pattern/routeinfo.rb
 - lib/ratis/pattern.rb
 - lib/ratis/point_2_point/group.rb