scott_uk 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c75ad6918639978c21390326e38fdfcf5886f1370aa334cbf033126612eaae1
-  data.tar.gz: 2ef1613c736ff2ecfff93a4c5f8aca5c5d006be0f54a6224f852a98a7d28d773
+  metadata.gz: 312a255283c7d0e40ff0b942ad794a932970546989f1037405b1f82796ff71bb
+  data.tar.gz: f804e8a6edaa0ffd9d152f670dc792eedcdbec76d3e8840053aab9d6e6b121fe
 SHA512:
-  metadata.gz: 92e4acd0631ca75f7dea25e2fd1cf8ff38e5684824c63aac58571cd9913e3574dba9c39ce61ad7bb5c2b556a9d65b1bcb39c920ca70c847fe595a7707cdd3a0b
-  data.tar.gz: 24bb933aed665e63108747fa5073bb4f05c476d79f8ab664dc94fe7a97c1a443ac16513d0707c9c3b94d765952af272928226a05512692b58a0dc75c64605f63
+  metadata.gz: 732fadf6628e5cb09fcda60ad72d0a4841becc4b72d5f483c07325df1723e86804d971e96613f471184a69df2f3f783f57496e6217559b12c983633b186336af
+  data.tar.gz: 21b345e48610f083a195e9007f47b53fe9e8872408bf333d8b44b3cffba82bf82e6386f223f10494bb4df029fa26d22889f3bc503c6427ea474442e1b0074a27

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 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 www.scottcinemas.co.uk" rather than "Scott Cinemas HTTP error 500".
+
 ## [1.0.0] - 2026-11-01
 
 ### Added

data/lib/scott_uk/internal/feed.rb

@@ -8,16 +8,18 @@ module ScottUk
     # https://www.scottcinemas.co.uk/api. Each venue's feed holds every
     # advertised date.
     class Feed
-      include Http
-
       URL = 'https://www.scottcinemas.co.uk/json.php'
 
+      def initialize
+        @http = Cinebase::Http.new
+      end
+
       # @param [String] code a venue's feed code, e.g. 'SCOBAR'
       # @return [Hash] the feed: 'cinema', 'films' by id, and 'schedule' of
       #   showtimes by local midnight, then screen, then start, each a Unix
       #   timestamp
       def listings(code)
-        JSON.parse(get("#{URL}?cinema=#{CGI.escape(code)}"))
+        JSON.parse(@http.get("#{URL}?cinema=#{CGI.escape(code)}"))
       end
     end
   end

data/lib/scott_uk/performance.rb

@@ -24,8 +24,6 @@ module ScottUk
     #   @option options [String] :language (nil) audio language, e.g. 'Hindi'
     #   @option options [Time] :starting_at listed start time of the performance
 
-    TIME_ZONE = 'Europe/London'.freeze
-
     # Performances within an inclusive range of showing dates, from one
     # request: the venue's feed holds every advertised date.
     # @param [String] cinema_id the cinema's feed code, e.g. 'SCOBAR'
@@ -34,7 +32,7 @@ module ScottUk
     # @return [Array<ScottUk::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
@@ -68,7 +66,7 @@ module ScottUk
     def self.showtimes_between(feed, from, to)
       films = Hash(feed['films'])
       Hash(feed['schedule']).flat_map do |midnight, screens|
-        if (from..to).cover?(london_date(midnight))
+        if (from..to).cover?(Cinebase::London.date(Time.at(midnight.to_i)))
           Hash(screens).values.flat_map do |showtimes|
             Hash(showtimes).filter_map do |timestamp, showtime|
               film = films[showtime['film_id']]
@@ -81,10 +79,5 @@ module ScottUk
       end
     end
     private_class_method :showtimes_between
-
-    def self.london_date(timestamp)
-      TZInfo::Timezone.get(TIME_ZONE).to_local(Time.at(timestamp.to_i).utc).to_date
-    end
-    private_class_method :london_date
   end
 end

data/lib/scott_uk/version.rb

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

data/lib/scott_uk.rb

@@ -5,7 +5,6 @@ require 'cinebase'
 
 require_relative './scott_uk/version'
 
-require_relative './scott_uk/internal/http'
 require_relative './scott_uk/internal/feed'
 require_relative './scott_uk/internal/title_sanitizer'
 require_relative './scott_uk/internal/parser/showtime'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scott_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 Scott Cinemas website
 email:
 - andy@goodscary.com
@@ -121,7 +121,6 @@ files:
 - lib/scott_uk.rb
 - lib/scott_uk/cinema.rb
 - lib/scott_uk/internal/feed.rb
-- lib/scott_uk/internal/http.rb
 - lib/scott_uk/internal/parser/showtime.rb
 - lib/scott_uk/internal/title_sanitizer.rb
 - lib/scott_uk/performance.rb

data/lib/scott_uk/internal/http.rb

@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-
-require 'net/http'
-
-module ScottUk
-  # Internal utility classes: Do not use
-  # @api private
-  module Internal
-    # Requests to scottcinemas.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)
-        uri = URI(url)
-        attempts = 0
-        begin
-          response = Net::HTTP.start(uri.host, uri.port, use_ssl: true, open_timeout: 10, read_timeout: 30) do |http|
-            http.request(Net::HTTP::Get.new(uri))
-          end
-        rescue *TRANSIENT_ERRORS
-          attempts += 1
-          raise if attempts > RETRIES
-
-          sleep(attempts)
-          retry
-        end
-        # Omit response bodies from errors, and never follow redirects.
-        raise "Scott Cinemas HTTP error #{response.code}" unless response.is_a?(Net::HTTPSuccess)
-
-        String.new(response.body, encoding: Encoding::UTF_8)
-      end
-    end
-  end
-end