wrapi 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f1cf824802fe7b24c8df963fcf6598e650d4bcf8393f4d685cab9f4825838ca
-  data.tar.gz: 4f7b2f485cdbbcf3e2f10aa64fa0d562d789bb23aa2e6c47611bb7ff5a86db29
+  metadata.gz: 1d7d0d197548b78702536dcb3ffd582f1a637ba7c4563b678b682702a55f1f92
+  data.tar.gz: 944dd3cb645f422900a45ff8728a08f47472abb98c64e7c3c34a3a8e696ad0d0
 SHA512:
-  metadata.gz: d601f302816a8e521bfd00985f04391a939c4f416a06e7b5accb0701a6c02109f7653b4be0ea8d7b12b191f867284959e0068a1b84495c082dd600c094636e2e
-  data.tar.gz: 16c72f9028b2060dc39b28a9c7037e3d2fba2ebe2a1079a2dbfe3eef2f9ed198ecc60c7dd4ae0c61a1cf79ddefe4638789b4e5072e07da36236b0cf4d3fc92f6
+  metadata.gz: 51854938895ac5cfdcb616fd9a6a6de72ed0e4a7544bea9eca525b64b8c370b2dbc9b0ca2b596fcbd1838f7b4eaec0a4fa476666e1bca79436f448c647d358cb
+  data.tar.gz: fe27c57580cf3d50d49830d0b1449d177f0de21cb077eb12a3cc953351c1f3d9dc898de8cf4391130dea6f5e549cf9b6530928094cf5866482fefb5e1d795cca

data/CHANGELOG.md

@@ -15,3 +15,6 @@
 ## [0.2.0] - 2024-02-8
 - implement json pagination
 
+## [0.2.0] - 2024-02-13
+- implement option to manipulate request
+

data/Gemfile

@@ -6,4 +6,4 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'rake', '~> 13.0'
-gem 'rubocop', "~> 1.7'
+gem 'rubocop', '~> 1.7'

data/lib/wrapi/connection.rb

@@ -52,9 +52,9 @@ module WrAPI
       connection.response :logger, logger, { headers: true, bodies: true } do |l|
         # filter json content
         l.filter(/("password":")(.+?)(".*)/, '\1[REMOVED]\3')
-        l.filter(/("accessToken":")(.+?)(".*)/, '\1[REMOVED]\3')
+        l.filter(/("[Aa]ccess_?[Tt]oken":")(.+?)(".*)/, '\1[REMOVED]\3')
         # filter header content
-        l.filter(/(client-secret:.)([^&]+)/, '\1[REMOVED]')
+        l.filter(/(client[-_]secret[:=].)([^&]+)/, '\1[REMOVED]')
         l.filter(/(Authorization:.)([^&]+)/, '\1[REMOVED]')
       end
     end

data/lib/wrapi/pagination.rb

@@ -6,7 +6,7 @@ module WrAPI
   # required attributes format
   module RequestPagination
 
-    # Defaut pages asumes all sdata retrieved in a single go.
+    # Defaut pages asumes all data retrieved in a single go.
     class DefaultPager
 
       # initialize with page size

data/lib/wrapi/request.rb

@@ -7,26 +7,40 @@ module WrAPI
   module Request
 
     # Perform an HTTP GET request and return entity incase format is :json
+    #  @return if format is :json an [Entity] is returned, otherwhise the response body
     def get(path, options = {})
-      response = request(:get, path, options)
+      response = request(:get, path, options) do |request|
+        yield(request) if block_given?
+      end
       :json.eql?(format) ? Entity.new(pagination_class.data(response.body)) : response.body
     end
 
     # Perform an HTTP GET request for paged date sets response
-    def get_paged(path, options = {}, &block)
+    #  @return nil if block given, otherwise complete concatenated json result set
+    def get_paged(path, options = {}, request_labda = nil)
       raise ArgumentError,
             "Pages requests should be json formatted (given format '#{format}')" unless :json.eql? format
 
       result = []
       pager = create_pager
       while pager.more_pages?
-        response = request(:get, path, options.merge(pager.page_options))
-        #data = response.body
-        d = pager.class.data(response.body).map { |e| Entity.new(e) }
+        response = request(:get, path, options.merge(pager.page_options)) do |req|
+          request_labda.call(req) if request_labda
+        end
+        d = pager.class.data(response.body)
+        if d.is_a? Array
+          d = pager.class.data(response.body).map { |e| Entity.new(e) }
+        else
+          d = Entity.new(d)
+        end
         if block_given?
           yield(d)
         else
-          result += d
+          if d.is_a? Array
+            result += d
+          else
+            result << d
+          end
         end
         pager.next_page!(response.body)
       end
@@ -34,29 +48,39 @@ module WrAPI
     end
 
     # Perform an HTTP POST request
+    # @return response is returned in json if format is :json
     def post(path, options = {})
-      request(:post, path, options)
+      response = request(:post, path, options) do |request|
+        yield(request) if block_given?
+      end
     end
 
     # Perform an HTTP PUT request
+    # @return response is returned in json if format is :json
     def put(path, options = {})
-      request(:put, path, options)
+      response = request(:put, path, options) do |request|
+        yield(request) if block_given?
+      end
     end
 
     # Perform an HTTP DELETE request
+    # @return response is returened
     def delete(path, options = {})
-      request(:delete, path, options)
+      response = request(:delete, path, options) do |request|
+        yield(request) if block_given?
+      end
     end
 
     private
 
     def create_pager
-      pagination_class.new(page_size)
+      pagination_class ? pagination_class.new(page_size) : WrAPI::RequestPagination::DefaultPager
     end
 
     # Perform an HTTP request
     def request(method, path, options)
       response = connection.send(method) do |request|
+        yield(request) if block_given?
         uri = URI::Parser.new
         case method
         when :get, :delete

data/lib/wrapi/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module WrAPI
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wrapi
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Janco Tanis
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-02-08 00:00:00.000000000 Z
+date: 2024-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday