picturehouse_uk 5.0.0 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c4c71062363f2efdabda5696692051f79c7915f250367ff8c16536e058c821b
-  data.tar.gz: a76bf492b267b7ae89cbbe829b4269dea9ac0207add6b41fe47685d1df76fbb9
+  metadata.gz: 00531220ffd28a45ae2bcb4216fffde1e074fb7aaff9e3f7b9d9073c58231c5c
+  data.tar.gz: 01e54418fb861d42bd2564ab03a45aec27c0165d2069e22395c62f5d52c7b6e0
 SHA512:
-  metadata.gz: b1722850d1b2f161725a961f420b8122c404161050c794b02d93a8f735c5d7053745c2eb35de8d0200e5cc20cd2525024ed94a4cc63357fe2157fc9e149fdc11
-  data.tar.gz: d5225d4815b31cd31d072820f55e257e72cc415e619c8cbb3eaa6b5c7609d81b624107554d367036164f07da58d83bc5656d5e0ad42df154d955af02411d06fd
+  metadata.gz: 8ee5a705ee67e10f05f6cc12e65ad325bc0b61a7e80d96a79aaf028774cbb45359f100dad3ab5c8b9223dfbe10a3fb0202635f56a4de9495df8bcaef937a140f
+  data.tar.gz: b1de3de2012b7263e22d9c7df087ae8737fe748d62077e814ceac33aa998fa7100fcc025fa6a31ba14381f9560fabcbbdb371541ff52e9192c1ad30c0f69760b

data/.github/workflows/ci.yml

@@ -9,18 +9,39 @@ on:
 jobs:
   test:
     runs-on: ubuntu-latest
-
+    strategy:
+      matrix:
+        ruby-version: ['3.4', '4.0']
     steps:
-    - uses: actions/checkout@v4
-
-    - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: '3.4'
-        bundler-cache: true
+      - uses: actions/checkout@v4
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+          bundler-cache: true
+      - run: bundle exec rake test
 
