solis 0.74.0 → 0.76.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 166805286e332f8a5a9f572fa6ab7841f2f234223384b298139fa25d8339cf91
-  data.tar.gz: e43b4f5b33c911c8759e96012165cd9203b6941113e511442d169b0acd61bfe3
+  metadata.gz: 14e23fd1f3bfd75d6c0349299ec95fd1b298224be106532bd0af5e85ea7eeef2
+  data.tar.gz: 73e6ccc7ca60e80c6afe349c0384b416b00a9de7661509995ac7cffe7b35aa2e
 SHA512:
-  metadata.gz: 7a091ee239234b0a71cfde2cbebb19905af07af63bf2e58dedb6c0178a7f2c4ac9d3f875df509cecf689857c4dcfac2cc76fa0f4b8dc4ef2d7b1df566af4edc8
-  data.tar.gz: 96dc87a0b2b208f6f56adcae71b391a7cbd18b22ac2ba4ea6d936d87d39bd98d88a2c74bed54d12c6a73fa00896ec23dbd60bf4b52474cc5d7f11f4048188961
+  metadata.gz: 6994d3c3a89e1456c71b3e09bd846c20a93076d4b3d1a179fa129ba313066ba2534b1eb3288b71c06eb5e0ea90d9a0c7d7c31270e7972e832fb7212b9b6373eb
+  data.tar.gz: b382ce56230855d7a6716b90e43f97734bd9b82335f0cdeac14708787a551cab2c573c61d60c2b4c6df691249d1abea7a04c1da24e30097750da41e4af6b9bd1

data/lib/solis/graph.rb

@@ -309,7 +309,8 @@ module Solis
                       remote_resource.id =~ /^http/ ? remote_resource.id.split('/').last : remote_resource.id
                     end
                   end
-                  "#{resource.class.graph_name.gsub(/\/$/,'')}/#{belongs_to_resource.name.tableize}?filter[id]=#{resource_ids.join(',')}" unless remote_resources.nil? || resource_ids.empty?
+                  #"#{resource.class.graph_name.gsub(/\/$/,'')}/#{belongs_to_resource.name.tableize}?filter[id]=#{resource_ids.join(',')}" unless remote_resources.nil? || resource_ids.empty?
+                  "#{resource.class.graph_name.gsub(/\/$/,'')}/#{remote_resources.first.name.tableize}?filter[id]=#{resource_ids.join(',')}" unless remote_resources.nil? || resource_ids.empty?
                 end
               end
               #

data/lib/solis/model.rb

@@ -131,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)
 
@@ -142,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|
@@ -160,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
@@ -179,11 +202,18 @@ values ?s {<#{self.graph_id}>}
           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)
+
+            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
-              embedded.save
+              Solis::LOGGER.info("#{embedded.class.name} is embedded not allowed to change. Skipping")
             end
           end
         end
@@ -191,106 +221,6 @@ values ?s {<#{self.graph_id}>}
         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
-      # 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)
@@ -360,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
@@ -456,6 +394,10 @@ values ?s {<#{self.graph_id}>}
       m
     end
 
+    def self.construct(level = 0)
+      raise 'to bo implemented'
+    end
+
     def self.model_before_read(&blk)
       self.before_read_proc = blk
     end

data/lib/solis/version.rb

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

data/solis.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'activesupport', '~> 7.0'
   spec.add_runtime_dependency 'http', '~> 5.1'
-  spec.add_runtime_dependency 'graphiti', '~> 1.3'
+  spec.add_runtime_dependency 'graphiti', '~> 1.7'
   spec.add_runtime_dependency 'moneta', '~> 1.6'
   spec.add_runtime_dependency 'linkeddata', '~> 3.3'
   spec.add_runtime_dependency 'google_drive', '~> 3.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solis
 version: !ruby/object:Gem::Version
-  version: 0.74.0
+  version: 0.76.0
 platform: ruby
 authors:
 - Mehmet Celik
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-03-22 00:00:00.000000000 Z
+date: 2024-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: moneta
   requirement: !ruby/object:Gem::Requirement
@@ -295,7 +295,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.6
+rubygems_version: 3.5.10
 signing_key:
 specification_version: 4
 summary: Turn any SHACL file into an API, ORM, documentation, ...