transport-opendata 0.8.2 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e23c345fa314c42131c8df416d56daf3dba9e53b
-  data.tar.gz: 9d27cceeac918eaffcb2ebd8da5d70f6f191db7c
+  metadata.gz: 477321930cf1cd7bb8a640345b83c9cd01ef910e
+  data.tar.gz: e0b0a35fcd22b4948a1b3d076e59f997252f3fb0
 SHA512:
-  metadata.gz: 6f39b76d4a53fbbcce470fc92896fe4da70a65502778fcebee421229d65c22e0c13a46be9ea7b48ffcb70423c4708c660f7d1cdf3ed7d45d09cbf5920800a456
-  data.tar.gz: 34a2fa0d4426cfe0d6eb1f665a9ce3a81d3524f69816d97facdecd3aa77fb80609ece124373b3849a14d21b3ab6b76c49196495d47433437e7f4c1b812cc783d
+  metadata.gz: bb3314474a91b5104a96fb44a43bd25dce790b277d81b9976e558d5e2392c39e4654997cad6dc45528838bf6a91e261866006d9337a790745a94f0d556950d87
+  data.tar.gz: b206b3794dcd8f6326ded9f6cfae6ea05334b0d1a61d2733e034b5998d31fb1ae692d28ecb9c73b5022c678f0d0dd098ce451486134a35d6dff4fa82094bd5c5

data/lib/checkpoint.rb

@@ -1,22 +1,23 @@
-#
-# Checkpoint
-#
-
-require_relative 'location'
-require_relative 'prognosis'
-
-module Transport
-  class Checkpoint
-    attr_reader :station, :arrival, :departure, :platform, :prognosis
-    
-    def initialize(checkpoint)
-      return unless checkpoint
-      
-      @station = Location.new checkpoint['station']
-      @arrival = DateTime.parse(checkpoint['arrival']) if checkpoint['arrival']
-      @departure = DateTime.parse(checkpoint['departure']) if checkpoint['departure']
-      @platform = checkpoint['platform']
-      @prognosis = Prognosis.new checkpoint['prognosis']
-    end
-  end
-end
+#
+# Checkpoint
+#
+
+require_relative 'station'
+require_relative 'prognosis'
+
+module Transport
+  class Checkpoint
+    attr_reader :station, :arrival, :departure, :platform, :prognosis
+    
+    def initialize(checkpoint)
+      return unless checkpoint
+      
+      @station = Station.new checkpoint['station']
+      @arrival = DateTime.parse(checkpoint['arrival']) if checkpoint['arrival']
+      @departure = DateTime.parse(checkpoint['departure']) if checkpoint['departure']
+      @delay = checkpoint['delay'].to_i if checkpoint['delay']
+      @platform = checkpoint['platform']
+      @prognosis = Prognosis.new checkpoint['prognosis']
+    end
+  end
+end

data/lib/connection.rb

@@ -1,25 +1,25 @@
-#
-# Connection
-#
-
-require_relative 'checkpoint'
-require_relative 'service'
-require_relative 'section'
-require_relative 'duration'
-
-module Transport
-  class Connection
-    attr_reader :from, :to, :duration, :service, :products, :capacity1st, :capacity2nd, :sections
-    
-    def initialize(connection)
-      @from = Checkpoint.new connection['from']
-      @to = Checkpoint.new connection['to']
-      @duration = Duration.new connection['duration']
-      @service = Service.new connection['service']
-      @products = connection['products']
-      @capacity1st = connection['capacity1st']
-      @capacity2nd = connection['capacity2nd']
-      @sections = connection['sections'].map { |section| Section .new section }
-    end
-  end
+#
+# Connection
+#
+
+require_relative 'checkpoint'
+require_relative 'service'
+require_relative 'section'
+require_relative 'duration'
+
+module Transport
+  class Connection
+    attr_reader :from, :to, :duration, :service, :products, :capacity1st, :capacity2nd, :sections
+    
+    def initialize(connection)
+      @from = Checkpoint.new connection['from']
+      @to = Checkpoint.new connection['to']
+      @duration = Duration.new connection['duration']
+      @service = Service.new connection['service']
+      @products = connection['products']
+      @capacity1st = connection['capacity1st']
+      @capacity2nd = connection['capacity2nd']
+      @sections = connection['sections'].map { |section| Section .new section }
+    end
+  end
 end

data/lib/coordinate.rb

@@ -1,15 +1,15 @@
-#
-# Coordinate
-#
-
-module Transport
-  class Coordinate
-    attr_reader :type, :x, :y
-    
-    def initialize(coordinate)
-      @type = coordinate['type'].to_sym
-      @x = coordinate['x']
-      @y = coordinate['y']
-    end
-  end
+#
+# Coordinate
+#
+
+module Transport
+  class Coordinate
+    attr_reader :type, :x, :y
+    
+    def initialize(coordinate)
+      @type = coordinate['type'].to_sym
+      @x = coordinate['x']
+      @y = coordinate['y']
+    end
+  end
 end

data/lib/duration.rb

@@ -1,24 +1,24 @@
-#
-# Duration
-#
-
-module Transport
-  class Duration
-    attr_reader :seconds, :minutes, :hours, :days
-    
-    def initialize(duration)
-      @days, @hours, @minutes, @seconds = duration.split(/d|:/)
-      @seconds = @seconds.to_i
-      @minutes = @minutes.to_i
-      @hours = @hours.to_i
-      @days = @days.to_i
-    end
-      
-    def to_s
-      result = ""
-      result += "#{@days}d" if @days > 0
-      result += "#{@hours}h" if @hours > 0 || @days > 0
-      result += "#{@minutes}m"
-    end
-  end
+#
+# Duration
+#
+
+module Transport
+  class Duration
+    attr_reader :seconds, :minutes, :hours, :days
+    
+    def initialize(duration)
+      @days, @hours, @minutes, @seconds = duration.split(/d|:/)
+      @seconds = @seconds.to_i
+      @minutes = @minutes.to_i
+      @hours = @hours.to_i
+      @days = @days.to_i
+    end
+      
+    def to_s
+      result = ""
+      result += "#{@days}d" if @days > 0
+      result += "#{@hours}h" if @hours > 0 || @days > 0
+      result += "#{@minutes}m"
+    end
+  end
 end

data/lib/error.rb

@@ -1,13 +1,13 @@
-#
-# Error
-#
-
-module Transport
-  class Error
-    attr_reader :message
-    
-    def initialize(error)
-      @message = error['message']
-    end
-  end
+#
+# Error
+#
+
+module Transport
+  class Error
+    attr_reader :message
+    
+    def initialize(error)
+      @message = error['message']
+    end
+  end
 end

data/lib/journey.rb

@@ -1,26 +1,27 @@
-#
-# Journey
-#
-
-require_relative 'checkpoint'
-
-module Transport
-  class Journey
-    attr_reader :stop, :name, :category, :categoryCode, :number, :operator, :to, :passList, :capacity1st, :capacity2nd
-    
-    def initialize(journey)
-      return unless journey
-      
-      @stop = Checkpoint.new journey['stop']
-      @name = journey['name']
-      @category = journey['category']
-      @categoryCode = journey['categoryCode']
-      @number = journey['number'].to_i
-      @operator = journey['operator']
-      @to = journey['to']
-      @passList = journey['passList'].map { |checkpoint| Checkpoint.new checkpoint }
-      @capacity1st = journey['capacity1st']
-      @capacity2nd = journey['capacity2nd']    
-    end
-  end
-end
+#
+# Journey
+#
+
+require_relative 'stop'
+
+module Transport
+  class Journey
+    attr_reader :stop, :name, :category, :categoryCode, :number, :operator, :to, :passList, :capacity1st, :capacity2nd
+    
+    def initialize(journey)
+      return unless journey
+      
+      @stop = Stop.new journey['stop']
+      @name = journey['name']
+      @category = journey['category']
+      @subcategory = journey['subcategory']
+      @categoryCode = journey['categoryCode']
+      @number = journey['number'].to_i
+      @operator = journey['operator']
+      @to = journey['to']
+      @passList = journey['passList'].map { |checkpoint| Checkpoint.new checkpoint }
+      @capacity1st = journey['capacity1st']
+      @capacity2nd = journey['capacity2nd']    
+    end
+  end
+end

data/lib/prognosis.rb

