wrapi 0.4.4 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cbba7a5999de019875c356dc158b4061bd417cc4f2d21364c2e18bdcac715ac2
-  data.tar.gz: 8932fd54e9872f43b3e64b4b31554ca71e55987fc35a096bcc10162022773036
+  metadata.gz: 5b7bed56656363a708f42ca25752e0d7235e9172e479a929e2f0c42674f42197
+  data.tar.gz: 0d0ea9163649d1da64a89c37c548dbb657a98f74fd0da8e3eb871c6994afe8f7
 SHA512:
-  metadata.gz: 0f95131accc766c77a6e81ffa8702dc501137478e5fc8d58589e058f30de4886afbc1b1c469f38a33a06c0b2b4177f26db701be033122000a901485b9c02ecb8
-  data.tar.gz: 885c32718e57b86b9bf395d392263bc0c60044929dc7cf86dba5f80209ba1b7d1c7815fc345ff904836c0838af51e39fe408d4a7f49678eae62da1c93ecf1f64
+  metadata.gz: 81cc81edf7e4e9cf2d6b0c837e599332dd717d0914b87aba76ce56da736cdd588a43b863dcf9196e7eec8c86fbfb1df5e5d6586292a5f58c619487f8b7952bff
+  data.tar.gz: d1e12b22efcaf3ba181dd62407f9acf4e15e2f45f7c03848d8c076763fdd94ad9904f3b3751bd5491a00a820e0bec8ffd53bef60e910e4f541b4df9a04ed1be3

data/CHANGELOG.md

@@ -37,3 +37,9 @@
 
 ## [0.4.4] - 2024-03-12
 - fix typo and implement clone for entities
+
+## [0.4.5] - 2024-03-12
+- refactorings code readability
+
+## [0.4.6] - 2024-06-17
+- fix issue with loading Entity from yaml

data/lib/wrapi/entity.rb

@@ -4,32 +4,39 @@ module WrAPI
   # Defines HTTP request methods
   module Request
     class Entity
-      attr_reader :attributes
-
       # factory method to create entity or array of entities
-      def self.create(attributes)
-        if attributes.is_a? Array
-          Entity.entify(attributes)
+      def self.create(attr)
+        if attr.is_a? Array
+          Entity.entify(attr)
         else
-          Entity.new(attributes) if attributes
+          Entity.new(attr) if attr
         end
       end
 
-      def initialize(attributes)
-        case attributes
+      def initialize(attr)
+        case attr
         when Hash
-          @attributes = attributes.clone.transform_keys(&:to_s)
+          @attributes = attr.clone.transform_keys(&:to_s)
         else
-          @attributes = attributes.clone
+          @attributes = attr.clone
         end
       end
+      
+      def attributes
+        @attributes || {}
+      end
+
+      def attributes= val
+        @attributes = val || {}
+      end
 
       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
@@ -39,6 +46,7 @@ module WrAPI
       end
 
       def respond_to?(method_sym, include_private = false)
+        @attributes ||= {}
         if @attributes.include? method_sym.to_s
           true
         else
@@ -51,15 +59,15 @@ module WrAPI
       end
 
       def accessor(method)
-          case @attributes[method]
-          when Hash
-            @attributes[method] = self.class.new(@attributes[method])
-          when Array
-            # make deep copy
-            @attributes[method] = Entity.entify(@attributes[method])
-          else
-            @attributes[method]
-          end
+        case @attributes[method]
+        when Hash
+          @attributes[method] = self.class.new(@attributes[method])
+        when Array
+          # make deep copy
+          @attributes[method] = Entity.entify(@attributes[method])
+        else
+          @attributes[method]
+        end
       end
       
       def clone
@@ -68,6 +76,11 @@ module WrAPI
         c
       end
 
+      def ==(other)
+        (self.class == other.class) && (self.attributes.eql? other.attributes)
+      end
+      alias eql? ==
+
       def self.entify(a)
         if ( a.count > 0 ) && ( a.first.is_a? Hash )
           a.dup.map do |item|

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,18 +26,14 @@ 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)
-          d = Entity.create(d)
+        handle_data(response.body,pager) do |d|
           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 +72,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 +82,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 +91,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 +104,28 @@ 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
+    def handle_data(body,pager)
+      if d = pager.class.data(body)
+        d = Entity.create(d)
+        yield(d) if block_given?
+      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.6'
 end

metadata

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