wcc-media-client 0.4.8 → 0.4.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d18367e52ec3f09cc84c5959e68a8bbe36c53f2
-  data.tar.gz: 54abfc8029902f64f480c1260c6c69fd24954a5e
+  metadata.gz: c5267da3904b4c03dcd2806653a5416dc8c2be9b
+  data.tar.gz: a8ff4629d184ecdcfe7a946df52ab1b4ced3e92b
 SHA512:
-  metadata.gz: f519e7ab6c4c3c07989a0656c75f83ad5908bc30874aaad98a0499eda8c3709a7b1660698f14cf8aa8a8861901f5492aebf9ea9db8e6a1cc5216347774c9c038
-  data.tar.gz: dfa00ce89851417a5e0d52aef98f52e5cf07e51dd284ffa1570956fdd4f14cc4a55996331529c5c648463957ede12c05d2a1e52f288204361cd1affd1b5606ec
+  metadata.gz: c5bbf278905e91d9f8937a83ebd9af3a18de8ae7a8b7078675b505d1e76403feddb648316db8f8f8f50cd593f10aec7847bd5ef4988f28b8a1e13b971f184534
+  data.tar.gz: 1b857617295dfb1e684ae58f8a7fcd4f7f6616ad785c0b3b810fa7769e7db5e64e1eb24e1bff336fb2b906e004e0110fff437a2314b6f9f5a19b23b98c27a68e

data/.rubocop.yml

@@ -10,3 +10,6 @@ Style/ClassAndModuleChildren:
 Style/MultilineBlockChain:
   Exclude:
     - 'spec/**/*'
+
+Rails/TimeZone:
+  Enabled: false

data/lib/wcc/media/cacheable.rb

@@ -10,6 +10,15 @@ module WCC
         @cache_key = "#{self.class.name}/#{key}"
       end
 
+      def last_modified
+        return @last_modified if @last_modified
+
+        last_modified =
+          (headers&.fetch('Last-Modified', nil) if respond_to?(:headers))
+        @last_modified = Time.parse(last_modified) if last_modified && /\S/.match(last_modified)
+      end
+      alias_method :updated_at, :last_modified
+
       def self.hash_cache_key(hash)
         Digest::SHA1.hexdigest(Marshal.dump(hash))
       end

data/lib/wcc/media/client.rb

@@ -4,6 +4,7 @@ require_relative 'series'
 require_relative 'speaker'
 require_relative 'tag'
 require_relative 'playlist'
+require_relative 'live_stream'
 require_relative 'client/response'
 
 module WCC
@@ -35,7 +36,8 @@ module WCC
         'series' => WCC::Media::Series,
         'speakers' => WCC::Media::Speaker,
         'tags' => WCC::Media::Tag,
-        'playlists' => WCC::Media::Playlist
+        'playlists' => WCC::Media::Playlist,
+        'streams' => WCC::Media::LiveStream
       }.freeze
       attr_reader(*RESOURCES.keys)
 
@@ -44,7 +46,8 @@ module WCC
       def initialize(**options)
         options = {
           api_url: 'https://media.watermark.org/api/v1/',
-          response_class: Response
+          response_class: Response,
+          adapter: :typhoeus
         }.merge!(options)
         super(**options)
 
@@ -60,7 +63,7 @@ module WCC
 
             resp = client.get(
               "#{model.endpoint}/#{id}",
-              default_params('target').merge(params)
+              default_params('target').merge(params),
             )
             resp.assert_ok!
             model.new(resp.body[model.key], resp.headers.freeze)

data/lib/wcc/media/client/response.rb

@@ -15,7 +15,7 @@ module WCC
         end
 
         def page_items
-          body['messages'] || body['series'] || body['speakers'] || body['tags']
+          body['messages'] || body['series'] || body['speakers'] || body['tags'] || body['streams']
         end
 
         def next_page_query

data/lib/wcc/media/engine.rb

@@ -59,10 +59,18 @@ class WCC::Media::Engine < ::Rails::Engine
 
   initializer 'configure WCC::Media Toots' do
     ActiveSupport::Notifications.subscribe 'routes_loaded.engine.media.wcc' do
-      ::Toot.config.callback_url ||= Rails.application.routes.url_helpers.wcc_media_url +
-        '/callbacks'
-
-      WCC::Media::Engine.register_subscriptions
+      ::Toot.config.callback_url ||=
+        begin
+          Rails.application.routes.url_helpers.wcc_media_url + '/callbacks'
+        rescue ArgumentError => ex
+          raise unless ex.message =~ /^Missing host to link to/
+        end
+
+      if ::Toot.config.callback_url.nil?
+        Rails.logger.error "Toot.config.callback_url not set!  Media webhooks will not be subscribed."
+      else
+        WCC::Media::Engine.register_subscriptions
+      end
     end
   end
 

data/lib/wcc/media/live_stream.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+class WCC::Media::LiveStream < WCC::Media::Base
+  active_record_shim do
+    endpoint 'streams'
+    key 'stream'
+    filters %w[
+    ].freeze
+  end
+
+  %w[
+    title
+    description
+  ].each do |att|
+    define_method att do
+      raw[att]
+    end
+  end
+
+  %w[
+    current_event
+    next_event
+  ].each do |att|
+    define_method att do
+      Event.new(raw[att]) if raw[att]
+    end
+  end
+
+  def active?
+    current_event.present?
+  end
+
+  class Event < WCC::Media::Base
+    %w[
+      title
+      description
+      embed_code
+      stream_url
+      starts_at
+      ends_at
+      duration
+    ].each do |att|
+      define_method att do
+        raw[att]
+      end
+    end
+  end
+end

data/lib/wcc/media/message.rb

@@ -8,6 +8,7 @@ class WCC::Media::Message < WCC::Media::Base
       on_or_after_date
       on_or_before_date
       tag_id
+      playlist_id
       speaker_id
       scripture_book_id
       series_id
@@ -37,6 +38,10 @@ class WCC::Media::Message < WCC::Media::Base
     (raw['speakers'] || []).map { |val| WCC::Media::Speaker.new(val) }
   end
 
+  def playlists
+    (raw['playlists'] || []).map { |val| WCC::Media::Playlist.new(val) }
+  end
+
   def tags
     (raw['tags'] || []).map { |val| WCC::Media::Tag.new(val) }
   end
@@ -76,12 +81,21 @@ class WCC::Media::Message < WCC::Media::Base
       .any? { |k, v| /video/.match(k) && v && !v.empty? }
   end
 
+  def has_audio? # rubocop:disable Naming/PredicateName
+    assets.each_pair
+      .any? { |k, v| /^audio/.match(k) && v && !v.empty? }
+  end
+
   def to_param
     "#{id}-#{slug}"
   end
 
   WCC::Media::TagGroup.all.each do |tag_group|
-    define_method(tag_group.name.downcase) do
+    method_name = tag_group.name.downcase.to_sym
+    # except :meta (different definition above)
+    next if instance_methods.include?(method_name)
+
+    define_method(method_name) do
       tags.select { |t| t.tag_group == tag_group }
     end
   end

data/lib/wcc/media/series.rb

@@ -29,6 +29,7 @@ class WCC::Media::Series < WCC::Media::Base
 
   %w[
     images
+    series_type
   ].each do |att|
     define_method att do
       OpenStruct.new(raw[att]) if raw[att]

data/lib/wcc/media/version.rb

@@ -1,5 +1,5 @@
 module WCC
   module Media
-    VERSION = '0.4.8'.freeze
+    VERSION = '0.4.13'.freeze
   end
 end

data/wcc-media-client.gemspec

@@ -35,6 +35,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'guard-rubocop', '~> 1.3'
   spec.add_development_dependency 'http', '> 1.0', '< 3.0'
   spec.add_development_dependency 'httplog', '~> 1.0'
+  spec.add_development_dependency 'nio4r', '2.5.2'
   spec.add_development_dependency 'rails', '~> 5.0'
   spec.add_development_dependency 'rake', '~> 12.3'
   spec.add_development_dependency 'responders', '< 3.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wcc-media-client
 version: !ruby/object:Gem::Version
-  version: 0.4.8
+  version: 0.4.13
 platform: ruby
 authors:
 - Watermark Dev
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-02-04 00:00:00.000000000 Z
+date: 2020-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: wcc-api
@@ -156,6 +156,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: nio4r
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.5.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.5.2
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -357,6 +371,7 @@ files:
 - lib/wcc/media/client.rb
 - lib/wcc/media/client/response.rb
 - lib/wcc/media/engine.rb
+- lib/wcc/media/live_stream.rb
 - lib/wcc/media/message.rb
 - lib/wcc/media/playlist.rb
 - lib/wcc/media/rails.rb
@@ -371,7 +386,7 @@ homepage: https://github.com/watermarkchurch/media/wcc-media-client
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -386,9 +401,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
+rubyforge_project:
 rubygems_version: 2.5.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: ''
 test_files: []