cineworld_uk 3.0.4 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 05bf58c0a5b7017cf11d3ccc42db151628f61549
-  data.tar.gz: 2ef345fb4bbd547ae2dcbb3f8ea348a86b18b8a0
+SHA256:
+  metadata.gz: 5284f7c7c8b846edbdd724cb3c105b033da4f313eed083d6b691ae6b8714d3b8
+  data.tar.gz: 1568acd04ed0346ba388509903a17487726c088ff2d280329cfb0fe8f6023eed
 SHA512:
-  metadata.gz: 9ca64cf5628c0f02d6890a736d36c8b342e06963ad8fa4fa69a7a5639668b51fb92e0327ecabb0f33c5929093c35c112988d8bf42287e0540f28310a5979e3e4
-  data.tar.gz: ae4e5ebf966d324d971c3be8b28e865ea709df88c0f395f046cee08ba66b8410424415be6bd2f655a7715f98ae7986a86bb5bf4ca50011224ee817b6a0898a6a
+  metadata.gz: faff1f58b5e101ce8185a96f791a27088ed31f7c78d3eebf3f9b332b6931848604726b7e5b3d16f3bb51c1878c4693cb993863cf48dcbbe743436208e5c3186b
+  data.tar.gz: 2ab7741bafc40d66d104390340fa2e28a1a5b0a6d166f85b3526f8eb576d664b6860c5f03032fc3d71a2c21bb3ece25804d5258aeba3a7f74601027610c161d8

data/.agents/setup

