cinebase 5.2.0 → 5.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e2e7e8c5976a431db0d55f18a831e89e2dda1590dcac508f959e17d06cbdeb3
-  data.tar.gz: 20a8dd91bca32d0b31ccd45e1c6d7f2940c0caaa0e0ab184a44a64f3eecaaaea
+  metadata.gz: 9cf2b85c2edc9824535b2304c6a138c9fcb1f741514729c68f997bd11691b3cf
+  data.tar.gz: 617e4142d0f55a1fa36b0c01accf4c4c620ac9816f6dc0f2ddde3e247fb6c16e
 SHA512:
-  metadata.gz: 400b26c276c60dfc217148f80d85a216a641731f56cacdce68f2b940454b850fc1d142f2055371f1ad54108e228b85d324c0458247dd66e4404f750622c03ab8
-  data.tar.gz: 978a46e47f5a6e004b0f0d1b79dbdb01d8d6c99db800c499db596bb9cf64b336b189c54614241ae93112a7a902fd5e7fe21b757bbbafdef102b35426a871fbad
+  metadata.gz: 8d2317b3bbf779296fde7e95e2982304cf6a23a2710e271539c1bfa2c2f107b5c77b5c07187c31ff85a59bce37b3cb2efcac1f60b8a276ad0c9009de1e9d1e19
+  data.tar.gz: b8f2b58778e8dafab5c9811fabd6cba08f24b6b9f5f9c20814d9bc2252e44fc6c502a8fb6901a029ac36066cb392d610f1d6938da6db0a73b10d99a9d059707a

data/CHANGELOG.md

@@ -2,6 +2,22 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [5.4.0] - 2026-10-22
+### Added
+- `Vista::Client` accepts `region_code: nil` and then sends no `Connect-Region-Code` header, for chains such as Picturehouse whose API rejects every region code
+- `COMMON_REMOVE` strips any `+ ... Q&A` or `+ ... Q+A` add-on, `+ Discussion`, `(35mm)`, `(70mm)` and a `4K` marker
+- `Met Opera Encore 2026-27:` titles standardise like other Met Opera seasons
+- `CFF:` (Cambridge Film Festival) title prefixes are festivals
+
+## [5.3.0] - 2026-10-22
+### Added
+- `Performance#film_year` with an optional `film_year:` option, and `TitleSanitizer.film_year` reading a trailing `(1996)` from a title
+- `COMMON_REMOVE` strips that year, `(Re-release)` and Lithuanian versions
+- `Horror Season` title prefixes are festivals, so `Horror Season 2026 From Dusk Till Dawn (1996)` becomes `From Dusk Till Dawn`, year 1996, in the Horror Season 2026
+
+### Fixed
+- Indentation of tests added in 5.2.0
+
 ## [5.2.0] - 2026-10-22
 ### Added
 - `Performance#festival`, `#language` and `#subtitled?`, with optional `festival:` and `language:` options

data/README.md

@@ -45,7 +45,7 @@ module CinemaChainName
     def self.at(cinema_id)
       # parse webpages or apis to get performances for a cinema, built with
       # booking_url:, cinema_id:, cinema_name:, dimension:, festival:,
-      # film_name:, language:, starting_at: and variant:
+      # film_name:, film_year:, language:, starting_at: and variant:
     end
   end
 end
@@ -85,6 +85,19 @@ Cinebase::Festival.from_title('UKJFF - From Cable Street To Brick Lane', year: 2
 
 `COMMON_REMOVE` strips the same prefixes from titles.
 
+### Film years
+
+Titles often end with the film's year. `COMMON_REMOVE` strips it, and
+`TitleSanitizer.film_year` reads it so it can be passed as `film_year:`:
+
+```ruby
+Cinebase::TitleSanitizer.film_year('Street Fighter (2026)')               #=> 2026
+Cinebase::TitleSanitizer.film_year('Kung Fu Soccer (2026) (Dubbed)')     #=> 2026
+Cinebase::TitleSanitizer.film_year('Blade Runner 2049')                  #=> nil
+```
+
+For a re-release this is the original year, which is what IMDb lists.
+
 ### Vista OCAPI chains
 
 Chains whose websites run on Vista share a client, guest token retrieval and

data/lib/cinebase/festival.rb

@@ -9,7 +9,9 @@ module Cinebase
     PREFIXES = [
       /\A(Cine-Excess) (20\d{2}): /,
       /\A(Cinemagic) (\d{4}) -/,
-      /\A(UKJFF) -/
+      /\A(UKJFF) -/,
+      /\A(CFF): /,
+      /\A(Horror Season) (20\d{2}) /
     ].freeze
 
     # @param [String] title raw film title

data/lib/cinebase/performance.rb

@@ -9,6 +9,7 @@ module Cinebase
     attr_reader :cinema_name
     attr_reader :festival
     attr_reader :film_name
+    attr_reader :film_year
     attr_reader :language
 
     def initialize(options)
@@ -18,6 +19,7 @@ module Cinebase
       @dimension   = options.fetch(:dimension, '2d')
       @festival    = options.fetch(:festival, nil)
       @film_name   = options.fetch(:film_name)
+      @film_year   = options.fetch(:film_year, nil)
       @language    = options.fetch(:language, nil)
       @time        = options.fetch(:starting_at)
       @variant     = options.fetch(:variant, [])

data/lib/cinebase/title_sanitizer.rb

@@ -32,8 +32,12 @@ module Cinebase
   # Rules every chain can share; subclasses opt in after their own patterns,
   # e.g. `[...] + COMMON_REMOVE` in #remove
   class TitleSanitizer
-    LANGUAGES = %w(Arabic Cantonese French Hindi Kannada Korean Malayalam
-                   Mandarin Marathi Polish Punjabi Tamil Telugu Turkish).freeze
+    LANGUAGES = %w(Arabic Cantonese French Hindi Kannada Korean Lithuanian
+                   Malayalam Mandarin Marathi Polish Punjabi Tamil Telugu
+                   Turkish).freeze
+
+    # A trailing "(1996)", allowing other bracketed markers after it
+    FILM_YEAR = /\s*\((1[89]\d{2}|20\d{2})\)(?=(?:\s*\([^)]*\))*\s*\z)/
 
     COMMON_REMOVE = [
       *Festival::PREFIXES,                              # festival prefix
@@ -41,14 +45,25 @@ module Cinebase
       /\((#{LANGUAGES.join('|')})\)/i,                  # language version
       /\((Dubbed|Subbed|English Dub|[^)]*subtitles)\)/i, # dub or subtitle version
       /\(\d+(st|nd|rd|th) Anniversary\)/i,              # anniversary re-release
-      /\s*\+\s*(In-Person )?Q&A\z/i,                    # Q&A add-on
+      /\(Re-release\)/i,                                # re-release
+      FILM_YEAR,                                        # film year, see .film_year
+      /\s*\+\s*(?:[\w-]+\s+)*Q(?:&|\+)A\z/i,            # Q&A add-on
+      /\s*\+\s*Discussion\z/i,                          # discussion add-on
+      /\s*\((35|70)mm\)/i,                              # film gauge
+      /\s+4K\b/,                                        # 4K restoration
       /:\s*Encore\z/i,                                  # encore
       /\bsing-?a-?long\z/i,                             # singalong
       'amp;'                                            # html ampersands
     ].freeze
 
+    # @param [String] title raw film title
+    # @return [Integer, nil] the film's year from a trailing "(1996)"
+    def self.film_year(title)
+      title[FILM_YEAR, 1]&.to_i
+    end
+
     COMMON_REPLACE = {
-      /Met Opera 20\d{2}-\d{2}: (.*)/              => 'Met Opera: ',
+      /Met Opera (?:Encore )?20\d{2}-\d{2}: (.*)/  => 'Met Opera: ',
       /RBO (?:Cinema Season )?20\d{2}-\d{2}: (.*)/ => 'Royal Ballet and Opera: ',
       /WORLD TOUR(.*)/                             => 'World Tour'
     }.freeze

data/lib/cinebase/version.rb

@@ -2,5 +2,5 @@
 
 # Cinebase version
 module Cinebase
-  VERSION = '5.2.0'
+  VERSION = '5.4.0'
 end

data/lib/cinebase/vista/client.rb

@@ -8,7 +8,8 @@ module Cinebase
     # Makes guest-token GET requests to a chain's OCAPI
     class Client
       # @param [String] base_url e.g. 'https://vwc.odeon.co.uk/WSVistaWebClient/ocapi/v1/'
-      # @param [String] region_code Connect-Region-Code header, e.g. 'UK' or 'GB'
+      # @param [String, nil] region_code Connect-Region-Code header, e.g. 'UK'
+      #   or 'GB'; nil for chains whose API rejects every region code
       # @param [String, nil] token raw guest JWT, without the "Bearer " prefix
       def initialize(base_url:, region_code:, token:)
         @base_url = base_url
@@ -44,7 +45,7 @@ module Cinebase
         uri.query = URI.encode_www_form(query) unless query.empty?
         request = Net::HTTP::Get.new(uri)
         request['Authorization'] = "Bearer #{@token}"
-        request['Connect-Region-Code'] = @region_code
+        request['Connect-Region-Code'] = @region_code if @region_code
         request['Accept'] = 'application/json'
         Net::HTTP.start(uri.host, uri.port, use_ssl: true, open_timeout: 10, read_timeout: 30) do |http|
           http.request(request)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cinebase
 version: !ruby/object:Gem::Version
-  version: 5.2.0
+  version: 5.4.0
 platform: ruby
 authors:
 - Andy Croll