@@ -1,19 +1,19 @@
-#
-# Prognosis
-#
-
-module Transport
-  class Prognosis
-    attr_reader :platform, :departure, :arrival, :capacity1st, :capacity2nd
-    
-    def initialize(prognosis)
-      return unless prognosis
-
-      @platform = prognosis['platform']
-      @departure = DateTime.parse prognosis['departure'] if prognosis['departure'] 
-      @arrival = DateTime.parse prognosis['arrival'] if prognosis['arrival'] 
-      @capacity1st = prognosis['capacity1st']
-      @capacity2nd = prognosis['capacity2nd']
-    end
-  end
+#
+# Prognosis
+#
+
+module Transport
+  class Prognosis
+    attr_reader :platform, :departure, :arrival, :capacity1st, :capacity2nd
+    
+    def initialize(prognosis)
+      return unless prognosis
+
+      @platform = prognosis['platform']
+      @departure = DateTime.parse prognosis['departure'] if prognosis['departure'] 
+      @arrival = DateTime.parse prognosis['arrival'] if prognosis['arrival'] 
+      @capacity1st = prognosis['capacity1st']
+      @capacity2nd = prognosis['capacity2nd']
+    end
+  end
 end

data/lib/section.rb

@@ -1,16 +1,16 @@
-#
-# Section
-#
-
-module Transport
-  class Section
-    attr_reader :journey, :walk, :departure, :arrival
-    
-    def initialize(section)
-      @journey = Journey.new section['journey']
-      @walk = section['walk']
-      @departure = Checkpoint.new section['departure']
-      @arrival = Checkpoint.new section['arrival']
-    end
-  end
+#
+# Section
+#
+
+module Transport
+  class Section
+    attr_reader :journey, :walk, :departure, :arrival
+    
+    def initialize(section)
+      @journey = Journey.new section['journey']
+      @walk = section['walk']
+      @departure = Checkpoint.new section['departure']
+      @arrival = Checkpoint.new section['arrival']
+    end
+  end
 end

data/lib/service.rb

@@ -1,14 +1,14 @@
-#
-# Service
-#
-
-module Transport
-  class Service
-    attr_reader :regular, :irregular
-    
-    def initialize(service)
-      @regular = service['regular']
-      @irregular = service['irregular']
-    end
-  end
+#
+# Service
+#
+
+module Transport
+  class Service
+    attr_reader :regular, :irregular
+    
+    def initialize(service)
+      @regular = service['regular']
+      @irregular = service['irregular']
+    end
+  end
 end

data/lib/station.rb

@@ -0,0 +1,20 @@
+#
+# Station
+#
+
+require_relative 'coordinate'
+
+module Transport
+  class Station
+    attr_reader :id, :type, :name, :score, :coordinate, :distance
+    
+    def initialize(station)
+      @id = station['id']
+      @name = station['name']
+      @score = station['score']
+      @coordinate = Coordinate.new station['coordinate']
+      @distance = station['distance']
+      @type = station['type']
+    end
+  end
+end

data/lib/stop.rb

@@ -1,20 +1,21 @@
-#
-# Stop
-#
-
-module Transport
-  class Stop
-    attr_reader :station, :name, :category, :number, :operator, :to
-    
-    def initialize(stop)
-      return unless stop
-      
-      @station = Location.new stop['station']
-      @name = stop['name']
-      @category = stop['category']
-      @number = stop['number']
-      @operator = stop['operator']
-      @to = stop['to']
-    end
-  end
-end
+#
+# Stop
+#
+
+module Transport
+  class Stop
+    attr_reader :station, :arrival, :departure, :delay, :realtimeAvailability
+    
+    def initialize(stop)
+      return unless stop
+      
+      @station = Station.new stop['station']
+      @arrival = DateTime.parse stop['arrival'] if stop['arrival'] 
+      @departure = DateTime.parse stop['departure'] if stop['departure'] 
+      @delay = stop['delay'].to_i if stop['delay']
+      @platform =  stop['platform'] if stop['platform']
+      @prognosis = Prognosis.new stop['prognosis']
+      @realtimeAvailability = stop['realtimeAvailability']
+    end
+  end
+end

data/lib/timetable.rb

