poms 2.5.1 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9703e39549b604585b1a9089b86b543426024350e7a77b243fc135ff262955a6
-  data.tar.gz: 0706bfb103c8f75864bef989a1982005dc302f048fd833bd5d269dc8a6dae7db
+  metadata.gz: 94b59c21b3b95931b03b4b04739cb8dc7b623c26f5d633455221678223b6f625
+  data.tar.gz: ffcf48dabbbdc935e457457fe98eefce1fb04e7e4152f34e466c0b83a5e525e4
 SHA512:
-  metadata.gz: 7b25d5c5bc019d04f224e47e09354baa13c8f82a70f59f4de67f195d542448d5e5ff98215b181ed0edb2198b75e064392b89b61952dea65cf276e2f813030ed9
-  data.tar.gz: bfbe8ce2fb202dc209a9037d2fefecca1627cd3ab91bca847ba7e4120a4b5bd331a456f98e0bddd4bda1371783559906ae6a55c99eacf197698e8e666995a447
+  metadata.gz: cdd4c961aa0bedf9dc01bd4c901c43dbe2156ad24bfe6488bfc9340fdcae3788ff22fd237bf0b82f0952e2c4e8ad51adc65e723a98e5c2879377a30810bbe893
+  data.tar.gz: 20899c206ed27d38126e42236f29b1f9f08b62aa568dfcc266483f2802e727ce6c63078f55d94f2484c3870b806aec16410753965451add9bb822bb0503a3c11

data/.circleci/config.yml

@@ -2,7 +2,7 @@ version: 2
 jobs:
   build:
     docker:
-      - image: circleci/ruby:2.3.4-node-browsers
+      - image: cimg/ruby:3.2.0-browsers
         environment:
           POMS_KEY: key
           POMS_ORIGIN: origin

data/.rubocop.yml

@@ -8,6 +8,8 @@ AllCops:
     - bin/*
     - poms.gemspec
     - vendor/**/*
+  NewCops: enable
+  TargetRubyVersion: 3.2.0
 
 Style/Documentation:
   Exclude:
@@ -40,16 +42,16 @@ ModuleLength:
 RSpec/ExampleLength:
   Max: 15
 
-Layout/AlignParameters:
+Layout/ParameterAlignment:
   EnforcedStyle: with_fixed_indentation
 
 Layout/FirstParameterIndentation:
   EnforcedStyle: consistent
 
-Layout/IndentArray:
+Layout/FirstArrayElementIndentation:
   EnforcedStyle: consistent
 
-Layout/IndentHash:
+Layout/FirstHashElementIndentation:
   EnforcedStyle: consistent
 
 Layout/MultilineMethodCallIndentation:

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Poms Release notes
 
+## 3.0.0
+
+* Support Ruby 3.2.0.
+
+## 2.6.0
+
+* Include `Poms::Fields` in the main library file.
+
 ## 2.5.1
 
 * Actually filter out publications with `owner` `NEBO`.

data/lib/poms/api/auth.rb

@@ -49,6 +49,7 @@ module Poms
       # Convert a hash of parameters to the format expected by the message
       def params_string(params)
         return unless params
+
         params.map { |key, value| "#{key}:#{value}" }.sort.join(',')
       end
 

data/lib/poms/api/drivers/net_http.rb

@@ -41,7 +41,7 @@ module Poms
           end
         rescue *NET_HTTP_ERRORS => e
           raise Errors::HttpError,
-            "An error (#{e.class}) occured while processing your request."
+                "An error (#{e.class}) occured while processing your request."
         end
 
         def prepare_request(request_description)
@@ -65,7 +65,7 @@ module Poms
         end
 
         private_class_method :attempt_request, :prepare_request,
-          :request_to_net_http_request
+                             :request_to_net_http_request
       end
     end
   end

data/lib/poms/api/pagination_client.rb

@@ -15,6 +15,7 @@ module Poms
             page.execute { |page_uri| client_execute(request, page_uri) }
             page.items.each { |item| yielder << item }
             raise StopIteration if page.final?
+
             page = page.next_page
           end
         end.lazy
@@ -29,7 +30,7 @@ module Poms
       # Keep track of number of items and how many have been retrieved
       class Page
         def initialize(uri, offset = 0)
-          uri.query_values = { offset: offset }
+          uri.query_values = { offset: }
           @uri = uri
         end
 

data/lib/poms/api/request.rb

@@ -21,16 +21,16 @@ module Poms
       end
 
       def merge(new_attributes)
