chronicle-core 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21efb5e6a7bf0dfb29a8e4187dfdfddbac79e47b4a13f636cd7be6e77ff95eea
-  data.tar.gz: 1527959dfd39a7f4345d784f009d3f5aaf0e67008b31c1734fdf2e1aa0b782db
+  metadata.gz: ed6ae5d478596b65ee33d68c10862a87f351dd7711e49e9ac7b15237e878fbea
+  data.tar.gz: 33ed98e503065a2d5dfe21f4e6e551d3c6ba30dfcf052d0e621bf5d9750519be
 SHA512:
-  metadata.gz: 10caca6156eb0ffac0cbfbc15fbcdf0b1edc289862f74f7dea019bbd57111acccd08d0490f1c893af022ad1337b0b90858f1b54d3b9940f1dca05459c3aced44
-  data.tar.gz: f780be776364b03063b033e5f39df64eddee82ff6643b0e75fd6840bf9e144742f2f123696163e76d90bee0dc3a33174988f9daaf6ac162e73eed8a5b6861233
+  metadata.gz: ee6ff44d1b2318451073b38d38db1e015edf19d7df70c61f5e15406ff00483eeb7d0d131173fa61e233c8cf782d3a0345f12fdf9bcea31187a10a2143585a9b7
+  data.tar.gz: 4afd04abcd28e6a8792c8f947ad97473a452fe792e3ed4e1bac6d2e99f7fe4cfb5b614d7589d2e2d10dcd3684285c75a8510bf061d73cfcac976519ea02eaa66

data/lib/chronicle/core/version.rb

@@ -2,6 +2,6 @@
 
 module Chronicle
   module Core
-    VERSION = "0.2.0"
+    VERSION = "0.2.2"
   end
 end

data/lib/chronicle/schema/base.rb

@@ -1,4 +1,4 @@
-require 'chronicle/utils/hash'
+require 'chronicle/utils/hash_utils'
 
 module Chronicle::Schema
   class Base
@@ -50,13 +50,26 @@ module Chronicle::Schema
     end
 
     def to_h
-      identifier_hash
-        .merge(@properties)
-        .merge({ meta: meta })
+      @properties.transform_values do |v|
+        # convert nested records to hashes
+        if v.is_a?(Array)
+          v.map do |e|
+            if e.is_a?(Chronicle::Schema::Base)
+              e.to_h
+            else
+              e
+            end
+          end
+        elsif v.is_a?(Chronicle::Schema::Base)
+          v.to_h
+        else
+          v
+        end
+      end
     end
 
     def to_h_flattened
-      Chronicle::Utils::Hash.flatten_keys(to_h)
+      Chronicle::Utils::HashUtils.flatten_hash(to_h)
     end
   end
 end

data/lib/chronicle/serialization/hash_serializer.rb

@@ -1,7 +1,15 @@
 module Chronicle::Serialization
   class HashSerializer < Chronicle::Serialization::Serializer
     def serializable_hash
-      @record.to_h
+      @record.properties.transform_values do |v|
+        if v.is_a?(Array)
+          v.map{|record| HashSerializer.new(record).serializable_hash}
+        elsif v.is_a?(Chronicle::Schema::Base)
+          HashSerializer.new(v).serializable_hash
+        else
+          v
+        end
+      end
     end
   end
 end

data/lib/chronicle/utils/hash_utils.rb

@@ -0,0 +1,23 @@
+module Chronicle::Utils
+  module HashUtils
+    def self.flatten_hash(hash, parent_key = '', result = {})
+      hash.each do |key, value|
+        current_key = parent_key + (parent_key.empty? ? '' : '.') + key.to_s
+        if value.is_a?(Hash)
+          flatten_hash(value, current_key, result)
+        elsif value.is_a?(Array)
+          value.each_with_index do |item, index|
+            if item.is_a?(Hash)
+              flatten_hash(item, "#{current_key}[#{index}]", result)
+            else
+              result["#{current_key}[#{index}]".to_sym] = item
+            end
+          end
+        else
+          result[current_key.to_sym] = value
+        end
+      end
+      result
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chronicle-core
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Andrew Louis
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-08-11 00:00:00.000000000 Z
+date: 2023-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-schema
@@ -126,7 +126,7 @@ files:
 - lib/chronicle/serialization/hash_serializer.rb
 - lib/chronicle/serialization/jsonapi_serializer.rb
 - lib/chronicle/serialization/serializer.rb
-- lib/chronicle/utils/hash.rb
+- lib/chronicle/utils/hash_utils.rb
 - sig/chronicle/core.rbs
 homepage: https://github.com/chronicle-app
 licenses:

data/lib/chronicle/utils/hash.rb

@@ -1,15 +0,0 @@
-module Chronicle::Utils
-  module Hash
-    def self.flatten_keys(hash)
-      hash.each_with_object({}) do |(k, v), h|
-        if v.is_a? Hash
-          flatten_hash(v).map do |h_k, h_v|
-            h["#{k}.#{h_k}".to_sym] = h_v
-          end
-        else 
-          h[k] = v
-        end
-      end
-    end
-  end
-end