watershed_uk 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25f3ad50902cb21471308b32eaeec16b576c6b5da5670a45541729166b83260c
-  data.tar.gz: 2300056cb51e3c7a4abfe882407f26fb5b8e737a86c02ba263209cef5698a000
+  metadata.gz: 176f84354ab0579e88f79acea5ab9b2f973202b526c7422505854b9d4fe1ddd1
+  data.tar.gz: 05753a54475ea569b0dece05aa623d9eede9b916a0d0e9e0e8b16b6645070487
 SHA512:
-  metadata.gz: 6d41c49ff4c8d8826e0d41409157b728d20ae398e89708caef1dd55d68ad1598fd5f2a32e9f00e459c74bdb7ea76f3bbc540fc1348031baf6b8a32cd8129199c
-  data.tar.gz: 16529c7f223fda2e63340566c0fb2b14e7a9a732e65b2cafb23b02578b2549e6f2cf45606e505ed336bb41af08932b63014e7fb43d2ac4f63af180d6f6e3dca0
+  metadata.gz: eca038a9f071b6ef9e479ba8da6c0b51c5217cd84c0fd42b90b42deedcb778193451d5c14221e874e72e5285fdccc68d8a53bd855664ebdcf2f6701402686810
+  data.tar.gz: 178b595764435675f9f875d04411ac6dfe687d016821707db8e3b2927665afac60ef3f3f3e6502c6c64c7334e518d7e944fb170ab3c78dd3e699e3a6b8c4dfe7

data/CHANGELOG.md

@@ -2,6 +2,13 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.0.1] - 2026-11-02
+
+### Changed
+- Requests and London times use cinebase 5.8's `Cinebase::Http` and `Cinebase::London`.
+- HTTP errors read "HTTP error 500 from watershed.ticketsolve.com" rather than "Ticketsolve HTTP error 500".
+- Connections give up after 10 seconds rather than 30; responses still have 30 seconds.
+
 ## [1.0.0] - 2026-11-02
 
 ### Added

data/lib/watershed_uk/internal/ticketsolve.rb

@@ -6,15 +6,19 @@ module WatershedUk
   module Internal
     # Reads Watershed's Ticketsolve box office
     class Ticketsolve
-      include Http
+      USER_AGENT = 'Mozilla/5.0 (compatible; watershed_uk; +https://github.com/andycroll/watershed_uk)'
 
       # Every show on sale at Watershed and its partner venues, with every
       # advertised event, in one public document
       FEED_URL = 'https://watershed.ticketsolve.com/shows.xml'
 
+      def initialize
+        @http = Cinebase::Http.new(headers: { 'User-Agent' => USER_AGENT })
+      end
+
       # @return [String] the shows feed, parsed by {Parser::Feed}
       def feed
-        get(FEED_URL)
+        @http.get(FEED_URL)
       end
     end
   end

data/lib/watershed_uk/performance.rb

@@ -23,8 +23,6 @@ module WatershedUk
     #   @option options [Integer] :film_year (nil) year from the film's title
     #   @option options [Time] :starting_at listed start time of the performance
 
-    TIME_ZONE = 'Europe/London'.freeze
-
     # Performances within an inclusive range of showing dates. The Ticketsolve
     # feed holds every advertised date, so any range is one request.
     # @param [String] cinema_id the cinema's id, 'watershed'
@@ -33,7 +31,7 @@ module WatershedUk
     # @return [Array<WatershedUk::Performance>]
     def self.at(
       cinema_id,
-      from: TZInfo::Timezone.get(TIME_ZONE).now.to_date,
+      from: Cinebase::London.today,
       to: from + 13
     )
       raise ArgumentError, 'to must not precede from' if to < from
@@ -65,10 +63,9 @@ module WatershedUk
     #   @return <Array[String]>
 
     def self.screenings(shows, dates)
-      london = TZInfo::Timezone.get(TIME_ZONE)
       shows.select { |show| Internal::Parser::Screening.film?(show) }.flat_map do |show|
         show.events
-            .select { |event| dates.cover?(london.to_local(event.starting_at).to_date) }
+            .select { |event| dates.cover?(Cinebase::London.date(event.starting_at)) }
             .map { |event| Internal::Parser::Screening.new(show, event) }
       end
     end

data/lib/watershed_uk/version.rb

@@ -1,6 +1,6 @@
 # Ruby interface for https://www.watershed.co.uk
-# @version 1.0.0
+# @version 1.0.1
 module WatershedUk
   # Gem version
-  VERSION = '1.0.0'.freeze
+  VERSION = '1.0.1'.freeze
 end

data/lib/watershed_uk.rb

@@ -5,7 +5,6 @@ require 'cinebase'
 
 require_relative './watershed_uk/version'
 
-require_relative './watershed_uk/internal/http'
 require_relative './watershed_uk/internal/ticketsolve'
 require_relative './watershed_uk/internal/title_sanitizer'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: watershed_uk
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Andy Croll
@@ -99,14 +99,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.7'
+        version: '5.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.7'
+        version: '5.8'
 - !ruby/object:Gem::Dependency
   name: rexml
   requirement: !ruby/object:Gem::Requirement
@@ -134,7 +134,6 @@ files:
 - README.md
 - lib/watershed_uk.rb
 - lib/watershed_uk/cinema.rb
-- lib/watershed_uk/internal/http.rb
 - lib/watershed_uk/internal/parser/feed.rb
 - lib/watershed_uk/internal/parser/screening.rb
 - lib/watershed_uk/internal/ticketsolve.rb

data/lib/watershed_uk/internal/http.rb

@@ -1,41 +0,0 @@
-# frozen_string_literal: true
-
-require 'net/http'
-
-module WatershedUk
-  # Internal utility classes: Do not use
-  # @api private
-  module Internal
-    # Requests to Ticketsolve
-    module Http
-      TIMEOUT = 30
-      RETRIES = 2
-      USER_AGENT = 'Mozilla/5.0 (compatible; watershed_uk; +https://github.com/andycroll/watershed_uk)'
-      TRANSIENT_ERRORS = [
-        EOFError, Errno::ECONNRESET, Errno::ECONNREFUSED, Net::OpenTimeout, Net::ReadTimeout, OpenSSL::SSL::SSLError
-      ].freeze
-
-      private
-
-      def get(url)
-        uri = URI(url)
-        attempts = 0
-        begin
-          response = Net::HTTP.start(uri.host, uri.port, use_ssl: true, open_timeout: TIMEOUT, read_timeout: TIMEOUT) do |http|
-            http.request(Net::HTTP::Get.new(uri, 'User-Agent' => USER_AGENT))
-          end
-        rescue *TRANSIENT_ERRORS
-          attempts += 1
-          raise if attempts > RETRIES
-
-          sleep(attempts)
-          retry
-        end
-        # Omit response bodies from errors, and never follow redirects.
-        raise "Ticketsolve HTTP error #{response.code}" unless response.is_a?(Net::HTTPSuccess)
-
-        String.new(response.body, encoding: Encoding::UTF_8)
-      end
-    end
-  end
-end