atco 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82cd5858676f7202932ecbe6d68846066019bd75c5637c33a44ec3eaf83fe599
-  data.tar.gz: 144dad716574ca9f45f63170193de8c1115edc6a4ece1557516c57e9d1d250a3
+  metadata.gz: 59b747dbf14f2f4ab07ca86c8344fda6294efbf4d7b83cdd11fcfa45a9e4961b
+  data.tar.gz: 276916993eae21683270e35ba8d4d167820eb2ae65dd410ab535f94a7ba50134
 SHA512:
-  metadata.gz: 947c0a1bbfa755bacb1d907c50f90720e98dcebfef88d500b6e418c652827846ea2c32372e8aed4fdd8e1e4aad71ce9f61acd1f0c51b0dd68bd696d1e9774a98
-  data.tar.gz: 9556d7e0bc6cd268b326475c03c3136a59f5f0066db0d1a84fa7510ee9e4eeb0a0f8cc1a63cb1869bd7165184eb54481afdb984d0cd2bb79bc7c6dcfe21a1e32
+  metadata.gz: 54cf093ae098cc2fbc2b38067ffeeec9fa7a513107b00a4cb7822b8c0b65e273b016be3465dffed59403a9f88ce9f4cfb3c750236fb8c1354ffa9347511b26ca
+  data.tar.gz: 92c5635e38a717f4ba9f0e036d081463b4d84bb5bd3d1788d99b191b54e8bcd09f6a44bc114f5495302a191fc47b8887f8c97934696c7a5b6f3ad9d6217fc544

data/lib/atco/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Atco
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 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,24 @@ 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",
+        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.3
 platform: ruby
 authors:
 - David Rice