reel_uk 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6f1209b04f84c1c66a844ff4dd3c9b6212372a7a7281cbf1be4fb46bc2db02e
-  data.tar.gz: 7b92797f151c402671b8a87660149f1977bf1207383d1558acc191e20a50a07f
+  metadata.gz: 88a832fdb71a6d3f7052fa863d53e97eecdd5c63a54489990fe7bd496c1a796c
+  data.tar.gz: 9440fb29505233a09a86fda618d42c96eab815e7f916ea23754b056c0c8bcfbe
 SHA512:
-  metadata.gz: a08041ba47ce4fa230fdbda0f9b5bcfaf968b582c23ed52600da1bd33cdf29180fb568e0ba971770bd67d2cd1fbce2afd8343527dd1999085b2a045934f9b6a9
-  data.tar.gz: 0cdd9454883ab8982efd2f89f520464bc3f468d3fbd3749484f09777d5e012c06df4d38ba9df82a8f81420ee9def30c13c1c281224790f84316adfbf556ff2e5
+  metadata.gz: 2740ef677d0b13d77f76edc09360775760ab51216dfbeef4dc639e2e7f5a9c223c39b7a253ae3685de23179f7ad9e75bb712603b8db14043d348455c2b562300
+  data.tar.gz: 0cfb73b6944cf0c2eb57cf44f7d459668af008e2891cfb103d43d129c3e46060fd52ef2cbc673e52fcbb9555ea4cf7078a344e31226e3f78814f092d68e6b72a

data/CHANGELOG.md

@@ -2,6 +2,15 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.0.1] - 2026-11-02
+
+### Changed
+- Requests and London times use cinebase 5.8's `Cinebase::Http` and `Cinebase::London`.
+- HTTP errors read "HTTP error 500 from reel-cinemas.co.uk" instead of "Reel HTTP error 500 from reel-cinemas.co.uk".
+
+### Removed
+- `ReelUk::Performance::TIME_ZONE`, now unused.
+
 ## [1.0.0] - 2026-11-01
 
 ### Added

data/lib/reel_uk/internal/parser/showtimes.rb

@@ -8,7 +8,6 @@ module ReelUk
       # such as '16 Dec 2026 @ 09:30', which name every showtime on sale
       class Showtimes
         OPTION = %r{<option value="[^"]*/booknow/(\d+)/?">(\d{1,2} [A-Z][a-z]{2} \d{4}) @ (\d{1,2}):(\d{2})</option>}
-        TIME_ZONE = 'Europe/London'
 
         # @param [String] html the menu's options
         # @param [String] film_id Jacro's film id
@@ -38,7 +37,7 @@ module ReelUk
 
         def starting_at(date, hour, minute)
           local = Time.utc(date.year, date.month, date.day, hour.to_i, minute.to_i)
-          TZInfo::Timezone.get(TIME_ZONE).local_to_utc(local) { |periods| periods.first }.utc
+          Cinebase::London.utc(local)
         end
       end
     end

data/lib/reel_uk/internal/parser/whats_on.rb

@@ -14,7 +14,6 @@ module ReelUk
           <a\shref="[^"]*/booknow/(\d+)/?"[^>]*>\s*(\d{1,2}:\d{2})\s*</a>
           (?:<div\sclass="show_time_label">([^<]*)</div>)?
         }x
-        TIME_ZONE = 'Europe/London'
 
         # @param [String] html a what's on page
         # @param [String] venue_url e.g. 'https://reel-cinemas.co.uk/chorley'
@@ -54,7 +53,7 @@ module ReelUk
         def starting_at(date, time)
           hour, minute = time.split(':').map(&:to_i)
           local = Time.utc(date.year, date.month, date.day, hour, minute)
-          TZInfo::Timezone.get(TIME_ZONE).local_to_utc(local) { |periods| periods.first }.utc
+          Cinebase::London.utc(local)
         end
       end
     end

data/lib/reel_uk/internal/website.rb

@@ -7,35 +7,37 @@ module ReelUk
     # Reads pages from Reel's WordPress website, built on Jacro's cinema
     # plugin. No token is needed.
     class Website
-      include Http
-
       HOME = 'https://reel-cinemas.co.uk/'
       AJAX = 'https://reel-cinemas.co.uk/wp-admin/admin-ajax.php'
       # The quick booking menu's request for every showtime of a film
       SHOWTIMES_ACTION = 'display_showtime_byfilmid'
 
+      def initialize
+        @http = Cinebase::Http.new
+      end
+
       # @return [String] the home page, whose cinema menu lists every venue
       def home
-        get(HOME)
+        @http.get(HOME)
       end
 
       # @param [String] venue_url e.g. 'https://reel-cinemas.co.uk/chorley'
       # @return [String] the venue's page, whose quick booking menu names
       #   the venue's Jacro location id
       def venue(venue_url)
-        get("#{venue_url}/")
+        @http.get("#{venue_url}/")
       end
 
       # @param [String] venue_url e.g. 'https://reel-cinemas.co.uk/chorley'
       # @return [String] the next three weeks of showtimes, with labels
       def whats_on(venue_url)
