solis 0.73.0 → 0.75.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a91e5038f9e0a152b51ad35d25c6bdd99ef383bfb0da8fb7baf1d08baddbf49a
-  data.tar.gz: b4b1a434aae6a337358815e8b0dc5ff37edea7e0ffb56d85a9d7d1590677ea92
+  metadata.gz: d927fa3a6e648f3d4359df7bc05f60d3ac2cdd62e36ae8a3c1bd7b9845c6c13c
+  data.tar.gz: 92475ada9028fa045fe7f8f5b07a9ccd8b03db2ecb81f67a978dbecdd6eef714
 SHA512:
-  metadata.gz: 35f713d36e731ac83203fec6f3d82bd6ad5f321c68ccf1424fd8f0c6b82183392e2c76d62cdd7eac6542318810c62940d9a4e1badb5dd817177509bf65753c9e
-  data.tar.gz: 5a9efc223d46e01936aed52e649e856344c7847307f6a39d7b094b48d2b553542a8059ce846bd483634cfb7046f9ab9646ed2130bab81de5c196b43af48b95c2
+  metadata.gz: cb0e60d9e4d347e488bac8429e6c1481ad3344cdf1acc5170da37079d82cdc5a1e412ca28b648edaf4db642d6481a3fa07afb45bb176688cbef142b32c9d96b3
+  data.tar.gz: 8fab47cd98128888ed69e3c1af21df1a19bc2872dc05be70fd23a66fc25b2738b344353b28ebce4e7a7d26fb81647d1bc8b0e61ad5bd70fbfaa633fe7d45e57c

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
@@ -130,7 +131,7 @@ values ?s {<#{self.graph_id}>}
       result
     end
 
-    def save(validate_dependencies = true)
+    def save(validate_dependencies = true, top_level = true)
       raise "I need a SPARQL endpoint" if self.class.sparql_endpoint.nil?
       sparql = SPARQL::Client.new(self.class.sparql_endpoint)
 
@@ -141,6 +142,29 @@ values ?s {<#{self.graph_id}>}
 
         result = update(data)
       else
+        data = properties_to_hash(self)
+        attributes = data.include?('attributes') ? data['attributes'] : data
+        attributes.each_pair do |key, value| # check each key. if it is an entity process it
+          unless self.class.metadata[:attributes][key][:node].nil? #is it an entity
+            value = [value] unless value.is_a?(Array)
+            value.each do |sub_value|
+              embedded = self.class.graph.shape_as_model(self.class.metadata[:attributes][key][:datatype].to_s).new(sub_value)
+              embedded_readonly_entities = Solis::Options.instance.get[:embedded_readonly].map{|s| s.to_s} || []
+
+              if (embedded.class.ancestors.map{|s| s.to_s} & embedded_readonly_entities).empty? || top_level
+                if embedded.exists?(sparql)
+                  embedded_data = properties_to_hash(embedded)
+                  embedded.update(embedded_data, validate_dependencies, false)
+                else
+                  embedded.save(validate_dependencies, false)
+                end
+              else
+                Solis::LOGGER.info("#{embedded.class.name} is embedded not allowed to change. Skipping")
+              end
+            end
+          end
+        end
+
         graph = as_graph(self, validate_dependencies)
 
         # File.open('/Users/mehmetc/Dropbox/AllSources/LP/graphiti-api/save.ttl', 'wb') do |file|
@@ -159,7 +183,7 @@ values ?s {<#{self.graph_id}>}
       raise e
     end
 
-    def update(data, validate_dependencies = true)
+    def update(data, validate_dependencies = true, top_level = true)
       raise Solis::Error::GeneralError, "I need a SPARQL endpoint" if self.class.sparql_endpoint.nil?
 
       attributes = data.include?('attributes') ? data['attributes'] : data
@@ -173,100 +197,36 @@ 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)
+
+            embedded_readonly_entities = Solis::Options.instance.get[:embedded_readonly].map{|s| s.to_s} || []
+
+            if (embedded.class.ancestors.map{|s| s.to_s} & embedded_readonly_entities).empty? || top_level
+              if embedded.exists?(sparql)
+                embedded_data = properties_to_hash(embedded)
+                embedded.update(embedded_data, validate_dependencies, false)
+              else
+                embedded.save(validate_dependencies, false)
+              end
+            else
+              Solis::LOGGER.info("#{embedded.class.name} is embedded not allowed to change. Skipping")
+            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
-      # properties_original_klass=Model.properties_to_hash(original_klass)
-      # properties_updated_klass = Model.properties_to_hash(updated_klass)
-      # changes = Hashdiff.diff(properties_original_klass, properties_updated_klass)
-      # pp changes
-      #
-      # #a=self.class.graph.shape_as_model('Identificatienummer').new
-      # changes.each do |change|
-      #   change_type = change[0]
-      #   original_change_entity = change[1]
-      #   change_entity = original_change_entity.split('.').last
-      #   change[1] = change_object
-      #   data = change[2]
-      #
-      #   case change_type
-      #   when '+' # new
-      #     new_entity_hash = {} #self.class.graph.shape_as_model(change_object.classify).new
-      #     Hashdiff.patch!(new_entity_hash, [change])
-      #
-      #     new_entity = self.class.graph.shape_as_model(change_entity.classify).new(new_entity_hash[change_entity])
-      #     new_entity.save
-      #   when '-' # delete
-      #   when '~' # change
-      #   else
-      #     raise RuntimeError, "Unknown change type(#{change_type}) for #{change[1]}"
-      #   end
-      #
-      # end
-
-      # attributes.each_pair do |key, value|
-      #   updated_klass.instance_variable_set("@#{key}", value)
-      #   unless original_klass.class.metadata[:attributes][key][:node_kind].nil?
-      #     inner_model = self.class.graph.shape_as_model(original_klass.class.metadata[:attributes][key][:datatype].to_s)
-      #     if value.is_a?(Hash)
-      #       value.each_pair do |inner_key, inner_value|
-      #         next unless inner_model.metadata[:attributes][inner_key][:node_kind].is_a?(RDF::URI)
-      #         inner_inner_model = self.class.graph.shape_as_model(inner_model.metadata[:attributes][inner_key][:datatype].to_s)
-      #         # if inner_inner_model.class.ancestors.include?(Codetabel) && inner_value.key?('id')
-      #         #   inner_data = inner_inner_model.query.filter({ language: nil, filters: { id: [inner_value['id']] } }).find_all.map { |m| m }&.first
-      #         # else
-      #         inner_value = inner_value.first if inner_value.is_a?(Array)
-      #           inner_data = inner_inner_model.new(inner_value)
-      #           inner_data.save
-      #         # end
-      #       end
-      #     elsif value.is_a?(Array)
-      #       data = value.map do |m|
-      #         if m.is_a?(Hash)
-      #           m.each do |inner_key, inner_value|
-      #             #next if inner_model.metadata[:attributes][inner_key][:class].nil?
-      #             next unless inner_model.metadata[:attributes][inner_key][:node_kind].is_a?(RDF::URI)
-      #             inner_inner_model = self.class.graph.shape_as_model(inner_model.class.metadata[:attributes][inner_key][:datatype].to_s)
-      #             # if inner_inner_model.class.ancestors.include?(Codetabel) && inner_value.key?('id')
-      #             #   inner_data = inner_inner_model.query.filter({ language: nil, filters: { id: [inner_value['id']] } }).find_all.map { |m| m }&.first
-      #             # else
-      #               inner_value = inner_value.first if inner_value.is_a?(Array)
-      #               inner_data = inner_inner_model.new(inner_value)
-      #               inner_data.save
-      #             # end
-      #
-      #             inner_data
-      #           end
-      #         else
-      #           m
-      #         end
-      #       end
-      #     elsif value.is_a?(Object)
-      #       value.save
-      #     end
-      #   end
-      # end
-
       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
@@ -330,9 +290,17 @@ values ?s {<#{self.graph_id}>}
     end
 
     def self.make_id_for(model)
+      raise "I need a SPARQL endpoint" if self.sparql_endpoint.nil?
+      sparql = SPARQL::Client.new(self.sparql_endpoint)
       id = model.instance_variable_get("@id")
       if id.nil? || (id.is_a?(String) && id&.empty?)
-        id = SecureRandom.uuid
+        id_retries = 0
+
+        while id.nil? || sparql.query("ASK WHERE { ?s <#{self.graph_name}/id>  \"#{id}\" }")
+          id = SecureRandom.uuid
+          id_retries+=1
+        end
+        LOGGER.info("ID(#{id}) generated for #{self.name} in #{id_retries} retries") if ConfigFile[:debug]
         model.instance_variable_set("@id", id)
       end
       model

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.75.0"
 end

metadata

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