-    - name: Run tests
-      run: bundle exec rake
-
-    - name: Run live tests
-      run: bundle exec rake live
+  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: PICTUREHOUSE_PACKAGE="$(echo pkg/*.gem)" bundle exec ruby test/package_test.rb
+      - uses: actions/upload-artifact@v4
+        with:
+          name: gem-${{ matrix.platform }}
+          path: pkg/*.gem

data/.github/workflows/release.yml

@@ -4,23 +4,70 @@ 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: PICTUREHOUSE_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
-
-    - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: '3.4'
-        bundler-cache: true
-
-    - name: Run tests
-      run: bundle exec rake test
-
-    - name: Release gem
-      uses: rubygems/release-gem@v1
+      - 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,32 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [6.0.0] - 2026-10-22
+
+### Changed
+- Retrieve cinemas and performances from the Vista API behind picturehouses.com, as cineworld_uk and odeon_uk do, instead of scraping HTML pages and the `get-movies-ajax` endpoint.
+- **BREAKING**: Cinema ids are Vista site ids, zero-padded strings such as `'019'` for Duke's at Komedia, instead of page slugs such as `'duke-s-at-komedia'`.
+- **BREAKING**: `Performance.at` accepts inclusive `from:` and `to:` business dates, defaulting to today in London and the following 13 days. One request per day.
+- **BREAKING**: Require cinebase 5.4, and so Ruby 3.3 or newer. Nokogiri is no longer needed.
+- `Cinema#adr` comes from the API's address lines; `region` is no longer given. `Cinema#url` points at the current cinema pages.
+- Film titles also use cinebase's common rules and lose `Dog-Friendly -`, `Relaxed-Screening:`, `LMF Presents:`, `Green Screen:` and `FFQ:` prefixes.
+- Tests use hand-written fixtures in place of recorded pages and API responses.
+
+### Added
+- `PicturehouseUk.token` and `PicturehouseUk.acquire_token!`, with platform gems that bundle curl-impersonate 2.2.3.
+- `Performance#film_year`, `#subtitled?` and `#festival`.
+- Variants from the current Vista attributes: `audio_described`, `baby`, `kids`, `q&a`, `relaxed`, `senior`, `subtitled` and `arts`.
+- Live API shape tests that check real responses without storing them.
+
+### Fixed
+- Performance times were London local times labelled as UTC, an hour out during British Summer Time. They now use Vista's explicit offsets.
+- Booking links used the cinema slug and now use Vista's showtime id, as in `https://web.picturehouses.com/order/showtimes/019-41632/seats`.
+- Performances could include other cinemas' films returned by the old endpoint.
+- Unit tests failed under Minitest 6, which moved `stub` into `minitest-mock`.
+
+### Removed
+- HTML scraping, the `fixtures` rake task, and live tests in CI.
+
 ## [5.0.0] - 2025-10-31
 
 ### Added

data/README.md

@@ -1,12 +1,8 @@
 # PicturehouseUk
 
-A simple gem to parse the [Picturehouse Cinemas UK website](http://picturehouses.com) and spit out useful formatted info.
+A simple gem to pull cinemas and performances from the Vista API behind the [Picturehouse website](https://www.picturehouses.com) and spit out useful formatted info.
 
 [![Gem Version](https://badge.fury.io/rb/picturehouse_uk.svg)](https://badge.fury.io/rb/picturehouse_uk)
-[![Code Climate](https://codeclimate.com/github/andycroll/picturehouse_uk/badges/gpa.svg)](https://codeclimate.com/github/andycroll/picturehouse_uk)
-[![Test Coverage](https://codeclimate.com/github/andycroll/picturehouse_uk/badges/coverage.svg)](https://codeclimate.com/github/andycroll/picturehouse_uk/coverage)
-[![Build Status](https://travis-ci.org/andycroll/picturehouse_uk.svg?branch=master)](https://travis-ci.org/andycroll/picturehouse_uk)
-[![Inline docs](http://inch-ci.org/github/andycroll/picturehouse_uk.svg?branch=master)](http://inch-ci.org/github/andycroll/picturehouse_uk)
 
 ## Installation
 
@@ -24,44 +20,152 @@ Or install it yourself as:
 
 ## Usage
 
-### Cinema
+The gem conforms to the API set down in the `cinebase` gem, [andycroll/cinebase](https://github.com/andycroll/cinebase), which provides a lot of useful base vocabulary and repetitive code for this series of cinema focussed gems.
+
+Performance titles are sanitized as much as possible, removing 'screening type' information, years, Q&A add-ons and festival prefixes, and standardising theatre and opera event naming.
+
+### Guest token
+
+Every API call needs the public guest token the Picturehouse ticketing site
+gives each visitor. Fetch one before anything else:
+
+``` ruby
+PicturehouseUk.acquire_token!
+PicturehouseUk::Cinema.all
+```
+
+This shells out to **`curl-impersonate`**, not ordinary system `curl`, using its
+Chrome 150 TLS/HTTP profile, and reads `gasToken` from the page data of
+`https://web.picturehouses.com/`. No browser or JavaScript execution is needed.
+
+Platform-specific gem packages include the pinned `curl-impersonate` 2.2.3
+executable for glibc Linux (x86-64, ARM64) and macOS (Intel, Apple Silicon).
+On other platforms, or when installing from Git, install a
+[curl-impersonate release](https://github.com/lexiforest/curl-impersonate/releases/tag/v2.2.3)
+yourself and put it on your `PATH` or pass its path:
 
 ``` ruby
-PicturehouseUK::Cinema.all
-#=> [
-      <PicturehouseUK::Cinema brand="Picturehouse" name="Duke's at Komedia" slug="dukes-at-komedia" chain_id="Dukes_At_Komedia" url="...">,
-      <PicturehouseUK::Cinema brand="Picturehouse" name="Duke of York's" slug="duke-of-yorks" chain_id="Duke_Of_Yorks" url="...">,
-      ...
-    ]
+PicturehouseUk.acquire_token!(curl: '/opt/curl-impersonate/curl-impersonate')
+```
 
-PicturehouseUK::Cinema.find('Duke_Of_Yorks')
-#=> <PicturehouseUK::Cinema brand="Picturehouse" name="Duke_Of_Yorks" slug="duke-of-yorks" address="..." chain_id="Duke_Of_Yorks" url="...">
+Or supply your own current guest JWT, without the `Bearer ` prefix:
+
+``` ruby
+PicturehouseUk.token = ENV.fetch('PICTUREHOUSE_TOKEN')
+```
+
+Tokens currently last 12 hours. The gem checks the declared expiry but does not
+verify the signature. Missing, expired or rejected tokens raise
+`PicturehouseUk::AuthenticationError`; call `PicturehouseUk.acquire_token!`
+again. Normal API calls never acquire or renew a token automatically.
+
+### Cinema
+
+Cinema ids are Vista site ids. Duke's at Komedia is `'019'`.
+
+``` ruby
+PicturehouseUk::Cinema.all
+#=> [<PicturehouseUk::Cinema ...>, <PicturehouseUk::Cinema ...>, ...]
+
+cinema = PicturehouseUk::Cinema.new(19)
+#=> <PicturehouseUk::Cinema ...>
+
+cinema.adr
+#=> {
+  street_address:   '44-47 Gardner Street',
+  extended_address: nil,
+  locality:         'Brighton',
+  region:           nil,
+  postal_code:      'BN1 1UN',
+  country_name:     'United Kingdom'
+}
 
 cinema.brand
 #=> 'Picturehouse'
 
-cinema.chain_id
-#=> 'Duke_Of_Yorks'
+cinema.name
+#=> "Duke's at Komedia"
+
+cinema.id
+#=> '019'
 
 cinema.url
-#=> "http://www.picturehouses.co.uk/cinema/Duke_Of_Yorks/"
+#=> 'https://www.picturehouses.com/cinema/duke-s-at-komedia'
+```
+
+### Performances
+
+`Performance.at` returns performances for an inclusive range of business dates,
+defaulting to today in London and the following 13 days. It makes one request
+per day.
+
+``` ruby
+PicturehouseUk::Performance.at(19, from: Date.today, to: Date.today + 2)
+#=> [<PicturehouseUk::Performance ...>, <PicturehouseUk::Performance ...>, ...]
+
+performance = PicturehouseUk::Performance.at(19).first
+#=> <PicturehouseUk::Performance ...>
+
+performance.film_name
+#=> 'Sense and Sensibility'
+
+performance.film_year
+#=> 2026 # from the title, nil when it has no year
 
-cinema.films
-#=> [<PicturehouseUK::Film name="Iron Man 3">, <PicturehouseUK::Film name="Star Trek: Into Darkness">]
+performance.dimension
+#=> '2d'
 
-cinema.screenings
-#=> [<PicturehouseUK::Screening film="About Time" when="2013-09-09 11:00 UTC" varient="3d">, <PicturehouseUK::Screening film="Iron Man 3" when="2013-09-09 13:50 UTC" varient="kids">, <PicturehouseUK::Screening ..>, <PicturehouseUK::Screening ...>]
+performance.variant
+#=> ['audio_described', 'subtitled']
 
+performance.subtitled?
+#=> true
+
+performance.festival
+#=> #<data Cinebase::Festival name="CFF", year=2026> # nil outside festivals
+
+performance.starting_at
+#=> 2026-10-23 15:00:00 UTC
+
+performance.booking_url
+#=> 'https://web.picturehouses.com/order/showtimes/019-41632/seats'
+
+performance.cinema_name
+#=> "Duke's at Komedia"
+
+performance.cinema_id
+#=> '019'
 ```
 
-## Running Tests
+Variants are `arts`, `audio_described`, `baby`, `kids`, `q&a`, `relaxed`,
+`senior` and `subtitled`. Picturehouse doesn't tag audio languages, so
+`language` is always `nil`.
 
-To redownload the test URLs run
+## Tests
 
+```sh
+bundle exec rake          # unit tests against fixtures
+bundle exec rake live     # live API, needs curl-impersonate or PICTUREHOUSE_TOKEN
 ```
-ruby test/fixture_updater.rb
+
+Fixtures in `test/fixtures/api` are hand-written: invented films and
+addresses in the shape of Vista responses, never recorded API output.
+`test/support/api_shapes.rb` describes the fields the gem reads. The unit suite
+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.
+
+## Building release packages
+
+```sh
+bundle exec rake build         # Portable source gem; external curl-impersonate required
+bundle exec rake package:all   # Four platform gems with bundled executables
 ```
 
+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/Rakefile

@@ -2,13 +2,16 @@
 require 'bundler/gem_tasks'
 
 require 'rake/testtask'
+require 'cinebase/vista/package_task'
+
+Cinebase::Vista::PackageTask.new('picturehouse_uk.gemspec', root: __dir__)
 
 Rake::TestTask.new do |t|
   t.libs << 'lib/picturehouse_uk'
   t.test_files = FileList[
     'test/lib/picturehouse_uk/*_test.rb',
     'test/lib/picturehouse_uk/internal/*_test.rb',
-    'test/lib/picturehouse_uk/internal/parser/*_test.rb'
+    'test/lib/picturehouse_uk/internal/parser/api/*_test.rb'
   ]
   t.verbose = true
 end
@@ -31,16 +34,4 @@ task :console do
   IRB.start
 end
 
-desc 'recreate test fixtures'
-task :fixtures do
-  require 'picturehouse_uk'
-  require_relative 'rake/fixture_creator'
-
-  FixtureCreator.new.home
-  FixtureCreator.new.cinemas
-  %w(duke-of-york-s-picturehouse duke-s-at-komedia phoenix-picturehouse).each do |cinema_id|
-    FixtureCreator.new.cinema(cinema_id)
-  end
-end
-
 task default: :test

data/lib/picturehouse_uk/cinema.rb

@@ -1,18 +1,24 @@
 module PicturehouseUk
   # The object representing a cinema on the Picturehouse UK website
   class Cinema < Cinebase::Cinema
-    # address css
-    ADDRESS_CSS = '.cinemaAdrass:not(.openingTime)'.freeze
-    # cinema link css on the /cinema page
-    CINEMA_LINKS_CSS = 'a[href*="/cinema/"]'.freeze
-
     # @!attribute [r] id
-    #   @return [Integer] the numeric id of the cinema on the Cineworld website
-
-    # @!method initialize(options)
-    #   Constructor
-    #   @param [String] id the cinema id of the cinema in capitalized snake case
-    #   @return [PicturehouseUk::Cinema]
+    #   @return [String] the zero-padded Vista id of the cinema, e.g. '019'
+
+    # Vista site ids whose page slug differs from the cinema name
+    URL_SLUGS = {
+      '013' => 'picturehouse-at-fact',
+      '030' => 'epsom-picturehouse'
+    }.freeze
+
+    # UK postcode, the last line of an address
+    POSTCODE = /\A[A-Z]{1,2}\d[A-Z\d]? ?\d[A-Z]{2}\z/i.freeze
+
+    # Constructor
+    # @param [Integer, String] id the cinema id of the format 19/'019'
+    # @return [PicturehouseUk::Cinema]
+    def initialize(id)
+      @id = id.to_s.rjust(3, '0')
+    end
 
     # Return basic cinema information for all cinemas
     # @return [Array<PicturehouseUk::Cinema>]
@@ -20,12 +26,7 @@ module PicturehouseUk
     #   PicturehouseUk::Cinema.all
     #   #=> [<PicturehouseUk::Cinema>, <PicturehouseUk::Cinema>, ...]
     def self.all
-      cinema_hash.keys.map { |id| new(id) }
-    end
-
-    # @api private
-    def self.cinema_hash
-      @cinema_hash ||= ListParser.new(cinema_links).to_hash
+      sites_hash.keys.map { |id| new(id) }
     end
 
     # @!method address
@@ -35,178 +36,91 @@ module PicturehouseUk
 
     # Address of the cinema
     # @return [Hash] contains :street_address, :extended_address,
-    # :locality, :postal_code, :country
+    # :locality, :region, :postal_code, :country_name
     # @example
-    #   cinema = PicturehouseUk::Cinema.new('Dukes_At_Komedia')
+    #   cinema = PicturehouseUk::Cinema.new(19)
     #   cinema.adr
     #   #=> {
     #         street_address:   '44-47 Gardner Street',
-    #         extended_address: 'North Laine',
+    #         extended_address: nil,
     #         locality:         'Brighton',
-    #         region:           'East Sussex',
+    #         region:           nil,
     #         postal_code:      'BN1 1UN',
-    #         country_name: 'United Kingdom'
+    #         country_name:     'United Kingdom'
     #       }
     # @note Uses method naming as at http://microformats.org/wiki/adr
     def adr
-      PicturehouseUk::Internal::Parser::Address.new(address_node.to_s).address
+      lines = address_lines
+      postal_code = lines.pop if lines.last&.match?(POSTCODE)
+      street_address = lines.shift
+      locality = lines.pop
+      {
+        street_address:   street_address,
+        extended_address: lines.empty? ? nil : lines.join(', '),
+        locality:         locality,
+        region:           nil,
+        postal_code:      postal_code,
+        country_name:     'United Kingdom'.freeze
+      }
     end
 
     # Brand of the cinema
     # @return [String] which will always be 'Picturehouse'
-    # @example
-    #   cinema = PicturehouseUk::Cinema.new('Dukes_At_Komedia')
-    #   cinema.brand
-    #   #=> 'Picturehouse'
     def brand
       'Picturehouse'.freeze
     end
 
-    # @!method country_name
-    #   Country of the cinema
-    #   @return [String] which will always be 'United Kingdom'
-    #   @example
-    #     cinema = PicturehouseUk::Cinema.new('Dukes_At_Komedia')
-    #     cinema.country_name
-    #     #=> 'United Kingdom'
-
-    # @!method extended_address
-    #   The second address line of the cinema
-    #   @return [String]
-    #   @example
-    #     cinema = PicturehouseUk::Cinema.new('Dukes_At_Komedia')
-    #     cinema.extended_address
-    #     #=> 'North Laine'
-
-    # The name of the cinema (might include brand)
+    # The name of the cinema, which often includes the brand
     # @return [String]
     # @example
-    #   cinema = PicturehouseUk::Cinema.new('Dukes_At_Komedia')
+    #   cinema = PicturehouseUk::Cinema.new(19)
     #   cinema.full_name
-    #   #=> "Duke's At Komedia"
+    #   #=> "Duke's at Komedia"
     def full_name
       name
     end
 
-    # @!method locality
-    #   The locality (town) of the cinema
-    #   @return [String]
-    #   @example
-    #     cinema = PicturehouseUk::Cinema.new('Dukes_At_Komedia')
-    #     cinema.locality
-    #     #=> 'Brighton'
-
     # The name of the cinema
     # @return [String]
     # @example
-    #   cinema = PicturehouseUk::Cinema.new('Dukes_At_Komedia')
+    #   cinema = PicturehouseUk::Cinema.new(19)
     #   cinema.name
-    #   #=> "Duke's At Komedia"
+    #   #=> "Duke's at Komedia"
     def name
-      self.class.cinema_hash.fetch(id, {})[:name]
+      site_hash.dig('name', 'text').to_s
     end
 
-    # @!method postal_code
-    #   Post code of the cinema
-    #   @return [String]
-    #   @example
-    #     cinema = PicturehouseUk::Cinema.new('Dukes_At_Komedia')
-    #     cinema.postal_code
-    #     #=> 'BN1 1UN'
-
-    # @!method region
-    #   The region (county) of the cinema if provided
-    #   @return [String]
-    #   @example
-    #     cinema = PicturehouseUk::Cinema.new('Dukes_At_Komedia')
-    #     cinema.region
-    #     #=> 'East Sussex'
-
-    # @!method slug
-    #   The URL-able slug of the cinema
-    #   @return [String]
-    #   @example
-    #     cinema = PicturehouseUk::Cinema.new('Dukes_At_Komedia')
-    #     cinema.slug
-    #     #=> 'dukes-at-komedia'
-
-    # @!method street_address
-    #   The street address of the cinema
-    #   @return [String]
-    #   @example
-    #     cinema = PicturehouseUk::Cinema.new('Dukes_At_Komedia')
-    #     cinema.street_address
-    #     #=> '44-47 Gardner Street'
-
     # The url of the cinema on the Picturehouse website
     # @return [String]
     def url
-      "http://www.picturehouses.com#/cinema/#{id}"
-    end
-
-    private
-
-    def self.cinema_links
-      cinemas_doc.css(CINEMA_LINKS_CSS)
-    end
-    private_class_method :cinema_links
-
-    def self.cinemas_doc
-      @cinemas_doc ||=
-        Nokogiri::HTML(PicturehouseUk::Internal::Website.new.cinemas)
-    end
-    private_class_method :cinemas_doc
-
-    def address_node
-      @address_node ||= info_doc.css(ADDRESS_CSS)
-    end
-
-    def info_doc
-      @info_doc ||=
-        Nokogiri::HTML(PicturehouseUk::Internal::Website.new.information(id))
+      "https://www.picturehouses.com/cinema/#{url_slug}"
     end
 
     # @api private
-    # Utility class to parse the links from the cinemas page
-    class ListParser
-      def initialize(nodes)
-        @nodes = nodes
-      end
-
-      def to_hash
-        @nodes.each_with_object({}) do |node, result|
-          cinema_id = id(node)
-          cinema_name = name(node)
-          # Skip links that don't have valid cinema data
-          next unless cinema_id && cinema_name
-          # Skip duplicate entries
-          next if result.key?(cinema_id)
-
-          result[cinema_id] = { name: cinema_name, url: url(node) }
-        end
+    def self.sites_hash
+      @sites_hash ||= PicturehouseUk::Internal::ApiResponse.new.sites.to_h do |site|
+        [site.fetch('id'), site]
       end
+    end
+    private_class_method :sites_hash
 
-      private
+    private
 
-      def id(node)
-        href = url(node)
-        return nil unless href
-        match = href.match(%r{/cinema/([^/?#]+)})
-        match ? match[1] : nil
+    def address_lines
+      address = site_hash.dig('contactDetails', 'addressV2') || {}
+      %w(line1 line2 line3 line4).filter_map do |key|
+        text = address.dig(key, 'text').to_s.strip
+        text unless text.empty?
       end
+    end
 
-      def name(node)
-        # Cinema name is in a <p> tag within the link
-        p_tag = node.css('p').first
-        return nil unless p_tag
-        # Get text and remove the location span
-        p_tag.children.find { |child| child.text? }&.text&.strip
-      end
+    def site_hash
+      @site_hash ||= self.class.send(:sites_hash).fetch(id, {})
+    end
 
-      def url(node)
-        href = node.get_attribute('href')
-        # Convert relative URLs to absolute if needed
-        href&.start_with?('http') ? href : "https://www.picturehouses.com#{href}"
+    def url_slug
+      URL_SLUGS.fetch(id) do
+        name.downcase.gsub(/[^a-z0-9]+/, '-').gsub(/\A-|-\z/, '')
       end
     end
   end