-        get("#{venue_url}/whatson/")
+        @http.get("#{venue_url}/whatson/")
       end
 
       # @param [String] venue_url e.g. 'https://reel-cinemas.co.uk/chorley'
       # @return [String] films not yet showing, with up to three showtimes each
       def coming_soon(venue_url)
-        get("#{venue_url}/comingsoon/")
+        @http.get("#{venue_url}/comingsoon/")
       end
 
       # @param [String] film_id Jacro's film id, the same at every venue
@@ -43,7 +45,8 @@ module ReelUk
       # @return [String] options naming every showtime of the film at the
       #   venue, however far ahead
       def showtimes(film_id, location)
-        response = post(AJAX, 'action' => SHOWTIMES_ACTION, 'select_movie' => film_id, 'movie_loc' => location)
+        form = { 'action' => SHOWTIMES_ACTION, 'select_movie' => film_id, 'movie_loc' => location }
+        response = @http.post(AJAX, form: form)
         JSON.parse(response).fetch('html', '').to_s
       end
     end

data/lib/reel_uk/performance.rb

@@ -37,7 +37,6 @@ module ReelUk
     THREE_D = Cinebase::A1web::Performance::THREE_D
     IMAX = Cinebase::A1web::Performance::IMAX
     LANGUAGE = Cinebase::A1web::Performance::LANGUAGE
-    TIME_ZONE = 'Europe/London'.freeze
 
     # The old website's own booking links only work in a browser that has
     # just visited the venue's pages, so link to the venue's Admit One
@@ -54,7 +53,7 @@ module ReelUk
     # @return [Array<ReelUk::Performance>]
     def self.at(
       cinema_id,
-      from: TZInfo::Timezone.get(TIME_ZONE).now.to_date,
+      from: Cinebase::London.today,
       to: from + 13
     )
       raise ArgumentError, 'to must not precede from' if to < from
@@ -82,9 +81,8 @@ module ReelUk
       if cinema.url.empty?
         []
       elsif cinema.a1web?
-        today = TZInfo::Timezone.get(TIME_ZONE).now.to_date
         html = Cinema.a1web_client.whats_on(cinema.url)
-        Cinebase::A1web::Listings.new(html, venue_url: cinema.url, today: today).showings
+        Cinebase::A1web::Listings.new(html, venue_url: cinema.url, today: Cinebase::London.today).showings
       else
         ReelUk::Internal::Listings.new(cinema.url).showings
       end

data/lib/reel_uk/version.rb

@@ -1,6 +1,6 @@
 # Ruby interface for https://reel-cinemas.co.uk
-# @version 1.0.0
+# @version 1.0.1
 module ReelUk
   # Gem version
-  VERSION = '1.0.0'.freeze
+  VERSION = '1.0.1'.freeze
 end

data/lib/reel_uk.rb

@@ -6,7 +6,6 @@ require 'cinebase/a1web'
 
 require_relative './reel_uk/version'
 
-require_relative './reel_uk/internal/http'
 require_relative './reel_uk/internal/website'
 require_relative './reel_uk/internal/title_sanitizer'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reel_uk
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Andy Croll
@@ -99,14 +99,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.7'
+        version: '5.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.7'
+        version: '5.8'
 description: Pull movie & cinema information from the Reel Cinemas website
 email:
 - andy@goodscary.com
@@ -120,7 +120,6 @@ files:
 - README.md
 - lib/reel_uk.rb
 - lib/reel_uk/cinema.rb
-- lib/reel_uk/internal/http.rb
 - lib/reel_uk/internal/listings.rb
 - lib/reel_uk/internal/parser/coming_soon.rb
 - lib/reel_uk/internal/parser/showtimes.rb

data/lib/reel_uk/internal/http.rb

@@ -1,49 +0,0 @@
-# frozen_string_literal: true
-
-require 'net/http'
-
-module ReelUk
-  # Internal utility classes: Do not use
-  # @api private
-  module Internal
-    # Requests to reel-cinemas.co.uk
-    module Http
-      RETRIES = 2
-      TRANSIENT_ERRORS = [
-        EOFError, Errno::ECONNRESET, Errno::ECONNREFUSED, Net::OpenTimeout, Net::ReadTimeout, OpenSSL::SSL::SSLError
-      ].freeze
-
-      private
-
-      def get(url)
-        perform(Net::HTTP::Get.new(URI(url)))
-      end
-
-      def post(url, form)
-        post = Net::HTTP::Post.new(URI(url))
-        post.set_form_data(form)
-        perform(post)
-      end
-
-      def perform(request)
-        uri = request.uri
-        attempts = 0
-        begin
-          response = Net::HTTP.start(uri.host, uri.port, use_ssl: true, open_timeout: 10, read_timeout: 30) do |http|
-            http.request(request)
-          end
-        rescue *TRANSIENT_ERRORS
-          attempts += 1
-          raise if attempts > RETRIES
-
-          sleep(attempts)
-          retry
-        end
-        # Omit response bodies from errors, and never follow redirects.
-        raise "Reel HTTP error #{response.code} from #{uri.host}" unless response.is_a?(Net::HTTPSuccess)
-
-        String.new(response.body, encoding: Encoding::UTF_8)
-      end
-    end
-  end
-end