go_transit 1.3.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84243aa4bc3cdb3d2a86f340ca75d60258e93e98bb9977f32d36ec05b2222932
-  data.tar.gz: 40069a1839ae01fd8053053398ef33607ee4af557a9c1f8f7b891e2ee91807c1
+  metadata.gz: 751a393a6605bb8cdd61ef32add027a21a98525b8c7b915e0056e46b0a10d612
+  data.tar.gz: 78788276d6887bd958084f65da77d023f0a85f720da59d2906c949ce2946e4fc
 SHA512:
-  metadata.gz: bcb8c6f390868672a075a961631c79762089e0bb84e9eace72be500174352b4b6120789377f7041b65aff7ea1e40a2f2450162939182ac94fe27c0ac055d2c87
-  data.tar.gz: ac5a553ddd10f0225cb1a80088bed844c94f8ddc64c1ff2801cfaa9840373b1e52aa09a594f9c90e8c1dfd1625d9806ab96ccbaa06d94e1b4fb77ed11084f73e
+  metadata.gz: adce23e7e7328e4152b136e6871cea7785eeaaf74b6286fab12005375f9c0855a7f205efdadeb8ff26f105052f1371a425a00bf454ae03609d55ca7f4fce8530
+  data.tar.gz: cc544ca9e200e2de1227cb85b38d97328dffe690427d24a939b1a265e064e909646d20bd7016b8f731912c57e5d70480c89ccd8f3139fac337d4ef67ff032be0

data/lib/go_transit/api_resource.rb

@@ -8,17 +8,17 @@ module GoTransit
 
     def hydrate(params)
       params.each_pair do |key, value|
-        if collection?(value)
+        if wrapped_collection?(value)
           sub_key, sub_value = value.first
-          key = sub_key.pluralize
-          value = build_object(sub_key.singularize, sub_value)
+          key = Inflector.pluralize(sub_key)
+          value = build_object(Inflector.singularize(sub_key), sub_value)
         elsif value.kind_of?(Hash)
           value = build_object(key, value)
         elsif value.kind_of?(Array)
-          value = build_object(key.singularize, value)
-          key = key.pluralize
+          value = build_object(Inflector.singularize(key), value)
+          key = Inflector.pluralize(key)
         end
-        send("#{key.to_s.underscore}=", value)
+        send("#{Inflector.underscore(key)}=", value)
       end
     end
 
@@ -35,38 +35,46 @@ module GoTransit
       Object.const_get("#{self.class.name}::#{name}")
     end
 
-    def collection?(value)
+    def wrapped_collection?(value)
       return false unless value.kind_of?(Hash)
       key, data = value.first
       data.kind_of?(Array)
     end
 
     def to_utc(date)
-      to_local(date).utc
+      Zone.wall_clock_to_utc(date)
     end
 
-    def to_local(date, timezone: "America/Toronto")
-      date.in_time_zone(timezone)
+    def to_local(date, timezone: Zone::DEFAULT)
+      Zone.wall_clock_to_local(date, timezone)
     end
 
-    def to_utc_from_anchor(time, trip_date, timezone: "America/Toronto")
-      to_local_from_anchor(time, trip_date, timezone: timezone)&.utc
+    def to_utc_from_anchor(time, trip_date, timezone: Zone::DEFAULT)
+      wall_clock = anchored_wall_clock(time, trip_date)
+      wall_clock && Zone.wall_clock_to_utc(wall_clock, timezone)
     end
 
-    def to_local_from_anchor(time, trip_date, timezone: "America/Toronto")
+    def to_local_from_anchor(time, trip_date, timezone: Zone::DEFAULT)
+      wall_clock = anchored_wall_clock(time, trip_date)
+      wall_clock && Zone.wall_clock_to_local(wall_clock, timezone)
+    end
+
+    def anchored_wall_clock(time, trip_date)
       raise MissingAnchorDateError if trip_date.nil?
-      return nil if time.blank?
-      hour = time.split(":").first.to_i
-      date = determine_date(trip_date, hour)
-      "#{date} #{time}".in_time_zone(timezone)
+      return nil if blank_value?(time)
+      "#{determine_date(trip_date, time.split(":").first.to_i)} #{time}"
     end
 
     def determine_date(date, hour)
       if hour < GoTransit.service_day_boundary_hour
