rest-client-wrapper 3.0.3 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 850533c6b1b1da4dafb1059762820eb8085d43544d934b3a6db1e925228017e8
-  data.tar.gz: 8cafb6e965ae858ba748d970438faabdc3e92ec7a31c2c76f316f37d018caa4f
+  metadata.gz: a8dbb01db061166b6679d6664e71e9f7cc6b84c9644bca7f56cc231560bff32e
+  data.tar.gz: 0713c07b9fa1dd7f302a961f54b94362099a83af4787446f0b5a26826f7d2469
 SHA512:
-  metadata.gz: 2201ea8ebc813d0437933446da66d4f735493bb9c2cfb71cfe92c2cb6d4581db4d7ae1f6e4c8f6d31a219f40d06433db4803e1a3dc8b48be297a93e2e9d1115d
-  data.tar.gz: 971a6eb73f52120ecf6cf194b73e58a690e1449012bd50d450cc9b26952fd2037b2e10a66d2d886a695c57c8ff39ae60ae308f67c05f319649dae6975e8e0968
+  metadata.gz: '044878f94f5de478f4cb99314c77c01b95bfbb66ab50b42915b10c0a78a239a0acd3e3b7ab30f394fb1b7d4d253ca15c643f0923cce29cb4b0539d1885b8fb43'
+  data.tar.gz: b5aa02f91a1edc87fd2c4658dc4374231f865f0ca78dedb9fbe87353a7ee1909abbffeeb0b1612ae1e8e6c753c164c7a00ba6b01f10c8a0a7485d4a5bc612b92

data/lib/rest_client_wrapper/paginators/echo.rb

@@ -36,13 +36,13 @@ module RestClientWrapper
         @config = { limit: limit }
       end
 
-      def paginate(http_method:, uri:, query_params: {}, headers: {}, data: false)
+      def paginate(http_method:, uri:, segment_params: {}, query_params: {}, headers: {}, data: false)
         raise RestClientError.new("Client not set, unable to make API call", nil, nil) unless @rest_client
 
         query_params.reverse_merge!(@config)
         responses = []
         loop do
-          response = @rest_client.make_request({ http_method: http_method, uri: uri, query_params: query_params, headers: headers })
+          response = @rest_client.make_request({ http_method: http_method, uri: uri, segment_params: segment_params, query_params: query_params, headers: headers })
           block_given? ? yield(response) : (responses << response)
           links = _pagination_links(response)
           break unless links.key?(:offset)

data/lib/rest_client_wrapper/paginators/echo_paginator.rb

@@ -36,13 +36,13 @@ module RestClientWrapper
         @config = { limit: limit }
       end
 
-      def paginate(http_method:, uri:, query_params: {}, headers: {}, data: false)
+      def paginate(http_method:, uri:, segment_params: {}, query_params: {}, headers: {}, data: false)
         raise RestClientError.new("Client not set, unable to make API call", nil, nil) unless @rest_client
 
         query_params.reverse_merge!(@config)
         responses = []
         loop do
-          response = @rest_client.make_request({ http_method: http_method, uri: uri, query_params: query_params, headers: headers })
+          response = @rest_client.make_request({ http_method: http_method, uri: uri, segment_params: segment_params, query_params: query_params, headers: headers })
           block_given? ? yield(response) : (responses << response)
           links = _pagination_links(response)
           break unless links.key?(:offset)

data/lib/rest_client_wrapper/paginators/header_link.rb

@@ -36,14 +36,14 @@ module RestClientWrapper
         @config = { page: nil, per_page: per_page }
       end
 
-      def paginate(http_method:, uri:, query_params: {}, headers: {}, data: false)
+      def paginate(http_method:, uri:, segment_params: {}, query_params: {}, headers: {}, data: false)
         raise RestClientError.new("Client not set, unable to make API call", nil, nil) unless @rest_client
 
         query_params.reverse_merge!(@config)
         responses = []
         loop.with_index(1) do |_, page|
           query_params[:page] = page
-          response = @rest_client.make_request({ http_method: http_method, uri: uri, query_params: query_params, headers: headers })
+          response = @rest_client.make_request({ http_method: http_method, uri: uri, segment_params: segment_params, query_params: query_params, headers: headers })
           block_given? ? yield(response) : (responses << response)
           links = _pagination_links(response)
           break unless links.key?(:next)

data/lib/rest_client_wrapper/paginators/header_link_paginator.rb

@@ -36,14 +36,14 @@ module RestClientWrapper
         @config = { page: nil, per_page: per_page }
       end
 
-      def paginate(http_method:, uri:, query_params: {}, headers: {}, data: false)
+      def paginate(http_method:, uri:, segment_params: {}, query_params: {}, headers: {}, data: false)
         raise RestClientError.new("Client not set, unable to make API call", nil, nil) unless @rest_client
 
         query_params.reverse_merge!(@config)
         responses = []
         loop.with_index(1) do |_, page|
           query_params[:page] = page
-          response = @rest_client.make_request({ http_method: http_method, uri: uri, query_params: query_params, headers: headers })
+          response = @rest_client.make_request({ http_method: http_method, uri: uri, segment_params: segment_params, query_params: query_params, headers: headers })
           block_given? ? yield(response) : (responses << response)
           links = _pagination_links(response)
           break unless links.key?(:next)

data/lib/rest_client_wrapper/request.rb

@@ -28,7 +28,7 @@ module RestClientWrapper
     VALID_HTTP_METHODS = %i[get post put patch delete connect options trace].freeze
     HTTP_METHOD_FOR_JSON = %i[post put patch].freeze
 
-    def initialize(http_method:, uri:, segment_params: {}, payload: {}, query_params: {}, headers: {}) # rubocop:disable Metrics/ParameterLists
+    def initialize(http_method:, uri:, segment_params: {}, payload: {}, query_params: {}, headers: {})
       @uri = uri
       self.headers = headers
       self.http_method = http_method

data/lib/rest_client_wrapper/rest_client.rb

@@ -84,22 +84,21 @@ module RestClientWrapper
       end
     end
 
-    def make_request(http_method:, uri:, payload: {}, query_params: {}, headers: {})
-      parsed_uri = URI.parse(uri)
-
-      raise ArgumentError, "URL host does not match config host of instance, unable to make API call" if parsed_uri.absolute? && @host.casecmp("#{ parsed_uri.scheme }://#{ parsed_uri.host }").nonzero?
+    def execute_paginated_request(request:, data: true)
+      return self.make_request_for_pages({ http_method: request.http_method, uri: request.uri, segment_params: request.segment_params, query_params: request.query_params, headers: request.headers, data: data }) # rubocop:disable Metrics/LineLength
+    end
 
-      uri = parsed_uri.absolute? ? parsed_uri.path : uri
-      request = Request.new({ http_method: http_method, uri: uri, payload: payload, query_params: query_params })
+    def make_request(http_method:, uri:, payload: {}, segment_params: {}, query_params: {}, headers: {})
+      request = Request.new({ http_method: http_method, uri: uri, payload: payload, segment_params: segment_params, query_params: query_params })
       request.headers = headers
       return self.execute({ request: request })
     end
 
-    def make_request_for_pages(http_method:, uri:, query_params: {}, headers: {}, data: false)
+    def make_request_for_pages(http_method:, uri:, segment_params: {}, query_params: {}, headers: {}, data: false)
       raise RestClientError.new("Paginator not set, unable to make API call", nil, nil) unless @paginator
 
       @paginator.rest_client ||= self
-      return @paginator.paginate({ http_method: http_method, uri: uri, query_params: query_params, headers: headers, data: data })
+      return @paginator.paginate({ http_method: http_method, uri: uri, segment_params: segment_params, query_params: query_params, headers: headers, data: data })
     end
 
     private
@@ -121,7 +120,11 @@ module RestClientWrapper
     end
 
     def _build_uri(request)
-      return format("#{ @host }#{ request.uri }", request.segment_params)
+      uri = format(request.uri, request.segment_params)
+      parsed_uri = URI.parse(uri)
+      raise ArgumentError, "URL host does not match config host of instance, unable to make API call" if parsed_uri.absolute? && @host.casecmp("#{ parsed_uri.scheme }://#{ parsed_uri.host }").nonzero?
+
+      return parsed_uri.absolute? ? uri : "#{ @host }#{ uri }"
     end
 
     def _validate_request(request)

data/lib/rest_client_wrapper/version.rb

@@ -18,6 +18,6 @@
 
 module RestClientWrapper
 
-  VERSION = "3.0.3".freeze
+  VERSION = "3.1.0".freeze
 
 end

data/rest-client-wrapper.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |s|
   s.summary     = "Rest client wrapper"
   s.description = "Generic REST client wrapper"
   s.license     = "GPL 3.0"
-  s.required_ruby_version = ">= 2.4.0"
+  s.required_ruby_version = ">= 2.6.0"
 
   s.add_runtime_dependency "json", "~> 1.8", ">= 1.8.3"
   s.add_runtime_dependency "oauth2", "~> 1.2"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rest-client-wrapper
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.1.0
 platform: ruby
 authors:
 - University of Adelaide
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-28 00:00:00.000000000 Z
+date: 2019-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -194,14 +194,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Rest client wrapper