rio_uk 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e3e5119b7aa4f3c0822c76f974c76e2be2ebdfb9a9c08fcc3fac80549551eaf
-  data.tar.gz: b06872046de7982781e513ff8813e87b832490aafc18d5da46f0ef1b69ce7575
+  metadata.gz: ee16c0c022f2fa1ecf21cdd679ec226c97f34c068cc84a09c86fed03690a5022
+  data.tar.gz: ad086a55a3b0ae48ce3c8101525a857fbd7443a55589a142c3e0c82703d79777
 SHA512:
-  metadata.gz: e952d79239ed7ccffd543dd7a0cbb4e540ec8c0fa66c0ccb889af162b2269720fc481ac39efbae8dd9e5ea770b81e12679fbca672b7ca76f8a369fd273a44c89
-  data.tar.gz: 1f2909dcd30cdf621ceeadcf1d1b4e1d184668cccba4c75b5dbfc6cbfb3ca85cc53e8228ed0f6b5541b3555aa57341c0e87f6fbba112de55b631a2079c9b7adb
+  metadata.gz: d2b27c8de08c32cc0f4d58c31dd18bd4dc15d7f8998237beb748cd47585de809ebdc64444be4cdf28f275bfd928835976df531cc9cdc73ee7180d8d09fa9ddbd
+  data.tar.gz: 78cab9f6b1276dca143d39922459f791b215048c5d91ca8f3d0207afd0cfdfa953bc0d964cf3c6590bc4235c3788992c84cab51ac103cab1d26465494907125e

data/CHANGELOG.md

@@ -2,6 +2,23 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.1.0] - 2026-11-03
+
+### Changed
+- Uses cinebase 5.9: performances take the raw `title:`, so audience labels become variants, and series prefixes such as `Met Opera:` become the performance's `event`.
+
+### Fixed
+- `THE DEVILS (4K Restoration)` reads "The Devils", not "The Devils (4K".
+
+## [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 riocinema.org.uk" instead of "Rio Cinema HTTP error 500".
+
+### Removed
+- `RioUk::Performance::TIME_ZONE`, now unused.
+
 ## [1.0.0] - 2026-11-02
 
 The first release, as 1.0.0.

data/lib/rio_uk/internal/parser/event.rb

@@ -33,7 +33,6 @@ module RioUk
         YES = 'Y'
         THREE_D = /\b3D\b/i
         YEAR = /\A\d{4}\z/
-        TIME_ZONE = 'Europe/London'
 
         # @param [Hash] event one of the website's Savoy events
         def initialize(event)
@@ -67,6 +66,7 @@ module RioUk
             film_name: film_name,
             film_year: film_year,
             starting_at: starting_at,
+            title: title,
             variant: variant(performance)
           }
         end
@@ -101,7 +101,7 @@ module RioUk
         def starting_at(performance, date)
           hour, minute = performance.fetch('StartTime').unpack('a2a2').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 strands

data/lib/rio_uk/internal/title_sanitizer.rb

@@ -36,9 +36,9 @@ module RioUk
         @sanitized ||= begin
           listed = without_director(title.squeeze(' ').strip)
           event_cinema = listed[EVENT_CINEMA].to_s
-          film = without_strand(listed.delete_prefix(event_cinema))
+          film = without_labels(without_strand(listed.delete_prefix(event_cinema)))
           film = titlecase(leading_capitals(film)) if capitals?(film)
-          film = remove.reduce(event_cinema + film) { |text, pattern| text.gsub(pattern, '') }
+          film = without_labels(event_cinema + film)
           replace.reduce(film) { |text, (pattern, prefix)| text.gsub(pattern) { prefix + $1 } }.squeeze(' ').strip
         end
       end
@@ -59,6 +59,12 @@ module RioUk
         }.merge(COMMON_REPLACE)
       end
 
+      # Before the case check too, as a mixed case label such as
+      # '(4K Restoration)' would otherwise be cut in half with the extras
+      def without_labels(text)
+        remove.reduce(text) { |stripped, pattern| stripped.gsub(pattern, '') }
+      end
+
       def capitals?(text)
         word = text[FIRST_WORD]
         !word.nil? && !word.match?(/\p{Ll}/)

data/lib/rio_uk/internal/website.rb

@@ -7,17 +7,19 @@ module RioUk
     # Reads the Rio Cinema's website, run on Savoy Systems' ticketing. No
     # token is needed.
     class Website
-      include Http
-
       WHATS_ON = 'https://riocinema.org.uk/Rio.dll/WhatsOn'
       # Savoy pages carry the whole programme as one line of JSON
       EVENTS = /^var Events =\s*(\{.*\})\s*$/
 
+      def initialize
+        @http = Cinebase::Http.new
+      end
+
       # Every event on sale with every advertised performance, however far
       # ahead, including sold out ones
       # @return [Array<Hash>] Savoy events, each with its 'Performances'
       def events
-        JSON.parse(get(WHATS_ON)[EVENTS, 1] || '{}').fetch('Events', [])
+        JSON.parse(@http.get(WHATS_ON)[EVENTS, 1] || '{}').fetch('Events', [])
       end
 
       # @param [String] path a Savoy link relative to the what's on page,

data/lib/rio_uk/performance.rb

@@ -23,8 +23,6 @@ module RioUk
     #   @option options [Integer] :film_year (nil) year of the film
     #   @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 what's on page holds every advertised date.
     # @param [String] cinema_id the cinema's id, 'rio'
@@ -33,7 +31,7 @@ module RioUk
     # @return [Array<RioUk::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/rio_uk/version.rb

@@ -1,6 +1,6 @@
 # Ruby interface for https://riocinema.org.uk
-# @version 1.0.0
+# @version 1.1.0
 module RioUk
   # Gem version
-  VERSION = '1.0.0'.freeze
+  VERSION = '1.1.0'.freeze
 end

data/lib/rio_uk.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rio_uk
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Andy Croll
@@ -99,14 +99,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.7'
+        version: '5.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.7'
+        version: '5.9'
 description: Pull movie & cinema information from the Rio Cinema website
 email:
 - andy@goodscary.com
@@ -120,7 +120,6 @@ files:
 - README.md
 - lib/rio_uk.rb
 - lib/rio_uk/cinema.rb
-- lib/rio_uk/internal/http.rb
 - lib/rio_uk/internal/parser/event.rb
 - lib/rio_uk/internal/title_sanitizer.rb
 - lib/rio_uk/internal/website.rb

data/lib/rio_uk/internal/http.rb

@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-
-require 'net/http'
-
-module RioUk
-  # Internal utility classes: Do not use
-  # @api private
-  module Internal
-    # Requests to riocinema.org.uk
-    module Http
-      RETRIES = 2
-      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: 10, read_timeout: 30) do |http|
-            http.request(Net::HTTP::Get.new(uri))
-          end
-        rescue *TRANSIENT_ERRORS
-          attempts += 1
-          raise if attempts > RETRIES
-
-          sleep(attempts)
-          retry
-        end
-        # Omit response bodies from errors, and never follow redirects.
-        raise "Rio Cinema HTTP error #{response.code}" unless response.is_a?(Net::HTTPSuccess)
-
-        String.new(response.body, encoding: Encoding::UTF_8)
-      end
-    end
-  end
-end