wcc-media-client 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 360b25849df0cec25c561c8b221b18ecae44fde7
-  data.tar.gz: aa267536df96372a69036b5a7b070681412f7a9c
+  metadata.gz: 26adba91ed34291d31b66a829cf650252ca667d5
+  data.tar.gz: b58140833fe65dbe42ef94ad5e7fa025264c9f16
 SHA512:
-  metadata.gz: 341cb15599bc49a57cec7487556334304abed2ca108777d7781f7259a193970ee38bde4e870d2c4c7338252e58825a3553e9b0b86f70b26803a42204de63a21d
-  data.tar.gz: 30e9f362bcd88803050fe6a59f1799973f7d77f33623bfe27b6207dda7356211b9fddcc146f4f75d9cfe846ce40a6391e6f79b5d7fa8c07e2fe710557ca10234
+  metadata.gz: 26bb6a9f269c700130cf35e10ba63bba84bcb9d57d3409f3de73b7c89e1de4d9926f783ecad9d27039f1c8b36bc7275f78732910363be8c0ff2ce52eb2f7a780
+  data.tar.gz: 1aafbcd559cd6432cb8f09236edd70eb14fb74bd86c6054ee5d9e40788947d2b4eee99808be3714cdb50c30eb81560533a016057598c28a5ca69ed5a3927a1f5

data/lib/wcc/media/client.rb

@@ -26,6 +26,10 @@ module WCC
         target
       ].freeze
 
+      CONFIGURABLE_PARAMS = PARAMS - %w[
+        offset
+      ]
+
       RESOURCES = {
         'messages' => WCC::Media::Message,
         'series' => WCC::Media::Series,
@@ -68,12 +72,19 @@ module WCC
           private
 
           def extract_params(filters)
-            filters.each_with_object({}) do |(k, _v), h|
+            filters.each_with_object(default_params) do |(k, _v), h|
               k_s = k.to_s
               h[k_s] = filters.delete(k) if PARAMS.include?(k_s)
             end
           end
 
+          def default_params
+            options.each_with_object({}) do |(k, v), h|
+              k = k.to_s
+              h[k] = v if CONFIGURABLE_PARAMS.include?(k)
+            end
+          end
+
           def apply_filters(filters, expected_filters)
             defaults = default_filters(expected_filters) || {}
             filters.each_with_object(defaults) do |(k, v), h|

data/lib/wcc/media/engine.rb

@@ -76,6 +76,21 @@ class WCC::Media::Engine < ::Rails::Engine
 
     def perform
       Toot::RegistersSubscriptions.call
+    rescue WCC::Data::Mapper::ServiceUnavailable => e
+      _handle_error(e)
+    rescue Faraday::ConnectionFailed => e
+      _handle_error(e)
+    rescue Toot::RegisterSubscriptionFailure => e
+      raise unless e.status == 503
+
+      _handle_error(e)
+    end
+
+    private
+
+    def _handle_error(err)
+      logger.error "Error registering subscriptions (Retrying in 5 minutes): #{err.class} #{err}"
+      retry_job wait: 5.minutes
     end
   end
 end

data/lib/wcc/media/version.rb

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

data/wcc-media-client.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   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_runtime_dependency 'wcc-data', '~> 0.3.3'
 
   spec.add_development_dependency 'byebug'
   spec.add_development_dependency 'guard', '~> 2.15'
@@ -41,10 +41,11 @@ Gem::Specification.new do |spec|
   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 'rubocop', '~> 0.60.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 'toot', '~> 0.4.1'
   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.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Watermark Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-16 00:00:00.000000000 Z
+date: 2019-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: wcc-api
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.3
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -240,6 +240,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.0
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.60.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.60.0
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
@@ -288,14 +302,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: typhoeus
   requirement: !ruby/object:Gem::Requirement