london_transport 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e1a8ed1303ee5dced5f837dd15335d3c31694b0
-  data.tar.gz: ac9eeaef1f095a20e28db9ff12424b8cec66f9fa
+  metadata.gz: cd9f6b195b362db7349a64f7487a98b6959555a0
+  data.tar.gz: df7ab97282e4c0902ac8044e3e162319aa8ed77a
 SHA512:
-  metadata.gz: 7eb7a6e0526c26c9e1f73013b57add5f1248aad877256347823283280ad5fd904ba5e6254fde91a4fc70dc074855391a6b5486bae00580db133552e1809a260b
-  data.tar.gz: f00f9c4da208205e9e3cb13e6bb8290de7870c085192966320a7b02b58c7ec9abeb992994821ad9f846134e2c1d4cd9db2d924f6b8d8612a9ff4067b27a48b64
+  metadata.gz: c9caaa0f0d91720f69091f2dc027f47ef379b76255e02a6297320856c9406e499c7d0db730682e8949aa8c0d08bee466ffc8596aac005b724359220aa6dbf626
+  data.tar.gz: 6ee9469264cce7869e591d7cb88465aea23b16bbae83d79090163540057bce75db907a71c115505e73b776d244ebc5169a82ac15a323f90ff1f41fd3990c57f7

data/lib/london_transport.rb

@@ -4,9 +4,12 @@ module LondonTransport
   end
 end
 
+require 'net/http'
 require 'oj'
 require 'london_transport/version'
 require 'london_transport/base'
+require 'london_transport/line'
+require 'london_transport/combined'
 require 'london_transport/train'
 require 'london_transport/tube'
 require 'london_transport/bus'

data/lib/london_transport/base.rb

@@ -3,6 +3,7 @@ class LondonTransport::Base
   API_ENDPOINT = "https://api.tfl.gov.uk/StopPoint"
   STOP_TYPES = []
   MODES = []
+  AVAILABLE_MODES_OF_TRANSPORT = ['bus', 'train', 'tube']
 
   def initialize(longitude:, latitude:, radius: 500)
     @longitude = longitude
@@ -15,7 +16,15 @@ class LondonTransport::Base
     return distances unless nearest
 
     nearest['stopPoints'][0..limit - 1].each do |station|
-      distances << { station['commonName'] => station['distance'] }
+      line = LondonTransport::Line.new(station['lineModeGroups'])
+
+      distances << {
+        station['commonName'] => {
+          distance: station['distance'],
+          modes: self.class::MODES || station['modes'],
+          lines: line.names
+        }
+      }
     end
 
     distances
@@ -35,7 +44,6 @@ class LondonTransport::Base
   end
 
   def nearest
-    Oj.load(Net::HTTP.get(api_endpoint))
+    Oj.load(::Net::HTTP.get(api_endpoint))
   end
-
 end

data/lib/london_transport/combined.rb

@@ -0,0 +1,16 @@
+class LondonTransport::Combined < LondonTransport::Base
+  private
+  def stop_types
+    @stop_types ||= combined_data(constant_name: 'STOP_TYPES').flatten.uniq.join(',')
+  end
+
+  def modes
+    @modes ||= combined_data(constant_name: 'MODES').flatten.uniq.join(',')
+  end
+
+  def combined_data(constant_name:)
+    LondonTransport::Base::AVAILABLE_MODES_OF_TRANSPORT.map do |transport|
+      Module.const_get("LondonTransport::#{transport.capitalize}::#{constant_name}")
+    end
+  end
+end

data/lib/london_transport/line.rb

@@ -0,0 +1,9 @@
+class LondonTransport::Line
+  def initialize(line_details)
+    @line_details = line_details || []
+  end
+
+  def names
+    @names ||= @line_details.any? ? @line_details.last['lineIdentifier'] : []
+  end
+end

data/lib/london_transport/version.rb

@@ -1,3 +1,3 @@
 module LondonTransport
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: london_transport
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Edwin Wills
@@ -76,6 +76,8 @@ files:
 - lib/london_transport.rb
 - lib/london_transport/base.rb
 - lib/london_transport/bus.rb
+- lib/london_transport/combined.rb
+- lib/london_transport/line.rb
 - lib/london_transport/train.rb
 - lib/london_transport/tube.rb
 - lib/london_transport/version.rb