omniplex_uk 1.0.0 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 214a923918e2ceaf94c27e71c88acefd9fbd529adaa6439b73e77415a46c1681
-  data.tar.gz: 1ae9efee80308dfecf8dadafdc279a20417d4222694bdd4e184d1a79a574bc59
+  metadata.gz: 34a23136866807694df72905a39351543e9201f1b89887a72fe1093876a3d185
+  data.tar.gz: 70ffc74bfe06c6e3f5d173ca4ac73c90dcfb8697ca9159131b526e5798055c79
 SHA512:
-  metadata.gz: 7e0a5d219d980dba3fce49080a9a52e137606f6ce9f1845b297e5a2751e978a90668cb4913e9a890caca9f5001184395f170d7549c96ae2cd957710d277774f5
-  data.tar.gz: 0477df8657519fad5d298ebbe593a815a2decd253ed9c242229385eff87494edab66ea618341cb68550dfb67abf5672254d4bcad6f6ec3399e14240ac811849d
+  metadata.gz: dcab2ab429d0a1670bf916b92dc4f9d51acd6908fadc943f3e677dcb1fd74a7ef319e66d7845a29079c1d92e319d86fa88b11917f769014c88cf14df64ea1cbd
+  data.tar.gz: 3a773b39a7d55af75701bea2896b13fc51dbe5e361a9824dbfa00bc150183fb8a87408514b2423139be812de04df3369e8e7ec2cff0e89daf3faeeebad0ce738

data/CHANGELOG.md

@@ -2,6 +2,16 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.0.2] - 2026-11-03
+
+### Fixed
+- Placeholder `Live event test` sessions are left out of performances.
+
+## [1.0.1] - 2026-11-02
+
+### Changed
+- Requests and London times use cinebase 5.8's `Cinebase::Http` and `Cinebase::London`.
+
 ## [1.0.0] - 2026-11-01
 
 ### Added

data/lib/omniplex_uk/internal/client.rb

@@ -1,5 +1,4 @@
 require 'cgi/escape'
-require 'net/http'
 
 module OmniplexUk
   # Internal utility classes: Do not use
@@ -19,10 +18,10 @@ module OmniplexUk
 
       # Pages claim ISO-8859-1 but mix UTF-8 with Windows-1252 apostrophes
       LEGACY_ENCODING = Encoding::Windows_1252
-      RETRIES = 2
-      TRANSIENT_ERRORS = [
-        EOFError, Errno::ECONNRESET, Errno::ECONNREFUSED, Net::OpenTimeout, Net::ReadTimeout, OpenSSL::SSL::SSLError
-      ].freeze
+
+      def initialize
+        @http = Cinebase::Http.new(keep_alive: true)
+      end
 
       # UK venues in the home page's site picker
       # @return [Array<Hash>] with :url, :name and :code, e.g.
@@ -58,8 +57,7 @@ module OmniplexUk
       end
 
       def close
-        @http.finish if @http&.started?
-        @http = nil
+        @http.close
       end
 
       private
@@ -71,35 +69,11 @@ module OmniplexUk
       end
 
       def get(path)
-        attempts = 0
-        begin
-          response = http.request(Net::HTTP::Get.new(path))
-        rescue *TRANSIENT_ERRORS
-          close
-          attempts += 1
-          raise if attempts > RETRIES
-
-          sleep(attempts)
-          retry
-        end
-
-        if response.is_a?(Net::HTTPSuccess)
-          decode(response.body)
-        else
-          # Omit response bodies from errors, and never follow redirects.
-          raise "HTTP error #{response.code} from #{URI(WEBSITE).host}"
-        end
-      end
-
-      def http
-        @http ||= begin
-          uri = URI(WEBSITE)
-          Net::HTTP.start(uri.host, uri.port, use_ssl: true, open_timeout: 10, read_timeout: 30, max_retries: 0)
-        end
+        decode(@http.get(WEBSITE + path))
       end
 
       def decode(body)
-        body.dup.force_encoding(Encoding::UTF_8).scrub do |bytes|
+        body.scrub do |bytes|
           bytes.force_encoding(LEGACY_ENCODING).encode(Encoding::UTF_8, invalid: :replace, undef: :replace)
         end
       end

data/lib/omniplex_uk/internal/listings.rb

@@ -36,7 +36,6 @@ module OmniplexUk
       # Films whose genres include it are live and recorded events
       EVENT_GENRE = 'Event'.freeze
       MILLISECONDS = 1000
-      TIME_ZONE = 'Europe/London'.freeze
 
       # @return [Date, nil] the day this page lists
       attr_reader :date
@@ -84,12 +83,12 @@ module OmniplexUk
       end
 
       def local_date(seconds)
-        TZInfo::Timezone.get(TIME_ZONE).to_local(Time.at(seconds).utc).to_date
+        Cinebase::London.date(Time.at(seconds))
       end
 
       def starting_at(hour, minute)
         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
 
       def text(html)

data/lib/omniplex_uk/performance.rb

@@ -58,6 +58,9 @@ module OmniplexUk
     COUNTRY_LANGUAGES = { 'Poland' => 'Polish' }.freeze
     COUNTRY = /\((#{COUNTRY_LANGUAGES.keys.join('|')})\)/
 
+    # Placeholder sessions Omniplex lists while setting up a broadcast
+    TEST_EVENT = /\ALive event test\b/i
+
     # Performances within an inclusive range of showing dates. The website
     # lists one day per page, so this reads the venue's advertised dates
     # from its first page, then one page for each other date in the range.
@@ -67,7 +70,7 @@ module OmniplexUk
     # @return [Array<OmniplexUk::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
@@ -76,7 +79,7 @@ module OmniplexUk
       if cinema.url.empty?
         []
       else
-        showings = listings(cinema.id, from..to).flat_map(&:showings)
+        showings = listings(cinema.id, from..to).flat_map(&:showings).reject { |showing| showing.title.match?(TEST_EVENT) }
         performances = showings.map do |showing|
           new(attributes(showing).merge(cinema_id: cinema.id, cinema_name: cinema.name))
         end

data/lib/omniplex_uk/version.rb

@@ -1,6 +1,6 @@
 # Ruby interface for https://www.omniplexcinemas.co.uk
-# @version 1.0.0
+# @version 1.0.2
 module OmniplexUk
   # Gem version
-  VERSION = '1.0.0'.freeze
+  VERSION = '1.0.2'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniplex_uk
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.2
 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 Omniplex Cinemas website
 email:
 - andy@goodscary.com