solis 0.99.0 → 0.100.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c57f5cfabe93ada0f5aa3c008ecafa1b130147dfc7ca5b77930362a330a3457
-  data.tar.gz: 7b9854033bb6e4677bde52c4557705f4f48adffe2e0988af33600890c4615984
+  metadata.gz: 848141bb6e9f81fea57188c0a10cc3cf86b656a137e5f5a2a665a835af2ef6f5
+  data.tar.gz: 49505d5ce710f03daa6b14f2488df1c3d0ff8e2e24301b17940aa5d60aed67d1
 SHA512:
-  metadata.gz: 6f527bc987723ee900f250c8361a7570df65e3f6238c8ccc560c65097f94e0941a43540222e35e26196f4a70ed94d193040d55f0b2455f38f8ea2b2c39466e2f
-  data.tar.gz: 404047145bf332a80ee0bee495640071137682f009a1a17de7e21b8d531a2b3cf57aec7c704a423366f778c2cc2259267ed1e67f638fc092c38858c611f72a81
+  metadata.gz: 16c1286a2b9046f5c267b2e59d9d2d293fd3919e5792a867d174d6385fbfe522bdc4b306e96af244ff4493f21727ce09f71c6c98015cac3ab2f1206cf1543771
+  data.tar.gz: 6e02c4c9c3511271295f010579f76c758c9c590fae999c01ac262615a6fb21384aa2b73bc7e719be61563faec7a080b5f2a95be3a857e156cb2be9400c96c5ff

data/lib/solis/model.rb

