odeon_uk 5.0.0-x86_64-linux-gnu → 5.1.1-x86_64-linux-gnu

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4ad84f453bd9911cc64ce15f082a13c7a55d5873f0889231b2d6af0ab78e016
-  data.tar.gz: da486b64502f139e58ac40903a58156d522aa3f1816ed2651ff7d29d1d261763
+  metadata.gz: 3393135e93707f7e38672d0bd3d25287c822e84e8d5264b54e80f6f2041eef83
+  data.tar.gz: deaf4a386a483d7257845ad5052421d46e7ec91e23166bcb6cff43e13396032a
 SHA512:
-  metadata.gz: 9938b688d64ddaa017c00cf2eadf56b813a687c8dcf2bd6dba232b76b6dee84a1184148e1aabb991b59b1233d1a296dd6c9ee3ede3d02840687fec184fe34579
-  data.tar.gz: ec83924eea649b7195e128d3036c71fffb0329d3f8f93fbe5a9d7a5d75b83b2ff005ab7aedc1bbbeb58aaf2ce2bf0283200f06a167d03614aa5c5904578a9e58
+  metadata.gz: 644aa5c3a8db2a08cf60984e71eda83c64f038cd9ab05aa243fccd56f2c83f6385a67411c64295604a0bbf6f9db70c86ac044dcef7884773a80b5c642ff9066a
+  data.tar.gz: 1d6e9657baf9f7daf53e96c48ebe2c2ad38088660b562bae38b322002a6973d039d72b4b8b91bff2c54977c5cba83ff514f2a2b0d3fff8679c2854acdae3db35

data/.github/workflows/release.yml

