wtw_uk 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20e097fe8e19ea0378db319599e5019b1d8708b41639df28e97a8c4e7e0ca71b
-  data.tar.gz: 533a724be8e4c60fdac1ae47372f38a41d90c90add650df9738b419dd7cc9172
+  metadata.gz: f2cdd341fe1a494392295da71cb4b33b7203e872036f3693915eaea98765f769
+  data.tar.gz: d817e88ade9214f76cbe2fae6494f3bd50cab36872a1954cd669f40d7b240158
 SHA512:
-  metadata.gz: 0b4a4dff907cb990855d88efdbe81603c73d680bb8b1da4427490042b320c3f0559b006ae6cc97910de09d574c08112599daa313544df5563f15cd1d0c90a2fe
-  data.tar.gz: 406e29c5e7d7159cfcd9527acb3f0df93617428e6a66db89a5847a30e8ab1cc8031ea3e5412d1abd181e0c57867540f66f1242a9a16b00daa2abdf38dd80c0ca
+  metadata.gz: 5cafeb98b9646fcd1884113fc175dedc4d9553f8aa6bf0d5c53287393edb4d40ad908141b47326345870d94045c0e0f7e28a00efa84192a87b672999976adbf5
+  data.tar.gz: f6ac081804beaafe3f5774c141860a409e69e9899dc9a32630bf5b0a9def957375ef6016f0ff4cfca213be1a5eac74c23967d68e15e1c6a0be5b1c95d9faf65f

data/CHANGELOG.md

@@ -2,6 +2,15 @@
 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 wtwcinemas.co.uk" instead of "WTW Cinemas HTTP error 500".
+
+### Removed
+- `WtwUk::Performance::TIME_ZONE`, now unused.
+
 ## [1.0.0] - 2026-11-02
 
 ### Added

data/lib/wtw_uk/internal/parser/showtime.rb

@@ -35,7 +35,6 @@ module WtwUk
         # Venues differ over hyphens and en dashes in the same title
         EN_DASH = ' – '
         LANGUAGE = /\((#{Cinebase::TitleSanitizer::LANGUAGES.join('|')})\)/i
-        TIME_ZONE = 'Europe/London'
 
         # @return [Date] the local date of the showtime
         attr_reader :date
@@ -76,7 +75,7 @@ module WtwUk
         def starting_at
           hour, minute = @markup.match(START).captures.map(&:to_i)
           local = Time.utc(@date.year, @date.month, @date.day, hour, minute)
-          TZInfo::Timezone.get(TIME_ZONE).local_to_utc(local) { |periods| periods.first }.utc
+          Cinebase::London.utc(local)
         end
 
         def variant

data/lib/wtw_uk/internal/website.rb

@@ -7,8 +7,6 @@ module WtwUk
     # Reads WTW's WordPress website, built on Jacro's cinema plugin, with a
     # subsite for each venue. No token is needed.
     class Website
-      include Http
-
       HOME = 'https://wtwcinemas.co.uk'
       # The what's on page's request when a date is chosen
       ACTION = 'jacro_filter_result'
@@ -16,13 +14,17 @@ module WtwUk
       ALL_DATES = 'moredates'
       FILM_TYPE = 'Now Showing'
 
+      def initialize
+        @http = Cinebase::Http.new
+      end
+
       # @param [String] path the venue's subsite, e.g. 'truro'
       # @param [String] location Jacro's cinema id for the venue, e.g. '2'
       # @return [String] every film the venue has on sale, each with every
       #   showtime under date headings, however far ahead
       def programme(path, location)
         form = { 'action' => ACTION, 'film_date' => ALL_DATES, 'film_type' => FILM_TYPE, 'cinema_id' => location }
-        JSON.parse(post("#{HOME}/#{path}/wp-admin/admin-ajax.php", form)).fetch('html', '').to_s
+        JSON.parse(@http.post("#{HOME}/#{path}/wp-admin/admin-ajax.php", form: form)).fetch('html', '').to_s
       end
     end
   end

data/lib/wtw_uk/performance.rb

@@ -24,8 +24,6 @@ module WtwUk
     #   @option options [String] :language (nil) audio language, e.g. 'Hindi'
     #   @option options [Time] :starting_at listed start time of the performance
 
-    TIME_ZONE = 'Europe/London'.freeze
-
     # Performances within an inclusive range of showing dates, from one
     # request: the venue's programme holds every advertised date.
     # @param [String] cinema_id the venue's TapOS site code, e.g. 'PLATRU'
@@ -34,7 +32,7 @@ module WtwUk
     # @return [Array<WtwUk::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

data/lib/wtw_uk/version.rb

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

data/lib/wtw_uk.rb

@@ -5,7 +5,6 @@ require 'cinebase'
 
 require_relative './wtw_uk/version'
 
-require_relative './wtw_uk/internal/http'
 require_relative './wtw_uk/internal/website'
 require_relative './wtw_uk/internal/title_sanitizer'
 require_relative './wtw_uk/internal/parser/showtime'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wtw_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'
 description: Pull movie & cinema information from the WTW Cinemas website
 email:
 - andy@goodscary.com
@@ -120,7 +120,6 @@ files:
 - README.md
 - lib/wtw_uk.rb
 - lib/wtw_uk/cinema.rb
-- lib/wtw_uk/internal/http.rb
 - lib/wtw_uk/internal/parser/programme.rb
 - lib/wtw_uk/internal/parser/showtime.rb
 - lib/wtw_uk/internal/title_sanitizer.rb

data/lib/wtw_uk/internal/http.rb

@@ -1,41 +0,0 @@
-# frozen_string_literal: true
-
-require 'net/http'
-
-module WtwUk
-  # Internal utility classes: Do not use
-  # @api private
-  module Internal
-    # Requests to wtwcinemas.co.uk
-    module Http
-      RETRIES = 2
-      TRANSIENT_ERRORS = [
-        EOFError, Errno::ECONNRESET, Errno::ECONNREFUSED, Net::OpenTimeout, Net::ReadTimeout, OpenSSL::SSL::SSLError
-      ].freeze
-
-      private
-
-      def post(url, form)
-        uri = URI(url)
-        request = Net::HTTP::Post.new(uri)
-        request.set_form_data(form)
-        attempts = 0
-        begin
-          response = Net::HTTP.start(uri.host, uri.port, use_ssl: true, open_timeout: 10, read_timeout: 30) do |http|
-            http.request(request)
-          end
-        rescue *TRANSIENT_ERRORS
-          attempts += 1
-          raise if attempts > RETRIES
-
-          sleep(attempts)
-          retry
-        end
-        # Omit response bodies from errors, and never follow redirects.
-        raise "WTW Cinemas HTTP error #{response.code}" unless response.is_a?(Net::HTTPSuccess)
-
-        String.new(response.body, encoding: Encoding::UTF_8)
-      end
-    end
-  end
-end