@@ -0,0 +1,51 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+repo_root="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
+cd "$repo_root"
+
+echo 'Checking native gem build prerequisites'
+missing=()
+for package in ca-certificates curl build-essential pkg-config libyaml-dev libssl-dev zlib1g-dev; do
+  if ! dpkg-query -W -f='${Status}' "$package" 2>/dev/null | grep -q 'install ok installed'; then
+    missing+=("$package")
+  fi
+done
+if ((${#missing[@]})); then
+  sudo apt-get update -qq
+  sudo env DEBIAN_FRONTEND=noninteractive apt-get install -y "${missing[@]}"
+fi
+
+export PATH="$HOME/.local/bin:$PATH"
+if ! command -v mise >/dev/null; then
+  echo 'Installing mise'
+  curl --fail --silent --show-error --location https://mise.run | sh
+fi
+
+ruby_version="$(tr -d '[:space:]' < .ruby-version)"
+echo "Installing Ruby $ruby_version"
+MISE_RUBY_COMPILE=false mise install "ruby@$ruby_version"
+
+# Make the pinned Ruby available to later Amp commands in login shells.
+if [[ ! -f "$HOME/.bash_profile" ]]; then
+  printf '[ ! -f "$HOME/.profile" ] || . "$HOME/.profile"\n' > "$HOME/.bash_profile"
+fi
+marker="# Cineworld orb Ruby environment: $repo_root"
+if ! grep -Fqx "$marker" "$HOME/.bash_profile"; then
+  cat >> "$HOME/.bash_profile" <<EOF
+
+$marker
+case "\$PWD" in
+  "$repo_root"|"$repo_root"/*)
+    export PATH="\$HOME/.local/share/mise/shims:\$HOME/.local/bin:\$PATH"
+    export MISE_IDIOMATIC_VERSION_FILE_ENABLE_TOOLS=ruby
+    ;;
+esac
+EOF
+fi
+
+echo 'Installing gem dependencies (no Cineworld token required)'
+mise exec "ruby@$ruby_version" -- bundle config set --local path "$HOME/.cache/cineworld_uk/bundle"
+mise exec "ruby@$ruby_version" -- bundle check || mise exec "ruby@$ruby_version" -- bundle install --jobs 4 --retry 3
+mise reshim
+mise exec "ruby@$ruby_version" -- ruby --version

data/.github/workflows/test.yml

@@ -0,0 +1,17 @@
+name: Tests
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ['3.3', '3.4', '4.0']
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+          bundler-cache: true
+      - run: bundle exec rake test

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.amp/portals/*

data/.ruby-version

@@ -0,0 +1 @@
+3.4.7

data/CHANGELOG.md

@@ -2,6 +2,27 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 4.0.0 - 2026-10-15
+
+### Changed
+- Retrieve cinemas and performances from the Vista API instead of the retired iOS API.
+- Require a caller-supplied guest JWT through `CineworldUk.token`; token acquisition and renewal remain the caller's responsibility.
+- `Performance.at` accepts inclusive `from:` and `to:` business dates, defaulting to today in London and the following 13 days rather than discovering all screening dates.
+- Use one request per cinema per requested day, reusing related film, cinema and attribute data. Share cached cinema data with address lookups.
+- Convert advertised session times to UTC using Vista's explicit offsets and preserve session-specific formats.
+
+### Added
+- `CineworldUk::AuthenticationError` for missing tokens and HTTP 401 responses.
+- Orb setup for the pinned Ruby version and gem dependencies.
+
+## 3.1.0 - 2016-09-11
+
+### Fixed
+- Use of www2 domain, set to HTTPS and www
+
+### Added
+- Tests against live server, using `rake live`
+
 ## 3.0.4 - 2016-04-26
 
 ### Fixed

data/README.md

@@ -1,12 +1,9 @@
 # CineworldUk
 
-A simple gem to parse the [Cineworld UK](http://cineworld.co.uk) cinema times (using their iOS API) and spit out useful formatted info.
+A gem to retrieve [Cineworld UK](https://www.cineworld.co.uk) cinemas and showtimes using the Vista API.
 
 [![Gem Version](https://badge.fury.io/rb/cineworld_uk.svg)](https://badge.fury.io/rb/cineworld_uk)
-[![Code Climate](https://codeclimate.com/github/andycroll/cineworld_uk/badges/gpa.svg)](https://codeclimate.com/github/andycroll/cineworld_uk)
-[![Test Coverage](https://codeclimate.com/github/andycroll/cineworld_uk/badges/coverage.svg)](https://codeclimate.com/github/andycroll/cineworld_uk/coverage)
-[![Build Status](https://travis-ci.org/andycroll/cineworld_uk.svg?branch=master)](https://travis-ci.org/andycroll/cineworld_uk)
-[![Inline docs](http://inch-ci.org/github/andycroll/cineworld_uk.svg?branch=master)](http://inch-ci.org/github/andycroll/cineworld_uk)
+[![Tests](https://github.com/andycroll/cineworld_uk/actions/workflows/.travis.yml/badge.svg)](https://github.com/andycroll/cineworld_uk/actions)
 
 ## Installation
 
@@ -28,13 +25,46 @@ The gem conforms to the API set down in the `cinebase` gem, [andycroll/cinebase]
 
 Performance titles are sanitized as much as possible, removing 'screening type' information and 'dimension' as well as standardising all the theatre/cultural event naming (NT Live, Royal Opera House etc).
 
+### Authentication
+
+Configure a current guest JWT before retrieving data (without the `Bearer ` prefix):
+
+```ruby
+require 'cineworld_uk'
+
+CineworldUk.token = ENV.fetch('CINEWORLD_TOKEN')
+```
+
+The gem sends `Authorization: Bearer ...` and `Connect-Region-Code: GB` to
+`digital-api.cineworld.co.uk`. It does not acquire or refresh tokens, copy browser
+cookies, or bypass Cloudflare. The ticketing website supplies its guest token in
+`__NEXT_DATA__.props.pageProps.environment.gasToken`; access to that page may
+require an interactive browser.
+
+Missing tokens and HTTP 401 responses raise `CineworldUk::AuthenticationError`.
+Set `CineworldUk.token` again with a fresh token before retrying. Other HTTP
+failures raise an error rather than returning an empty schedule. Redirects are
+not followed, so credentials are not forwarded to another host.
+
+There is no verified fixed token lifetime. Its declared lifetime is `exp - iat`
+seconds. The website reloads to renew after 90% of that interval. To inspect
+your token locally without printing it (decoding does not verify its signature):
+
+```ruby
+require 'base64'
+payload = CineworldUk.token.split('.').fetch(1)
+claims = JSON.parse(Base64.urlsafe_decode64(payload))
+puts "Lifetime: #{claims.fetch('exp') - claims.fetch('iat')} seconds"
+puts "Expires: #{Time.at(claims.fetch('exp')).utc}"
+```
+
 ### Cinema
 
 ``` ruby
 CineworldUk::Cinema.all
 #=> [<CineworldUK::Cinema ...>, <CineworldUK::Cinema ...>, ...]
 
-cinema = CineworldUk::Cinema.new(3)
+cinema = CineworldUk::Cinema.new(14)
 #=> <CineworldUK::Cinema ...>
 
 cinema.adr
@@ -42,7 +72,7 @@ cinema.adr
   street_address:   'Brighton Marina Village',
   extended_address: nil,
   locality:         'Brighton',
-  region:           nil,
+  region:           'East Sussex',
   postal_code:      'BN2 5UF',
   country:          'United Kingdom'
 }
@@ -54,7 +84,7 @@ cinema.full_name
 #=> 'Cineworld Brighton'
 
 cinema.id
-#=> '3'
+#=> 14
 
 cinema.postal_code
 #=> 'BN2 5UF'
@@ -62,36 +92,57 @@ cinema.postal_code
 
 ### Performances
 
+`at` accepts a numeric Vista cinema ID (`14`, `'14'` or `'014'` for Brighton),
+not a Boxoffice ID such as `X079B`. Dates are inclusive **business dates**.
+Without dates, it fetches today in London and the following 13 days; it does not
+discover every future screening date.
+
+```ruby
+day = Date.new(2026, 10, 14)
+performances = CineworldUk::Performance.at(14, from: day, to: day)
+```
+
+This makes **one HTTP request per cinema per requested day**, including empty
+days. Cinema names, film titles and attributes come from the same response—no
+extra cinema or film lookups are needed. `Cinema.all` separately fetches and
+caches the cinema list in memory, shared by name and address lookups. Performance
+responses are not cached across calls, so reuse the returned array when possible.
+
+Advertised session times (`startsAt`), not feature start times (`filmStartsAt`),
+are converted to UTC using the offsets supplied by Vista. Recognized session
+attributes populate the existing dimension and variant fields; unknown attributes
+are ignored. No seat-availability or booking operations are performed.
+
 ``` ruby
-CineworldUk::Performance.at(3)
+CineworldUk::Performance.at(14)
 #=> [<CineworldUK::Performance ...>, <CineworldUK::Performance ...>, ...]
 
-performance = CineworldUk::Performance.at(3).first
+performance = performances.first
 #=> <CineworldUK::Performance ...>
 
 performance.film_name
-#=> 'Star Wars: The Force Awakens'
+#=> 'Other Mommy'
 
 performance.dimension
 #=> '2d'
 
 performance.variant
-#=> ['imax', 'kids']
+#=> ['audio_described']
 
 performance.starting_at
-#=> 2016-02-04 13:00:20 UTC
+#=> 2026-10-14 14:40:00 UTC
 
 performance.showing_on
-#=> #<Date: 2016-02-04 ((2457423j,0s,0n),+0s,2299161j)>
+#=> Date.new(2026, 10, 14)
 
 performance.booking_url
-#=> "http://www.cineworld.co.uk/booking?performance=..."
+#=> "https://web.cineworld.co.uk/order/showtimes/014-165507/seats"
 
 performance.cinema_name
 #=> 'Brighton'
 
 performance.cinema_id
-#=> 3
+#=> 14
 ```
 
 ## Contributing

data/Rakefile

@@ -13,6 +13,15 @@ Rake::TestTask.new do |t|
   t.verbose = true
 end
 
+Rake::TestTask.new do |t|
+  t.libs << 'lib/cineworld_uk'
+  t.name = :live
+  t.test_files = FileList[
+    'test/live/*_test.rb'
+  ]
+  t.verbose = true
+end
+
 desc 'console'
 # http://erniemiller.org/2014/02/05/7-lines-every-gems-rakefile-should-have/
 task :console do
@@ -26,6 +35,7 @@ end
 desc 'Recreate test fixtures'
 task :fixtures do
   require 'cineworld_uk'
+  CineworldUk.token = ENV.fetch("CINEWORLD_TOKEN")
 
   def js_fixture(name)
     File.expand_path("../test/fixtures/#{name}.json", __FILE__)
@@ -38,45 +48,11 @@ task :fixtures do
     file.write api.cinema_list
   end
 
-  File.open(js_fixture('api/cinema-detail-3'), 'w') do |file|
-    puts '* API Cinema Detail Brighton'
-    file.write api.cinema_detail(3)
-  end
-
-  File.open(js_fixture('api/cinema-detail-96'), 'w') do |file|
-    puts '* API Cinema Detail Birmingham NEC'
-    file.write api.cinema_detail(96)
-  end
-
-  File.open(js_fixture('api/cinema-detail-21'), 'w') do |file|
-    puts '* API Cinema Detail Edinburgh'
-    file.write api.cinema_detail(21)
-  end
-
-  File.open(js_fixture('api/cinema-detail-10'), 'w') do |file|
-    puts '* API Cinema Detail Chelsea'
-    file.write api.cinema_detail(10)
-  end
-
-  File.open(js_fixture('api/film-list'), 'w') do |file|
-    puts '* API Film List'
-    file.write api.film_list
-  end
-
-  File.open(js_fixture('api/film-list-comingsoon'), 'w') do |file|
-    puts '* API Film List Coming Soon'
-    file.write api.film_list_comingsoon
-  end
-
-  File.open(js_fixture('api/performances-tomorrow-3'), 'w') do |file|
+  File.open(js_fixture('api/performances-tomorrow-14'), 'w') do |file|
     puts '* API Performances in Brighton Tomorrow'
-    file.write api.performances(3, Date.today + 1)
+    file.write api.performances(14, Date.today + 1)
   end
 
-  File.open(js_fixture('api/dates-3'), 'w') do |file|
-    puts '* API Dates Brighton Tomorrow'
-    file.write api.dates(3)
-  end
 end
 
 task :default => :test

data/cineworld_uk.gemspec

@@ -12,16 +12,18 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'https://github.com/andycroll/cineworld_uk'
   spec.licenses      = %w(AGPL MIT)
 
-  spec.files         = `git ls-files`.split($RS)
+  spec.files         = `git ls-files`.split("\n")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 1.3'
-  spec.add_development_dependency 'codeclimate-test-reporter'
+  spec.add_development_dependency 'bundler', '>= 2.0'
+  spec.add_development_dependency 'minitest-mock'
   spec.add_development_dependency 'minitest-reporters'
   spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'simplecov', '< 1'
   spec.add_development_dependency 'webmock'
 
-  spec.add_runtime_dependency 'cinebase', '~> 3.0.0'
+  spec.add_runtime_dependency 'cinebase', '~> 5.0'
+  spec.add_runtime_dependency 'nokogiri', '>= 1.11'
 end

data/lib/cineworld_uk/cinema.rb

@@ -25,8 +25,9 @@ module CineworldUk
     # @return [Hash<Integer => String>]
     def self.id_names_hash
       @id_names_hash ||= cinema_list_json.each_with_object({}) do |hash, result|
-        result[hash['id']] =
-          hash['name'].gsub('London - ', '').gsub(' - ', ': ')
+        name = hash['displayName']
+        id_key = hash['id'].to_i
+        result[id_key] = name.gsub('London - ', '').gsub(' - ', ': ') if name
       end
     end
 
@@ -49,7 +50,9 @@ module CineworldUk
     #       }
     # @note Uses the standard method naming as at http://microformats.org/wiki/adr
     def adr
-      CineworldUk::Internal::Parser::Api::CinemaAddress.new(@id).to_hash
+      CineworldUk::Internal::Parser::Api::CinemaAddress.new(
+        @id, self.class.send(:cinema_list_json)
+      ).to_hash
     end
 
     # Brand of the cinema
@@ -158,7 +161,7 @@ module CineworldUk
     # @api private
     def self.cinema_list_json
       @cinema_list_json ||=
-        JSON.parse(api.cinema_list)['cinemas']
+        JSON.parse(api.cinema_list)['body']['cinemas']
     end
     private_class_method :cinema_list_json
   end

data/lib/cineworld_uk/internal/api_response.rb

@@ -1,72 +1,115 @@
-require 'net/http'
+# frozen_string_literal: true
+
+require "net/http"
+require "json"
+require "date"
+require "time"
 
 module CineworldUk
-  # @api private
   module Internal
-    # @api private
+    # Adapts Vista responses to the parsers' cinema/film/event vocabulary.
     class ApiResponse
-      # Basic cinema list of ids/names
-      # @return [String] JSON encoded
-      def cinema_list
-        response('cinema/list', full: true)
-      end
-
-      # List of dates on which there are screening for this cinema id
-      # @param [Fixnum] id the id of the cinema
-      # @return [String] JSON encoded
-      def dates(id)
-        response('dates', cinema: id)
-      end
+      BASE_URL = "https://digital-api.cineworld.co.uk/ocapi/v1/"
+      ATTRIBUTES = {
+        "3D" => "3d", "IMAX" => "imax", "AD" => "audio-described",
+        "Subtitled" => "subbed", "Subtitles" => "subbed",
+        "Autism Friendly" => "autism-friendly",
+        "Movies for Juniors" => "junior",
+        "Unlimited Screening" => "unlimited-screening", "Q&A" => "qa"
+      }.freeze
 
-      # Detail about a specific cinema
-      # @param [Fixnum] id the id of the cinema
-      # @return [String] JSON encoded
-      def cinema_detail(id)
-        response('cinema/detail', cinema: id)
-      end
-
-      # List of all currently showing films
-      # @return [String] JSON encoded
-      def film_list
-        response('film/list', full: true)
-      end
-
-      # List of all upcoming films
-      # @return [String] JSON encoded
-      def film_list_comingsoon
-        response('film/list/comingsoon', full: true)
+      def cinema_list
+        cinemas = fetch("sites").fetch("sites").map do |site|
+          address = site.fetch("contactDetails", {}).fetch("addressV2", {})
+          {
+            "id" => site.fetch("id"),
+            "displayName" => site.fetch("name").fetch("text"),
+            "addressInfo" => {
+              "address1" => address.dig("line1", "text"),
+              "city" => address.dig("line2", "text"),
+              "state" => address.dig("line3", "text"),
+              "postalCode" => address.dig("line4", "text")
+            }
+          }
+        end
+        JSON.generate("body" => { "cinemas" => cinemas })
       end
 
-      # All screenings from a specific cinema on a specific date
-      # @param [Fixnum] cinema_id the id of the cinema
-      # @param [Date] date a single date in the future
-      # @return [String] JSON encoded
       def performances(cinema_id, date)
-        response('performances', cinema: cinema_id,
-                                 date: date.strftime('%Y%m%d'))
+        site_id = cinema_id.to_s.rjust(3, "0")
+        response = fetch("showtimes/by-business-date/#{date.iso8601}",
+                         "siteIds" => site_id)
+        related = response.fetch("relatedData")
+        films = related.fetch("films").to_h { |film| [film.fetch("id"), film] }
+        attributes = related.fetch("attributes").to_h do |attr|
+          [attr.fetch("id"), attr]
+        end
+        normalized_films = []
+        events = response.fetch("showtimes").map do |showtime|
+          film = films.fetch(showtime.fetch("filmId"))
+          attrs = showtime.fetch("attributeIds", []).filter_map do |id|
+            attribute = attributes.fetch(id)
+            ATTRIBUTES[attribute.dig("shortName", "text")] ||
+              ATTRIBUTES[attribute.dig("name", "text")]
+          end
+          attrs << "3d" if showtime["requires3dGlasses"]
+          # Formats belong to a session, not to the film as a whole.
+          id = showtime.fetch("id")
+          normalized_films << {
+            "id" => id,
+            "name" => film.fetch("title").fetch("text"),
+            "attributeIds" => attrs
+          }
+          starts_at = showtime.fetch("schedule").fetch("startsAt")
+          {
+            "filmId" => id, "attributeIds" => attrs,
+            "eventDateTime" => Time.iso8601(starts_at).utc.iso8601,
+            "bookingLink" =>
+              "https://web.cineworld.co.uk/order/showtimes/#{id}/seats"
+          }
+        end
+        site = related.fetch("sites").detect do |item|
+          item.fetch("id") == site_id
+        end
+        JSON.generate(
+          "body" => {
+            "films" => normalized_films, "events" => events,
+            "cinemaName" => site&.dig("name", "text")
+          }
+        )
       end
 
       private
 
-      # @api private
-      # mixin the default hash
-      DEFAULTS = { key: 'ios', territory: 'GB' }
-
-      def fetch(uri, limit = 10)
-        fail ArgumentError, 'too many HTTP redirects' if limit == 0
-
-        case response = Net::HTTP.get_response(URI(uri))
-        when Net::HTTPSuccess then response.body
-        when Net::HTTPRedirection then fetch(response['location'], limit - 1)
-        else response.code
+      def fetch(path, query = {})
+        token = CineworldUk.token
+        if !token.is_a?(String) || token.strip.empty?
+          raise AuthenticationError,
+                "Set CineworldUk.token to a current guest JWT " \
+                "before fetching data"
+        end
+        uri = URI(BASE_URL + path)
+        uri.query = URI.encode_www_form(query) unless query.empty?
+        request = Net::HTTP::Get.new(uri)
+        request["Authorization"] = "Bearer #{token}"
+        request["Connect-Region-Code"] = "GB"
+        request["Accept"] = "application/json"
+        response = Net::HTTP.start(
+          uri.host, uri.port, use_ssl: true, open_timeout: 10, read_timeout: 30
+        ) do |http|
+          http.request(request)
+        end
+        case response
+        when Net::HTTPSuccess
+          JSON.parse(response.body)
+        when Net::HTTPUnauthorized
+          raise AuthenticationError,
+                "Vista rejected the guest token; " \
+                "supply a fresh token with CineworldUk.token="
+        else
+          # Omit response bodies and never redirect credentials to another host.
+          raise "Vista HTTP error #{response.code}"
         end
-      end
-
-      def response(path, hash)
-        uri = URI::HTTP.build(host:  'www2.cineworld.co.uk',
-                              path:  "/api/#{path}",
-                              query: URI.encode_www_form(hash.merge(DEFAULTS)))
-        fetch(uri)
       end
     end
   end

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

@@ -7,8 +7,9 @@ module CineworldUk
         class CinemaAddress
           # @param [Integer] id the cinema id
           # @return [CineworldUk::Internal::Parser::Api::CinemaAddress]
-          def initialize(id)
+          def initialize(id, cinemas = nil)
             @id = id
+            @cinemas = cinemas
           end
 
           # @return [Hash] contains :street_address, :extended_address,
@@ -27,52 +28,51 @@ module CineworldUk
 
           private
 
-          def adr_array
-            @adr_array ||=
-              cinema_detail_hash['address'].split(',').map(&:strip).compact
+          def address_info
+            @address_info ||= cinema_hash['addressInfo'] || {}
           end
 
-          def cinema_detail_hash
-            @cinema_detail_hash ||= JSON.parse(cinema_detail_response)['cinema']
+          def cinema_hash
+            @cinema_hash ||= begin
+              cinemas = @cinemas ||
+                        JSON.parse(cinema_list_response)["body"]["cinemas"]
+              formatted_id = @id.to_s.rjust(3, '0')
+              cinemas.find { |c| c['id'] == formatted_id } || {}
+            end
           end
 
-          def cinema_detail_response
-            @cinema_detail_response ||=
-              CineworldUk::Internal::ApiResponse.new.cinema_detail(@id)
-          end
-
-          def ext_array
-            @ext_array ||= adr_array[1..-1]
+          def cinema_list_response
+            @cinema_list_response ||=
+              CineworldUk::Internal::ApiResponse.new.cinema_list
           end
 
           def extended_address
-            return nil if ext_array.count == 1
-            london? ? nil : ext_array[0]
-          end
+            addr2 = address_info['address2']
+            addr3 = address_info['address3']
 
-          def final
-            @final ||= ext_array.last
+            return nil if london?
+            addr2 || addr3
           end
 
           def locality
-            return ext_array[0] if ext_array.count == 1
-            london? ? ext_array[0] : ext_array[1]
+            address_info['city']
           end
 
           def london?
-            final == 'London'
+            address_info['city'] == 'London' ||
+            cinema_hash['displayName']&.start_with?('London')
           end
 
           def postal_code
-            cinema_detail_hash['postcode']
+            address_info['postalCode']
           end
 
           def region
-            'London' if london?
+            address_info['state'] || ('London' if london?)
           end
 
           def street_address
-            adr_array[0]
+            address_info['address1']
           end
         end
       end