-        date + 1.day
+        date + 1
       else
         date
       end
     end
+
+    def blank_value?(value)
+      value.nil? || value.to_s.strip.empty?
+    end
   end
 end

data/lib/go_transit/inflector.rb

@@ -0,0 +1,32 @@
+module GoTransit
+  module Inflector
+    module_function
+
+    def underscore(word)
+      word.to_s.
+        gsub(/(?<=[A-Z\d])(?=[A-Z][a-z])/, "_").
+        gsub(/([a-z\d])([A-Z])/, '\1_\2').
+        tr("-", "_").
+        downcase
+    end
+
+    def pluralize(word)
+      plural_of_singular(singularize(word))
+    end
+
+    def singularize(word)
+      word = word.to_s
+      return "#{word[0..-4]}y" if word.match?(/[^aeiou]ies\z/i)
+      return word[0..-3] if word.match?(/(ss|x|z|ch|sh)es\z/i)
+      return word[0..-2] if word.match?(/[^s]s\z/i) && !word.match?(/(us|is)\z/i)
+      word
+    end
+
+    def plural_of_singular(singular)
+      return singular if singular.empty?
+      return "#{singular[0..-2]}ies" if singular.match?(/[^aeiou]y\z/i)
+      return "#{singular}es" if singular.match?(/(s|x|z|ch|sh)\z/i)
+      "#{singular}s"
+    end
+  end
+end

data/lib/go_transit/resources/gtfs/alert.rb

@@ -0,0 +1,10 @@
+module GoTransit
+  class Gtfs::Alert < Gtfs::Resource
+    attr_accessor :active_periods, :informed_entities, :cause, :effect, :url,
+                  :header_text, :description_text
+
+    hydrate_as active_period: Gtfs::TimeRange, informed_entity: Gtfs::EntitySelector,
+               url: Gtfs::TranslatedString, header_text: Gtfs::TranslatedString,
+               description_text: Gtfs::TranslatedString
+  end
+end

data/lib/go_transit/resources/gtfs/entity_selector.rb

@@ -0,0 +1,7 @@
+module GoTransit
+  class Gtfs::EntitySelector < Gtfs::Resource
+    attr_accessor :agency_id, :route_id, :route_type, :trip, :stop_id
+
+    hydrate_as trip: Gtfs::TripDescriptor
+  end
+end

data/lib/go_transit/resources/gtfs/feed.rb

@@ -0,0 +1,36 @@
+module GoTransit
+  class Gtfs::Feed < Gtfs::Resource
+    include Enumerable
+
+    attr_accessor :header, :entities
+
+    hydrate_as header: Gtfs::FeedHeader, entity: Gtfs::FeedEntity
+
+    def self.alerts
+      request_feed("Alerts")
+    end
+
+    def self.trip_updates
+      request_feed("TripUpdates")
+    end
+
+    def self.vehicle_position
+      request_feed("VehiclePosition")
+    end
+
+    def self.endpoint_prefix
+      "Gtfs/Feed"
+    end
+
+    def self.request_feed(name)
+      client = Client.new
+      response = client.get("#{endpoint_prefix}/#{name}")
+      new(response.data)
+    end
+    private_class_method :request_feed
+
+    def each(&block)
+      entities.each(&block)
+    end
+  end
+end

data/lib/go_transit/resources/gtfs/feed_entity.rb

@@ -0,0 +1,7 @@
+module GoTransit
+  class Gtfs::FeedEntity < Gtfs::Resource
+    attr_accessor :id, :is_deleted, :trip_update, :vehicle, :alert
+
+    hydrate_as trip_update: Gtfs::TripUpdate, vehicle: Gtfs::VehiclePosition, alert: Gtfs::Alert
+  end
+end

data/lib/go_transit/resources/gtfs/feed_header.rb

@@ -0,0 +1,7 @@
+module GoTransit
+  class Gtfs::FeedHeader < Gtfs::Resource
+    attr_accessor :gtfs_realtime_version, :incrementality, :timestamp
+
+    epoch_time :timestamp
+  end
+end

