gft_uk 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af31bfcd359eebc295d64482429e10550cce980ec3000492eccebcc1bca48839
-  data.tar.gz: a68a152fb326ed3535e6ae63e2498fc940e9eb0e616fcc8f0bad5e8188b9c98a
+  metadata.gz: 3ac986d109ce14f592d90da5095b4cb399068ac89e09fe3987137863b7c3ce96
+  data.tar.gz: 353a6aacc32a4fcd3de1585e92df2e6e4057d3e40e748d93861719168424c691
 SHA512:
-  metadata.gz: 89fdf5b1cffe1fe0b8cd63812d24ad1d3aa5f839f906059222a835424a71f3ccf2502dc38673b465aa1b11258f1778b71973ca8560d906960591e08cc2292e5b
-  data.tar.gz: a30e076569febddf7b2907894629cdd25017e8f27570a569229d53f47d19dfd02709206beedaea8534c3cb1f17f729e7c3f88d56cc852f8f88b123a67fcc8f05
+  metadata.gz: 67fbf2fd355940b3dd66f8399a90e7c3a68d86c2e44dde025e5da0f90523e3d3af66822be928e045955d704e1e33b99d6b1c7e58ea50aba4e0f79eb4b0d8efe3
+  data.tar.gz: 4112af4325eff401a436a3d34a004953b7bbe0bf2b76da6f2341a861a8fc83acabb6e729355a998b901fa53c91c70daec074b3c59453bf56f7506c788283b647

data/CHANGELOG.md

@@ -2,6 +2,17 @@
 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`.
+
+## [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 www.glasgowfilm.org" in place of "Indy HTTP error 500".
+
 ## [1.0.0] - 2026-11-02
 
 The first release, as 1.0.0.

data/README.md

@@ -136,7 +136,8 @@ Titles are cleaned up:
 - Anniversaries, restorations and prints go: 'Marie Antoinette - 20th
   Anniversary - 4K', 'Short Cuts - 35mm', 'A Silent Voice (10th Anniversary)'.
 - Add-ons go: '+ Q&A', '+ discussion', '+ introduction'.
-- 'NT Live:' becomes 'National Theatre Live:'.
+- Series prefixes such as 'NT Live:' go, and the performance's `event` names
+  the series, here National Theatre Live.
 
 ## Tests
 

data/lib/gft_uk/internal/graphql.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'json'
-require 'net/http'
 
 module GftUk
   # Internal utility classes: Do not use
@@ -10,23 +9,23 @@ module GftUk
     # Posts queries to the consumer GraphQL API of a website built on Indy
     # Systems, the Indy Cinema Group's platform
     class Graphql
-      RETRIES = 2
-      TRANSIENT_ERRORS = [
-        EOFError, Errno::ECONNRESET, Errno::ECONNREFUSED, Net::OpenTimeout, Net::ReadTimeout, OpenSSL::SSL::SSLError
-      ].freeze
+      READ_TIMEOUT = 60
 
       # @param [String] url the website's GraphQL endpoint
       # @param [String] site_id the venue's Indy site id
       def initialize(url, site_id:)
-        @uri = URI(url)
-        @site_id = site_id
+        @url = url
+        # Indy refuses consumer queries that name no site
+        @headers = { 'Client-Type' => 'consumer', 'Site-Id' => site_id }
+        # One connection for all of an import's requests
+        @http = Cinebase::Http.new(read_timeout: READ_TIMEOUT, keep_alive: true)
       end
 
       # @param [String] document a GraphQL query
       # @param [Hash] variables the query's variables
       # @return [Hash] the response's data
       def query(document, variables = {})
-        body = JSON.parse(post(JSON.generate(query: document, variables: variables)))
+        body = JSON.parse(@http.post(@url, json: { query: document, variables: variables }, headers: @headers))
         # Indy reports a failed query in one 'error' object, not an 'errors' list
         error = body['error'] || Array(body['errors']).first
         if error
@@ -35,42 +34,6 @@ module GftUk
           body.fetch('data')
         end
       end
-
-      private
-
-      # Indy refuses consumer queries that name no site
-      def post(body)
-        request = Net::HTTP::Post.new(@uri)
-        request['Content-Type'] = 'application/json'
-        request['Client-Type'] = 'consumer'
-        request['Site-Id'] = @site_id
-        request.body = body
-        response = with_retries { connection.request(request) }
-        # Omit response bodies from errors, and never follow redirects.
-        raise "Indy HTTP error #{response.code}" unless response.is_a?(Net::HTTPSuccess)
-
-        String.new(response.body, encoding: Encoding::UTF_8)
-      end
-
-      # Net::HTTP never retries a POST itself
-      def with_retries
-        attempts = 0
-        begin
-          yield
-        rescue *TRANSIENT_ERRORS
-          attempts += 1
-          raise if attempts > RETRIES
-
-          @connection = nil
-          sleep(attempts)
-          retry
-        end
-      end
-
-      # One connection for all of an import's requests
-      def connection
-        @connection ||= Net::HTTP.start(@uri.host, @uri.port, use_ssl: true, open_timeout: 10, read_timeout: 60)
-      end
     end
   end
 end

data/lib/gft_uk/internal/parser/showing.rb

@@ -65,7 +65,6 @@ module GftUk
         NON_FILM_TITLES = /\b(?:Pass|Gift Card|Voucher|Membership)\z/i
 
         THREE_D = /\b3D\b/i
-        TIME_ZONE = 'Europe/London'
 
         # @param [Hash] showing one showing, with its movie
         # @param [String] url the website's home page
@@ -90,6 +89,7 @@ module GftUk
             film_name: TitleSanitizer.new(title).sanitized,
             film_year: Cinebase::TitleSanitizer.film_year(title) || release_year,
             starting_at: starting_at,
+            title: title,
             variant: variant
           }
         end
@@ -108,7 +108,7 @@ module GftUk
         end
 
         def festival
-          Cinebase::Festival.from_title(title, year: london_year) || badge_festival || title_festival
+          title_festival || Cinebase::Festival.from_title(title, year: london_year) || badge_festival
         end
 
         def badge_festival
@@ -127,7 +127,7 @@ module GftUk
         end
 
         def london_year
-          TZInfo::Timezone.get(TIME_ZONE).to_local(starting_at).year
+          Cinebase::London.date(starting_at).year
         end
 
         def movie

data/lib/gft_uk/performance.rb

@@ -22,8 +22,7 @@ module GftUk
     #   @option options [String] :film_name name of the film
     #   @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
+    #   @option options [String] :title (nil) raw title, for audience variants
 
     # Performances within an inclusive range of showing dates: one request
     # for the dates with showings, then one for every ten of those dates.
@@ -33,7 +32,7 @@ module GftUk
     # @return [Array<GftUk::Performance>]
     def self.at(
       cinema_id,
-      from: today,
+      from: Cinebase::London.today,
       to: from + 13
     )
       raise ArgumentError, 'to must not precede from' if to < from
@@ -61,11 +60,6 @@ module GftUk
     #   The kinds of screening (arts, audio_described, kids, relaxed, subtitled ...)
     #   @return <Array[String]>
 
-    def self.today
-      TZInfo::Timezone.get(TIME_ZONE).now.to_date
-    end
-    private_class_method :today
-
     def self.showings(cinema, dates)
       indy = GftUk::Internal::Indy.new(cinema.url, site_id: cinema.id)
       indy.showings(indy.dates.select { |date| dates.cover?(date) })

data/lib/gft_uk/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gft_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 Glasgow Film Theatre website
 email:
 - andy@goodscary.com