rail_feeds 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd597c45ef2dc68d4da4278cfeda76ad9ae61e128309071a89c85adb27b510e4
-  data.tar.gz: 4af4ee4fb4302f304b444e87804ab6d3813098ccf637fe957b57ac9cbbbeb8f3
+  metadata.gz: 48c8d73c18dddf2cbe0cdc89764f686112157e85b910ac07140a0718871aa20b
+  data.tar.gz: e27ab1045735dc9e1c69419821af37610c6234ca9ceda8fb7664614e3abdbafd
 SHA512:
-  metadata.gz: 23f62dfd13351944c0c24e204e5c9788a53a4871d03440a5dfae3a121769044c198bc41b7330b3f54a83bb82a4488218b4958b2575797d9d0a637729fef32268
-  data.tar.gz: b3e18f1f140f3e16c6c2ad67358cd2269dc4ed43a450384347fed1c73d208353cd13029f2b1c330725f87880be7494e894d2f451baf30a39c806aef9199501a7
+  metadata.gz: 58fb1b17bd665d1d1881d143bccbc5f1ee1a743710b28ecd8f88867b52ee4e238bcc438072425bf3098e3142769a9e671aea74796629c5015b82a0bb35c95770
+  data.tar.gz: 0ea4810aa3c8d91de9e7e0a6fad6adf26a7c4c7fbdb35c6a41e9bd47ad365b91be3e9de3ac7ac50baa416edadfa9231703bf25ba66a9085f5c359274fd7d3b7c

data/.rubocop.yml

@@ -1,5 +1,9 @@
+require:
+  - rubocop-performance
 AllCops:
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.4
+  Exclude:
+    - '*.gemspec'
 Style/SignalException:
   Enabled: false
 Metrics/MethodLength:
@@ -14,6 +18,9 @@ Metrics/LineLength:
 Layout/TrailingBlankLines:
   Exclude:
   - rail_feeds.gemspec
+Style/BracesAroundHashParameters:
+  Exclude:
+  - spec/**/*
 Style/WordArray:
   Exclude:
   - spec/**/*

data/.travis.yml

@@ -1,11 +1,24 @@
 language: ruby
 rvm:
-  - 2.4.0
-  - 2.4.1
-  - 2.4.2
-  - 2.4.3
+  - 2.4.4
+  - 2.4.5
+  - 2.4.6
   - 2.5.0
   - 2.5.1
+  - 2.5.2
+  - 2.5.3
+  - 2.5.4
+  - 2.5.5
+  - 2.6.0
+  - 2.6.1
+  - 2.6.2
+  - jruby-9.2.0.0
+  - jruby-9.2.1.0
+  - jruby-9.2.3.0
+  - jruby-9.2.4.0
+  - jruby-9.2.4.1
+  - jruby-9.2.5.0
+  - jruby-9.2.6.0
 gemfile:
   - Gemfile
 branches:

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## Version 0.0.2
+
+  * Add support for:
+    * rubies 2.4.4 - 2.6.2
+    * jrubyies 9.2.0.0 - 9.2.6.0
+  * Sort API consistency - when passing credentials use positional not keywork arguments, except:
+    * Initializing a new HTTP or Stomp client
+    * Initializing a new NetworkRail Schedule Fetcher
+  * Add National rail - Knowledge base - National service indicator via HTTP.
+  * Fix issue 1: OpenURI returns a StringIO not TempFile when size is under 10KB.
+  * Fix "undefined method `parse_cif_file'" when loading Network Rail schedule data.
+
 ## Version 0.0.1
 
  * Initial release.

data/README.md

