rail_feeds 0.0.1 → 0.0.2

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

@@ -0,0 +1,122 @@
+# frozen_string_literal: true
+
+describe RailFeeds::NationalRail::KnowledgeBase::NationalServiceIndicator do
+  let :xml do
+    <<~HEREDOC
+      <?xml version="1.0" encoding="utf-8"?>
+      <NSI xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://internal.nationalrail.co.uk/xml/XsdSchemas/External/Version4.0/nre-service-indicator-v4-0.xsd" xmlns="http://nationalrail.co.uk/xml/serviceindicator">
+        <TOC>
+          <TocCode>AW</TocCode>
+          <TocName>Arriva Trains Wales</TocName>
+          <Status>Good service</Status>
+          <StatusImage>icon-tick2.png</StatusImage>
+          <TwitterAccount>ArrivaTW</TwitterAccount>
+          <AdditionalInfo><![CDATA[Follow us on Twitter]]></AdditionalInfo>
+        </TOC>
+        <TOC>
+          <TocCode>WM</TocCode>
+          <TocName>West Midlands Railway</TocName>
+          <Status>Major delays on some routes</Status>
+          <StatusImage>icon-disruption.png</StatusImage>
+          <StatusDescription><![CDATA[An amended service is in operation]]></StatusDescription>
+          <ServiceGroup>
+            <GroupName>Aston</GroupName>
+            <CurrentDisruption>36DB32F7EB7F40ACACFF1D5CF7572D4C</CurrentDisruption>
+            <CustomDetail><![CDATA[Read about this disruption]]></CustomDetail>
+            <CustomURL>http://www.nationalrail.co.uk/</CustomURL>
+          </ServiceGroup>
+          <TwitterAccount>WestMidRailway</TwitterAccount>
+          <AdditionalInfo><![CDATA[Latest travel news]]></AdditionalInfo>
+        </TOC>
+      </NSI>
+    HEREDOC
+  end
+  let(:http_client) { double RailFeeds::NationalRail::HTTPClient }
+  let(:temp_file) { double Tempfile }
+
+
+  describe '::download' do
+    it 'Using default credentials' 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')
+      described_class.download 'file'
+    end
+
+    it 'Using passed credentials' do
+      credentials = double RailFeeds::NationalRail::Credentials
+      expect(RailFeeds::NationalRail::HTTPClient).to receive(:new)
+        .with(credentials: credentials).and_return(http_client)
+      expect(http_client).to receive(:download)
+      described_class.download 'file', credentials
+    end
+  end
+
+  describe '::fetch' do
+    it 'Using default credentials' 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)
+      expect(described_class.fetch).to eq temp_file
+    end
+
+    it 'Using passed credentials' do
+      credentials = double RailFeeds::NationalRail::Credentials
+      expect(RailFeeds::NationalRail::HTTPClient).to receive(:new)
+        .with(credentials: credentials).and_return(http_client)
+      expect(http_client).to receive(:fetch).and_return(temp_file)
+      expect(described_class.fetch(credentials)).to eq temp_file
+    end
+  end
+
+  it '::load_data' do
+    expect(File).to receive(:read).with('filename').and_return(xml)
+    data = described_class.load_file('filename')
+
+    expect(data[0].code).to eq 'AW'
+    expect(data[0].name).to eq 'Arriva Trains Wales'
+    expect(data[0].twitter_account).to eq 'ArrivaTW'
+    expect(data[0].additional_info).to eq 'Follow us on Twitter'
+    expect(data[0].status.title).to eq 'Good service'
+    expect(data[0].status.description).to eq nil
+    expect(data[0].status.image).to eq 'icon-tick2.png'
+    expect(data[0].service_groups).to eq []
+
+    expect(data[1].code).to eq 'WM'
+    expect(data[1].name).to eq 'West Midlands Railway'
+    expect(data[1].twitter_account).to eq 'WestMidRailway'
+    expect(data[1].additional_info).to eq 'Latest travel news'
+    expect(data[1].status.title).to eq 'Major delays on some routes'
+    expect(data[1].status.description).to eq 'An amended service is in operation'
+    expect(data[1].status.image).to eq 'icon-disruption.png'
+    expect(data[1].service_groups[0].disruption_id).to eq '36DB32F7EB7F40ACACFF1D5CF7572D4C'
+    expect(data[1].service_groups[0].name).to eq 'Aston'
+    expect(data[1].service_groups[0].detail).to eq 'Read about this disruption'
+    expect(data[1].service_groups[0].url).to eq 'http://www.nationalrail.co.uk/'
+  end
+
+  it '::fetch_data' do
+    expect(described_class).to receive(:fetch)
+      .with(credentials: RailFeeds::NationalRail::Credentials)
+      .and_yield(temp_file)
+
+    expect(temp_file).to receive(:read).and_return(xml)
+    expect(described_class).to receive(:parse_xml).with(xml)
+    described_class.fetch_data
+  end
+
+  it 'Converts to string' do
+    expect(File).to receive(:read).with('filename').and_return(xml)
+    data = described_class.load_file('filename')
+    expect(data[0].to_s).to eq "AW - Arriva Trains Wales\n" \
+                               "Good service -  - icon-tick2.png\n\n" \
+                               '@ArrivaTW - Follow us on Twitter'
+    expect(data[1].to_s).to eq "WM - West Midlands Railway\n" \
+                               "Major delays on some routes - An amended service is in operation - icon-disruption.png\n" \
+                               "Aston - Read about this disruption\n" \
+                               "36DB32F7EB7F40ACACFF1D5CF7572D4C http://www.nationalrail.co.uk/\n" \
+                               '@WestMidRailway - Latest travel news'
+  end
+end

