cineworld_uk 4.3.1-x86_64-linux-gnu → 4.4.0-x86_64-linux-gnu

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c445f90a89f599972722f5a60105516629dad8ce1815cc1f6ac62c66cd96fa5
-  data.tar.gz: 004be778b3c64ae3d6d1cca58b4107d5cbaa4e5cc80ffcb26fb435c3523dff8a
+  metadata.gz: bda5e3524fc495d9cd2299b5a8563d1a0a06c1268565282dbc9f861b5902c173
+  data.tar.gz: f63b13ab73cd926c9954181a3270b24312bcf92635d283ac8f4517495f1bfec7
 SHA512:
-  metadata.gz: e0c862d5c7b251717551c6cff2b6e0c209caf465353f8ab264f1d9d564466b258427574130b30008bcd22311e76b9a10c8079c02358f0ad698a02376c5dc6c8e
-  data.tar.gz: 31341179ff88509fc1f164998108f70fd77cc0dc8de2363a498326f6aebddf2a222855d0a5e07dd87599e55ca45d6d61aaf646f6611a5d7f7b725def628bc52e
+  metadata.gz: 0242c5dd32fc1240940a8311b1772e4994288bb7ca4179b6ad1216b48dec12cb9b1e6f99347df0d35c73ccefa88725cd55a71a081ff72b6f7b3df076024ceb32
+  data.tar.gz: dd2f8ca6902de3884be7b8688738d264092fff5148060e4cad33e7f4c15c52e080d0def03d93c4ce749251738d105d209d538fe04ae42b0646683a3999c3fd41

data/CHANGELOG.md

@@ -2,6 +2,21 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 4.4.0 - 2026-10-31
+
+### Added
+- `Cinema#latitude` and `Cinema#longitude` as Floats in decimal degrees, from the Vista sites response. They are `nil` when a site has no location or sits at 0, 0.
+- `CineworldUk.ensure_token!` fetches a guest token only when there is none or it expires within an hour, and `CineworldUk.token_expires_at` reads its expiry. Both come from cinebase's `Vista::TokenHolder`.
+
+### Changed
+- A token the API rejects is cleared from `CineworldUk.token`, so the next `ensure_token!` fetches a fresh one.
+- Requires cinebase 5.6.
+
+## 4.3.2 - 2026-10-22
+
+### Changed
+- Reuse one Vista client, and so one kept-alive connection, per thread instead of opening a TLS connection for every request. Requires cinebase 5.5. A cinema day now takes about 0.19s rather than 0.37s.
+
 ## 4.3.1 - 2026-10-22
 
 ### Fixed

data/Gemfile

@@ -2,3 +2,4 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in cineworld_uk.gemspec
 gemspec
+

data/README.md

@@ -36,6 +36,16 @@ CineworldUk.acquire_token!
 CineworldUk::Cinema.all
 ```
 
+`acquire_token!` always fetches a new token. `ensure_token!` fetches one only
+when there is no token, or the token expires within an hour, and otherwise
+keeps the current one. Call it before each batch of requests:
+
+```ruby
+CineworldUk.ensure_token!
+CineworldUk.token_expires_at
+#=> 2026-10-31 03:00:00 UTC
+```
+
 This shells out to **`curl-impersonate`**, not ordinary system `curl`, using its
 Chrome 150 TLS/HTTP profile. No Python, Chrome, JavaScript execution or browser
 cookies are needed. Platform-specific gem packages include the pinned
@@ -89,8 +99,9 @@ The gem sends `Authorization: Bearer ...` and `Connect-Region-Code: GB` to
 automatically.
 
 Missing tokens and HTTP 401 responses raise `CineworldUk::AuthenticationError`.
-Call `CineworldUk.acquire_token!` again, or set `CineworldUk.token` with a fresh
-token, before retrying. Tokens are never persisted by the gem. Other HTTP
+A token the API rejects is cleared from `CineworldUk.token`, so call
+`CineworldUk.ensure_token!`, or set `CineworldUk.token` with a fresh token,
+before retrying. Tokens are never persisted by the gem. Other HTTP
 failures raise an error rather than returning an empty schedule. Redirects are
 not followed, so credentials are not forwarded to another host.
 
@@ -134,6 +145,12 @@ cinema.full_name
 cinema.id
 #=> 14
 
+cinema.latitude
+#=> 50.8125991821289
+
+cinema.longitude
+#=> -0.104699999094009
+
 cinema.postal_code
 #=> 'BN2 5UF'
 ```
