k_util 0.0.17 → 0.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b57165e4a0192dcffbfd3655e45b326bcc00db6ce32d1b72116516d32d8a5c07
-  data.tar.gz: 79ee2191737f976495009f303fb7db18f0ae9e52b6b344eb642dab5ae2884b6c
+  metadata.gz: 8b52770ba6a289d791e99eb4fcf868f87281200424ff7817c07e10b8dd1a4701
+  data.tar.gz: 23ec84b2db507096fd6593360c08570fcb3eac84676edd89f94666b81d8c1a28
 SHA512:
-  metadata.gz: 21de731f6f1d53e8d1a28df7e1f5d80058955a517d774960f0d7362c778062cac0e9445c5d6d2cde6a88a9ce1619810dce9d5103b8a5b62d83707fce34aaabc3
-  data.tar.gz: 6d062276df66896e21ffa92e07dd25d38f7951da46fcaba6ab5ced669cedd7decd669df11a7902b251589e2f17dda4bb2d7aaf61911f5c08277e20a208b6a314
+  metadata.gz: 78ee597e330cda00891023bb95bbbacfe07178accad429d4724805a7f60f853d0ace04c74ff91c540b3a71a34ef722e3cd1606092c957ac5a368aa7c440a38cd
+  data.tar.gz: 0f7f5913e389eb066f42819040211d68791735a32b9c1af3572fdd08712adcbe4ddfb5c1e3732004be89ef4ba842ef5a339887021426e1e655b6d06ed64135f6

data/Gemfile

@@ -23,3 +23,7 @@ group :development, :test do
   gem 'rubocop-rake', require: false
   gem 'rubocop-rspec', require: false
 end
+
+group :test do
+  gem 'dry-struct', '~> 1'
+end

data/lib/k_util/data_helper.rb

@@ -6,62 +6,48 @@ module KUtil
   class DataHelper
     # Convert JSON string into to_open_struct but designed to work with a JSON string
     #
+    # KUtil.data.parse_json(json, as: :symbolize_keys)
     # https://docs.ruby-lang.org/en/master/JSON.html
     # rubocop:disable Naming/MethodParameterName
-    def json_parse(json, as: :hash)
+    def parse_json(json, as: :hash)
+      log.block(%i[hash hash_symbolized open_struct], title: 'Help as: ?') if as == :help
+
       case as
       when :hash
         JSON.parse(json)
-      when :hash_symbolized
+      when :hash_symbolized, :symbolize_names, :symbolize_keys
         JSON.parse(json, symbolize_names: true)
       when :open_struct
         JSON.parse(json, object_class: OpenStruct)
       end
     end
+    alias json_parse parse_json
     # rubocop:enable Naming/MethodParameterName
 
     # Convert various data types (Hash, Array, Struct) into a deep nested OpenStruct
     #
     # or an array of deep nested OpenStruct
     def to_open_struct(data)
-      case data
-      when Hash
-        OpenStruct.new(data.transform_values { |v| to_open_struct(v) })
-
-      when Array
-        data.map { |o| to_open_struct(o) }
+      return OpenStruct.new(data.transform_values { |v| to_open_struct(v) })  if data.is_a?(Hash)
+      return data.map { |o| to_open_struct(o) }                               if data.is_a?(Array)
+      return to_open_struct(data.to_h)                                        if hash_convertible?(data)
 
-      when Struct, OpenStruct
-        to_open_struct(data.to_h)
-
-      else
-        # Some primitave type: String, True/False or an ObjectStruct
-        data
-      end
+      # Some primitave type: String, True/False or an ObjectStruct
+      data
     end
 
     # rubocop:disable Metrics/AbcSize,  Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+    # Convert data to hash and deal with mixed data types such as Struct and OpenStruct
     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
+      # This nil check is only for the root object
+      return {} if data.nil?
+
+      return data.map { |value| hash_convertible?(value) ? to_hash(value) : value } if data.is_a?(Array)
 
       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, Struct, Hash
-          hash[key] = to_hash(value)
-        when Array
-          # No test yet
-          values = value.map do |v|
-            v.is_a?(OpenStruct) || v.is_a?(Struct) || v.is_a?(Hash) ? to_hash(v) : v
-          end
-          hash[key] = values
-        else
-          hash[key] = value
-        end
+        hash[key] = hash_convertible?(value) ? to_hash(value) : value
       end
     end
     # rubocop:enable Metrics/AbcSize,  Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
@@ -72,19 +58,41 @@ module KUtil
       value.is_a?(Symbol) ? value.to_s : value
     end
 
-    # Add if needed
-    # # Is the value a basic (aka primitive) type
-    # def basic_type?(value)
-    #   value.is_a?(String) ||
-    #     value.is_a?(Symbol) ||
-    #     value.is_a?(FalseClass) ||
-    #     value.is_a?(TrueClass) ||
-    #     value.is_a?(Integer) ||
-    #     value.is_a?(Float)
+    def deep_symbolize_keys(input)
+      return input if input.nil?
+
+      return input unless input.is_a?(Hash)
+
+      input.each_with_object({}) do |key_value, new_hash|
+        key, value = key_value
+        value = deep_symbolize_keys(value)                  if value.is_a?(Hash)
+        value = value.map { |v| deep_symbolize_keys(v) }    if value.is_a?(Array)
+        new_hash[key.to_sym] = value
+      end
+    end
+
+    # def deep_symbolize_keys(hash)
+    #   return hash if hash.nil?
+
+    #   hash.transform_keys(&:to_sym)
     # end
 
+    # Is the value a basic (aka primitive) type
+    def basic_type?(value)
+      value.is_a?(String) ||
+        value.is_a?(Symbol) ||
+        value.is_a?(FalseClass) ||
+        value.is_a?(TrueClass) ||
+        value.is_a?(Integer) ||
+        value.is_a?(Float)
+    end
+
     # Is the value a complex container type, but not a regular class.
     def hash_convertible?(value)
+      # Nil is a special case, it responds to :to_h but generally
+      # you only want to convert nil to {} in specific scenarios
+      return false if value.nil?
+
       value.is_a?(Array) ||
         value.is_a?(Hash) ||
         value.is_a?(Struct) ||

data/lib/k_util/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: k_util
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.24
 platform: ruby
 authors:
 - David Cruwys
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-07-12 00:00:00.000000000 Z
+date: 2021-08-28 00:00:00.000000000 Z
 dependencies: []
 description: "    KUtil provides simple utility methods, such as file helpers, data
   object helpers and more.\n"