data/spec/rail_feeds/national_rail/knowledge_base_spec.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+describe RailFeeds::NationalRail::KnowledgeBase do
+end

data/spec/rail_feeds/national_rail_spec.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+describe RailFeeds::NationalRail do
+  it 'Has NatRailFeeds as an alias' do
+    expect(::NatRailFeeds).to be RailFeeds::NationalRail
+  end
+end

data/spec/rail_feeds/network_rail/corpus_spec.rb

@@ -26,7 +26,7 @@ describe RailFeeds::NetworkRail::CORPUS do
       expect(RailFeeds::NetworkRail::HTTPClient).to receive(:new)
         .with(credentials: credentials).and_return(http_client)
       expect(http_client).to receive(:download)
-      described_class.download 'file', credentials: credentials
+      described_class.download 'file', credentials
     end
   end
 
@@ -47,7 +47,7 @@ describe RailFeeds::NetworkRail::CORPUS do
       expect(RailFeeds::NetworkRail::HTTPClient).to receive(:new)
         .with(credentials: credentials).and_return(http_client)
       expect(http_client).to receive(:fetch).and_return(temp_file)
-      expect(described_class.fetch(credentials: credentials)).to eq temp_file
+      expect(described_class.fetch(credentials)).to eq temp_file
     end
   end
 

data/spec/rail_feeds/network_rail/credentials_spec.rb

@@ -1,22 +1,13 @@
 # frozen_string_literal: true
 
 describe RailFeeds::NetworkRail::Credentials do
-  subject { described_class.new username: 'user-i', password: 'pass-i' }
+  it 'Is a RailFeeds::Credentials' do
+    expect(described_class).to be < RailFeeds::Credentials
+  end
 
   it 'Has seperate values to RailFeeds::Credentials' do
     described_class.configure username: 'a', password: 'b'
     expect(described_class.username).to_not eq RailFeeds::Credentials.username
     expect(described_class.password).to_not eq RailFeeds::Credentials.password
   end
-
-  describe 'Outputs an array' do
-    it '::to_a' do
-      described_class.configure username: 'user', password: 'pass'
-      expect(described_class.to_a).to eq ['user', 'pass']
-    end
-
-    it '#to_a' do
-      expect(subject.to_a).to eq ['user-i', 'pass-i']
-    end
-  end
 end

data/spec/rail_feeds/network_rail/http_client_spec.rb

