k_util 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8615e74388467bff65c418f4367b9a6946ad9f1ed9dc7aaee45ccd81774a437
-  data.tar.gz: 8c752c2c0210b4aea25afeb5a6d41847a138d11a2af5e16bcad0d8ea35499b5d
+  metadata.gz: 38fccd7c4b972bc1f8c1c6af03b5b956292890aee4ceacbd4a5144b09c6d3b51
+  data.tar.gz: e20b45b314fac1440757b526b14cf30d228173ddc89e328205a1bb66a22384dc
 SHA512:
-  metadata.gz: ac0a9551cc6a4c8c463e0bdc8b4b209695d5d8a1fcfd7c633cdc33488725d81f9479f91e54ea3393d66312543135149a9838dce70eeb46943e1b868be564aa31
-  data.tar.gz: 6512cfa298e0bf08f3b29776326dd8e8be3ebe8a0c3162c2be8764cf791748d5421ee4efd14606c65b8192351e3163a8249a610abd9481258744dae95e045d33
+  metadata.gz: 151a8e8a701153e448edddb7cd238512163e24f99690e2bae9717d2a388b5b181126f032352977a3c53468f181bb29cecb51dda836c1a4a608e968360c8d5f86
+  data.tar.gz: 69b14793219fc0e9327b9707bd1cc243959faefb2b7643bbe28dc9a0cf34bcf2ef85e1db6872fddc8ea2eeff0375da8296195a9def8094c875841d9dee976340

data/lib/k_util/data_helper.rb

@@ -23,27 +23,31 @@ module KUtil
       end
     end
 
-    # rubocop:disable Metrics/AbcSize,  Metrics/CyclomaticComplexity
+    # rubocop:disable Metrics/AbcSize,  Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
     def to_hash(data)
       # No test yet
       if data.is_a?(Array)
         return data.map { |v| v.is_a?(OpenStruct) ? to_hash(v) : v }
       end
 
+      return to_hash(data.to_h) if !data.is_a?(Hash) && data.respond_to?(:to_h)
+
       data.each_pair.with_object({}) do |(key, value), hash|
         case value
-        when OpenStruct
+        when OpenStruct, Struct, Hash
           hash[key] = to_hash(value)
         when Array
           # No test yet
-          values = value.map { |v| v.is_a?(OpenStruct) ? to_hash(v) : v }
+          values = value.map do |v|
+            v.is_a?(OpenStruct) || v.is_a?(Struct) || v.is_a?(Hash) ? struct_to_hash(v) : v
+          end
           hash[key] = values
         else
           hash[key] = value
         end
       end
     end
-    # rubocop:enable Metrics/AbcSize,  Metrics/CyclomaticComplexity
+    # rubocop:enable Metrics/AbcSize,  Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
     def clean_symbol(value)
       return value if value.nil?

data/lib/k_util/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module KUtil
-  VERSION = '0.0.8'
+  VERSION = '0.0.9'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: k_util
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - David Cruwys