atco 1.0.2 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82cd5858676f7202932ecbe6d68846066019bd75c5637c33a44ec3eaf83fe599
-  data.tar.gz: 144dad716574ca9f45f63170193de8c1115edc6a4ece1557516c57e9d1d250a3
+  metadata.gz: e5321b93f293661308b4e7ee41024d24f873e08115c14a0600a45ca50875ca7d
+  data.tar.gz: d31652011de26eb9872d118366e47d07e578d2a1f1459e8b6079219b0e42aafb
 SHA512:
-  metadata.gz: 947c0a1bbfa755bacb1d907c50f90720e98dcebfef88d500b6e418c652827846ea2c32372e8aed4fdd8e1e4aad71ce9f61acd1f0c51b0dd68bd696d1e9774a98
-  data.tar.gz: 9556d7e0bc6cd268b326475c03c3136a59f5f0066db0d1a84fa7510ee9e4eeb0a0f8cc1a63cb1869bd7165184eb54481afdb984d0cd2bb79bc7c6dcfe21a1e32
+  metadata.gz: '09fb7d8d1948d46855e0a07cd9f3739360e85fc048235ef6994b15939ef3e54faabfc4f5399b4076dcb498df0f26528a403f7e10e3532cddf7f55aa13a0f5f44'
+  data.tar.gz: 07f1ed552c5b5278975e309bce0f518efeab83c518ea16fbc88fecff35d6ff80c8650ac1ba1682ff0d53edf5b10a9ce33337fe7309ab8ce79cccc6b2289f4491

data/lib/atco/version.rb

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

data/lib/atco.rb

@@ -9,6 +9,8 @@ require_relative "atco/version"
 
 # Public: Atco is a module that provides a parser for the ATCO-CIF data format.
 module Atco # rubocop:disable Metrics/ModuleLength
+  class UnidentifiedRecordError < StandardError; end
+
   class << self # rubocop:disable Metrics/ClassLength
     @path = nil
     METHODS = {
@@ -21,6 +23,7 @@ module Atco # rubocop:disable Metrics/ModuleLength
       origin: "QO",
       journey_header: "QS"
     }.freeze
+    METHODS_BY_RECORD_IDENTITY = METHODS.invert.freeze
 
     def parse(file) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
       @path = File.expand_path(file)
@@ -32,13 +35,20 @@ module Atco # rubocop:disable Metrics/ModuleLength
       locations = []
       journeys = {}
       header = nil
+      unparsed = []
 
-      data.each do |line|
+      data.each_with_index do |line, line_number| # rubocop:disable Metrics/BlockLength
         if line == data.first
           header = parse_header(line)
           next
         end
-        METHODS.each do |method, identifier|
+
+        identifier = line[0, 2]
+        method = METHODS_BY_RECORD_IDENTITY[identifier]
+
+        begin
+          raise UnidentifiedRecordError, "Unidentified record: #{identifier}" unless method
+
           object = send("parse_#{method}", line)
           next unless object[:record_identity] && object[:record_identity] == identifier
 
@@ -59,9 +69,12 @@ module Atco # rubocop:disable Metrics/ModuleLength
             end
           end
           objects << object
+        rescue UnidentifiedRecordError
+          unparsed << { line: line, line_number: line_number }
+          next
         end
       end
-      { header: header, locations: locations, journeys: journeys }
+      { header: header, locations: locations, journeys: journeys, unparsed: unparsed }
     end
 
     def parse_header(string)

data/spec/atco_spec.rb

@@ -194,5 +194,27 @@ RSpec.describe Atco do # rubocop:disable Metrics/BlockLength
       json = JSON.parse(data)
       expect(json).to be_a(Hash)
     end
+
+    it "should return 17 unparsed lines" do
+      expect(@atco[:unparsed].size).to eq(17)
+    end
+
+    it "should not parse GS records" do
+      expect(@atco[:unparsed][0]).to eq(
+        {
+          line: "GS00001433 N                    Belfast Metro Ops                                 7000\n",
+          line_number: 3
+        }
+      )
+    end
+
+    it "should not parse GR records" do
+      expect(@atco[:unparsed][1]).to eq(
+        {
+          line: "GR00001433Donegall Square East                                                                                7000\n", # rubocop:disable Layout/LineLength
+          line_number: 4
+        }
+      )
+    end
   end
 end

metadata

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