@@ -1,88 +1,20 @@
 # frozen_string_literal: true
 
 describe RailFeeds::NetworkRail::HTTPClient do
-  let(:temp_file) { double Tempfile }
-  let(:uri) { double URI }
-
-  describe '#download' do
-    let(:file) { double File }
-
-    it 'Saves the file' do
-      expect(URI).to receive(:parse).with('https://datafeeds.networkrail.co.uk/path').and_return(uri)
-      expect(uri).to receive(:open).and_return(temp_file)
-      expect(File).to receive(:open).with('file', 'w').and_yield(file)
-      expect(IO).to receive(:copy_stream).with(temp_file, file)
-      subject.download('path', 'file')
-    end
-
-    it 'Adds credentials when getting path' do
-      credentials = RailFeeds::NetworkRail::Credentials.new(
-        username: 'user',
-        password: 'pass'
-      )
-      expect(URI).to receive(:parse).and_return(uri)
-      expect(uri).to receive(:open)
-        .with(http_basic_authentication: ['user', 'pass'])
-        .and_return(temp_file)
-      expect(File).to receive(:open).and_yield(file)
-      expect(IO).to receive(:copy_stream).with(temp_file, file)
-      subject = described_class.new credentials: credentials
-      subject.download('path', 'file')
-    end
+  it 'Is a RailFeeds::HTTPClient' do
+    expect(described_class).to be < RailFeeds::HTTPClient
+  end
 
-    it 'Handles special characters in credentials' do
-      credentials = RailFeeds::NetworkRail::Credentials.new(
-        username: 'a@example.com',
-        password: '!:@'
-      )
-      expect(URI).to receive(:parse).and_return(uri)
-      expect(uri).to receive(:open).and_return(temp_file)
-      expect(File).to receive(:open).and_yield(file)
-      expect(IO).to receive(:copy_stream).with(temp_file, file)
-      subject = described_class.new credentials: credentials
-      expect { subject.download('path', 'file') }.to_not raise_error
-    end
+  it 'has correct default credentials' do
+    expect(subject.send(:credentials)).to eq RailFeeds::NetworkRail::Credentials
   end
 
   describe '#fetch' do
-    it 'Yields what uri.open does' do
+    it 'Adds server to path then delegates to super' do
+      uri = double URI
       expect(URI).to receive(:parse).with('https://datafeeds.networkrail.co.uk/path').and_return(uri)
-      expect(uri).to receive(:open).and_return(temp_file)
-      expect { |a| subject.fetch('path', &a) }.to yield_with_args(temp_file)
-    end
-
-    it 'Adds credentials when getting path' do
-      credentials = RailFeeds::NetworkRail::Credentials.new(
-        username: 'user',
-        password: 'pass'
-      )
-      expect(URI).to receive(:parse).and_return(uri)
       expect(uri).to receive(:open)
-        .with(http_basic_authentication: ['user', 'pass'])
-        .and_return(temp_file)
-      subject = described_class.new credentials: credentials
       subject.fetch('path') {}
     end
-
-    it 'Handles special characters in credentials' do
-      credentials = RailFeeds::NetworkRail::Credentials.new(
-        username: 'a@example.com',
-        password: '!:@'
-      )
-      expect(URI).to receive(:parse).and_return(uri)
-      expect(uri).to receive(:open).and_return(temp_file)
-      subject = described_class.new credentials: credentials
-      expect { subject.fetch('path') {} }.to_not raise_error
-    end
-  end
-
-  describe '#fetch_unzipped' do
-    it 'Returns what Zlib::GzipReader.open does' do
-      reader = double Zlib::GzipReader
-      expect(subject).to receive(:fetch).with('path').and_yield(temp_file)
-      expect(temp_file).to receive(:path).and_return('gz_file_path')
-      expect(Zlib::GzipReader).to receive(:open).with('gz_file_path').and_return(reader)
-      expect { |a| subject.fetch_unzipped('path', &a) }.to yield_with_args(reader)
-    end
   end
 end

data/spec/rail_feeds/network_rail/schedule/data_spec.rb