@@ -19,8 +19,12 @@ and Staging (which is what is currently being developed ready for moving to mast
 ## Ruby Versions
 This gem supports the following versions of ruby, it may work on other versions but is not tested against them so don't rely on it.
 
-  * 2.4.0 - 2.4.3
-  * 2.5.0 - 2.5.1
+  * ruby:
+    * 2.4.4 - 2.4.6
+    * 2.5.0 - 2.5.5
+    * 2.6.0 - 2.6.2
+  * jruby:
+    * 9.2.0.0 - 9.2.6.0
 
 
 ## Rail Feeds
@@ -50,10 +54,10 @@ We follow the [Semantic Versioning](http://semver.org/) concept.
 
 ### Sources
 
-| Source        | Module                  | Module Alias | Support                    |
-| ------------- | ----------------------- | ------------ | -------------------------- |
-| Network Rail  | RailFeeds::NetworkRail  | NetRailFeeds | Being developed            |
-| National Rail | RailFeeds::NationalRail | NatRailFeeds | None yet - any volunteers? |
+| Source        | Module                  | Module Alias | Support         |
+| ------------- | ----------------------- | ------------ | --------------- |
+| Network Rail  | RailFeeds::NetworkRail  | NetRailFeeds | Being developed |
+| National Rail | RailFeeds::NationalRail | NatRailFeeds |                 |
 
 ### Feeds
 
@@ -72,6 +76,6 @@ We follow the [Semantic Versioning](http://semver.org/) concept.
 | National Rail | stomp  | Darwin Push Port                     |                                      |
 | National Rail | stomp  | Darwin Timetable Feed                |                                      |
 | National Rail | stomp  | Knowledgebase                        |                                      |
-| National Rail | http   | Knowledgebase                        |                                      |
+| National Rail | http   | Knowledgebase                        | Can download, fetch and parse NSI.   |
 | National Rail | soap   | Darwin Webservice                    |                                      |
 | National Rail | rest   | Historical Service Performance       |                                      |

data/doc/guides/National Rail/Knowledge Base/National Service Indicator.md

@@ -0,0 +1,21 @@
+# National Rail - National Service Indicator
+
+The national service indicator provides information on the current service
+provided by each TOC.
+
+```ruby
+# Download the file and then get the data from it
+RailFeeds::NationalRail::Credentials.configure(
+  username: 'YOUR USERNAME HERE',
+  password: 'YOUR PASSWORD HERE'
+)
+RailFeeds::NationalRail::KnowledgeBase::NationalServiceIndicator.download('file name')
+data = RailFeeds::NationalRail::KnowledgeBase::NationalServiceIndicator.load_file('file name')
+
+# Get data by fetching it from the web
+RailFeeds::NationalRail::Credentials.configure(
+  username: 'YOUR USERNAME HERE',
+  password: 'YOUR PASSWORD HERE'
+)
+data = RailFeeds::NationalRail::KnowledgeBase::NationalServiceIndicator.fetch_data
+```

data/doc/guides/Network Rail/CORPUS.md

@@ -1,4 +1,4 @@
-# Network Rail CORPUS (Codes for Operations, Retail & Planning – a Unified Solution)
+# Network Rail - CORPUS (Codes for Operations, Retail & Planning – a Unified Solution)
 
 The CORPUS data is a list of indentification information for locations around the network.
 See <https://wiki.openraildata.com/index.php/Reference_Data#CORPUS:_Location_Reference_Data>
@@ -16,13 +16,17 @@ You'll get an array of a data struct with the following attributes:
 
 ```ruby
 # Download the CORPUS data and get the data from it
+RailFeeds::NetworkRail::Credentials.configure(
+  username: 'YOUR USERNAME HERE',
+  password: 'YOUR PASSWORD HERE'
+)
 temp_file = RailFeeds::NetworkRail::CORPUS.fetch
-data = RailFeeds::NetworkRail::CORPUS.load_file(temp_file.path)
+data = RailFeeds::NetworkRail::CORPUS.load_file(temp_file)
 
 # Get data from a previously saved file
 data = RailFeeds::NetworkRail::CORPUS.load_file('PATH TO FILE.json.gz')
 
-# Get data from a previously saved and extracted file
+# Get data from a previously saved and unzipped file
 data = RailFeeds::NetworkRail::CORPUS.load_file('PATH TO FILE.json')
 
 # Get data by fetching it from the web

data/doc/guides/Network Rail/SMART.md

@@ -1,4 +1,4 @@
-# Network Rail SMART 
+# Network Rail - SMART 
 
 The SMART data is a periodically updated list of mappings between train describer berths
 and locations, allowing for TD events to be translated into arrival/departure from location
@@ -18,8 +18,12 @@ reachable in each direction.
 
 ```ruby
 # Download the SMART data and get the data from it
+RailFeeds::NetworkRail::Credentials.configure(
+  username: 'YOUR USERNAME HERE',
+  password: 'YOUR PASSWORD HERE'
+)
 temp_file = RailFeeds::NetworkRail::SMART.fetch
-step_data = RailFeeds::NetworkRail::SMART.load_file(temp_file.path)
+step_data = RailFeeds::NetworkRail::SMART.load_file(temp_file)
 
 # Get the SMART data from a previously saved file
 step_data = RailFeeds::NetworkRail::SMART.load_file('PATH TO FILE.json.gz')

data/doc/guides/Network Rail/Schedule.md

@@ -1,4 +1,4 @@
-# Network Rail Schedule
+# Network Rail - Schedule
 
 The schedule files from Network Rail contain:
 
@@ -36,14 +36,14 @@ RailFeeds::NetworkRail::Credentials.configure(
 # 2. Fetch some files
 fetcher = RailFeeds::NetworkRail::Schedule::Fetcher.new
 
-fetcher.fetch_all_full(:cif) do |full_file|
+fetcher.fetch_all_full(:cif) do |full_file_as_an_io|
   ...
 end
 
-fetcher.fetch_all_update('fri', :cif) do |update_file|
+fetcher.fetch_all_update('fri', :cif) do |update_file_as_an_io|
   ...
 end
-# Each of the file variables will contain a TempFile which can be used to read
+# Each of the file variables will contain an IO object which can be used to read
 # the CIF data (or passed to the parser to make use of). The files will be deleted
 # at the end of the block.
 ```

data/lib/rail_feeds/credentials.rb

@@ -34,6 +34,36 @@ module RailFeeds
       @password = password.to_s.clone
     end
 
+    # Get an array of [username, password].
+    # @return [Array<String>]
+    def to_a
+      [username, password]
+    end
+
+    # Get a hash of { username: ?, password: ? }.
+    # @return [Hash<Symbol => String>]
+    def to_h
+      {
+        username: username,
+        password: password
+      }
+    end
+
+    # Get an array of [username, password].
+    # @return [Array<String>]
+    def self.to_a
+      [username, password]
+    end
+
+    # Get a hash of { username: ?, password: ? }.
+    # @return [Hash<Symbol => String>]
+    def self.to_h
+      {
+        username: username,
+        password: password
+      }
+    end
+
     def self.username
       @username.clone
     end

data/lib/rail_feeds/http_client.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+module RailFeeds
+  # A wrapper class for ::Net::HTTP
+  class HTTPClient
+    include Logging
+
+    # Initialize a new http client.
+    # @param [RailFeeds::Credentials] credentials
+    #   The credentials for connecting to the feed.
+    # @param [Logger] logger
+    #   The logger for outputting evetns, if nil the global logger will be used.
+    def initialize(credentials: nil, logger: nil)
+      @credentials = credentials
+      self.logger = logger unless logger.nil?
+    end
+
+    # Fetch path from server.
+    # @param [String] url The URL to fetch.
+    # @yield contents
+    #   @yieldparam [IO] file Either a Tempfile or StringIO.
+    def fetch(url, options = {})
+      logger.debug "fetching #{url.inspect}"
+      options[:http_basic_authentication] = @credentials.to_a
+      yield URI(url).open(options)
+    end
+
+    # Fetch path from server and unzip it.
+    # @param [String] url The URL to fetch. For child classes this is just the path.
+    # @yield contents
+    #   @yieldparam [Zlib::GzipReader] reader The unzippable content of the file.
+    def fetch_unzipped(url)
+      logger.debug "get_unzipped(#{url.inspect})"
+      fetch(url) do |gz_file|
+        reader = Zlib::GzipReader.new gz_file
+        yield reader
+      end
+    end
+
+    # Download path from server.
+    # @param [String] url The URL to download. For child classes this is just the path.
+    # @param [String] file The path to the file to save the contents in.
+    def download(url, file)
+      logger.debug "download(#{url.inspect}, #{file.inspect})"
+      fetch(url) do |src|
+        File.open(file, 'w') do |dst|
+          IO.copy_stream src, dst
+        end
+      end
+    end
+
+    private
+
+    attr_reader :credentials
+  end
+end

data/lib/rail_feeds/logging.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'logger'
-
 module RailFeeds
   # A Module to provide a global logger
   module Logging

data/lib/rail_feeds/national_rail/credentials.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module RailFeeds
+  module NationalRail
+    # A Class to store username & password required to access national rail feeds
+    # Can be used to set a global default but create new instances with
+    # specific ones for a specific use.
+    class Credentials < RailFeeds::Credentials
+    end
+  end
+end

data/lib/rail_feeds/national_rail/http_client.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module RailFeeds
+  module NationalRail
+    # A wrapper class for ::Net::HTTP
+    class HTTPClient < RailFeeds::HTTPClient
+      def initialize(credentials: nil, **args)
+        credentials ||= RailFeeds::NationalRail::Credentials
+        super
+      end
+
+      # Fetch path from server.
+      # @param [String] path The path to fetch.
+      # @yield contents
+      #   @yieldparam [IO] file Either a Tempfile or StringIO.
+      def fetch(path)
+        super "https://datafeeds.nationalrail.co.uk/#{path}", 'X-Auth-Token' => auth_token
+      end
+
+      private
+
+      # rubocop:disable Metrics/AbcSize
+      def auth_token
+        return @auth_token if !@auth_token.nil? && @auth_token_expires_at >= Time.now
+
+        logger.info 'Getting an auth token for national rail.'
+        response = Net::HTTP.post_form(
+          URI('https://datafeeds.nationalrail.co.uk/authenticate'),
+          credentials.to_h
+        )
+        response.value # Raise an exception if not successful
+        data = JSON.parse(response.body)
+        logger.debug "Got auth token data: #{data.inspect}"
+        token = data.fetch('token')
+
+        # Token expires in 1 hour. Using 55 minutes provides a safety margin.
+        @auth_token_expires_at = Time.now + (55 * 60)
+        logger.debug "Auth token expires at #{@auth_token_expires_at}."
+
+        @auth_token = token
+      end
+      # rubocop:enable Metrics/AbcSize
+    end
+  end
+end

data/lib/rail_feeds/national_rail/knowledge_base/national_service_indicator.rb

@@ -0,0 +1,100 @@
+# frozen_string_literal: true
+
+module RailFeeds
+  module NationalRail
+    module KnowledgeBase
+      # A module for accessing the national service indicator
+      # from the national rail  knowledge base.
+      module NationalServiceIndicator
+        TOC = Struct.new(
+          :code, :name, :status, :twitter_account, :additional_info, :service_groups
+        ) do
+          def to_s
+            "#{code} - #{name}\n" \
+            "#{status}\n#{service_groups.join("\n")}\n" \
+            "@#{twitter_account} - #{additional_info}"
+          end
+        end
+
+        Status = Struct.new(:title, :description, :image) do
+          def to_s
+            "#{title} - #{description} - #{image}"
+          end
+        end
+
+        ServiceGroup = Struct.new(:disruption_id, :name, :detail, :url) do
+          def to_s
+            "#{name} - #{detail}\n#{disruption_id} #{url}"
+          end
+        end
+
+        # Download the current data.
+        # @param [RailFeeds::NationalRail::Credentials] credentials
+        # @param [String] file
+        #   The path to the file to save the .xml download in.
+        def self.download(file, credentials = Credentials)
+          client = HTTPClient.new(credentials: credentials)
+          client.download 'darwin/api/staticfeeds/4.0/serviceIndicators', file
+        end
+
+        # Fetch the current data.
+        # @param [RailFeeds::NationalRail::Credentials] credentials
+        # @return [IO]
+        def self.fetch(credentials = Credentials, &block)
+          client = HTTPClient.new(credentials: credentials)
+          client.fetch 'darwin/api/staticfeeds/4.0/serviceIndicators', &block
+        end
+
+        # Load data from either a .json or .json.gz file.
+        # @param [String] file The path of the file to open.
+        # @return
+        #   [Array<RailFeeds::NationalRail::KnowledgeBase::NationalServiceIndicator::TOC>]
+        def self.load_file(file)
+          parse_xml File.read(file)
+        end
+
+        # Load data from the internet.
+        # @param [RailFeeds::NationalRail::Credentials] credentials
+        #  The credentials to authenticate with.
+        # @return
+        #   [Array<RailFeeds::NationalRail::KnowledgeBase::NationalServiceIndicator::TOC>]
+        def self.fetch_data(credentials = Credentials)
+          fetch(credentials: credentials) do |file|
+            parse_xml file.read
+          end
+        end
+
+        # rubocop:disable Metrics/AbcSize
+        # rubocop:disable Metrics/MethodLength
+        def self.parse_xml(xml)
+          options = Nokogiri::XML::ParseOptions.new.nonet.noent.noblanks
+          doc = Nokogiri::XML.parse(xml, nil, nil, options)
+          doc.xpath('/xmlns:NSI/xmlns:TOC').map do |toc_node|
+            TOC.new(
+              toc_node.xpath('./xmlns:TocCode').first&.content,
+              toc_node.xpath('./xmlns:TocName').first&.content,
+              Status.new(
+                toc_node.xpath('./xmlns:Status').first&.content,
+                toc_node.xpath('./xmlns:StatusDescription').first&.content,
+                toc_node.xpath('./xmlns:StatusImage').first&.content
+              ),
+              toc_node.xpath('./xmlns:TwitterAccount').first&.content,
+              toc_node.xpath('./xmlns:AdditionalInfo').first&.content,
+              toc_node.xpath('./xmlns:ServiceGroup').map do |service_group|
+                ServiceGroup.new(
+                  service_group.xpath('./xmlns:CurrentDisruption').first&.content,
+                  service_group.xpath('./xmlns:GroupName').first&.content,
+                  service_group.xpath('./xmlns:CustomDetail').first&.content,
+                  service_group.xpath('./xmlns:CustomURL').first&.content
+                )
+              end
+            )
+          end
+        end
+        # rubocop:enable Metrics/AbcSize
+        # rubocop:enable Metrics/MethodLength
+        private_class_method :parse_xml
+      end
+    end
+  end
+end

data/lib/rail_feeds/national_rail/knowledge_base.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module RailFeeds
+  module NationalRail
+    module KnowledgeBase # :nodoc:
+    end
+  end
+end

data/lib/rail_feeds/national_rail.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module RailFeeds
+  module NationalRail # :nodoc:
+  end
+end
+
+# Add alias for module
+::NatRailFeeds = RailFeeds::NationalRail

data/lib/rail_feeds/network_rail/corpus.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'json'
-
 module RailFeeds
   module NetworkRail
     # A module for getting information out of the CORPUS data.
@@ -14,15 +12,15 @@ module RailFeeds
       # @param [RailFeeds::NetworkRail::Credentials] credentials
       # @param [String] file
       #   The path to the file to save the .json.gz download in.
-      def self.download(file, credentials: Credentials)
+      def self.download(file, credentials = Credentials)
         client = HTTPClient.new(credentials: credentials)
         client.download 'ntrod/SupportingFileAuthenticate?type=CORPUS', file
       end
 
       # Fetch the current CORPUS data.
       # @param [RailFeeds::NetworkRail::Credentials] credentials
-      # @return [Tempfile]
-      def self.fetch(credentials: Credentials)
+      # @return [IO]
+      def self.fetch(credentials = Credentials)
         client = HTTPClient.new(credentials: credentials)
         client.fetch 'ntrod/SupportingFileAuthenticate?type=CORPUS'
       end
@@ -42,7 +40,7 @@ module RailFeeds
       # @param [RailFeeds::NetworkRail::Credentials] credentials
       #  The credentials to authenticate with.
       # @return [Array<RailFeeds::NetworkRail::CORPUS::Data>]
-      def self.fetch_data(credentials: Credentials)
+      def self.fetch_data(credentials = Credentials)
         client = HTTPClient.new(credentials: credentials)
         client.fetch_unzipped('ntrod/SupportingFileAuthenticate?type=CORPUS') do |file|
           break parse_json file.read
@@ -69,6 +67,7 @@ module RailFeeds
 
       def self.nilify(item)
         return nil if item.nil? || item.empty?
+
         item
       end
       private_class_method :nilify

data/lib/rail_feeds/network_rail/credentials.rb

@@ -6,17 +6,6 @@ module RailFeeds
     # Can be used to set a global default but create new instances with
     # specific ones for a specific use.
     class Credentials < RailFeeds::Credentials
-      # Get an array of [username, password].
-      # @return [Array<String>]
-      def to_a
-        [username, password]
-      end
-
-      # Get an array of [username, password].
-      # @return [Array<String>]
-      def self.to_a
-        [username, password]
-      end
     end
   end
 end

data/lib/rail_feeds/network_rail/http_client.rb

@@ -1,56 +1,20 @@
 # frozen_string_literal: true
 
-require 'open-uri'
-
 module RailFeeds
   module NetworkRail
     # A wrapper class for ::Net::HTTP
-    class HTTPClient
-      include Logging
-
-      HOST = 'datafeeds.networkrail.co.uk'
-
-      # Initialize a new http client.
-      # @param [RailFeeds::NetworkRail::Credentials] credentials
-      #   The credentials for connecting to the feed.
-      # @param [Logger] logger
-      #   The logger for outputting evetns, if nil the global logger will be used.
-      def initialize(credentials: Credentials, logger: nil)
-        @credentials = credentials
-        self.logger = logger unless logger.nil?
+    class HTTPClient < RailFeeds::HTTPClient
+      def initialize(credentials: nil, **args)
+        credentials ||= RailFeeds::NetworkRail::Credentials
+        super
       end
 
-      # Fetch path from network rail server.
+      # Fetch path from server.
       # @param [String] path The path to fetch.
-      # @yield [file] Once the block has run the temp file will be deleted.
-      #   @yieldparam [Tempfile] file The content of the file.
+      # @yield contents
+      #   @yieldparam [IO] file Either a Tempfile or StringIO.
       def fetch(path)
-        logger.debug "fetch(#{path.inspect})"
-        uri = URI("https://#{HOST}/#{path}")
-        yield uri.open(http_basic_authentication: @credentials.to_a)
-      end
-
-      # Fetch path from network rail server and unzip it.
-      # @param [String] path The path to fetch.
-      # @yield [reader] Once the block has run the temp file will be deleted.
-      #   @yieldparam [Zlib::GzipReader] reader The unzippable content of the file.
-      def fetch_unzipped(path)
-        logger.debug "get_unzipped(#{path.inspect})"
-        fetch(path) do |gz_file|
-          yield Zlib::GzipReader.open(gz_file.path)
-        end
-      end
-
-      # Download path from netwrok rail server.
-      # @param [String] path The path to download.
-      # @param [String] file The path to the file to save the contents in.
-      def download(path, file)
-        logger.debug "download(#{path.inspect}, #{file.inspect})"
-        fetch(path) do |src|
-          File.open(file, 'w') do |dst|
-            IO.copy_stream src, dst
-          end
-        end
+        super "https://datafeeds.networkrail.co.uk/#{path}"
       end
     end
   end

data/lib/rail_feeds/network_rail/schedule/association.rb

@@ -181,7 +181,7 @@ module RailFeeds
         # rubocop:enable Metrics/AbcSize
 
         # rubocop:disable Metrics/MethodLength
-        def to_json
+        def to_json(**opts)
           {
             'JsonAssociationV1' => {
               'transaction_type' => 'Create',
@@ -198,7 +198,7 @@ module RailFeeds
               'diagram_type' => 'T',
               'CIF_stp_indicator' => stp_indicator_to_cif
             }
-          }.to_json
+          }.to_json(**opts)
         end
         # rubocop:enable Metrics/MethodLength
       end

data/lib/rail_feeds/network_rail/schedule/data.rb

@@ -52,7 +52,7 @@ module RailFeeds
         # @param [IO] file
         #   The file to load data from.
         def load_cif_file(file)
-          @parser.parse_cif_file file
+          @parser.parse_file file
 
           logger.info "Currently have #{associations.count} associations, " \
                       "#{tiplocs.count} tiplocs, #{trains.count} trains."
@@ -92,7 +92,7 @@ module RailFeeds
         #   The credentials for connecting to the feed.
         # @return [RailFeeds::NetworkRail::Schedule::Header::CIF]
         #   The header of the last file added.
-        def fetch_data(credentials: Credentials)
+        def fetch_data(credentials = Credentials)
           fetcher = Fetcher.new credentials: credentials
 
           method = if last_header.nil? ||
@@ -198,6 +198,7 @@ module RailFeeds
           trains[train_schedule.uid] ||= []
           index = trains[train_schedule.uid].index train_schedule
           return do_train_schedule_create(parser, train_schedule) if index.nil?
+
           trains[train_schedule.uid][index] = train_schedule
         end