data/lib/go_transit/resources/gtfs/position.rb

@@ -0,0 +1,5 @@
+module GoTransit
+  class Gtfs::Position < Gtfs::Resource
+    attr_accessor :latitude, :longitude, :bearing, :odometer, :speed
+  end
+end

data/lib/go_transit/resources/gtfs/resource.rb

@@ -0,0 +1,40 @@
+module GoTransit
+  class Gtfs::Resource < ApiResource
+    def self.hydrate_as(classes)
+      own_classes.merge!(classes)
+    end
+
+    def self.own_classes
+      @own_classes ||= {}
+    end
+
+    def self.class_for(key)
+      own_classes[key.to_sym] || (superclass.class_for(key) if superclass.respond_to?(:class_for))
+    end
+
+    def self.epoch_time(*fields)
+      fields.each do |field|
+        define_method("#{field}_utc") { epoch_utc(public_send(field)) }
+        define_method("#{field}_local") { epoch_local(public_send(field)) }
+      end
+    end
+
+    private
+
+    def get_klass(name)
+      self.class.class_for(name) || raise(NameError, "#{self.class.name} has no class for #{name.inspect}")
+    end
+
+    def wrapped_collection?(_value)
+      false
+    end
+
+    def epoch_utc(epoch)
+      Time.at(epoch).utc if epoch
+    end
+
+    def epoch_local(epoch, timezone: Zone::DEFAULT)
+      Zone.epoch_to_local(epoch, timezone) if epoch
+    end
+  end
+end

data/lib/go_transit/resources/gtfs/stop_time_event.rb

@@ -0,0 +1,7 @@
+module GoTransit
+  class Gtfs::StopTimeEvent < Gtfs::Resource
+    attr_accessor :delay, :time, :uncertainty
+
+    epoch_time :time
+  end
+end

data/lib/go_transit/resources/gtfs/stop_time_update.rb

@@ -0,0 +1,7 @@
+module GoTransit
+  class Gtfs::StopTimeUpdate < Gtfs::Resource
+    attr_accessor :stop_id, :arrival, :departure, :schedule_relationship
+
+    hydrate_as arrival: Gtfs::StopTimeEvent, departure: Gtfs::StopTimeEvent
+  end
+end

data/lib/go_transit/resources/gtfs/time_range.rb

@@ -0,0 +1,7 @@
+module GoTransit
+  class Gtfs::TimeRange < Gtfs::Resource
+    attr_accessor :start, :end
+
+    epoch_time :start, :end
+  end
+end

data/lib/go_transit/resources/gtfs/translated_string.rb

@@ -0,0 +1,11 @@
+module GoTransit
+  class Gtfs::TranslatedString < Gtfs::Resource
+    attr_accessor :translations
+
+    class Translation < Gtfs::Resource
+      attr_accessor :text, :language
+    end
+
+    hydrate_as translation: Translation
+  end
+end

data/lib/go_transit/resources/gtfs/trip_descriptor.rb

@@ -0,0 +1,18 @@
+module GoTransit
+  class Gtfs::TripDescriptor < Gtfs::Resource
+    attr_accessor :trip_id, :route_id, :direction_id, :start_time, :start_date,
+                  :schedule_relationship
+
+    def service_date
+      Date.strptime(start_date, "%Y%m%d") unless blank_value?(start_date)
+    end
+
+    def start_time_utc
+      to_utc_from_anchor(start_time, service_date)
+    end
+
+    def start_time_local
+      to_local_from_anchor(start_time, service_date)
+    end
+  end
+end

data/lib/go_transit/resources/gtfs/trip_update.rb

@@ -0,0 +1,10 @@
+module GoTransit
+  class Gtfs::TripUpdate < Gtfs::Resource
+    attr_accessor :trip, :vehicle, :stop_time_updates, :timestamp, :delay
+
+    hydrate_as trip: Gtfs::TripDescriptor, vehicle: Gtfs::VehicleDescriptor,
+               stop_time_update: Gtfs::StopTimeUpdate
+
+    epoch_time :timestamp
+  end
+end