-        self.class.new(attributes.merge(new_attributes))
+        self.class.new(**attributes.merge(new_attributes))
       end
 
       def attributes
         {
-          method: method,
-          uri: uri,
-          body: body,
-          headers: headers,
-          credentials: credentials
+          method:,
+          uri:,
+          body:,
+          headers:,
+          credentials:
         }
       end
 

data/lib/poms/api/search.rb

@@ -18,6 +18,7 @@ module Poms
 
       def build(options)
         return {} if options.empty?
+
         all = options.map do |key, value|
           case key
           when :starts_at, :ends_at

data/lib/poms/configuration.rb

@@ -23,7 +23,7 @@ module Poms
       reset
       yield self if block_given?
       validate
-      @credentials = OpenStruct.new(key: key, origin: origin, secret: secret)
+      @credentials = Struct.new(:key, :origin, :secret, :base_uri).new(key, origin, secret, nil)
       freeze
     end
 
@@ -37,6 +37,7 @@ module Poms
     def assert_credentials
       REQUIRED_CREDENTIAL_KEYS.each do |key|
         next if send(key).present?
+
         raise Errors::AuthenticationError, "#{key} must be supplied"
       end
     end
@@ -48,9 +49,9 @@ module Poms
 
     def reset
       @credentials = nil
-      self.key = ENV['POMS_KEY']
-      self.origin = ENV['POMS_ORIGIN']
-      self.secret = ENV['POMS_SECRET']
+      self.key = ENV.fetch('POMS_KEY', nil)
+      self.origin = ENV.fetch('POMS_ORIGIN', nil)
+      self.secret = ENV.fetch('POMS_SECRET', nil)
       self.base_uri = Addressable::URI.parse(
         ENV.fetch('POMS_BASE_URI', DEFAULT_BASE_URI)
       )

data/lib/poms/fields/details.rb

@@ -88,8 +88,10 @@ module Poms
       # @param type The type to select
       def value_of_type(item, key, type)
         return unless item && item[key]
+
         res = item[key].find { |value| value['type'] == type }
         return unless res
+
         res['value']
       end
       private_class_method :value_of_type

data/lib/poms/fields/media.rb

@@ -17,6 +17,7 @@ module Poms
       # Expects a hash of just an image from POMS
       def image_id(image)
         return unless image['imageUri']
+
         image['imageUri'].split(':').last
       end
 
@@ -27,6 +28,7 @@ module Poms
       # Returns the id of the first image or nil if there are none.
       def first_image_id(item)
         return unless images(item)
+
         image_id(images(item).first)
       end
     end

data/lib/poms/fields/schedule.rb

@@ -13,9 +13,10 @@ module Poms
       def odi_streams(item)
         locations = item['locations']
         return [] if locations.nil? || locations.empty?
+
         odi_streams = locations.select { |l| l['programUrl'].match(/^odi/) }
         streams = odi_streams.map do |l|
-          l['programUrl'].match(%r{^[\w+]+\:\/\/[\w\.]+\/video\/(\w+)\/\w+})[1]
+          l['programUrl'].match(%r{^[\w+]+://[\w.]+/video/(\w+)/\w+})[1]
         end
         streams.uniq
       end
@@ -36,6 +37,7 @@ module Poms
       # INTERNETVOD and is PUBLISHED and does not have owner NEBO.
       def publication(poms_item)
         return if poms_item.fetch('locations', nil).blank?
+
         poms_item.fetch('locations', []).find do |item|
           item.fetch('platform', '') == 'INTERNETVOD' &&
             item.fetch('workflow', '') == 'PUBLISHED' &&
@@ -47,6 +49,7 @@ module Poms
       def publish_stop(poms_item)
         published_item = publication(poms_item)
         return unless published_item
+
         Timestamp.to_datetime(published_item['publishStop'])
       end
 
@@ -54,15 +57,18 @@ module Poms
       def publish_start(poms_item)
         published_item = publication(poms_item)
         return unless published_item
+
         Timestamp.to_datetime(published_item['publishStart'])
       end
 
       # Returns the enddate of the publication of an internet vod if present.
       def available_until(item)
         return if item['predictions'].blank?
+
         internetvod = item['predictions']
           .find { |p| p['platform'] == 'INTERNETVOD' }
         return unless internetvod
+
         Timestamp.to_datetime(internetvod['publishStop'])
       end
 

data/lib/poms/timestamp.rb

@@ -6,12 +6,14 @@ module Poms
     # Convert unix timestamp in milliseconds to datetime
     def to_datetime(timestamp)
       return unless timestamp
+
       Time.at(timestamp / 1000).to_datetime
     end
 
     # Convert to unix timestamp in milliseconds
     def to_unix_ms(datetime)
       return unless datetime
+
       datetime.to_i * 1000
     end
   end

data/lib/poms/version.rb

@@ -1,4 +1,4 @@
 # The version
 module Poms
-  VERSION = '2.5.1'.freeze
+  VERSION = '3.0.0'.freeze
 end

data/lib/poms.rb

@@ -6,6 +6,7 @@ require 'poms/api/request'
 require 'poms/errors'
 require 'poms/api/search'
 require 'poms/configuration'
+require 'poms/fields'
 require 'json'
 
 # Main interface for the POMS gem
@@ -42,32 +43,32 @@ module Poms
   # @raise Api::Client::HttpMissingError
   def first!(mid)
     Api::JsonClient.execute(build_request(
-      uri: Api::Uris::Media.single(config.base_uri, mid)
-    ))
+                              uri: Api::Uris::Media.single(config.base_uri, mid)
+                            ))
   end
 
   def fetch(arg)
     Api::JsonClient.execute(build_request(
-      method: :post,
-      uri: Api::Uris::Media.multiple(config.base_uri),
-      body: Array(arg)
-    ))
+                              method: :post,
+                              uri: Api::Uris::Media.multiple(config.base_uri),
+                              body: Array(arg)
+                            ))
   end
 
   def descendants(mid, search_params = {})
     Api::PaginationClient.execute(build_request(
-      method: :post,
-      uri: Api::Uris::Media.descendants(config.base_uri, mid),
-      body: Api::Search.build(search_params)
-    ))
+                                    method: :post,
+                                    uri: Api::Uris::Media.descendants(config.base_uri, mid),
+                                    body: Api::Search.build(search_params)
+                                  ))
   end
 
   def members(mid)
     Api::PaginationClient.execute(build_request(
-      method: :post,
-      uri: Api::Uris::Media.members(config.base_uri, mid),
-      body: Api::Search.empty
-    ))
+                                    method: :post,
+                                    uri: Api::Uris::Media.members(config.base_uri, mid),
+                                    body: Api::Search.empty
+                                  ))
   end
 
   # Gets the merged serie mids as a hash. Expects a JSON response from
@@ -76,8 +77,8 @@ module Poms
   # @return [Hash] a hash with old_mid => new_mid pairs
   def merged_series
     Api::JsonClient.execute(build_request(
-      uri: Api::Uris::Media.redirects(config.base_uri)
-    )).fetch('map')
+                              uri: Api::Uris::Media.redirects(config.base_uri)
+                            )).fetch('map')
   end
 
   # Fetches the event for current broadcast on the given channel
@@ -85,8 +86,8 @@ module Poms
   # @param channel The channel name
   def scheduled_now(channel)
     Api::JsonClient.execute(build_request(
-      uri: Api::Uris::Schedule.now(config.base_uri, channel)
-    )).fetch('items').first
+                              uri: Api::Uris::Schedule.now(config.base_uri, channel)
+                            )).fetch('items').first
   end
 
   # Fetches the event for the next broadcast on a given channel
@@ -94,8 +95,8 @@ module Poms
   # @param channel The channel name
   def scheduled_next(channel)
     Api::JsonClient.execute(build_request(
-      uri: Api::Uris::Schedule.next(config.base_uri, channel)
-    )).fetch('items').first
+                              uri: Api::Uris::Schedule.next(config.base_uri, channel)
+                            )).fetch('items').first
   end
 
   def reset_config
@@ -107,7 +108,7 @@ module Poms
   end
 
   def build_request(attributes)
-    Api::Request.new(attributes.merge(credentials: config.credentials))
+    Api::Request.new(**attributes.merge(credentials: config.credentials))
   end
 
   private_class_method :config, :build_request

data/poms.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'rubocop-rspec', '~> 1.20.0'
-  spec.add_development_dependency 'rubocop', '~> 0.51.0'
+  spec.add_development_dependency 'rubocop', '~> 1.0'
   spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'timecop'
   spec.add_development_dependency 'vcr'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: poms
 version: !ruby/object:Gem::Version
-  version: 2.5.1
+  version: 3.0.0
 platform: ruby
 authors:
 - Tom Kruijsen
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-01 00:00:00.000000000 Z
+date: 2023-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.51.0
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.51.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -238,7 +238,7 @@ homepage: https://github.com/brightin/poms
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -253,8 +253,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Interface to POMS CouchDB API
 test_files: []