wrapi 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2879998432bd9b2be748b54c21024a68acf5cdba01ecc3040c9e9da45f02268
-  data.tar.gz: 63b482ee658b94a605f92faa52502efe1fa24bee5a918db27c773726f4a1e326
+  metadata.gz: 5b7bed56656363a708f42ca25752e0d7235e9172e479a929e2f0c42674f42197
+  data.tar.gz: 0d0ea9163649d1da64a89c37c548dbb657a98f74fd0da8e3eb871c6994afe8f7
 SHA512:
-  metadata.gz: 4913f5e123c1a2211e1c57b2b66e5712d1920ac667e38740d5047134fcc178aa82c1a509652da6f23ee16c54396025ed0959a4b95438d4026a2589b28de4d90e
-  data.tar.gz: 0772f0cdb948a5100df2f08a0fdaf356823f1fdfa0bb658817d3a3626540c54ec29cf92a9d1d4f83b2f957b990a73dce8c20bff8a537fd6e6c226aff7f956706
+  metadata.gz: 81cc81edf7e4e9cf2d6b0c837e599332dd717d0914b87aba76ce56da736cdd588a43b863dcf9196e7eec8c86fbfb1df5e5d6586292a5f58c619487f8b7952bff
+  data.tar.gz: d1e12b22efcaf3ba181dd62407f9acf4e15e2f45f7c03848d8c076763fdd94ad9904f3b3751bd5491a00a820e0bec8ffd53bef60e910e4f541b4df9a04ed1be3

data/CHANGELOG.md

@@ -39,4 +39,7 @@
 - fix typo and implement clone for entities
 
 ## [0.4.5] - 2024-03-12
-- rafactorings code readability
+- refactorings code readability
+
+## [0.4.6] - 2024-06-17
+- fix issue with loading Entity from yaml

data/lib/wrapi/entity.rb

@@ -4,25 +4,31 @@ 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
@@ -40,6 +46,7 @@ module WrAPI
       end
 
       def respond_to?(method_sym, include_private = false)
+        @attributes ||= {}
         if @attributes.include? method_sym.to_s
           true
         else
@@ -52,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
@@ -69,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

@@ -29,8 +29,7 @@ module WrAPI
           # 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
@@ -114,7 +113,12 @@ module WrAPI
         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

data/lib/wrapi/version.rb

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

metadata

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