rail_feeds 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48c8d73c18dddf2cbe0cdc89764f686112157e85b910ac07140a0718871aa20b
-  data.tar.gz: e27ab1045735dc9e1c69419821af37610c6234ca9ceda8fb7664614e3abdbafd
+  metadata.gz: 3a1013f3b8ef5f80c4b7948c1879ca1a6643799361bb383275c344b8e0cffe74
+  data.tar.gz: a0ff6b8569bfd1d1460fd471f629c3c72f3d889cf7b5564372198ddebb5c029b
 SHA512:
-  metadata.gz: 58fb1b17bd665d1d1881d143bccbc5f1ee1a743710b28ecd8f88867b52ee4e238bcc438072425bf3098e3142769a9e671aea74796629c5015b82a0bb35c95770
-  data.tar.gz: 0ea4810aa3c8d91de9e7e0a6fad6adf26a7c4c7fbdb35c6a41e9bd47ad365b91be3e9de3ac7ac50baa416edadfa9231703bf25ba66a9085f5c359274fd7d3b7c
+  metadata.gz: eb80002043f3d749e9555aa58ef4f9a7512100c637b87d78f4ed0c075610cc32aad2f63120854d922896f70173358653c4f4b9ccc7fa76d2a6a954c57d23782d
+  data.tar.gz: b9d3d94b01a91822320b2f860e5424c2cb679d0e6379c0585d879d1304c9a9a28d936d7430eb56d0e65190215eee86d29d5f46ea4d6d80ee878af7ee1a6113bd

data/.gitignore

@@ -5,6 +5,7 @@ Gemfile.lock
 # And because this is Ruby, ignore the following
 #  (source: https://github.com/github/gitignore/blob/master/Ruby.gitignore):
 
+.ruby-version
 notes.txt
 todo.txt
 *.gem

data/.travis.yml

@@ -3,15 +3,22 @@ rvm:
   - 2.4.4
   - 2.4.5
   - 2.4.6
+  - 2.4.7
+  - 2.4.8
   - 2.5.0
   - 2.5.1
   - 2.5.2
   - 2.5.3
   - 2.5.4
   - 2.5.5
+  - 2.5.6
+  - 2.5.7
   - 2.6.0
   - 2.6.1
   - 2.6.2
+  - 2.6.3
+  - 2.6.4
+  - 2.6.5
   - jruby-9.2.0.0
   - jruby-9.2.1.0
   - jruby-9.2.3.0
@@ -27,10 +34,18 @@ branches:
     - staging
     - /gh(?:\d)+(?:-.+)?/
     - /dev_ver_\d+\.\d+/
+env:
+  global:
+    # CC_TEST_REPORTER_ID for reporting test coverage to code climate
+    - secure: "LJDr3rGTkn3gi8Vpvo2LdgvgjfuJHbPD7LIHNfhn+WtjoIXRCBom+CiB8OvStwxHnmK+KkaFK3RJgYSVs7QjgGFquuyVlWnWLU1uJBElZgSHhcgPcenjvzT8GglxR1JBJF322iPblqNDfTaplJw7rNt78dxrJhkCKD8lybwYoE/ops6p510pVsaV44m+N5qcYd8w9WTUhXIr0KZB2bDLAkkZAvdqOrN3qFM/fsnnzzn+EKI3QSxWgfGTzVMlhHPLntsY1DdVvmdK0cDo0jxJ0CbRdkt4XFGfwbSBF2llZ/Mbw7AOm0Ej7xT/Ge6hhg9+hOkrgsd4F0pnmQD8mh5ZR1lCQBCA8D8AHJFUv63bG1GoHs77X5fUNet+NQOnCgs7Xmp7YUYEg8ZqSRqw3FWJ7xn/H9K9s3rHZ3cgQXi+L+ZRocSMnVqEe9BupkgKW6jxtu0RS1Do7jXj32wnNOQoXKRxEdEzvXZyp1XLYw4H2SZkfw8ig3KK0wd8qzBUTVvZCluoOYSvd6AMzf3ZBaKE+r/3HI5M5mW0oCQQPWbz6f3fIlMeRUajzwSiabdRPLT/15FD17OygkhKA0OdIHywQJCmGzjf1r86qxpZXxFjr2+ePQRTH+/3Oj3r4Yb8IkhYnA1gNZgxtnaQSDFcjoFmLwHX2Hx8B9lTTV1teTq7xXc="
 before_install: gem update bundler
