ratis 3.1.3 → 3.1.4

data/CHANGELOG

@@ -10,4 +10,7 @@
 - Contains info about the stop (:side, :stopid, :heading, :lat, :area, :servicetype, :route, :operator)
 
 3.1.3
-- 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
+- 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

data/lib/ratis/next_bus.rb

@@ -22,29 +22,43 @@ module Ratis
                        :servicetype => service[:servicetype],
                        :route       => service[:route],
                        :operator    => service[:operator],
-                       :trips       => service[:tripinfo].map do |ti|
-                                         OpenStruct.new(:triptime   => ti[:triptime],
-                                                        :block      => ti[:block],
-                                                        :tripid     => ti[:tripid],
-                                                        :exception  => ti[:exception],
-                                                        :skedtripid => ti[:skedtripid],
-                                                        :realtime   => OpenStruct.new(:valid            => ti[:realtime][:valid],
-                                                                                      :adherence        => ti[:realtime][:adherence],
-                                                                                      :estimatedtime    => ti[:realtime][:estimatedtime],
-                                                                                      :estimatedminutes => ti[:realtime][:estimatedminutes],
-                                                                                      :polltime         => ti[:realtime][:polltime],
-                                                                                      :trend            => ti[:realtime][:trend],
-                                                                                      :speed            => ti[:realtime][:speed],
-                                                                                      :reliable         => ti[:realtime][:reliable],
-                                                                                      :stopped          => ti[:realtime][:stopped],
-                                                                                      :lat              => ti[:realtime][:lat],
-                                                                                      :long             => ti[:realtime][:long] ))
-                                       end
+                       :trips       => parse_trip_info(service[:tripinfo])
                        )
       end
 
     end
 
+    def parse_trip_info(trips)
+      # can come back as an Array or single Hash...
+      if trips.is_a?(Array)
+        trips.map do |ti|
+          create_trip(ti)
+        end
+      else # Hash
+        [create_trip(trips)]
+      end
+    end
+
+    # TODO: turn into real classes
+    def create_trip(trip)
+      OpenStruct.new(:triptime   => trip[:triptime],
+                     :block      => trip[:block],
+                     :tripid     => trip[:tripid],
+                     :exception  => trip[:exception],
+                     :skedtripid => trip[:skedtripid],
+                     :realtime   => OpenStruct.new(:valid            => trip[:realtime][:valid],
+                                                   :adherence        => trip[:realtime][:adherence],
+                                                   :estimatedtime    => trip[:realtime][:estimatedtime],
+                                                   :estimatedminutes => trip[:realtime][:estimatedminutes],
+                                                   :polltime         => trip[:realtime][:polltime],
+                                                   :trend            => trip[:realtime][:trend],
+                                                   :speed            => trip[:realtime][:speed],
+                                                   :reliable         => trip[:realtime][:reliable],
+                                                   :stopped          => trip[:realtime][:stopped],
+                                                   :lat              => trip[:realtime][:lat],
+                                                   :long             => trip[:realtime][:long] ))
+    end
+
     def self.where(conditions)
       stop_id = conditions.delete(:stop_id)
       app_id  = conditions.delete(:app_id) || 'ratis-gem'

data/lib/ratis/version.rb

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

metadata

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