gft_uk 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af31bfcd359eebc295d64482429e10550cce980ec3000492eccebcc1bca48839
-  data.tar.gz: a68a152fb326ed3535e6ae63e2498fc940e9eb0e616fcc8f0bad5e8188b9c98a
+  metadata.gz: 9972f784150fbabe8ab6200f7d9489fb2732fae4f2967847eb2c3d0c9820eeb2
+  data.tar.gz: 206bcc75aa132a5e912edb173f36b0eb7c1ae735a1dd2596815a744ebcf3936d
 SHA512:
-  metadata.gz: 89fdf5b1cffe1fe0b8cd63812d24ad1d3aa5f839f906059222a835424a71f3ccf2502dc38673b465aa1b11258f1778b71973ca8560d906960591e08cc2292e5b
-  data.tar.gz: a30e076569febddf7b2907894629cdd25017e8f27570a569229d53f47d19dfd02709206beedaea8534c3cb1f17f729e7c3f88d56cc852f8f88b123a67fcc8f05
+  metadata.gz: de8a994096f943cbb906c6ed208d1ed2da08faf2883ecb7a36fe0ed9f4129fd407ea0402a66dbcd28126256c1d3927280f66c6bda7bb4c95dbec7e69b7092d08
+  data.tar.gz: 8efae36d5423f011682f2f0e0c76f9f45efed8b75543c617e1ec0a8e3156d0bd3bad7079efa321fad8aead1563b69e576e8e630d693a59c2e034e3fcd5b77f36

data/CHANGELOG.md

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

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
@@ -127,7 +126,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

@@ -23,8 +23,6 @@ module GftUk
     #   @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: one request
     # for the dates with showings, then one for every ten of those dates.
     # @param [Integer, String] cinema_id the cinema's Indy site id, '103'
@@ -33,7 +31,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 +59,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.0.1
 module GftUk
   # Gem version
-  VERSION = '1.0.0'.freeze
+  VERSION = '1.0.1'.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.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 Glasgow Film Theatre website
 email:
 - andy@goodscary.com