data/lib/go_transit/resources/gtfs/vehicle_descriptor.rb

@@ -0,0 +1,5 @@
+module GoTransit
+  class Gtfs::VehicleDescriptor < Gtfs::Resource
+    attr_accessor :id, :label, :license_plate
+  end
+end

data/lib/go_transit/resources/gtfs/vehicle_position.rb

@@ -0,0 +1,10 @@
+module GoTransit
+  class Gtfs::VehiclePosition < Gtfs::Resource
+    attr_accessor :trip, :vehicle, :position, :stop_id, :current_status,
+                  :timestamp, :congestion_level, :occupancy_status
+
+    hydrate_as trip: Gtfs::TripDescriptor, vehicle: Gtfs::VehicleDescriptor, position: Gtfs::Position
+
+    epoch_time :timestamp
+  end
+end

data/lib/go_transit/resources/gtfs.rb

@@ -0,0 +1,4 @@
+module GoTransit
+  module Gtfs
+  end
+end

data/lib/go_transit/resources/up/gtfs/feed.rb

@@ -0,0 +1,7 @@
+module GoTransit
+  class UP::Gtfs::Feed < GoTransit::Gtfs::Feed
+    def self.endpoint_prefix
+      "UP/Gtfs/Feed"
+    end
+  end
+end

data/lib/go_transit/resources/up.rb

@@ -0,0 +1,6 @@
+module GoTransit
+  module UP
+    module Gtfs
+    end
+  end
+end

data/lib/go_transit/response.rb

@@ -2,7 +2,13 @@ module GoTransit
   class Response
     attr_reader :metadata, :data
 
-    delegate :code, :error_message, to: :metadata
+    def code
+      metadata.code
+    end
+
+    def error_message
+      metadata.error_message
+    end
 
     def initialize(payload, http_status = nil)
       @http_status = http_status
@@ -20,6 +26,7 @@ module GoTransit
     end
 
     def payload_data(payload)
+      return payload if payload.key?("entity")
       return payload.values.first unless payload.values.first.kind_of?(Array)
       payload
     end

data/lib/go_transit/version.rb

@@ -1,3 +1,3 @@
 module GoTransit
-  VERSION = "1.3.0".freeze
+  VERSION = "2.0.0".freeze
 end

data/lib/go_transit/zone.rb

@@ -0,0 +1,43 @@
+require "date"
+require "tzinfo"
+
+module GoTransit
+  module Zone
+    DEFAULT = "America/Toronto".freeze
+    ONE_HOUR = 3600
+
+    module_function
+
+    def wall_clock_to_utc(text, timezone = DEFAULT)
+      parsed = parse_wall_clock(text)
+      return parsed[:utc] if parsed[:utc]
+      prefer_daylight_time(parsed[:wall], TZInfo::Timezone.get(timezone))
+    end
+
+    def wall_clock_to_local(text, timezone = DEFAULT)
+      utc_to_local(wall_clock_to_utc(text, timezone), timezone)
+    end
+
+    def epoch_to_local(epoch, timezone = DEFAULT)
+      utc_to_local(Time.at(epoch).utc, timezone)
+    end
+
+    def utc_to_local(utc, timezone = DEFAULT)
+      TZInfo::Timezone.get(timezone).utc_to_local(utc)
+    end
+
+    def parse_wall_clock(text)
+      found = Date._parse(text.to_s)
+      raise ArgumentError, "invalid date: #{text.inspect}" unless found[:year] && found[:mon] && found[:mday]
+      wall = Time.utc(found[:year], found[:mon], found[:mday], found[:hour].to_i, found[:min].to_i, found[:sec].to_i)
+      found[:offset] ? { utc: wall - found[:offset] } : { wall: wall }
+    end
+
+    def prefer_daylight_time(wall, zone)
+      zone.local_to_utc(wall, true)
+    rescue TZInfo::PeriodNotFound
+      zone.local_to_utc(wall + ONE_HOUR, true)
+    end
+    private_class_method :parse_wall_clock, :prefer_daylight_time
+  end
+end

