wcc-media-client 0.2.4 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab09c5594cc3c465e250a8aff766c6af21055316
-  data.tar.gz: dd66f0f3e46cb41368e96bb0bbe1758844604681
+  metadata.gz: 5d99e5accc0f31100188ebd4828c70e4c6a01587
+  data.tar.gz: c8e7a0440d77d584d0d6fd5c31a7f8b4653b586b
 SHA512:
-  metadata.gz: f80dd6f5ee11263e496ebc5341b3cba37d065b56a80ef3a8a658e24d37ac394122cd26d7eabe27433cbbe949de2063448dca95096841240bf39637f0b92127fd
-  data.tar.gz: 0a6dc9994037e417f35449971716db01f596d05843105d9dca75bc8dc9cce9681babe8c4418d6f3c8a9384170e25587a6bdafe94678b1b50879c5ceb98e1db07
+  metadata.gz: 27cd7495cd94f831ffe43e6f3ace6eb361fd1692610c2292a5d97ddf913246d5f30c5095ca939cbb32d6db2682a4203bc307b317f024140fd2cfa263f902481f
+  data.tar.gz: f27fdaa1c3e889d8905c3fea8af49aceff523fcb9edfb82b424280463c4d78b48a071999dc2e4d7899ed749f5808313a4613f50385a517f01d2ce12816ca28aa

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

@@ -1,7 +1,7 @@
 module WCC
   module Media
-    class Client < RestClient
-      class Response < RestClient::AbstractResponse
+    class Client < ::WCC::API::RestClient
+      class Response < AbstractResponse
         def skip
           body.dig('pagination', 'offset')
         end
@@ -26,4 +26,4 @@ module WCC
       end
     end
   end
-end
+end

data/lib/wcc/media/client.rb

@@ -1,4 +1,4 @@
-require_relative '../../rest_client'
+require 'wcc/api/rest_client'
 require_relative 'message'
 require_relative 'series'
 require_relative 'speaker'
@@ -7,7 +7,7 @@ require_relative 'client/response'
 
 module WCC
   module Media
-    class Client < RestClient
+    class Client < ::WCC::API::RestClient
       class << self
         attr_writer :default
         # The default client.  Set this in an initializer to change the client used
@@ -91,4 +91,4 @@ module WCC
         end
     end
   end
-end
+end

data/lib/wcc/media/version.rb

@@ -0,0 +1,5 @@
+module WCC
+  module Media
+    VERSION = '0.3.0'.freeze
+  end
+end

data/wcc-media-client.gemspec

@@ -2,11 +2,11 @@
 
 lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'wcc/media/client/version'
+require 'wcc/media/version'
 
 Gem::Specification.new do |spec|
   spec.name          = 'wcc-media-client'
-  spec.version       = WCC::Media::Client::VERSION
+  spec.version       = WCC::Media::VERSION
   spec.authors       = ['Watermark Dev']
   spec.email         = ['dev@watermark.org']
 
@@ -24,6 +24,8 @@ Gem::Specification.new do |spec|
 
   spec.require_paths = ['lib']
 
+  spec.add_runtime_dependency 'wcc-api', '>= 0.3.0'
+
   spec.add_development_dependency 'byebug'
   spec.add_development_dependency 'http', '> 1.0', '< 3.0'
   spec.add_development_dependency 'httplog', '~> 1.0'

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: wcc-media-client
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors:
 - Watermark Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-30 00:00:00.000000000 Z
+date: 2019-02-11 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: wcc-api
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -139,21 +153,16 @@ files:
 - ".rubocop.yml"
 - Gemfile
 - README.md
-- lib/rest_client.rb
-- lib/rest_client/api_error.rb
-- lib/rest_client/http_adapter.rb
-- lib/rest_client/response.rb
-- lib/rest_client/typhoeus_adapter.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/client/version.rb
 - lib/wcc/media/message.rb
 - lib/wcc/media/series.rb
 - lib/wcc/media/speaker.rb
 - lib/wcc/media/tag.rb
+- lib/wcc/media/version.rb
 - rakefile
 - wcc-media-client.gemspec
 homepage: https://github.com/watermarkchurch/media/wcc-media-client
@@ -176,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: ''

data/lib/rest_client/api_error.rb

@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-class RestClient
-  class ApiError < StandardError
-    attr_reader :response
-
-    def self.[](code)
-      case code
-      when 404
-        NotFoundError
-      else
-        ApiError
-      end
-    end
-
-    def initialize(response)
-      @response = response
-      super(response.error_message)
-    end
-  end
-
-  class NotFoundError < ApiError
-  end
-end

data/lib/rest_client/http_adapter.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-gem 'http'
-require 'http'
-
-class HttpAdapter
-  def call(url, query, headers = {}, proxy = {})
-    if proxy[:host]
-      HTTP[headers].via(proxy[:host], proxy[:port], proxy[:username], proxy[:password])
-        .get(url, params: query)
-    else
-      HTTP[headers].get(url, params: query)
-    end
-  end
-end

data/lib/rest_client/response.rb