@@ -229,7 +246,7 @@ To build and check just one platform on a matching host:
 
 ```sh
 bundle exec rake 'package:native[x86_64-linux-gnu]'
-CINEWORLD_PACKAGE=pkg/cineworld_uk-4.3.1-x86_64-linux-gnu.gem bundle exec ruby test/package_test.rb
+CINEWORLD_PACKAGE=pkg/cineworld_uk-4.3.2-x86_64-linux-gnu.gem bundle exec ruby test/package_test.rb
 ```
 
 Native packaging downloads pinned upstream archives at **build time**, verifies

data/cineworld_uk.gemspec

@@ -25,6 +25,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'simplecov', '< 1'
   spec.add_development_dependency 'webmock'
 
-  spec.add_runtime_dependency 'cinebase', '~> 5.4'
+  spec.add_runtime_dependency 'cinebase', '~> 5.6'
   spec.add_runtime_dependency 'nokogiri', '>= 1.11'
 end

data/lib/cineworld_uk/cinema.rb

@@ -101,6 +101,26 @@ module CineworldUk
     #     cinema.locality
     #     #=> 'Brighton'
 
+    # Latitude of the cinema
+    # @return [Float, nil] decimal degrees, or nil when unknown
+    # @example
+    #   cinema = CineworldUk::Cinema.new(14)
+    #   cinema.latitude
+    #   #=> 50.8125991821289
+    def latitude
+      coordinates&.first
+    end
+
+    # Longitude of the cinema
+    # @return [Float, nil] decimal degrees, or nil when unknown
+    # @example
+    #   cinema = CineworldUk::Cinema.new(14)
+    #   cinema.longitude
+    #   #=> -0.104699999094009
+    def longitude
+      coordinates&.last
+    end
+
     # The name of the cinema
     # @return [String]
     # @example
@@ -164,5 +184,19 @@ module CineworldUk
         JSON.parse(api.cinema_list)['body']['cinemas']
     end
     private_class_method :cinema_list_json
+
+    private
+
+    def cinema_hash
+      formatted_id = @id.to_s.rjust(3, '0')
+      self.class.send(:cinema_list_json).find { |cinema| cinema['id'] == formatted_id } || {}
+    end
+
+    # 0, 0 marks a site whose position was never set
+    def coordinates
+      location = cinema_hash['location'] || {}
+      pair = [location['latitude'], location['longitude']]
+      pair.map(&:to_f) if pair.all?(Numeric) && pair.any?(&:nonzero?)
+    end
   end
 end

data/lib/cineworld_uk/internal/api_response.rb

@@ -25,6 +25,7 @@ module CineworldUk
           {
             "id" => site.fetch("id"),
             "displayName" => site.fetch("name").fetch("text"),
+            "location" => site["location"],
             "addressInfo" => {
               "address1" => address.dig("line1", "text"),
               "city" => address.dig("line2", "text"),
@@ -86,8 +87,20 @@ module CineworldUk
       private
 
       def fetch(path, query = {})
-        Cinebase::Vista::Client.new(base_url: BASE_URL, region_code: "GB",
-                                    token: CineworldUk.token).get(path, query)
+        client.get(path, query)
+      rescue Cinebase::Vista::AuthenticationError
+        CineworldUk.reject_token!(@client_token)
+        raise
+      end
+
+      # One client keeps one connection open, so reuse it until the token changes.
+      def client
+        token = CineworldUk.token
+        if @client.nil? || @client_token != token
+          @client_token = token
+          @client = Cinebase::Vista::Client.new(base_url: BASE_URL, region_code: "GB", token: token)
+        end
+        @client
       end
     end
   end

data/lib/cineworld_uk/performance.rb

@@ -56,9 +56,13 @@ module CineworldUk
 
     # private
 
+    API = :cineworld_uk_performance_api
+
     # @api private
+    # One API, and so one kept-alive connection, per thread: job runners
+    # import several cinemas at once.
     def self.api
-      @api ||= Internal::ApiResponse.new
+      Thread.current[API] ||= Internal::ApiResponse.new
     end
     private_class_method :api
 

data/lib/cineworld_uk/version.rb

@@ -1,6 +1,6 @@
 # Ruby interface for http://www.cineworld.co.uk
-# @version 4.3.1
+# @version 4.4.0
 module CineworldUk
   # Gem version
-  VERSION = "4.3.1".freeze
+  VERSION = "4.4.0".freeze
 end

data/lib/cineworld_uk.rb

@@ -20,13 +20,10 @@ require_relative './cineworld_uk/performance'
 module CineworldUk
   AuthenticationError = Cinebase::Vista::AuthenticationError
 
-  # A raw guest JWT, without the "Bearer " prefix. Never persisted by the gem.
-  class << self
-    attr_accessor :token
-
-    # Explicit acquisition/renewal; ordinary API calls never launch a subprocess.
-    def acquire_token!(curl: nil)
-      self.token = Internal::GuestToken.new(curl: curl).fetch
-    end
+  extend Cinebase::Vista::TokenHolder
+
+  # @api private
+  def self.guest_token_class
+    Internal::GuestToken
   end
 end

data/test/fixtures/api/sites.json

@@ -3,6 +3,7 @@
     {
       "id": "014",
       "name": { "text": "Brighton" },
+      "location": { "latitude": 50.8125991821289, "longitude": -0.104699999094009 },
       "contactDetails": {
         "addressV2": {
           "line1": { "text": "1 Example Marina" },
@@ -15,6 +16,7 @@
     {
       "id": "088",
       "name": { "text": "Glasgow Silverburn" },
+      "location": { "latitude": 0, "longitude": 0 },
       "contactDetails": {
         "addressV2": {
           "line1": { "text": "2 Example Centre" },
@@ -27,6 +29,7 @@
     {
       "id": "103",
       "name": { "text": "Leicester Square" },
+      "location": null,
       "contactDetails": {
         "addressV2": {
           "line1": { "text": "3 Example Square" },

data/test/lib/cineworld_uk/cinema_test.rb

@@ -61,6 +61,25 @@ class CineworldUk::CinemaTest < Minitest::Test
     assert_equal 'Example: Riverside', CineworldUk::Cinema.new(999).name
   end
 
+  def test_latitude_and_longitude
+    cinema = CineworldUk::Cinema.new(14)
+
+    assert_in_delta 50.8126, cinema.latitude, 0.0001
+    assert_in_delta(-0.1047, cinema.longitude, 0.0001)
+  end
+
+  def test_latitude_and_longitude_are_nil_without_a_location
+    [103, 999].each do |id|
+      assert_nil CineworldUk::Cinema.new(id).latitude
+      assert_nil CineworldUk::Cinema.new(id).longitude
+    end
+  end
+
+  def test_latitude_and_longitude_are_nil_at_zero_zero
+    assert_nil CineworldUk::Cinema.new(88).latitude
+    assert_nil CineworldUk::Cinema.new(88).longitude
+  end
+
   def test_locality
     assert_equal 'Brighton', CineworldUk::Cinema.new(14).locality
     assert_equal 'London', CineworldUk::Cinema.new(103).locality

data/test/lib/cineworld_uk/internal/api_response_test.rb

@@ -14,6 +14,45 @@ class CineworldUk::Internal::ApiResponseTest < Minitest::Test
     super
   end
 
+  def test_reuses_one_client_while_the_token_holds
+    stub_request(:get, "#{BASE_URL}sites").to_return(body: '{"sites":[]}')
+    api = CineworldUk::Internal::ApiResponse.new
+
+    clients = count_clients { 3.times { api.cinema_list } }
+
+    assert_equal 1, clients
+  end
+
+  def test_builds_a_new_client_for_a_new_token
+    stub_request(:get, "#{BASE_URL}sites").to_return(body: '{"sites":[]}')
+    api = CineworldUk::Internal::ApiResponse.new
+
+    clients = count_clients do
+      api.cinema_list
+      CineworldUk.token = "renewed-token"
+      api.cinema_list
+    end
+
+    assert_equal 2, clients
+  end
+
+  def test_each_thread_has_its_own_performance_api
+    main = CineworldUk::Performance.send(:api)
+
+    other = Thread.new { CineworldUk::Performance.send(:api) }.value
+
+    assert_same main, CineworldUk::Performance.send(:api)
+    refute_same main, other
+  end
+
+  def count_clients
+    clients = 0
+    original = Cinebase::Vista::Client.method(:new)
+    counting = ->(**options) { clients += 1; original.call(**options) }
+    Cinebase::Vista::Client.stub(:new, counting) { yield }
+    clients
+  end
+
   def test_rejects_missing_token
     CineworldUk.token = nil
 
@@ -29,6 +68,15 @@ class CineworldUk::Internal::ApiResponseTest < Minitest::Test
     refute_includes error.message, "expired-secret"
   end
 
+  def test_rejected_token_is_cleared
+    CineworldUk.token = "rejected-token"
+    stub_request(:get, "#{BASE_URL}sites").to_return(status: 401)
+
+    assert_raises(CineworldUk::AuthenticationError) { CineworldUk::Cinema.all }
+
+    assert_nil CineworldUk.token
+  end
+
   def test_uses_replacement_token
     CineworldUk.token = "replacement"
     stub_request(:get, "#{BASE_URL}sites")

data/test/lib/cineworld_uk/internal/guest_token_test.rb

@@ -27,6 +27,16 @@ class CineworldUk::Internal::GuestTokenTest < Minitest::Test
     end
   end
 
+  def test_ensure_token_fetches_only_without_a_current_token
+    CineworldUk.token = nil
+    html, token = token_page(Time.now.to_i + 7200)
+    serve_token_page(html)
+
+    assert_equal token, CineworldUk.ensure_token!(curl: @curl)
+    serve_token_page("", exit_code: 7)
+    assert_equal token, CineworldUk.ensure_token!(curl: @curl)
+  end
+
   def test_rejects_expired_tokens_including_boundary_and_keeps_current_token
     now = Time.at(1_800_000_000)
     Time.stub(:now, now) do

data/test/live/integration_test.rb

@@ -8,6 +8,16 @@ class LiveCinemaTest < Minitest::Test
     assert_operator cinemas.size, :>, 18
     assert_equal 'Brighton', cinemas.detect { |cinema| cinema.id == 14 }.name
   end
+
+  def test_cinemas_have_uk_coordinates
+    located = CineworldUk::Cinema.all.select(&:latitude)
+
+    refute_empty located
+    located.each do |cinema|
+      assert_includes 49.0..61.0, cinema.latitude, "#{cinema.id} #{cinema.name}"
+      assert_includes(-9.0..2.0, cinema.longitude, "#{cinema.id} #{cinema.name}")
+    end
+  end
 end
 
 class LivePerformanceTest < Minitest::Test

data/test/support/api_shapes.rb

@@ -16,6 +16,11 @@ module ApiShapes
         line = address.fetch(key)
         assert_kind_of String, line.fetch('text'), "site #{site['id']} #{key}" unless line.nil?
       end
+      location = site['location'] || {}
+      %w(latitude longitude).each do |key|
+        value = location[key]
+        assert_kind_of Numeric, value, "site #{site['id']} #{key}" unless value.nil?
+      end
     end
   end
 

data/test/support/vista_fixtures.rb

@@ -53,6 +53,7 @@ module Support
       [CineworldUk::Cinema, CineworldUk::Performance].each do |klass|
         klass.instance_variables.each { |name| klass.remove_instance_variable(name) }
       end
+      Thread.current[CineworldUk::Performance::API] = nil if defined?(CineworldUk::Performance::API)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cineworld_uk
 version: !ruby/object:Gem::Version
-  version: 4.3.1
+  version: 4.4.0
 platform: x86_64-linux-gnu
 authors:
 - Andy Croll
@@ -113,14 +113,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.4'
+        version: '5.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.4'
+        version: '5.6'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement