rest-client-wrapper 3.2.1 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 672349eafd0d9487fd074d58761e4aa8de061bf370d165359d8a6378a0911af0
-  data.tar.gz: 7445c62040064f225ed52d81e0413e3f0cad2bde4843476a2ec486dbe5a92bb9
+  metadata.gz: 8b402585e6034813c0b9d3fa1af05e943ca106f7cdcae0b0f6e205e822250304
+  data.tar.gz: 64390499b6848d1dab15c57a723b9b02bded8eedf2b5f3650e8f3f8ed789f3f2
 SHA512:
-  metadata.gz: 40477e74390f5cbc3f2fda466baf98cdaed8ce462508c1a40e881f190fba85449ef5dd1fc8c378bf2ab99a3dcefda97ea1bf19f2a94a78bb7206137aa1d3ff38
-  data.tar.gz: 9015cd901cfaa23fccd76f1f7b39223ed28f1c9a0111b10c080192a32cd0a0f2385c4f798b4a174966d991b2461fb0296a7ea673e1a2563b4067de463eb33b01
+  metadata.gz: 8769b420a7bfe481450e0665a3f4899564dff302769bf050f7d512564b828479529a5a3859dd8fb581d714e8b4452601e102a0d28226771bc57ece9f16b4cc88
+  data.tar.gz: 46a6573d732840fe66240d6773db7f07ecd274d70b3a7b794b44d1bb31eca85fe514a050726571afe47538b8b4a16b260013c872b20283eb52c515df47829d6f

data/lib/rest_client_wrapper/authenticators/basic.rb

@@ -29,9 +29,9 @@ module RestClientWrapper
 
       include Auth
 
-      def initialize(username:, password:)
-        @username = username
-        @password = password
+      def initialize(**config)
+        @username = config[:username]
+        @password = config[:password]
       end
 
       def generate_auth

data/lib/rest_client_wrapper/authenticators/custom.rb

@@ -32,9 +32,9 @@ module RestClientWrapper
 
       TYPE = %i[header query_param].freeze
 
-      def initialize(type:, auth_param:)
-        self.type = type
-        self.auth_param = auth_param
+      def initialize(**config)
+        self.type = config[:type]
+        self.auth_param = config[:auth_param]
       end
 
       def generate_auth

data/lib/rest_client_wrapper/authenticators/oauth.rb

@@ -36,9 +36,9 @@ module RestClientWrapper
 
       @@api_client = {} # rubocop:disable Style/ClassVars
 
-      def initialize(site:, token_url_path:, client_id:, client_secret:)
+      def initialize(client_id:, **config)
         @client_id = client_id
-        @@api_client[client_id] = { lock: Mutex.new, settings: { site: site, token_url_path: token_url_path, client_secret: client_secret }, access_token: nil, refresh_token: nil }
+        @@api_client[client_id] = { lock: Mutex.new, settings: config, access_token: nil, refresh_token: nil }
       end
 
       def tokens

data/lib/rest_client_wrapper/paginators/echo_paginator.rb

@@ -55,7 +55,7 @@ module RestClientWrapper
       private
 
       def _pagination_links(response)
-        next_l = response&.body.class == Hash ? response&.body&.[](:next) || "" : ""
+        next_l = response&.body.instance_of?(Hash) ? response&.body&.[](:next) || "" : ""
         next_h = Rack::Utils.parse_query(URI.parse(next_l)&.query)
         return next_h.symbolize_keys!
       end

data/lib/rest_client_wrapper/request.rb

@@ -21,20 +21,20 @@ module RestClientWrapper
   # Request
   class Request
 
-    attr_reader :uri, :headers, :http_method, :payload, :segment_params, :query_params
-    attr_writer :uri
+    attr_accessor :uri
+    attr_reader :headers, :http_method, :payload, :segment_params, :query_params
 
     DEFAULT_CONTENT_TYPE = { content_type: :json, accept: :json }.freeze # default content type for post and put requests
     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: {})
-      @uri = uri
-      self.headers = headers
-      self.http_method = http_method
-      self.segment_params = segment_params
-      self.payload = payload
-      self.query_params = query_params
+    def initialize(**params)
+      @uri = params[:uri]
+      self.headers = params[:headers].nil? ? {} : params[:headers]
+      self.http_method = params[:http_method]
+      self.segment_params = params[:segment_params].nil? ? {} : params[:segment_params]
+      self.payload = params[:payload].nil? ? {} : params[:payload]
+      self.query_params = params[:query_params].nil? ? {} : params[:query_params]
     end
 
     def http_method=(http_method)

data/lib/rest_client_wrapper/rest_client.rb

@@ -41,7 +41,7 @@ module RestClientWrapper
       }
     }.freeze
 
-    def initialize(host:, config: {})
+    def initialize(host:, **config)
       @host          = host
       @config        = config
       @retry_configs = {}.reverse_merge(DEFAULT_CONFIG[:retries])
@@ -129,7 +129,7 @@ module RestClientWrapper
 
     def _validate_request(request)
       # Regex to find segments in uri with the pattern <segment_param>
-      url_segments = request.uri.scan(/\<(.*?)\>/).flatten
+      url_segments = request.uri.scan(/<(.*?)>/).flatten
       url_segments.each do |url_segment|
         raise ArgumentError, "Segment parameter not provided for #{ url_segment }. URI #{ request.uri }" unless request.segment_params.include? url_segment.to_sym
       end
@@ -156,8 +156,8 @@ module RestClientWrapper
       return { ok: true } if response.body == "ok".to_json # Handle special case for Echo delete responses
 
       return JSON.parse(response.body, { object_class: Hash, symbolize_names: true })
-    rescue StandardError => e
-      raise RestClientError.new("Response could not be parsed as JSON", response, e)
+    rescue StandardError
+      return response.body
     end
 
     def _reset_retries

data/lib/rest_client_wrapper/version.rb

@@ -18,6 +18,6 @@
 
 module RestClientWrapper
 
-  VERSION = "3.2.1".freeze
+  VERSION = "4.0.0".freeze
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rest-client-wrapper
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 4.0.0
 platform: ruby
 authors:
 - University of Adelaide
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-09 00:00:00.000000000 Z
+date: 2021-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -195,7 +195,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.9
 signing_key:
 specification_version: 4
 summary: Rest client wrapper