@@ -145,22 +145,28 @@ values ?s {<#{self.graph_id}>}
       else
         data = properties_to_hash(self)
         attributes = data.include?('attributes') ? data['attributes'] : data
+        readonly_list = (Solis::Options.instance.get[:embedded_readonly] || []).map(&:to_s)
+
         attributes.each_pair do |key, value|
           unless self.class.metadata[:attributes][key][:node].nil?
             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 readonly_entity?(embedded, readonly_list)
+                # Readonly entities (code tables) should never be modified
+                # Only verify they exist, do not create or update them
+                unless embedded.exists?(sparql)
+                  Solis::LOGGER.warn("#{embedded.class.name} (id: #{embedded.id}) is readonly but does not exist in database. Skipping.")
+                end
+              else
+                # Non-readonly entities can be created or updated
                 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
@@ -193,6 +199,9 @@ values ?s {<#{self.graph_id}>}
       raise Solis::Error::NotFoundError if original_klass.nil?
       updated_klass = original_klass.deep_dup
 
+      # Cache readonly entities list once
+      readonly_list = (Solis::Options.instance.get[:embedded_readonly] || []).map(&:to_s)
+
       # Track entities to potentially delete
       entities_to_check_for_deletion = {}
 
@@ -216,9 +225,16 @@ values ?s {<#{self.graph_id}>}
             embedded = self.class.graph.shape_as_model(original_klass.class.metadata[:attributes][key][:datatype].to_s).new(sub_value)
             new_ids << embedded.id if embedded.id
 
-            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 readonly_entity?(embedded, readonly_list)
+              # Readonly entities (code tables) should never be modified
+              # Only verify they exist, do not create or update them
+              if embedded.exists?(sparql)
+                new_embedded_values << embedded
+              else
+                Solis::LOGGER.warn("#{embedded.class.name} (id: #{embedded.id}) is readonly but does not exist in database. Skipping.")
+              end
+            else
+              # Non-readonly entities can be created or updated
               if embedded.exists?(sparql)
                 embedded_data = properties_to_hash(embedded)
                 embedded.update(embedded_data, validate_dependencies, false)
@@ -227,13 +243,11 @@ values ?s {<#{self.graph_id}>}
                 embedded_value = embedded.save(validate_dependencies, false)
                 new_embedded_values << embedded_value
               end
-            else
-              Solis::LOGGER.info("#{embedded.class.name} is embedded not allowed to change. Skipping")
-              new_embedded_values << embedded
             end
           end
 
           # Identify orphaned entities (in original but not in new)
+          # Note: Readonly entities will be filtered out in delete_orphaned_entities
           orphaned_ids = original_ids - new_ids
           unless orphaned_ids.empty?
             orphaned_entities = original_embedded.select { |e| solis_model?(e) && orphaned_ids.include?(e.id) }
@@ -289,11 +303,11 @@ values ?s {<#{self.graph_id}>}
 
       data
     rescue StandardError => e
-      original_graph = as_graph(original_klass, false)
+      original_graph = as_graph(original_klass, false) if defined?(original_klass) && original_klass
       Solis::LOGGER.error(e.message)
-      Solis::LOGGER.error original_graph.dump(:ttl)
+      Solis::LOGGER.error original_graph.dump(:ttl) if defined?(original_graph) && original_graph
       Solis::LOGGER.error delete_insert_query if defined?(delete_insert_query)
-      sparql.insert_data(original_graph, graph: original_graph.name)
+      sparql.insert_data(original_graph, graph: original_graph.name) if defined?(original_graph) && original_graph && defined?(sparql) && sparql
 
       raise e
     end
@@ -467,6 +481,12 @@ values ?s {<#{self.graph_id}>}
       obj.class.ancestors.include?(Solis::Model)
     end
 
+    # Helper method to check if an entity is readonly (code table)
+    def readonly_entity?(entity, readonly_list = nil)
+      readonly_list ||= (Solis::Options.instance.get[:embedded_readonly] || []).map(&:to_s)
+      (entity.class.ancestors.map(&:to_s) & readonly_list).any?
+    end
+
     # Helper method to get tableized class name
     def tableized_class_name(obj)
       obj.class.name.tableize
@@ -486,14 +506,18 @@ values ?s {<#{self.graph_id}>}
 
     # Delete orphaned entities that are no longer referenced
     def delete_orphaned_entities(entities_to_check, sparql)
-      embedded_readonly_entities = Solis::Options.instance.get[:embedded_readonly].map{|s| s.to_s} || []
+      return if entities_to_check.nil? || entities_to_check.empty?
+
+      readonly_list = (Solis::Options.instance.get[:embedded_readonly] || []).map(&:to_s)
 
       entities_to_check.each do |key, orphaned_entities|
+        next if orphaned_entities.nil?
+
         orphaned_entities.each do |orphaned_entity|
           next unless solis_model?(orphaned_entity)
 
           # Skip if it's a readonly entity (like code tables)
-          if (orphaned_entity.class.ancestors.map{|s| s.to_s} & embedded_readonly_entities).any?
+          if readonly_entity?(orphaned_entity, readonly_list)
             Solis::LOGGER.info("#{orphaned_entity.class.name} (id: #{orphaned_entity.id}) is in embedded_readonly list. Skipping deletion.")
             next
           end

data/lib/solis/shape/reader/sheet.rb

@@ -289,7 +289,7 @@ hide empty members
                   graph_prefix = data[:ontologies][:base][:prefix]
                   graph_name = data[:ontologies][:base][:uri]
 
-                  description = metadata[:comment]
+                  description = metadata[:description]
                   label = metadata[:label]
                   target_class = "#{graph_prefix}:#{entity_name}"
                   node = metadata[:sub_class_of]
@@ -454,9 +454,19 @@ hide empty members
 
               datas.each do |data|
                 data[:entities].select { |_k, v| !v[:same_as].empty? }.each do |k, v|
-                  prefix, verb = v[:same_as].split(':')
-                  rdf_vocabulary = RDF::Vocabulary.from_sym(prefix.upcase)
-                  rdf_verb = rdf_vocabulary[verb.to_sym]
+                  same_as_value = v[:same_as].strip
+
+                  if same_as_value.start_with?('<') && same_as_value.end_with?('>')
+                    # Full URI format: <http://xmlns.com/foaf/0.1/Person>
+                    uri_string = same_as_value[1...-1]
+                    rdf_verb = RDF::URI(uri_string)
+                  else
+                    # Prefixed name format: foaf:Person
+                    prefix, verb = same_as_value.split(':')
+                    rdf_vocabulary = RDF::Vocabulary.from_sym(prefix.upcase)
+                    rdf_verb = rdf_vocabulary[verb.to_sym]
+                  end
+
                   graph << RDF::Statement.new(rdf_verb, RDF::RDFV.type, RDF::OWL.Class)
                   graph << RDF::Statement.new(rdf_verb, RDF::Vocab::OWL.sameAs, o[k.to_sym])
                 rescue StandardError => e

data/lib/solis/version.rb

@@ -1,3 +1,3 @@
 module Solis
-  VERSION = "0.99.0"
+  VERSION = "0.100.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solis
 version: !ruby/object:Gem::Version
-  version: 0.99.0
+  version: 0.100.0
 platform: ruby
 authors:
 - Mehmet Celik