data/lib/go_transit.rb

@@ -1,10 +1,9 @@
 require "net/http"
 require "uri"
 require "json"
-require "active_support"
-require "active_support/core_ext"
-require "active_support/core_ext/string"
 
+require "go_transit/inflector"
+require "go_transit/zone"
 require "go_transit/client"
 require "go_transit/errors"
 require "go_transit/response"
@@ -59,6 +58,24 @@ require "go_transit/resources/schedule/journey/sch_journey/service/link"
 require "go_transit/resources/schedule/journey/sch_journey/service/transfer"
 require "go_transit/resources/schedule/journey/sch_journey/service/trip"
 require "go_transit/resources/schedule/journey/sch_journey/service/trip/stop"
+require "go_transit/resources/gtfs"
+require "go_transit/resources/gtfs/resource"
+require "go_transit/resources/gtfs/trip_descriptor"
+require "go_transit/resources/gtfs/vehicle_descriptor"
+require "go_transit/resources/gtfs/position"
+require "go_transit/resources/gtfs/stop_time_event"
+require "go_transit/resources/gtfs/stop_time_update"
+require "go_transit/resources/gtfs/vehicle_position"
+require "go_transit/resources/gtfs/trip_update"
+require "go_transit/resources/gtfs/time_range"
+require "go_transit/resources/gtfs/entity_selector"
+require "go_transit/resources/gtfs/translated_string"
+require "go_transit/resources/gtfs/alert"
+require "go_transit/resources/gtfs/feed_header"
+require "go_transit/resources/gtfs/feed_entity"
+require "go_transit/resources/gtfs/feed"
+require "go_transit/resources/up"
+require "go_transit/resources/up/gtfs/feed"
 
 module GoTransit
   @api_key = ""

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: go_transit
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Justin Mazur
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-09-14 00:00:00.000000000 Z
+date: 2026-10-12 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: tzinfo
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -17,7 +31,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -146,10 +160,27 @@ files:
 - lib/go_transit/api_resource.rb
 - lib/go_transit/client.rb
 - lib/go_transit/errors.rb
+- lib/go_transit/inflector.rb
 - lib/go_transit/resources/fare.rb
 - lib/go_transit/resources/fare/fare_category.rb
 - lib/go_transit/resources/fare/fare_category/ticket.rb
 - lib/go_transit/resources/fare/fare_category/ticket/fare.rb
+- lib/go_transit/resources/gtfs.rb
+- lib/go_transit/resources/gtfs/alert.rb
+- lib/go_transit/resources/gtfs/entity_selector.rb
+- lib/go_transit/resources/gtfs/feed.rb
+- lib/go_transit/resources/gtfs/feed_entity.rb
+- lib/go_transit/resources/gtfs/feed_header.rb
+- lib/go_transit/resources/gtfs/position.rb
+- lib/go_transit/resources/gtfs/resource.rb
+- lib/go_transit/resources/gtfs/stop_time_event.rb
+- lib/go_transit/resources/gtfs/stop_time_update.rb
+- lib/go_transit/resources/gtfs/time_range.rb
+- lib/go_transit/resources/gtfs/translated_string.rb
+- lib/go_transit/resources/gtfs/trip_descriptor.rb
+- lib/go_transit/resources/gtfs/trip_update.rb
+- lib/go_transit/resources/gtfs/vehicle_descriptor.rb
+- lib/go_transit/resources/gtfs/vehicle_position.rb
 - lib/go_transit/resources/metadata.rb
 - lib/go_transit/resources/schedule.rb
 - lib/go_transit/resources/schedule/all_lines.rb
@@ -196,8 +227,11 @@ files:
 - lib/go_transit/resources/stop/place.rb
 - lib/go_transit/resources/stop/place/stop.rb
 - lib/go_transit/resources/stop/station.rb
+- lib/go_transit/resources/up.rb
+- lib/go_transit/resources/up/gtfs/feed.rb
 - lib/go_transit/response.rb
 - lib/go_transit/version.rb
+- lib/go_transit/zone.rb
 homepage: https://github.com/jmazur/go_transit_ruby
 licenses:
 - MIT