@@ -1,133 +0,0 @@
-# frozen_string_literal: true
-
-require 'forwardable'
-require_relative 'api_error'
-
-class RestClient
-  class AbstractResponse
-    extend ::Forwardable
-
-    attr_reader :raw_response
-    attr_reader :raw_body
-    attr_reader :client
-    attr_reader :request
-
-    def_delegators :raw_response, :code, :headers
-
-    def body
-      @body ||= JSON.parse(raw_body)
-    end
-    alias_method :to_json, :body
-
-    def initialize(client, request, raw_response)
-      @client = client
-      @request = request
-      @raw_response = raw_response
-      @raw_body = raw_response.body.to_s
-    end
-
-    def skip
-      throw new NotImplementedError, 'Please implement "skip" parsing in response class'
-    end
-
-    def count
-      throw new NotImplementedError, 'Please implement "count" parsing in response class'
-    end
-
-    def collection_response?
-      page_items.nil? ? false : true
-    end
-
-    def page_items
-      throw new NotImplementedError, 'Please implement "page_items" parsing in response class'
-    end
-
-    def error_message
-      parsed_message =
-        begin
-          body.dig('error', 'message') || body.dig('message')
-        rescue JSON::ParserError
-          nil
-        end
-      parsed_message || "#{code}: #{raw_response.body}"
-    end
-
-    def next_page?
-      return false unless collection_response?
-
-      page_items.length + skip < count
-    end
-
-    def next_page
-      return unless next_page?
-
-      @next_page ||= @client.get(
-        @request[:url],
-        (@request[:query] || {}).merge(next_page_query)
-      )
-      @next_page.assert_ok!
-    end
-
-    def assert_ok!
-      return self if code >= 200 && code < 300
-
-      raise ApiError[code], self
-    end
-
-    # This method has a bit of complexity that is better kept in one location
-    def each_page(&block)
-      raise ArgumentError, 'Not a collection response' unless collection_response?
-
-      ret =
-        Enumerator.new do |y|
-          y << self
-
-          if next_page?
-            next_page.each_page.each do |page|
-              y << page
-            end
-          end
-        end
-
-      if block_given?
-        ret.map(&block)
-      else
-        ret.lazy
-      end
-    end
-
-    def items
-      return unless collection_response?
-
-      each_page.flat_map(&:page_items)
-    end
-
-    def first
-      raise ArgumentError, 'Not a collection response' unless collection_response?
-
-      page_items.first
-    end
-
-    def next_page_query
-      return unless collection_response?
-
-      {
-        skip: page_items.length + skip,
-      }
-    end
-  end
-
-  class DefaultResponse < AbstractResponse
-    def skip
-      body['skip']
-    end
-
-    def count
-      body['total']
-    end
-
-    def page_items
-      body['items']
-    end
-  end
-end

data/lib/rest_client/typhoeus_adapter.rb

@@ -1,32 +0,0 @@
-# frozen_string_literal: true
-
-require 'forwardable'
-gem 'typhoeus'
-require 'typhoeus'
-
-class RestClient
-  class TyphoeusAdapter
-    def call(url, query, headers = {}, proxy = {})
-      raise NotImplementedError, 'Proxying Not Yet Implemented' if proxy[:host]
-
-      TyphoeusAdapter::Response.new(
-        Typhoeus.get(
-          url,
-          params: query,
-          headers: headers
-        )
-      )
-    end
-
-    Response =
-      Struct.new(:raw) do
-        extend Forwardable
-
-        def_delegators :raw, :body, :to_s, :code, :headers
-
-        def status
-          raw.code
-        end
-      end
-  end
-end

data/lib/rest_client.rb

@@ -1,81 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'rest_client/response'
-
-class RestClient
-  attr_reader :api_url
-
-  def initialize(api_url:, headers: nil, **options)
-    # normalizes a URL to have a slash on the end
-    @api_url = api_url.gsub(/\/+$/, '') + '/'
-
-    @adapter = RestClient.load_adapter(options[:adapter])
-
-    @options = options
-    @query_defaults = {}
-    @headers = {
-      'Accept' => 'application/json',
-    }.merge(headers || {}).freeze
-    @response_class = options[:response_class] || DefaultResponse
-  end
-
-  # performs an HTTP GET request to the specified path within the configured
-  # space and environment.  Query parameters are merged with the defaults and
-  # appended to the request.
-  def get(path, query = {})
-    url = URI.join(@api_url, path)
-
-    @response_class.new(self,
-      { url: url, query: query },
-      get_http(url, query))
-  end
-
-  ADAPTERS = {
-    http: ['http', '> 1.0', '< 3.0'],
-    typhoeus: ['typhoeus', '~> 1.0'],
-  }.freeze
-
-  # This method is long due to the case statement,
-  # not really a better way to do it
-  def self.load_adapter(adapter)
-    case adapter
-    when nil
-      ADAPTERS.each do |a, spec|
-        begin
-          gem(*spec)
-          return load_adapter(a)
-        rescue Gem::LoadError
-          next
-        end
-      end
-      raise ArgumentError, 'Unable to load adapter!  Please install one of '\
-        "#{ADAPTERS.values.map(&:join).join(',')}"
-    when :http
-      require_relative 'rest_client/http_adapter'
-      HttpAdapter.new
-    when :typhoeus
-      require_relative 'rest_client/typhoeus_adapter'
-      TyphoeusAdapter.new
-    else
-      unless adapter.respond_to?(:call)
-        raise ArgumentError, "Adapter #{adapter} is not invokeable!  Please "\
-          "pass a proc or use one of #{ADAPTERS.keys}"
-      end
-      adapter
-    end
-  end
-
-  private
-
-  def get_http(url, query, headers = {}, proxy = {})
-    headers = @headers.merge(headers || {})
-
-    q = @query_defaults.dup
-    q = q.merge(query) if query
-
-    resp = @adapter.call(url, q, headers, proxy)
-
-    resp = get_http(resp.headers['location'], nil, headers, proxy) if [301, 302, 307].include?(resp.code) && !@options[:no_follow_redirects]
-    resp
-  end
-end

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

@@ -1,9 +0,0 @@
-require_relative '../../../rest_client'
-
-module WCC
-  module Media
-    class Client < RestClient
-      VERSION = '0.2.4'.freeze
-    end
-  end
-end