+before_script:
+  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter && chmod +x ./cc-test-reporter && ./cc-test-reporter before-build
 script:
   - bundle exec rubocop
   - bundle exec rspec
+after_script:
+  - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT
 notifications:
   slack:
     on_success: always

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## Version 0.0.3
+
+  * Add support for ruby 2.6.3 - 2.6.5
+  * Fixes to some URLs (thanks to @marcbest)
+
 ## Version 0.0.2
 
   * Add support for:

data/FUNDING.yml

@@ -0,0 +1,10 @@
+github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: robertgauld
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

data/README.md

@@ -1,28 +1,17 @@
 [![Gem Version](https://badge.fury.io/rb/rail_feeds.png)](http://badge.fury.io/rb/rail_feeds)
-
-Master branch:
 [![Build Status](https://secure.travis-ci.org/robertgauld/rail_feeds.png?branch=master)](http://travis-ci.org/robertgauld/rail_feeds)
 [![Coveralls Status](https://coveralls.io/repos/robertgauld/rail_feeds/badge.png?branch=master)](https://coveralls.io/r/robertgauld/rail_feeds)
 [![Code Climate](https://codeclimate.com/github/robertgauld/rail_feeds.png?branch=master)](https://codeclimate.com/github/robertgauld/rail_feeds)
-
-Staging branch:
-[![Build Status](https://secure.travis-ci.org/robertgauld/rail_feeds.png?branch=staging)](http://travis-ci.org/robertgauld/rail_feeds)
-[![Coveralls Status](https://coveralls.io/repos/robertgauld/rail_feeds/badge.png?branch=staging)](https://coveralls.io/r/robertgauld/rail_feeds)
-
-
-## Build State
-This project uses continuous integration to help ensure that a quality product is delivered.
-Travis CI monitors two branches (versions) of the code - Master (which is what gets released)
-and Staging (which is what is currently being developed ready for moving to master).
+[![security](https://hakiri.io/github/robertgauld/rail_feeds/master.svg)](https://hakiri.io/github/robertgauld/rail_feeds/master)
 
 
 ## 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.
 
   * ruby:
-    * 2.4.4 - 2.4.6
-    * 2.5.0 - 2.5.5
-    * 2.6.0 - 2.6.2
+    * 2.4.4 - 2.4.7
+    * 2.5.0 - 2.5.6
+    * 2.6.0 - 2.6.5
   * jruby:
     * 9.2.0.0 - 9.2.6.0
 

data/THANKS.md

@@ -0,0 +1,3 @@
+[@marcbest](https://github.com/marcbest) thank you for 2 PRs:
+* Fix URLs for national rail open data
+* Fix URL for service indicators

data/lib/rail_feeds/credentials.rb

@@ -27,9 +27,9 @@ module RailFeeds
 
     # Initialize a new cresential.
     def initialize(
-        username: self.class.username,
-        password: self.class.password
-      )
+      username: self.class.username,
+      password: self.class.password
+    )
       @username = username.to_s.clone
       @password = password.to_s.clone
     end

data/lib/rail_feeds/national_rail/http_client.rb

@@ -14,7 +14,7 @@ module RailFeeds
       # @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
+        super "https://opendata.nationalrail.co.uk/#{path}", 'X-Auth-Token' => auth_token
       end
 
       private
@@ -25,7 +25,7 @@ module RailFeeds
 
         logger.info 'Getting an auth token for national rail.'
         response = Net::HTTP.post_form(
-          URI('https://datafeeds.nationalrail.co.uk/authenticate'),
+          URI('https://opendata.nationalrail.co.uk/authenticate'),
           credentials.to_h
         )
         response.value # Raise an exception if not successful

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

@@ -34,7 +34,7 @@ module RailFeeds
         #   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
+          client.download 'api/staticfeeds/4.0/serviceIndicators', file
         end
 
         # Fetch the current data.
@@ -42,7 +42,7 @@ module RailFeeds
         # @return [IO]
         def self.fetch(credentials = Credentials, &block)
           client = HTTPClient.new(credentials: credentials)
-          client.fetch 'darwin/api/staticfeeds/4.0/serviceIndicators', &block
+          client.fetch 'api/staticfeeds/4.0/serviceIndicators', &block
         end
 
         # Load data from either a .json or .json.gz file.

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

@@ -159,15 +159,14 @@ module RailFeeds
         end
 
         # rubocop:disable Metrics/AbcSize
+        # rubocop:disable Style/FormatStringToken
         def to_cif
           format('%-80.80s', [
             'AAN',
             format('%-6.6s', main_train_uid),
             format('%-6.6s', associated_train_uid),
-            # rubocop:disable Style/FormatStringToken
             format('%-6.6s', start_date&.strftime('%y%m%d')),
             format('%-6.6s', end_date&.strftime('%y%m%d')),
-            # rubocop:enable Style/FormatStringToken
             days_to_cif,
             format('%-2.2s', category),
             format('%-1.1s', date_indicator),
@@ -179,6 +178,7 @@ module RailFeeds
           ].join) + "\n"
         end
         # rubocop:enable Metrics/AbcSize
+        # rubocop:enable Style/FormatStringToken
 
         # rubocop:disable Metrics/MethodLength
         def to_json(**opts)

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

@@ -70,24 +70,22 @@ module RailFeeds
           end
 
           # rubocop:disable Metrics/AbcSize
+          # rubocop:disable Style/FormatStringToken
           def to_cif
             format('%-80.80s', [
               'HD',
               format('%-20.20s', file_identity),
-              # rubocop:disable Style/FormatStringToken
               format('%-10.10s', extracted_at&.strftime('%d%m%y%H%M')),
-              # rubocop:enable Style/FormatStringToken
               format('%-7.7s', current_file_reference),
               format('%-7.7s', previous_file_reference),
               format('%-1.1s', update_indicator),
               format('%-1.1s', version),
-              # rubocop:disable Style/FormatStringToken
               format('%-6.6s', start_date&.strftime('%d%m%y')),
               format('%-6.6s', end_date&.strftime('%d%m%y'))
-              # rubocop:enable Style/FormatStringToken
             ].join) + "\n"
           end
           # rubocop:enable Metrics/AbcSize
+          # rubocop:enable Style/FormatStringToken
 
           def to_s
             "File #{file_identity.inspect} (version #{version}) " \

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

@@ -66,6 +66,7 @@ module RailFeeds
           tiploc.dup
         end
 
+        # rubocop:disable Style/FormatStringToken
         def to_cif
           format('%-80.80s', [
             'TI',
@@ -80,6 +81,7 @@ module RailFeeds
             format('%-16.16s', nlc_description)
           ].join) + "\n"
         end
+        # rubocop:enable Style/FormatStringToken
 
         def to_json(**opts)
           {

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

@@ -268,14 +268,13 @@ module RailFeeds
 
         # rubocop:disable Metrics/AbcSize
         # rubocop:disable Metrics/MethodLength
+        # rubocop:disable Style/FormatStringToken
         def basic_to_cif
           format('%-80.80s', [
             'BSN',
             format('%-6.6s', uid),
-            # rubocop:disable Style/FormatStringToken
             format('%-6.6s', start_date&.strftime('%y%m%d')),
             format('%-6.6s', end_date&.strftime('%y%m%d')),
-            # rubocop:enable Style/FormatStringToken
             days_to_cif,
             format('%-1.1s', bank_holiday_running),
             format('%-1.1s', status),
@@ -301,7 +300,9 @@ module RailFeeds
         end
         # rubocop:enable Metrics/AbcSize
         # rubocop:enable Metrics/MethodLength
+        # rubocop:enable Style/FormatStringToken
 
+        # rubocop:disable Style/FormatStringToken
         def extra_to_cif
           format('%-80.80s', [
             'BX    ',
@@ -310,6 +311,7 @@ module RailFeeds
             format('%-1.1s', (applicable_timetable ? 'Y' : 'N'))
           ].join) + "\n"
         end
+        # rubocop:enable Style/FormatStringToken
 
         def self.location_from_json(hash)
           case hash['record_identity']

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

@@ -116,6 +116,7 @@ module RailFeeds
 
           # rubocop:disable Metrics/AbcSize
           # rubocop:disable Metrics/MethodLength
+          # rubocop:disable Style/FormatStringToken
           def to_cif
             format('%-80.80s', [
               'CR',
@@ -143,6 +144,7 @@ module RailFeeds
           end
           # rubocop:enable Metrics/AbcSize
           # rubocop:enable Metrics/MethodLength
+          # rubocop:enable Style/FormatStringToken
 
           def hash
             "#{tiploc}-#{tiploc_suffix}"

data/lib/rail_feeds/network_rail/schedule/train_schedule/location/intermediate.rb

@@ -68,6 +68,7 @@ module RailFeeds
 
             # rubocop:disable Metrics/AbcSize
             # rubocop:disable Metrics/MethodLength
+            # rubocop:disable Style/FormatStringToken
             def to_cif
               format('%-80.80s', [
                 'LI',
@@ -89,6 +90,7 @@ module RailFeeds
             end
             # rubocop:enable Metrics/AbcSize
             # rubocop:enable Metrics/MethodLength
+            # rubocop:enable Style/FormatStringToken
 
             # rubocop:disable Metrics/MethodLength
             def to_hash_for_json

data/lib/rail_feeds/network_rail/schedule/train_schedule/location/origin.rb

@@ -51,6 +51,7 @@ module RailFeeds
             # rubocop:enable Metrics/AbcSize
 
             # rubocop:disable Metrics/AbcSize
+            # rubocop:disable Style/FormatStringToken
             def to_cif
               format('%-80.80s', [
                 'LO',
@@ -67,6 +68,7 @@ module RailFeeds
               ].join) + "\n"
             end
             # rubocop:enable Metrics/AbcSize
+            # rubocop:enable Style/FormatStringToken
 
             def to_hash_for_json
               {

data/lib/rail_feeds/network_rail/schedule/train_schedule/location/terminating.rb

@@ -39,6 +39,7 @@ module RailFeeds
             end
             # rubocop:enable Metrics/AbcSize
 
+            # rubocop:disable Style/FormatStringToken
             def to_cif
               format('%-80.80s', [
                 'LT',
@@ -51,6 +52,7 @@ module RailFeeds
                 format('%-12.12s', activity)
               ].join) + "\n"
             end
+            # rubocop:enable Style/FormatStringToken
 
             def to_hash_for_json
               {

data/lib/rail_feeds/version.rb

@@ -5,7 +5,7 @@ module RailFeeds
   class Version
     MAJOR = 0
     MINOR = 0
-    PATCH = 2
+    PATCH = 3
 
     def self.to_s
       [MAJOR, MINOR, PATCH].join('.')

data/rail_feeds.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |gem|
   gem.required_ruby_version     = '>= 2.4'
   gem.required_rubygems_version = '>= 2.6.14'
 
-  gem.add_dependency 'nokogiri', '~> 1.8'
+  gem.add_dependency 'nokogiri', '~> 1.10', '>= 1.10.4'
   gem.add_dependency 'stomp', '~> 1.4'
 
   gem.add_development_dependency 'coveralls', '~> 0.7'

data/spec/rail_feeds/national_rail/http_client_spec.rb

@@ -17,13 +17,13 @@ describe RailFeeds::NationalRail::HTTPClient do
 
       it 'It has not been fetched yet' do
         expect(subject).to receive(:auth_token)
-        expect(URI).to receive(:parse).with('https://datafeeds.nationalrail.co.uk/path').and_return(uri)
+        expect(URI).to receive(:parse).with('https://opendata.nationalrail.co.uk/path').and_return(uri)
         subject.fetch('path') {}
       end
 
       it 'Token is over an hour old' do
         expect(subject).to receive(:auth_token).twice
-        expect(URI).to receive(:parse).with('https://datafeeds.nationalrail.co.uk/path')
+        expect(URI).to receive(:parse).with('https://opendata.nationalrail.co.uk/path')
                                       .and_return(uri).twice
         subject.fetch('path') {} # Get the auth token
         Timecop.travel 3601
@@ -36,7 +36,7 @@ describe RailFeeds::NationalRail::HTTPClient do
         expect(response).to receive(:value)
         expect(response).to receive(:body).and_return('{"token":"TOKEN"}')
         expect(Net::HTTP).to receive(:post_form)
-          .with(URI('https://datafeeds.nationalrail.co.uk/authenticate'), { username: '', password: '' })
+          .with(URI('https://opendata.nationalrail.co.uk/authenticate'), { username: '', password: '' })
           .and_return(response)
         expect(subject.send(:auth_token)).to eq 'TOKEN'
       end
@@ -48,7 +48,7 @@ describe RailFeeds::NationalRail::HTTPClient do
       end
 
       it 'Adds server to path then delegates to super' do
-        expect(URI).to receive(:parse).with('https://datafeeds.nationalrail.co.uk/path').and_return(uri)
+        expect(URI).to receive(:parse).with('https://opendata.nationalrail.co.uk/path').and_return(uri)
         expect(uri).to receive(:open)
         subject.fetch('path') {}
       end

data/spec/rail_feeds/national_rail/knowledge_base/national_service_indicator_spec.rb

@@ -40,7 +40,7 @@ describe RailFeeds::NationalRail::KnowledgeBase::NationalServiceIndicator do
       expect(RailFeeds::NationalRail::HTTPClient).to receive(:new)
         .with(credentials: RailFeeds::NationalRail::Credentials).and_return(http_client)
       expect(http_client).to receive(:download)
-        .with('darwin/api/staticfeeds/4.0/serviceIndicators', 'file')
+        .with('api/staticfeeds/4.0/serviceIndicators', 'file')
       described_class.download 'file'
     end
 
@@ -58,7 +58,7 @@ describe RailFeeds::NationalRail::KnowledgeBase::NationalServiceIndicator do
       expect(RailFeeds::NationalRail::HTTPClient).to receive(:new)
         .with(credentials: RailFeeds::NationalRail::Credentials).and_return(http_client)
       expect(http_client).to receive(:fetch)
-        .with('darwin/api/staticfeeds/4.0/serviceIndicators').and_return(temp_file)
+        .with('api/staticfeeds/4.0/serviceIndicators').and_return(temp_file)
       expect(described_class.fetch).to eq temp_file
     end
 

data/spec/rail_feeds/network_rail/schedule/parser/cif_spec.rb

@@ -48,6 +48,7 @@ describe RailFeeds::NetworkRail::Schedule::Parser::CIF do
     "AAD            0102030405060101010                                             P\n"
   end
   let(:train_schedule_create_lines) do
+    # rubocop:disable Style/FormatStringToken
     [
       format('%-79s', 'BSN      010203040506') + 'P',
       format('%-80s', 'BX'),
@@ -59,8 +60,10 @@ describe RailFeeds::NetworkRail::Schedule::Parser::CIF do
       format('%-80s', 'LO'),
       format('%-80s', 'LT')
     ].join("\n") + "\n"
+    # rubocop:enable Style/FormatStringToken
   end
   let(:train_schedule_update_lines) do
+    # rubocop:disable Style/FormatStringToken
     [
       format('%-79s', 'BSR      010203040506') + 'P',
       format('%-80s', 'BX'),
@@ -72,8 +75,13 @@ describe RailFeeds::NetworkRail::Schedule::Parser::CIF do
       format('%-80s', 'LO'),
       format('%-80s', 'LT')
     ].join("\n") + "\n"
+    # rubocop:enable Style/FormatStringToken
+  end
+  let(:train_schedule_delete_line) do
+    # rubocop:disable Style/FormatStringToken
+    format('%-79.79s', 'BSD      010203040506') + "P\n"
+    # rubocop:enable Style/FormatStringToken
   end
-  let(:train_schedule_delete_line) { format('%-79.79s', 'BSD      010203040506') + "P\n" }
 
   let(:smallest_file) { StringIO.new header_line + trailer_line }
 

data/spec/spec_helper.rb

@@ -4,13 +4,13 @@ require 'timecop'
 require 'yaml'
 
 require 'simplecov'
-SimpleCov.coverage_dir(File.join('tmp', 'coverage'))
+SimpleCov.coverage_dir(File.join('tmp', 'coverage')) unless ENV.key?('TRAVIS')
 SimpleCov.start do
   add_filter 'spec/'
 end
 
 require 'coveralls'
-Coveralls.wear! if ENV['TRAVIS']
+Coveralls.wear! if ENV.key?('TRAVIS')
 
 RSPEC_ROOT = File.dirname __FILE__
 RSPEC_FIXTURES = File.join RSPEC_ROOT, 'fixtures'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rail_feeds
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Robert Gauld
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-22 00:00:00.000000000 Z
+date: 2019-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -16,14 +16,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.10'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.10.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.10'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.10.4
 - !ruby/object:Gem::Dependency
   name: stomp
   requirement: !ruby/object:Gem::Requirement
@@ -203,11 +209,13 @@ files:
 - ".rubocop.yml"
 - ".travis.yml"
 - CHANGELOG.md
+- FUNDING.yml
 - Gemfile
 - Guardfile
 - LICENSE.md
 - README.md
 - Rakefile
+- THANKS.md
 - doc/guides/Logging.md
 - doc/guides/National Rail/Knowledge Base/National Service Indicator.md
 - doc/guides/Network Rail/CORPUS.md