@@ -0,0 +1,73 @@
+name: Release Gem
+
+on:
+  workflow_dispatch:
+
+jobs:
+  package:
+    strategy:
+      matrix:
+        include:
+          - runner: ubuntu-latest
+            platform: x86_64-linux-gnu
+          - runner: ubuntu-24.04-arm
+            platform: aarch64-linux-gnu
+          - runner: macos-15
+            platform: arm64-darwin
+          - runner: macos-15-intel
+            platform: x86_64-darwin
+    runs-on: ${{ matrix.runner }}
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '4.0'
+          bundler-cache: true
+      - run: bundle exec rake 'package:native[${{ matrix.platform }}]'
+      - run: ODEON_PACKAGE="$(echo pkg/*.gem)" bundle exec ruby test/package_test.rb
+      - uses: actions/upload-artifact@v4
+        with:
+          name: gem-${{ matrix.platform }}
+          path: pkg/*.gem
+
+  release:
+    needs: package
+    runs-on: ubuntu-latest
+    permissions:
+      id-token: write
+      contents: write
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '4.0'
+          bundler-cache: true
+      - run: bundle exec rake test
+      - run: bundle exec rake build
+      - uses: actions/download-artifact@v4
+        with:
+          path: pkg
+          pattern: gem-*
+          merge-multiple: true
+      - uses: rubygems/configure-rubygems-credentials@v1.0.0
+      - name: Push the source and platform gems
+        run: |
+          for gem in pkg/*.gem; do
+            if output=$(gem push "$gem" 2>&1); then
+              echo "$output"
+            elif echo "$output" | grep -q "Repushing of gem versions is not allowed"; then
+              echo "Already published: $gem"
+            else
+              echo "$output"
+              exit 1
+            fi
+          done
+      - name: Tag the release
+        run: |
+          tag="v$(ruby -e 'print Gem::Specification.load(Dir["*.gemspec"].first).version')"
+          if git ls-remote --exit-code --tags origin "$tag" >/dev/null; then
+            echo "$tag already exists"
+          else
+            git tag "$tag"
+            git push origin "$tag"
+          fi

data/CHANGELOG.md

@@ -2,6 +2,19 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 5.1.1 - 2026-10-22
+
+### Changed
+- Reuse one Vista client, and so one kept-alive connection, for all requests until the token changes, instead of opening a TLS connection for every request. Requires cinebase 5.5.
+
+## 5.1.0 - 2026-10-22
+
+### Added
+- `Performance#film_year`, read from a trailing `(1996)` in the title.
+
+### Changed
+- Require cinebase 5.4. Film titles lose their year suffix, `(Re-release)` and Lithuanian markers, `+ ... Q&A` and `+ Discussion` add-ons, `(35mm)`, `(70mm)` and `4K` markers; `Horror Season` and `CFF:` prefixes become festivals.
+
 ## 5.0.0 - 2026-10-22
 
 ### Changed

data/README.md

@@ -122,6 +122,9 @@ performance.dimension
 performance.variant
 #=> ['audio_described', 'imax']
 
+performance.film_year
+#=> 1996 # from the title, nil when it has no year
+
 performance.language
 #=> 'Korean' # audio language, nil when the cinema does not tag one
 
@@ -163,6 +166,13 @@ addresses in the shape of Vista responses, never recorded API output.
 checks the fixtures against it and the live suite checks real responses, held
 only in memory. When the API changes, update the shape first, then the fixtures.
 
+## Releasing
+
+To release, bump the version, merge, then run the **Release Gem** workflow in
+GitHub Actions. It builds the source and four platform gems, publishes them
+through RubyGems trusted publishing (no MFA code needed) and tags the release.
+Versions already on RubyGems are skipped, so a failed run can be rerun.
+
 ## Contributing
 
 1. Fork it

data/lib/odeon_uk/internal/api_response.rb

@@ -27,9 +27,15 @@ module OdeonUk
 
       private
 
+      # One client keeps one connection open, so reuse it until the token changes.
       def client
-        Cinebase::Vista::Client.new(base_url: BASE_URL, region_code: REGION_CODE,
-                                    token: OdeonUk.token)
+        token = OdeonUk.token
+        if @client.nil? || @client_token != token
+          @client_token = token
+          @client = Cinebase::Vista::Client.new(base_url: BASE_URL, region_code: REGION_CODE,
+                                                token: token)
+        end
+        @client
       end
     end
   end

data/lib/odeon_uk/internal/parser/api/showtime.rb

@@ -40,6 +40,7 @@ module OdeonUk
               dimension: @data["requires3dGlasses"] ? "3d" : "2d",
               festival: Cinebase::Festival.from_title(title, year: starting_at.year),
               film_name: film_name,
+              film_year: Cinebase::TitleSanitizer.film_year(title),
               language: language,
               starting_at: starting_at,
               variant: variant

data/lib/odeon_uk/version.rb

@@ -1,6 +1,6 @@
 # Ruby interface for https://www.odeon.co.uk
-# @version 5.0.0
+# @version 5.1.1
 module OdeonUk
   # Gem version
-  VERSION = '5.0.0'.freeze
+  VERSION = '5.1.1'.freeze
 end

data/odeon_uk.gemspec

@@ -27,5 +27,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'simplecov', '< 1'
   spec.add_development_dependency 'webmock'
 
-  spec.add_runtime_dependency 'cinebase', '~> 5.2'
+  spec.add_runtime_dependency 'cinebase', '~> 5.5'
 end

data/test/fixtures/api/showtimes-824.json

@@ -48,7 +48,7 @@
     "films": [
       { "id": "FILM-1", "title": { "text": "The Example Film 3D" } },
       { "id": "FILM-2", "title": { "text": "Made Up Concert: Live" } },
-      { "id": "FILM-3", "title": { "text": "Imaginary Picture (Tamil)" } },
+      { "id": "FILM-3", "title": { "text": "Imaginary Picture (2025) (Tamil)" } },
       { "id": "FILM-4", "title": { "text": "Pretend Pups" } }
     ],
     "attributes": [

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

@@ -58,8 +58,36 @@ class OdeonUk::Internal::ApiResponseTest < Minitest::Test
     assert_equal 'Vista HTTP error 500', error.message
   end
 
+  def test_reuses_one_client_while_the_token_holds
+    stub_request(:get, "#{BASE_URL}/sites").to_return(status: 200, body: sites_json)
+    shared = api
+
+    assert_equal 1, count_clients { 3.times { shared.sites } }
+  end
+
+  def test_builds_a_new_client_for_a_new_token
+    stub_request(:get, "#{BASE_URL}/sites").to_return(status: 200, body: sites_json)
+    shared = api
+
+    clients = count_clients do
+      shared.sites
+      OdeonUk.token = 'renewed-jwt'
+      shared.sites
+    end
+
+    assert_equal 2, clients
+  end
+
   private
 
+  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 api
     OdeonUk::Internal::ApiResponse.new
   end

data/test/lib/odeon_uk/internal/parser/api/showtime_test.rb

@@ -3,7 +3,8 @@ require_relative '../../../../../test_helper'
 class OdeonUk::Internal::Parser::Api::ShowtimeTest < Minitest::Test
   FILMS = {
     'HO1' => { 'title' => { 'text' => 'Jailer 2 (Tamil)' } },
-    'HO2' => { 'title' => { 'text' => 'Cine-Excess 2026: Scum Of The Earth' } }
+    'HO2' => { 'title' => { 'text' => 'Cine-Excess 2026: Scum Of The Earth' } },
+    'HO3' => { 'title' => { 'text' => 'From Dusk Till Dawn (1996)' } }
   }.freeze
 
   ATTRIBUTES = {
@@ -20,6 +21,7 @@ class OdeonUk::Internal::Parser::Api::ShowtimeTest < Minitest::Test
       dimension: '2d',
       festival: nil,
       film_name: 'Jailer 2',
+      film_year: nil,
       language: nil,
       starting_at: Time.utc(2026, 10, 24, 17, 30),
       variant: []
@@ -47,6 +49,13 @@ class OdeonUk::Internal::Parser::Api::ShowtimeTest < Minitest::Test
     assert_equal 'Scum Of The Earth', showtime[:film_name]
   end
 
+  def test_film_year_moves_from_title_to_attribute
+    showtime = parse(film_id: 'HO3')
+
+    assert_equal 1996, showtime[:film_year]
+    assert_equal 'From Dusk Till Dawn', showtime[:film_name]
+  end
+
   def test_open_captions_and_subtitles_are_one_variant
     assert_equal %w(subtitled), parse(attribute_ids: %w(2 4))[:variant]
   end

data/test/lib/odeon_uk/performance_test.rb

@@ -49,6 +49,7 @@ class OdeonUk::PerformanceTest < Minitest::Test
     korean = performances[2]
 
     assert_equal 'Imaginary Picture', tamil.film_name
+    assert_equal 2025, tamil.film_year
     assert_equal 'Tamil', tamil.language
     assert tamil.subtitled?
     assert_equal 'Korean', korean.language
@@ -110,6 +111,10 @@ class OdeonUk::PerformanceTest < Minitest::Test
     assert_equal festival, performance.festival
   end
 
+  def test_film_year
+    assert_equal 1996, OdeonUk::Performance.new(options(film_year: 1996)).film_year
+  end
+
   def test_subtitled
     assert OdeonUk::Performance.new(options(variant: %w(subtitled))).subtitled?
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: odeon_uk
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.1.1
 platform: x86_64-linux-gnu
 authors:
 - Andy Croll
@@ -113,14 +113,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '5.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '5.5'
 description: Pull movie & cinema information from the ODEON Vista API
 email:
 - andy@goodscary.com
@@ -128,6 +128,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/release.yml"
 - ".github/workflows/test.yml"
 - ".gitignore"
 - ".ruby-version"