cineworld_uk 4.3.2-x86_64-linux-gnu → 4.5.0-x86_64-linux-gnu

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ddd265d5bfbbedaec6d9004a093f70b02873a978ce710f60f0e811b5bc86e7c
-  data.tar.gz: 39da4663b71cdf540a370f69d152287f851ef285cd497b95955cdf5859d7e1e4
+  metadata.gz: b152f11fcf9ae8cc88be932311d9e46c4029a239b59ffa32e952d39b390495bc
+  data.tar.gz: b778579ab039423dbf2d51b1a68ae336cadcfbd2ef982446328486b72149306d
 SHA512:
-  metadata.gz: a604de2a95540a40e026a4f005a84e6739f2b7d165f6c3e473df5fb97fe53a2fbb2bfd0c3d240154eed13f57cb592387460a8d98e3c6710379397ef10bd8873e
-  data.tar.gz: ea2ca7e6dd557850ed0726910c95de48aed582d10f60dc33e7c9b5866fb128932504f4d13f7b4d6638ff9368b74b5af98901c3c6b2b6f13f1d42c79959824818
+  metadata.gz: 06e4842e31ffac91113eee8770eec53f483eeef93ca07f3f632e1fa9d08408fe4ecc2a2d2ba105d594388128ef21007725797938fa13da7094c1c41d66938fc3
+  data.tar.gz: d746059a80b860ed9bb8e2d63d16b3c2e65acbed8db2eda685bc2a7fb78ffa0a4c82220d638bf5d5c28f158572cc8df2a009d470b2a9ad9e5365586a8897490c

data/CHANGELOG.md

@@ -2,6 +2,25 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [4.5.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`.
+- National Theatre Live screenings are named `National Theatre Live: `, not `National Theatre: `, before cinebase moves the series to `event`.
+
+### Fixed
+- `Met Opera - Cosi Fan Tutte (Mozart)` is now `Cosi Fan Tutte`: a Met Opera title loses a trailing bracketed composer.
+
+## 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

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'
 ```

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.5'
+  spec.add_runtime_dependency 'cinebase', '~> 5.9'
   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"),
@@ -87,6 +88,9 @@ module CineworldUk
 
       def fetch(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.

data/lib/cineworld_uk/internal/parser/api/film.rb

@@ -24,21 +24,25 @@ module CineworldUk
           # @param [Integer] year edition when the title gives none
           # @return [Cinebase::Festival, nil]
           def festival(year)
-            Cinebase::Festival.from_title(@data['name'] || '', year: year)
+            Cinebase::Festival.from_title(title, year: year)
           end
 
           # @return [Integer, nil] the year at the end of the title
           def film_year
-            Cinebase::TitleSanitizer.film_year(@data['name'] || '')
+            Cinebase::TitleSanitizer.film_year(title)
           end
 
           # Sanitized film name
           # @return [String]
           def name
-            title = @data['name'] || ''
             TitleSanitizer.new(title).sanitized
           end
 
+          # @return [String] the title as listed
+          def title
+            @data['name'] || ''
+          end
+
           # List of strings representing different kinds of performance, such
           # as autism, kids, imax, members or q&a
           # @return [Array<String>] or an empty array

data/lib/cineworld_uk/internal/title_sanitizer.rb

@@ -34,7 +34,8 @@ module CineworldUk
           'SciScreen: ',                        # SciScreen
           /\s(-\s)*(With)*\sLive Q And A/i,     # Live Q&A
           /(\s+\-\s+)?MOVIES FOR JUNIORS/i,     # movies for juniors
-          %r{\s20\d{2}[\/-]20\d{2} Season\b}
+          %r{\s20\d{2}[\/-]20\d{2} Season\b},
+          /\A(?i:Met Opera)\b.*\K\s*\(\p{Lu}[\p{L}-]+\)\z/ # Met Opera composer
         ] + COMMON_REMOVE
       end
 

data/lib/cineworld_uk/performance.rb

@@ -87,6 +87,7 @@ module CineworldUk
           film_year: film.film_year,
           language: performance.language,
           starting_at: starting_at,
+          title: film.title,
           variant: (performance.variant + film.variant).sort
         }
       end

data/lib/cineworld_uk/version.rb

@@ -1,6 +1,6 @@
 # Ruby interface for http://www.cineworld.co.uk
-# @version 4.3.2
+# @version 4.5.0
 module CineworldUk
   # Gem version
-  VERSION = "4.3.2".freeze
+  VERSION = "4.5.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

@@ -68,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/lib/cineworld_uk/internal/title_sanitizer_test.rb

@@ -42,17 +42,21 @@ class CineworldUk::Internal::TitleSanitizerTest < Minitest::Test
     assert_sanitized 'Met Opera: Le Nozze Di Figaro', 'MET Opera - Le Nozze Di Figaro'
   end
 
+  def test_met_opera_drops_composer
+    assert_sanitized 'Met Opera: Cosi Fan Tutte', 'Met Opera - Cosi Fan Tutte (Mozart)'
+  end
+
   def test_nt_live_encore
-    assert_sanitized 'National Theatre: Frankenstein (starring Benedict Cumberbatch)',
+    assert_sanitized 'National Theatre Live: Frankenstein (starring Benedict Cumberbatch)',
                      'NT Live Encore: Frankenstein (starring Benedict Cumberbatch)'
   end
 
   def test_nt_live
-    assert_sanitized 'National Theatre: Treasure Island', 'NT Live: Treasure Island'
+    assert_sanitized 'National Theatre Live: Treasure Island', 'NT Live: Treasure Island'
   end
 
   def test_nt_live_with_encore_suffix
-    assert_sanitized 'National Theatre: A Streetcar Named Desire (Young Vic)',
+    assert_sanitized 'National Theatre Live: A Streetcar Named Desire (Young Vic)',
                      'NT Live: A Streetcar Named Desire (Young Vic) - Encore'
   end
 

data/test/lib/cineworld_uk/performance_test.rb

@@ -70,6 +70,16 @@ class CineworldUk::PerformanceTest < Minitest::Test
     assert_equal Cinebase::Festival.new(name: 'Cine-Excess', year: 2026), performance.festival
   end
 
+  def test_at_names_event_from_title
+    stub_showtimes(DATE, showtimes_json.sub('The Example Film', 'Met Opera - Cosi Fan Tutte (Mozart)'))
+    performance = CineworldUk::Performance.at(14, from: DATE, to: DATE).first
+
+    assert_equal 'Met Opera - Cosi Fan Tutte (Mozart)', performance.title
+    assert_equal 'Cosi Fan Tutte', performance.film_name
+    assert_equal Cinebase::Event.new(name: 'Met Opera'), performance.event
+    assert_equal %w(arts audio_described), performance.variant
+  end
+
   def test_at_parses_format_and_film_year
     performance = performances_on_date[5]
 

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
 

metadata

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