wcc-media-client 0.3.8 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af546b49bb12b5a071a1c813119cd096f20abc24
-  data.tar.gz: 10bb50350612f7d30bf13031b389511f34b9c917
+  metadata.gz: 360b25849df0cec25c561c8b221b18ecae44fde7
+  data.tar.gz: aa267536df96372a69036b5a7b070681412f7a9c
 SHA512:
-  metadata.gz: ac0427c7a791bb3207877505948093eb07f49d3f2ae18f7be00d56f7fc8f3c2fab039ed62c079e8db3102ef33c9e27322eda8fdbbe2795028e126afae6dc7eac
-  data.tar.gz: 7118ce170ea25a683f07bdf8e83254e4ee74a571d08a43f4a70d90901b188b3e377d649aaf2fcafeeffbb3b3ae26fe7092fce78fc9570ac0bfa2047e1f6410cf
+  metadata.gz: 341cb15599bc49a57cec7487556334304abed2ca108777d7781f7259a193970ee38bde4e870d2c4c7338252e58825a3553e9b0b86f70b26803a42204de63a21d
+  data.tar.gz: 30e9f362bcd88803050fe6a59f1799973f7d77f33623bfe27b6207dda7356211b9fddcc146f4f75d9cfe846ce40a6391e6f79b5d7fa8c07e2fe710557ca10234

data/config/routes.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+WCC::Media::Engine.routes.draw do
+  match "/callbacks", to: Toot::HandlerService, via: :post
+end
+ActiveSupport::Notifications.instrument 'routes_loaded.engine.media.wcc'

data/lib/wcc/media/engine.rb

@@ -0,0 +1,81 @@
+# frozen_string_literal: true
+
+require 'active_job'
+require 'toot'
+require 'wcc/auth'
+require 'wcc/data'
+
+class WCC::Media::Engine < ::Rails::Engine
+  isolate_namespace WCC::Media
+
+  class << self
+    def subscribe(channel, handler = nil, &block)
+      handler ||= Proc.new(&block)
+      with_toot_config do |c|
+        c.subscribe :media, channel, handler
+      end
+      register_subscriptions
+    end
+
+    def initialized
+      # Don't register subscriptions unless
+      # 1. we mounted the engine and
+      # 2. something subscribed.
+      ::Toot.config.callback_url &&
+        ::Toot.config.subscriptions.any? { |s| s.source.name == :media }
+    end
+
+    def register_subscriptions
+      return unless initialized
+
+      raise StandardError, "WCC::Auth must be configured" unless WCC::Auth.config.app_name.present? && WCC::Auth.config.app_url.present?
+
+      RegistersSubscriptionsJob.perform_later
+    end
+
+    # Ensures toot is configured properly with the Media channel.  Note this is
+    # not done until an actual subscription is requested.
+    def with_toot_config(&block)
+      return ::Toot.config(&block) if @configured
+
+      ::Toot.config do |c|
+        media_api_url = WCC::Media::Client.default.api_url
+
+        c.source :media,
+          channel_prefix: "org.watermark.media.",
+          subscription_url: URI.join(media_api_url, '/toot/subscriptions')
+
+        # Note - use the [] method to override only if not set in client already
+        c[:http_connection] ||=
+          Faraday::Connection.new do |conn|
+            conn.use :client_app_token
+            conn.adapter :net_http
+          end
+
+        yield c
+      end
+      @configured = true
+    end
+  end
+
+  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
+    end
+  end
+
+  config.generators do |g|
+    g.test_framework :rspec, fixture: false
+  end
+
+  class RegistersSubscriptionsJob < ::ActiveJob::Base
+    self.queue_adapter = :async
+
+    def perform
+      Toot::RegistersSubscriptions.call
+    end
+  end
+end

data/lib/wcc/media/rails.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+require 'wcc/rails'
+require 'wcc/media/client'
+require 'wcc/media/engine'

data/lib/wcc/media/tag.rb

@@ -11,6 +11,7 @@ class WCC::Media::Tag < WCC::Media::Base
 
   %w[
     name
+    code
   ].each do |att|
     define_method att do
       raw[att]

data/lib/wcc/media/version.rb

@@ -1,5 +1,5 @@
 module WCC
   module Media
-    VERSION = '0.3.8'.freeze
+    VERSION = '0.4.0'.freeze
   end
 end

data/wcc-media-client.gemspec

@@ -25,6 +25,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_runtime_dependency 'wcc-api', '~> 0.3.1'
+  spec.add_runtime_dependency 'wcc-auth'
+  spec.add_runtime_dependency 'wcc-base', '~> 0.3.1'
   spec.add_runtime_dependency 'wcc-data', '~> 0.3.0'
 
   spec.add_development_dependency 'byebug'
@@ -33,9 +35,16 @@ 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 'rails', '~> 5.0'
   spec.add_development_dependency 'rake', '~> 12.3'
+  spec.add_development_dependency 'responders', '< 3.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'rspec-rails', '~> 3.7'
   spec.add_development_dependency 'rspec_junit_formatter', '~> 0.3.0'
+  spec.add_development_dependency 'sidekiq', '< 6.0'
+  spec.add_development_dependency 'sprockets', '< 4.0'
+  spec.add_development_dependency 'sqlite3', '~> 1.3.6'
+  spec.add_development_dependency 'toot', '~> 0.3.0'
   spec.add_development_dependency 'typhoeus', '~> 1.3'
   spec.add_development_dependency 'webmock', '~> 3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wcc-media-client
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.4.0
 platform: ruby
 authors:
 - Watermark Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-22 00:00:00.000000000 Z
+date: 2019-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: wcc-api
@@ -24,6 +24,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.1
+- !ruby/object:Gem::Dependency
+  name: wcc-auth
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: wcc-base
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: wcc-data
   requirement: !ruby/object:Gem::Requirement
@@ -128,6 +156,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -142,6 +184,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '12.3'
+- !ruby/object:Gem::Dependency
+  name: responders
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -156,6 +212,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.7'
 - !ruby/object:Gem::Dependency
   name: rspec_junit_formatter
   requirement: !ruby/object:Gem::Requirement
@@ -170,6 +240,62 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.0
+- !ruby/object:Gem::Dependency
+  name: sidekiq
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
+- !ruby/object:Gem::Dependency
+  name: sprockets
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.6
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.6
+- !ruby/object:Gem::Dependency
+  name: toot
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: typhoeus
   requirement: !ruby/object:Gem::Requirement
@@ -210,13 +336,16 @@ files:
 - Gemfile
 - Guardfile
 - README.md
+- config/routes.rb
 - lib/wcc/media/active_record_shim.rb
 - lib/wcc/media/base.rb
 - lib/wcc/media/cacheable.rb
 - lib/wcc/media/client.rb
 - lib/wcc/media/client/response.rb
+- lib/wcc/media/engine.rb
 - lib/wcc/media/message.rb
 - lib/wcc/media/playlist.rb
+- lib/wcc/media/rails.rb
 - lib/wcc/media/series.rb
 - lib/wcc/media/speaker.rb
 - lib/wcc/media/tag.rb