atco 1.0.4 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5321b93f293661308b4e7ee41024d24f873e08115c14a0600a45ca50875ca7d
-  data.tar.gz: d31652011de26eb9872d118366e47d07e578d2a1f1459e8b6079219b0e42aafb
+  metadata.gz: 4ddb4c619b9d60d92fa99bc37e0df7f1181e5f42d6e001757284077eadbc597b
+  data.tar.gz: d5c8ebaa0bcec7f07a447a78e20d77727926de121616b700103fb06719cd2c1f
 SHA512:
-  metadata.gz: '09fb7d8d1948d46855e0a07cd9f3739360e85fc048235ef6994b15939ef3e54faabfc4f5399b4076dcb498df0f26528a403f7e10e3532cddf7f55aa13a0f5f44'
-  data.tar.gz: 07f1ed552c5b5278975e309bce0f518efeab83c518ea16fbc88fecff35d6ff80c8650ac1ba1682ff0d53edf5b10a9ce33337fe7309ab8ce79cccc6b2289f4491
+  metadata.gz: bae3d2d4b0ace8e394497fba4457f76135940198b10fa05a630ff789efaec217d85cc87406dfca5e338c9aa1e16ee2dd4f62fd039c39066c9235c8b888e9368c
+  data.tar.gz: 44e57ff1c7f56a5b0e1930f2a1fbbd6ec22490fd25608d713f760194520639e509015d38d900587021854d8fbc9160233dbf852d0d1bb2df2d684b3915e18114

data/README.md

@@ -35,3 +35,9 @@ result = Atco.parse('SVRTMAO009A-20091005.cif) # an example data file in the rep
   journies: {…}
 }
 ```
+
+### Author & Contributors
+
+The `ATCO-CIF` Ruby library was originally authored by David Rice [@davidjrice](https://github.com/davidjrice) in response to an FOI request to [Translink](https://www.translink.co.uk) for there timetable data as part of an [OpenDataNI](https://admin.opendatani.gov.uk) initiative.
+
+See [CONTRIBUTORS.md](http://github.com/davidjrice/atco/blob/master/CONTRIBUTORS.md)

data/lib/atco/stop.rb

@@ -3,7 +3,12 @@
 module Atco
   # Atco::Stop is a class to abstract ATCO-CIF Origin, Intermediate and Destination (Stop) records.
   class Stop
-    attr_accessor :bay_number, :location, :timing_point_indicator, :fare_stage_indicator, :published_departure_time,
+    attr_accessor :bay_number,
+                  :location,
+                  :timing_point_indicator,
+                  :fare_stage_indicator,
+                  :published_arrival_time,
+                  :published_departure_time,
                   :record_identity
 
     def origin?
@@ -23,6 +28,7 @@ module Atco
       @location = data[:location]
       @timing_point_indicator = data[:timing_point_indicator]
       @fare_stage_indicator = data[:fare_stage_indicator]
+      @published_arrival_time = data[:published_arrival_time]
       @published_departure_time = data[:published_departure_time]
       @record_identity = data[:record_identity]
     end
@@ -31,6 +37,7 @@ module Atco
       {
         record_identity: @record_identity,
         location: @location,
+        published_arrival_time: @published_arrival_time,
         published_departure_time: @published_departure_time,
         timing_point_indicator: @timing_point_indicator,
         fare_stage_indicator: @fare_stage_indicator,

data/lib/atco/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Atco
-  VERSION = "1.0.4"
+  VERSION = "1.0.7"
 end

data/lib/atco.rb

@@ -38,7 +38,7 @@ module Atco # rubocop:disable Metrics/ModuleLength
       unparsed = []
 
       data.each_with_index do |line, line_number| # rubocop:disable Metrics/BlockLength
-        if line == data.first
+        if line_number.zero?
           header = parse_header(line)
           next
         end
@@ -52,13 +52,13 @@ module Atco # rubocop:disable Metrics/ModuleLength
           object = send("parse_#{method}", line)
           next unless object[:record_identity] && object[:record_identity] == identifier
 
-          current_journey = object if object[:record_identity] && object[:record_identity] == METHODS[:journey_header]
-          if object[:record_identity] && (object[:record_identity] == METHODS[:location] || object[:record_identity] == METHODS[:additional_location_info]) # rubocop:disable Layout/LineLength
-            if object[:record_identity] == METHODS[:location]
-              current_location = object
-            else
-              locations << Location.new(current_location, object)
-            end
+          case method
+          when :journey_header
+            current_journey = object
+          when :location
+            current_location = object
+          when :additional_location_info
+            locations << Location.new(current_location, object)
           end
 
           if current_journey
@@ -73,6 +73,7 @@ module Atco # rubocop:disable Metrics/ModuleLength
           unparsed << { line: line, line_number: line_number }
           next
         end
+        objects << object
       end
       { header: header, locations: locations, journeys: journeys, unparsed: unparsed }
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: atco
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.7
 platform: ruby
 authors:
 - David Rice