@@ -1,50 +1,55 @@
-#
-# Locations
-#
-
-require 'httparty'
-require_relative 'transport_factory'
-
-module Transport
-  class Timetable
-    include HTTParty
-    
-    attr_accessor :parse
-    
-    base_uri 'transport.opendata.ch'
-    
-    # default_params :output => 'json'
-  
-    def initialize
-      @version = 'v1'
-      @parse = true
-      @options = { query: {  } }
-    end
-  
-    def search_station station_partial
-      parse_filter(self.class.get(restful_url('locations'), @options.merge(query: { query: station_partial})))
-    end
-    
-    def search_connection from, to
-      parse_filter(self.class.get(restful_url('connections'), @options.merge(query: { from: from, to: to})))
-    end
-    
-    def board_for station
-      parse_filter(self.class.get(restful_url('stationboard'), @options.merge(query: { station: station, limit: 15})))
-    end
-    
-    private
-    def restful_url page
-      "/#{@version}/#{page}"
-    end 
-    
-    def parse_filter unparsed_result
-      if @parse
-        TransportFactory::create(unparsed_result)
-      else
-        unparsed_result
-      end
-    end
-
- end
-end
+#
+# Locations
+#
+
+require 'httparty'
+require_relative 'transport_factory'
+
+module Transport
+  class Timetable
+    include HTTParty
+    
+    attr_accessor :parse
+    
+    base_uri 'transport.opendata.ch'
+    
+    # default_params :output => 'json'
+  
+    def initialize
+      @version = 'v1'
+      @parse = true
+      @options = { query: {  } }
+    end
+  
+    def search_station station_partial
+      request 'locations', query: { query: station_partial }
+    end
+    
+    def search_connection from, to
+      request 'connections', query: { from: from, to: to}
+    end
+    
+    def board_for station, limit=15
+      request 'stationboard', query: { station: station, limit: limit}
+    end
+
+    
+    private
+    def restful_url page
+      "/#{@version}/#{page}"
+    end 
+    
+    def request resource, options
+      parse_filter(self.class.get(restful_url(resource), @options.merge(options)), resource)
+    end
+
+    def parse_filter unparsed_result, resource
+      if @parse
+        TransportFactory::create(unparsed_result, resource)
+      else
+        unparsed_result
+      end
+    end
+
+ end
+end

data/lib/transport-opendata.rb

@@ -1,5 +1,5 @@
-#
-# Transport Opendata
-#
-
+#
+# Transport Opendata
+#
+
 require_relative 'timetable'

data/lib/transport_factory.rb

@@ -1,41 +1,36 @@
-#
-# Transport Factory
-#
-
-require 'httparty'
-require_relative 'location'
-require_relative 'connection'
-require_relative 'journey'
-require_relative 'error'
-
-module Transport
-  class TransportFactory
-  
-    def self.create(json)
-      json.each do |type, data|
-        case type
-          when 'stations'
-            return data.map do |station|
-              Location.new station
-            end
-          when 'connections'
-            return data.map do |connection|
-              Connection.new connection
-            end
-          when 'station'
-            next
-          when 'stationboard'
-            return data.map do |journey|
-              Journey.new journey
-            end
-          when 'errors'
-            return data.map do |error|
-              Error.new error
-            end
-          else
-            raise ArgumentError.new('Unknown Type: ' + type)
-        end
-      end
-    end
-  end
-end
+#
+# Transport Factory
+#
+
+require 'httparty'
+require_relative 'station'
+require_relative 'connection'
+require_relative 'journey'
+require_relative 'error'
+
+module Transport
+  class TransportFactory
+    def self.create(json, resource)
+      if json['errors']
+        return Error.new json
+      else
+        case resource
+          when 'locations'
+            return json['stations'].map do |station|
+              Station.new station
+            end
+          when 'connections'
+            return json[resource].map do |connection|
+              Connection.new connection
+            end
+          when 'stationboard'
+            return json[resource].map do |journey|
+              Journey.new journey
+            end
+          else
+            raise ArgumentError.new('Unknown Resource: ', resource)
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: transport-opendata
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.9.0
 platform: ruby
 authors:
 - Thomas Bruderer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-03 00:00:00.000000000 Z
+date: 2017-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -36,10 +36,10 @@ files:
 - lib/duration.rb
 - lib/error.rb
 - lib/journey.rb
-- lib/location.rb
 - lib/prognosis.rb
 - lib/section.rb
 - lib/service.rb
+- lib/station.rb
 - lib/stop.rb
 - lib/timetable.rb
 - lib/transport-opendata.rb
@@ -64,7 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Swiss Public Transport API

data/lib/location.rb

@@ -1,20 +0,0 @@
-#
-# Locations
-#
-
-require_relative 'coordinate'
-
-module Transport
-  class Location
-    attr_reader :id, :type, :name, :score, :coordinate, :distance
-    
-    def initialize(location)
-      @id = location['id']
-      @type = location['type']
-      @name = location['name']
-      @score = location['score']
-      @coordinate = Coordinate.new location['coordinate']
-      @distance = location['distance']
-    end
-  end
-end