solis 0.73.0 → 0.74.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a91e5038f9e0a152b51ad35d25c6bdd99ef383bfb0da8fb7baf1d08baddbf49a
-  data.tar.gz: b4b1a434aae6a337358815e8b0dc5ff37edea7e0ffb56d85a9d7d1590677ea92
+  metadata.gz: 166805286e332f8a5a9f572fa6ab7841f2f234223384b298139fa25d8339cf91
+  data.tar.gz: e43b4f5b33c911c8759e96012165cd9203b6941113e511442d169b0acd61bfe3
 SHA512:
-  metadata.gz: 35f713d36e731ac83203fec6f3d82bd6ad5f321c68ccf1424fd8f0c6b82183392e2c76d62cdd7eac6542318810c62940d9a4e1badb5dd817177509bf65753c9e
-  data.tar.gz: 5a9efc223d46e01936aed52e649e856344c7847307f6a39d7b094b48d2b553542a8059ce846bd483634cfb7046f9ab9646ed2130bab81de5c196b43af48b95c2
+  metadata.gz: 7a091ee239234b0a71cfde2cbebb19905af07af63bf2e58dedb6c0178a7f2c4ac9d3f875df509cecf689857c4dcfac2cc76fa0f4b8dc4ef2d7b1df566af4edc8
+  data.tar.gz: 96dc87a0b2b208f6f56adcae71b391a7cbd18b22ac2ba4ea6d936d87d39bd98d88a2c74bed54d12c6a73fa00896ec23dbd60bf4b52474cc5d7f11f4048188961

data/lib/solis/graph.rb

@@ -351,7 +351,7 @@ module Solis
 
       @sparql_client = SPARQL::Client.new(@sparql_endpoint)
       result = @sparql_client.query("with <#{graph_name}> delete {?s ?p ?o} where{?s ?p ?o}")
-      LOGGER.info(result.first.to_a.first.last.value)
+      LOGGER.info(result)
       true
     end
 

data/lib/solis/model.rb

@@ -1,5 +1,6 @@
 require 'securerandom'
 require 'iso8601'
+require 'hashdiff'
 require_relative 'query'
 
 module Solis
@@ -173,20 +174,49 @@ values ?s {<#{self.graph_id}>}
       raise Solis::Error::NotFoundError if original_klass.nil?
       updated_klass = original_klass.deep_dup
 
-      attributes.each_pair do |key, value|
-        if value.is_a?(Hash)
-          embedded = self.class.graph.shape_as_model(original_klass.class.metadata[:attributes][key][:datatype].to_s).new(value)
-          if embedded.exists?(sparql)
-            embedded_data = properties_to_hash(embedded)
-            embedded.update(embedded_data)
-          else
-            embedded.save
+      attributes.each_pair do |key, value| # check each key. if it is an entity process it
+        unless original_klass.class.metadata[:attributes][key][:node].nil? #it is an entity
+          value = [value] unless value.is_a?(Array)
+          value.each do |sub_value|
+            embedded = self.class.graph.shape_as_model(original_klass.class.metadata[:attributes][key][:datatype].to_s).new(sub_value)
+            if embedded.exists?(sparql)
+              embedded_data = properties_to_hash(embedded)
+              embedded.update(embedded_data)
+            else
+              embedded.save
+            end
           end
         end
 
         updated_klass.instance_variable_set("@#{key}", value)
       end
 
+
+      # attributes.each_pair do |key, value|
+      #   if value.is_a?(Hash)
+      #     embedded = self.class.graph.shape_as_model(original_klass.class.metadata[:attributes][key][:datatype].to_s).new(value)
+      #     if embedded.exists?(sparql)
+      #       embedded_data = properties_to_hash(embedded)
+      #       embedded.update(embedded_data)
+      #     else
+      #       embedded.save
+      #     end
+      #   elsif value.is_a?(Array)
+      #     value.each do |sub_value|
+      #       if sub_value.is_a?(Hash)
+      #         if embedded.exists?(sparql)
+      #           embedded_data = properties_to_hash(embedded)
+      #           embedded.update(embedded_data)
+      #         else
+      #           embedded.save
+      #         end
+      #       end
+      #     end
+      #   end
+      #
+      #   updated_klass.instance_variable_set("@#{key}", value)
+      # end
+
       # attributes.each_pair do |key, value|
       #   updated_klass.instance_variable_set("@#{key}", value)
       # end
@@ -264,9 +294,9 @@ values ?s {<#{self.graph_id}>}
       before_update_proc&.call(original_klass, updated_klass)
 
       properties_orignal_klass = properties_to_hash(original_klass)
-      properties_updated_klsss = properties_to_hash(updated_klass)
+      properties_updated_klass = properties_to_hash(updated_klass)
 
-      if Hashdiff.best_diff(properties_orignal_klass, properties_updated_klsss).empty?
+      if Hashdiff.best_diff(properties_orignal_klass, properties_updated_klass).empty?
         Solis::LOGGER.info("#{original_klass.class.name} unchanged, skipping")
         data = self.query.filter({ filters: { id: [id] } }).find_all.map { |m| m }&.first
       else

data/lib/solis/query.rb

@@ -191,11 +191,11 @@ order by ?s
       from_cache = Graphiti.context[:object]&.from_cache || '0'
       if @query_cache.key?(query_key) && from_cache.eql?('1')
         result = @query_cache[query_key]
-        Solis::LOGGER.info("CACHE: from #{query_key}")# if ConfigFile[:debug]
+        Solis::LOGGER.info("CACHE: from #{query_key}") if ConfigFile[:debug]
       else
         result = graph_to_object(sparql_client.query(query))
         @query_cache[query_key] = result unless result.nil? || result.empty?
-        Solis::LOGGER.info("CACHE: to #{query_key}")# if ConfigFile[:debug]
+        Solis::LOGGER.info("CACHE: to #{query_key}") if ConfigFile[:debug]
       end
 
       result

data/lib/solis/version.rb

@@ -1,3 +1,3 @@
 module Solis
-  VERSION = "0.73.0"
+  VERSION = "0.74.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solis
 version: !ruby/object:Gem::Version
-  version: 0.73.0
+  version: 0.74.0
 platform: ruby
 authors:
 - Mehmet Celik
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-03-11 00:00:00.000000000 Z
+date: 2024-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport