wrapi 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cbba7a5999de019875c356dc158b4061bd417cc4f2d21364c2e18bdcac715ac2
-  data.tar.gz: 8932fd54e9872f43b3e64b4b31554ca71e55987fc35a096bcc10162022773036
+  metadata.gz: b2879998432bd9b2be748b54c21024a68acf5cdba01ecc3040c9e9da45f02268
+  data.tar.gz: 63b482ee658b94a605f92faa52502efe1fa24bee5a918db27c773726f4a1e326
 SHA512:
-  metadata.gz: 0f95131accc766c77a6e81ffa8702dc501137478e5fc8d58589e058f30de4886afbc1b1c469f38a33a06c0b2b4177f26db701be033122000a901485b9c02ecb8
-  data.tar.gz: 885c32718e57b86b9bf395d392263bc0c60044929dc7cf86dba5f80209ba1b7d1c7815fc345ff904836c0838af51e39fe408d4a7f49678eae62da1c93ecf1f64
+  metadata.gz: 4913f5e123c1a2211e1c57b2b66e5712d1920ac667e38740d5047134fcc178aa82c1a509652da6f23ee16c54396025ed0959a4b95438d4026a2589b28de4d90e
+  data.tar.gz: 0772f0cdb948a5100df2f08a0fdaf356823f1fdfa0bb658817d3a3626540c54ec29cf92a9d1d4f83b2f957b990a73dce8c20bff8a537fd6e6c226aff7f956706

data/CHANGELOG.md

@@ -37,3 +37,6 @@
 
 ## [0.4.4] - 2024-03-12
 - fix typo and implement clone for entities
+
+## [0.4.5] - 2024-03-12
+- rafactorings code readability

data/lib/wrapi/entity.rb

@@ -26,10 +26,11 @@ module WrAPI
 
       def method_missing(method_sym, *arguments, &block)
         # assignment
-        if (method = method_sym[/.*(?==\z)/m])
+        assignment = method_sym[/.*(?==\z)/m]
+        if assignment
           raise ArgumentError, "wrong number of arguments (given #{arguments.length}, expected 1)", caller(1) unless arguments.length == 1
 
-          @attributes[method] = arguments[0]
+          @attributes[assignment] = arguments[0]
         elsif @attributes.include? method_sym.to_s
           accessor(method_sym.to_s)
         else

data/lib/wrapi/request.rb

@@ -5,11 +5,12 @@ module WrAPI
   # Defines HTTP request methods
   # required attributes format
   module Request
-
+    CONTENT_TYPE_HDR = 'Content-Type'.freeze
     # Perform an HTTP GET request and return entity incase format is :json
     #  @return if format is :json and !raw an [Entity] is returned, otherwhise the response body
     def get(path, options = {}, raw=false)
       response = request(:get, path, options) do |request|
+        # inject headers...
         yield(request) if block_given?
       end
       entity_response(response, raw)
@@ -25,6 +26,7 @@ module WrAPI
       pager = create_pager
       while pager.more_pages?
         response = request(:get, path, options.merge(pager.page_options)) do |req|
+          # inject headers...
           request_labda.call(req) if request_labda
         end
         if d = pager.class.data(response.body)
@@ -32,11 +34,7 @@ module WrAPI
           if block_given?
             yield(d)
           else
-            if d.is_a? Array
-              result += d
-            else
-              result << d
-            end
+            result = add_data(result,d)
           end
         end
         pager.next_page!(response.body)
@@ -75,7 +73,7 @@ module WrAPI
       format && 'json'.eql?(format.to_s)
     end
 
-    private
+  private
 
     def create_pager
       pagination_class ? pagination_class.new(page_size) : WrAPI::RequestPagination::DefaultPager
@@ -85,7 +83,7 @@ module WrAPI
     def request(method, path, options)
       response = connection.send(method) do |request|
         yield(request) if block_given?
-        request.headers['Content-Type'] = "application/#{format}" unless request.headers['Content-Type']
+        request.headers[CONTENT_TYPE_HDR] = "application/#{format}" unless request.headers[CONTENT_TYPE_HDR]
         uri = URI::Parser.new
         _path = uri.parse(path)
         _path.path = uri.escape(_path.path)
@@ -94,11 +92,7 @@ module WrAPI
           request.url(_path.to_s, options)
         when :post, :put
           request.path = _path.to_s
-          if is_json? && !options.empty?
-            request.body = options.to_json
-          else
-            request.body = URI.encode_www_form(options) unless options.empty?
-          end
+          set_body(request,options)
         end
       end
       response
@@ -111,5 +105,23 @@ module WrAPI
         response
       end
     end
+
+    # set post body depending json content-type
+    def set_body(request,options)
+      if is_json? && !options.empty?
+        request.body = options.to_json
+      else
+        request.body = URI.encode_www_form(options) unless options.empty?
+      end
+    end
+
+    # add data to array and check if data itself is an array
+    def add_data(result,data)
+      if data.is_a? Array
+        result += data
+      else
+        result << data
+      end
+    end
   end
 end

data/lib/wrapi/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wrapi
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - Janco Tanis
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-03-12 00:00:00.000000000 Z
+date: 2024-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday