national_rail_wrapper 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d647f77e5c3ad869af182903c9bdf177681457e82b44c4dce917091a008c8b50
-  data.tar.gz: cce5619a39b42eaaad002cf603b3818a966a9f165a929b24efea20d9a50b22da
+  metadata.gz: 60858d6a68198583863a9aa97c96fee27c4bd3a29f9a9e6e12dbe1779f9654ae
+  data.tar.gz: bfdff1ee26952b22c0147bae89dbe100748359cf4045fa88d172fb4ffb922f63
 SHA512:
-  metadata.gz: 42b67e82fa8caa0eed1dd8c508ec8c3c9ed190be4d2d2cb824212b0ea23bf53925486ef367d8a11fb983434f93ad1c185d798b8e0331dd1fa4308248f5ee5a04
-  data.tar.gz: fc3fe4555f084e7a343eee2542a10fa8f1c456babd14534469d6b5745391db79a8f4208e57bade852310f917ae64e9d2413e956668978075ee144fc1d824fc24
+  metadata.gz: 2678154e89067563a21d1c4a188fcad883eaa488c0a145d3739bb7f4ad68117ee9240e1a5002bb898f50dcaf8de13cb1d0e7deeb54178569bafc5ce2078f4d57
+  data.tar.gz: 80ab35617e5f152eb21de8c74a7598fc10f4e32298c2a476feeebd985febb23f2947b709310a6907059c80334bdf9d0a9b08f18bd2e3073fc133d5cd9a4552cf

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    national_rail_wrapper (0.1.0)
+    national_rail_wrapper (0.1.2)
+      nokogiri
       ox
       typhoeus
 
@@ -13,8 +14,11 @@ GEM
     diff-lcs (1.3)
     ethon (0.12.0)
       ffi (>= 1.3.0)
-    ffi (1.11.2)
+    ffi (1.11.3)
     method_source (0.9.2)
+    mini_portile2 (2.4.0)
+    nokogiri (1.10.5)
+      mini_portile2 (~> 2.4.0)
     ox (2.11.0)
     pry (0.12.2)
       coderay (~> 1.1.0)

data/README.md

@@ -25,7 +25,6 @@ Or install it yourself as:
     $ gem install national_rail_wrapper
 
 ## Usage
-client = NationalRailWrapper::Feeds::Client.new(username: username, password: password)
 
 ### Knowledge Base 
 ```

data/lib/national_rail_wrapper.rb

@@ -10,11 +10,14 @@ require_relative "national_rail_wrapper/feeds/knowledge_base/client"
 require_relative "national_rail_wrapper/feeds/knowledge_base/requests/base"
 require_relative "national_rail_wrapper/feeds/knowledge_base/requests/incidents"
 require_relative "national_rail_wrapper/feeds/knowledge_base/requests/national_service_indicators"
+require_relative "national_rail_wrapper/feeds/knowledge_base/parsers/national_service_indicators"
 require_relative "national_rail_wrapper/feeds/knowledge_base/requests/public_promotions"
 require_relative "national_rail_wrapper/feeds/knowledge_base/requests/stations"
+require_relative "national_rail_wrapper/feeds/knowledge_base/parsers/stations"
 require_relative "national_rail_wrapper/feeds/knowledge_base/requests/ticket_restrictions"
 require_relative "national_rail_wrapper/feeds/knowledge_base/requests/ticket_types"
 require_relative "national_rail_wrapper/feeds/knowledge_base/requests/tocs"
+require_relative "national_rail_wrapper/feeds/knowledge_base/parsers/tocs"
 
 require_relative "national_rail_wrapper/feeds/historical_service_performance/client"
 require_relative "national_rail_wrapper/feeds/historical_service_performance/requests/base"

data/lib/national_rail_wrapper/feeds/knowledge_base/client.rb

@@ -6,47 +6,63 @@ module NationalRailWrapper
         def incidents(parse_result: true)
           request = KnowledgeBase::Requests::Incidents.new.run(auth_token)
 
-          parse_result ? Ox.parse(request.response_body).to_json : request.response_body 
+          parse_result ? Ox.parse(request.response_body).to_json : request.response_body
         end
 
         def national_service_indicators(parse_result: true)
-          request = KnowledgeBase::Requests::NationalServiceIndicators.new.run(auth_token)
+          request = KnowledgeBase::Requests::NationalServiceIndicators.new.run(auth_token).response_body
 
-          parse_result ? Ox.parse(request.response_body).to_json : request.response_body 
+          if parse_result
+            KnowledgeBase::Parsers::NationalServiceIndicators.new(request).to_json
+          else
+            request.response_body
+          end
         end
 
         def public_promotions(parse_result: true)
           request = KnowledgeBase::Requests::PublicPromotions.new.run(auth_token)
 
-          parse_result ? Ox.parse(request.response_body).to_json : request.response_body 
+          parse_result ? response.to_json : request.response_body
         end
 
         def stations(parse_result: true)
-          request = KnowledgeBase::Requests::Stations.new.run(auth_token) 
+          request = KnowledgeBase::Requests::Stations.new.run(auth_token).response_body
 
-          parse_result ? Ox.parse(request.response_body).to_json : request.response_body 
+          if parse_result
+            KnowledgeBase::Parsers::Stations.new(request).to_json
+          else
+            request.response_body
+          end
         end
 
         def ticket_restrictions(parse_result: true)
-          request = KnowledgeBase::Requests::TicketRestrictions.new.run(auth_token) 
+          request = KnowledgeBase::Requests::TicketRestrictions.new.run(auth_token)
 
-          parse_result ? Ox.parse(request.response_body).to_json : request.response_body 
+          parse_result ? Ox.parse(request.response_body).to_json : request.response_body
         end
 
         def ticket_types(parse_result: true)
           request = KnowledgeBase::Requests::TicketTypes.new.run(auth_token)
-          
-          parse_result ? Ox.parse(request.response_body).to_json : request.response_body 
+
+          parse_result ? Ox.parse(request.response_body).to_json : request.response_body
         end
 
         def tocs(parse_result: true)
-          request = KnowledgeBase::Requests::Tocs.new.run(auth_token)
+          request = KnowledgeBase::Requests::Tocs.new.run(auth_token).response_body
 
-          parse_result ? Ox.parse(request.response_body).to_json : request.response_body 
+          if parse_result
+            KnowledgeBase::Parsers::Tocs.new(request).to_json
+          else
+            request.response_body
+          end
         end
 
         private
 
+        def parse_result(endpoint, response)
+          "KnowledgeBase::Parsers::#{endpoint.camelize}".constantize.new(request).to_json
+        end
+
         def auth_token
           return @auth_token if !@auth_token.nil? && @auth_token_expires_at >= Time.now
 

data/lib/national_rail_wrapper/feeds/knowledge_base/parsers/incidents.rb

@@ -0,0 +1,26 @@
+module NationalRailWrapper
+  module Feeds
+    module KnowledgeBase
+      module Parsers
+        class Incidents
+          def initialize(data)
+            @data = data
+          end
+
+          def to_json
+            options = Nokogiri::XML::ParseOptions.new.nonet.noent.noblanks
+            doc = Nokogiri::XML.parse(@data, nil, nil, options)
+            doc.xpath('/xmlns:NSI/xmlns:TOC').map do |toc_node|
+              {
+
+              }
+            end
+          end
+
+          private
+
+        end
+      end
+    end
+  end
+end

data/lib/national_rail_wrapper/feeds/knowledge_base/parsers/national_service_indicators.rb

@@ -0,0 +1,44 @@
+module NationalRailWrapper
+  module Feeds
+    module KnowledgeBase
+      module Parsers
+        class NationalServiceIndicators 
+          def initialize(data)
+            @data = data
+          end
+
+          def to_json
+            options = Nokogiri::XML::ParseOptions.new.nonet.noent.noblanks
+            doc = Nokogiri::XML.parse(@data, nil, nil, options)
+            doc.xpath('/xmlns:NSI/xmlns:TOC').map do |toc_node|
+              {
+                toc_code: toc_node.xpath('./xmlns:TocCode').first&.content,
+                toc_name: toc_node.xpath('./xmlns:TocName').first&.content,
+                status: toc_node.xpath('./xmlns:Status').first&.content,
+                status_image: toc_node.xpath('./xmlns:StatusImage').first&.content,
+                status_description: toc_node.xpath('./xmlns:StatusDescription').first&.content,
+                service_groups: service_groups(toc_node.xpath('./xmlns:ServiceGroup')),
+                twitter_account: toc_node.xpath('./xmlns:TwitterAccount').first&.content,
+                additional_info: toc_node.xpath('./xmlns:AdditionalInfo').first&.content, 
+                custom_additional_info: toc_node.xpath('./xmlns:CustomAdditionalInfo').first&.content
+              }
+            end
+          end
+
+          private
+
+          def service_groups(service_groups)
+            service_groups.map do |service_group| 
+              {
+                group_name: service_group.xpath('./xmlns:GroupName').first&.content,
+                current_distruption: service_group.xpath('./xmlns:CurrentDisruption').first&.content,
+                custom_detail: service_group.xpath('./xmlns:CustomDetail').first&.content,
+                custom_url: service_group.xpath('./xmlns:CustomURL').first&.content
+              }
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/national_rail_wrapper/feeds/knowledge_base/parsers/stations.rb

@@ -0,0 +1,111 @@
+module NationalRailWrapper
+  module Feeds
+    module KnowledgeBase
+      module Parsers
+        class Stations
+          def initialize(data)
+            @data = data
+          end
+
+          def to_json
+            options = Nokogiri::XML::ParseOptions.new.nonet.noent.noblanks.huge
+            doc = Nokogiri::XML.parse(@data, nil, nil, options)
+
+            doc.xpath('/xmlns:StationList/xmlns:Station').map do |toc_node|
+              {
+                name: toc_node.xpath('./xmlns:Name')&.text,
+                crs_code: toc_node.css('CrsCode')&.text,
+                alternative_identifiers: toc_node.css('AlternativeIdentifiers')&.text,
+                sixteen_character_name: toc_node.css('SixteenCharacterName')&.text,
+                longitude: toc_node.css('Longitude')&.text,
+                latitude: toc_node.css('Latitude')&.text,
+                station_operator: toc_node.css('StationOperator')&.text,
+                staffing_level: toc_node.css('Staffing/StaffingLevel')&.text,
+                closed_circuit_television: toc_node.css('Staffing/ClosedCircuitTelevision')&.text,
+                station_facilities: station_facilities(toc_node.css('StationFacilities')),
+                # impaired_access: impaired_access(toc_node.css('ImpairedAccess'))
+                car_park: car_park(toc_node.css('CarPark'))
+
+              }
+            end
+          end
+
+
+                # national_location_code: toc_node.xpath('./xmlns:NationalLocationCode').first&.content,
+                # address: toc_node.xpath('./xmlns:Address').first&.content,
+                # postal_address: toc_node.xpath('./xmlns:PostalAddress').first&.content,
+                # #<add:A_5LineAddress> (mandatory) See section 2.4.1
+
+                # station_operator: toc_node.css('StationOperator').text, #
+                # Overall: toc_node.xpath('./xmlns:Overall').first&.content,
+                # InformationSystems: toc_node.xpath('./xmlns:InformationSystems').first&.content,
+                # cis: cis,
+                # fares: fares(toc_node.xpath('./xmlns:Fares').first),
+                # passenger_services: passenger_services,
+                # impaired_access: impaired_access,
+                # InterChange: inter_change,
+                # StationAlerts: toc_node.xpath('./xmlns:PostalAddress').first&.content,
+                # AlertText: toc_node.xpath('./xmlns:PostalAddress').first&.content,
+                # LastChangedDate: toc_node.xpath('./xmlns:PostalAddress').first&.content,
+                # car_park: car_park,
+                # opening_hours: opening_hours,
+                # contact_details: contact_details
+
+          private
+
+          def cis(toc_node)
+          end
+
+          def fares(fares)
+
+          end
+
+          def passenger_services(toc_node)
+          end
+
+          def station_facilities(node_set)
+            {
+              first_class_lounge: node_set.at('FirstClassLounge')&.text,
+              waiting_room: node_set.at('WaitingRoom')&.text,
+              trolleys: node_set.at('Trolleys')&.text,
+              station_buffet: node_set.at('StationBuffet')&.text,
+              toilets: node_set.at('Toilets')&.text,
+              baby_change: node_set.at('BabyChange')&.text,
+              showers: node_set.at('Showers')&.text,
+              # telephone: {
+              #   exists:
+              #   usage_type:
+              # },
+              wifi: node_set.at('WiFi')&.text,
+              post_box: node_set.at('BabyChange')&.text,
+              # tourist_information_office:
+              atm_machine: node_set.at('AtmMachine')&.text,
+              bureau_de_change: node_set.at('BureauDeChange')&.text,
+              shops: node_set.at('Shops')&.text
+            }
+          end
+
+          def impaired_access(toc_node)
+          end
+
+          def inter_change(toc_node)
+          end
+
+          def car_park(node_set)
+            {
+              name: node_set.at('Name')&.text,
+              spaces: node_set.at('Spaces')&.text
+            }
+          end
+
+          def opening_hours(toc_node)
+          end
+
+          def contact_details(toc_node)
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/national_rail_wrapper/feeds/knowledge_base/parsers/tocs.rb

@@ -0,0 +1,36 @@
+module NationalRailWrapper
+  module Feeds
+    module KnowledgeBase
+      module Parsers
+        class Tocs
+          def initialize(data)
+            @data = data
+          end
+
+          def to_json
+            options = Nokogiri::XML::ParseOptions.new.nonet.noent.noblanks.huge
+            doc = Nokogiri::XML.parse(@data, nil, nil, options)
+
+            doc.xpath('/xmlns:StationList/xmlns:Station').map do |toc_node|
+              {
+                name: toc_node.xpath('./xmlns:Name')&.text,
+                crs_code: toc_node.css('CrsCode')&.text,
+                alternative_identifiers: toc_node.css('AlternativeIdentifiers')&.text,
+                sixteen_character_name: toc_node.css('SixteenCharacterName')&.text,
+                longitude: toc_node.css('Longitude')&.text,
+                latitude: toc_node.css('Latitude')&.text,
+                station_operator: toc_node.css('StationOperator')&.text,
+                staffing_level: toc_node.css('Staffing/StaffingLevel')&.text,
+                closed_circuit_television: toc_node.css('Staffing/ClosedCircuitTelevision')&.text,
+                station_facilities: station_facilities(toc_node.css('StationFacilities')),
+                # impaired_access: impaired_access(toc_node.css('ImpairedAccess'))
+                car_park: car_park(toc_node.css('CarPark'))
+
+              }
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/national_rail_wrapper/version.rb

@@ -1,3 +1,3 @@
 module NationalRailWrapper
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/national_rail_wrapper.gemspec

@@ -39,6 +39,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "typhoeus"
   spec.add_dependency "ox"
+  spec.add_dependency "nokogiri"
 
   spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: national_rail_wrapper
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Marc Best
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-24 00:00:00.000000000 Z
+date: 2020-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +136,13 @@ files:
 - lib/national_rail_wrapper/feeds/historical_service_performance/requests/service_details.rb
 - lib/national_rail_wrapper/feeds/historical_service_performance/requests/service_metrics.rb
 - lib/national_rail_wrapper/feeds/knowledge_base/client.rb
+- lib/national_rail_wrapper/feeds/knowledge_base/parsers/incidents.rb
+- lib/national_rail_wrapper/feeds/knowledge_base/parsers/national_service_indicators.rb
+- lib/national_rail_wrapper/feeds/knowledge_base/parsers/public_promotions.rb
+- lib/national_rail_wrapper/feeds/knowledge_base/parsers/stations.rb
+- lib/national_rail_wrapper/feeds/knowledge_base/parsers/ticket_restrictions.rb
+- lib/national_rail_wrapper/feeds/knowledge_base/parsers/ticket_types.rb
+- lib/national_rail_wrapper/feeds/knowledge_base/parsers/tocs.rb
 - lib/national_rail_wrapper/feeds/knowledge_base/requests/base.rb
 - lib/national_rail_wrapper/feeds/knowledge_base/requests/incidents.rb
 - lib/national_rail_wrapper/feeds/knowledge_base/requests/national_service_indicators.rb
@@ -130,13 +151,6 @@ files:
 - lib/national_rail_wrapper/feeds/knowledge_base/requests/ticket_restrictions.rb
 - lib/national_rail_wrapper/feeds/knowledge_base/requests/ticket_types.rb
 - lib/national_rail_wrapper/feeds/knowledge_base/requests/tocs.rb
-- lib/national_rail_wrapper/feeds/knowledge_base/response_parser/incidents.rb
-- lib/national_rail_wrapper/feeds/knowledge_base/response_parser/national_services_indicators.rb
-- lib/national_rail_wrapper/feeds/knowledge_base/response_parser/public_promotions.rb
-- lib/national_rail_wrapper/feeds/knowledge_base/response_parser/stations.rb
-- lib/national_rail_wrapper/feeds/knowledge_base/response_parser/ticket_restrictions.rb
-- lib/national_rail_wrapper/feeds/knowledge_base/response_parser/ticket_types.rb
-- lib/national_rail_wrapper/feeds/knowledge_base/response_parser/tocs.rb
 - lib/national_rail_wrapper/feeds/live_departure_boards/client.rb
 - lib/national_rail_wrapper/version.rb
 - national_rail_wrapper.gemspec