@@ -7,7 +7,7 @@ class DummyParserForDataTests
     @events = {}
   end
 
-  def parse_cif_file(file)
+  def parse_file(file)
     filename = File.join RSPEC_FIXTURES, 'network_rail', 'schedule', 'data', "#{file}.yaml"
     YAML.load(File.read(filename)).each do |event, data|
       if data.nil?

data/spec/rail_feeds/network_rail/smart_spec.rb

@@ -31,7 +31,7 @@ describe RailFeeds::NetworkRail::SMART do
       expect(RailFeeds::NetworkRail::HTTPClient).to receive(:new)
         .with(credentials: credentials).and_return(http_client)
       expect(http_client).to receive(:download)
-      described_class.download 'file', credentials: credentials
+      described_class.download 'file', credentials
     end
   end
 
@@ -52,7 +52,7 @@ describe RailFeeds::NetworkRail::SMART do
       expect(RailFeeds::NetworkRail::HTTPClient).to receive(:new)
         .with(credentials: credentials).and_return(http_client)
       expect(http_client).to receive(:fetch).and_return(temp_file)
-      expect(described_class.fetch(credentials: credentials)).to eq temp_file
+      expect(described_class.fetch(credentials)).to eq temp_file
     end
   end
 

data/spec/rail_feeds/network_rail/stomp_client_spec.rb

@@ -132,7 +132,7 @@ describe RailFeeds::NetworkRail::StompClient do
     end
   end
 
-  describe 'Delegates methods to Stomp::Client' do
+  describe 'Delegates methods to ::Stomp::Client' do
     delegates = %i[
       ack acknowledge nack unreceive create_error_handler open? closed? join
       running? begin abort commit unsubscribe uuid poll hbsend_interval

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: rail_feeds
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Robert Gauld
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-12 00:00:00.000000000 Z
+date: 2019-04-22 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: stomp
   requirement: !ruby/object:Gem::Requirement
@@ -126,14 +140,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.57.1
+        version: '0.67'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.67'
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.57.1
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -181,13 +209,19 @@ files:
 - README.md
 - Rakefile
 - doc/guides/Logging.md
+- doc/guides/National Rail/Knowledge Base/National Service Indicator.md
 - doc/guides/Network Rail/CORPUS.md
 - doc/guides/Network Rail/SMART.md
 - doc/guides/Network Rail/Schedule.md
-- file
 - lib/rail_feeds.rb
 - lib/rail_feeds/credentials.rb
+- lib/rail_feeds/http_client.rb
 - lib/rail_feeds/logging.rb
+- lib/rail_feeds/national_rail.rb
+- lib/rail_feeds/national_rail/credentials.rb
+- lib/rail_feeds/national_rail/http_client.rb
+- lib/rail_feeds/national_rail/knowledge_base.rb
+- lib/rail_feeds/national_rail/knowledge_base/national_service_indicator.rb
 - lib/rail_feeds/network_rail.rb
 - lib/rail_feeds/network_rail/corpus.rb
 - lib/rail_feeds/network_rail/credentials.rb
@@ -225,7 +259,13 @@ files:
 - spec/fixtures/network_rail/schedule/parser/train_delete.json
 - spec/fixtures/network_rail/schedule/train_schedule/json-data.yaml
 - spec/rail_feeds/credentials_spec.rb
+- spec/rail_feeds/http_client_spec.rb
 - spec/rail_feeds/logging_spec.rb
+- spec/rail_feeds/national_rail/credentials_spec.rb
+- spec/rail_feeds/national_rail/http_client_spec.rb
+- spec/rail_feeds/national_rail/knowledge_base/national_service_indicator_spec.rb
+- spec/rail_feeds/national_rail/knowledge_base_spec.rb
+- spec/rail_feeds/national_rail_spec.rb
 - spec/rail_feeds/network_rail/corpus_spec.rb
 - spec/rail_feeds/network_rail/credentials_spec.rb
 - spec/rail_feeds/network_rail/http_client_spec.rb
@@ -267,15 +307,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.6.14
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Make use of the various open data rails feeds in the UK.