solis 0.78.0 → 0.80.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 424ee1c91533e6fe3238285da382f034457c338c7bbd4e8f44c9a6cb2bfffd88
-  data.tar.gz: fbe89a99f3a7c162dba2446769127779f988163051331913cf7be44f7dd51b00
+  metadata.gz: 156f64ccc4d0ce04ac67bbb450634697eab5f9c35079fafbc2024afc921aae79
+  data.tar.gz: 9ef551b57b0322740837b2ee4feaffe80b5447e6f0d119fdf865dfda43bea24b
 SHA512:
-  metadata.gz: 02a9645e8fa481276cfaa6320de404482be850035930d54df7c214a420746710afadd5ced2ec23bc7df3c06a1c08f47759fd641aff20cbd9e2904fc8e1bef4a5
-  data.tar.gz: 0af8c1358122caff1c2ecd36b2994cec8730d5db6f9cf5d59db367cd76f1eb20edf154629c97788a295df8db37bbec5b8816c3e5119510220c1dae062b3ab513
+  metadata.gz: bf8c5a1e3ed1a80ba916aaa9868cc5965cc9cf962ecd3913e9a4a2d41417db8c5e618eb1866e1085dea71573257934a42ed8f29b9a42e3dcf6134f6b3a2d99c2
+  data.tar.gz: ac4c0296ffa93d3b10ed183e5fef30a2a75a712e81e07898bb71cb927a0296f6ff5043c2b33d9964a5eac2542031f2d3f5802dad4b4e0ffecdbe9b817693191f

data/lib/solis/model.rb

@@ -210,7 +210,13 @@ values ?s {<#{self.graph_id}>}
                 embedded_data = properties_to_hash(embedded)
                 embedded.update(embedded_data, validate_dependencies, false)
               else
-                value = embedded.save(validate_dependencies, false)
+                embedded_value = embedded.save(validate_dependencies, false)
+                value = updated_klass.instance_variable_get("@#{key}").deep_dup
+                if value.is_a?(Array)
+                  value << embedded_value
+                else
+                  value = embedded_value
+                end
               end
             else
               Solis::LOGGER.info("#{embedded.class.name} is embedded not allowed to change. Skipping")

data/lib/solis/query/run.rb

@@ -64,6 +64,8 @@ class Solis::Query::Runner
                     value = Date.parse(value)
                   when "http://www.w3.org/2006/time#DateTimeInterval"
                     value = ISO8601::TimeInterval.parse(value)
+                  when "http://www.w3.org/2001/XMLSchema#boolean"
+                    value = value == "true"
                   end
                   v = value
                 end

data/lib/solis/query.rb

@@ -128,7 +128,10 @@ module Solis
     private
 
     def model_construct?
-      File.exist?("#{ConfigFile.path}/constructs/#{@model.name.tableize.singularize}.sparql")
+      construct_name = @model.name.tableize.singularize rescue @model.class.name.tableize.singularize
+      File.exist?("#{ConfigFile.path}/constructs/#{construct_name}.sparql")
+    rescue StandardError => e
+      false
     end
 
     def target_class

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

@@ -10,8 +10,16 @@ module Solis
       class Sheet
         def self.read(key, spreadsheet_id, options = {})
           class << self
+            def progress(i, data)
+              if data.key?(:job_id) && data.key?(:store)
+                job_id = data[:job_id]
+                progress = data[:store]
+                progress[job_id] = i
+              end
+            end
+
             def validate(sheets)
-              #raise "Please make sure the sheet contains '_PREFIXES', '_METADATA', '_ENTITIES' tabs" unless (%w[_PREFIXES _METADATA _ENTITIES] - sheets.keys).length == 0
+              # raise "Please make sure the sheet contains '_PREFIXES', '_METADATA', '_ENTITIES' tabs" unless (%w[_PREFIXES _METADATA _ENTITIES] - sheets.keys).length == 0
 
               prefixes = sheets['_PREFIXES']
               metadata = sheets['_METADATA']
@@ -61,7 +69,7 @@ module Solis
               sheets
             end
 
-            def process_sheet(key, sheet_id, sheets, options = {follow: true})
+            def process_sheet(key, sheet_id, sheets, options = { follow: true })
               entities = {}
               prefixes = {}
               ontology_metadata = {}
@@ -79,12 +87,16 @@ module Solis
               sheets['_ENTITIES'].each do |e|
 
                 top_class = e['name'].to_s
-                #if prefixes[graph_prefix][:data].nil? || prefixes[graph_prefix][:data].empty?
-                  entity_data = parse_entity_data(e['name'].to_s, graph_prefix, graph_name, sheets[top_class], { key: key, prefixes: prefixes, follow: options[:follow] })
+                top_sheet = sheets[top_class] || nil
+                # if sheets[top_class].nil? && !(e['subclassof'].nil? || e['subclassof'].empty?)
+                #   top_sheet = sheets[e['subclassof'].split(':').last.to_s] || nil
+                # end
+                # if prefixes[graph_prefix][:data].nil? || prefixes[graph_prefix][:data].empty?
+                entity_data = parse_entity_data(e['name'].to_s, graph_prefix, graph_name, top_sheet, { key: key, prefixes: prefixes, follow: options[:follow] })
                 #  prefixes[graph_prefix][:data] = entity_data
-                #else
+                # else
                 #  entity_data = prefixes[graph_prefix][:data]
-                #end
+                # end
 
                 if entity_data.empty?
                   entity_data[:id] = {
@@ -190,8 +202,8 @@ module Solis
             end
 
             def build_plantuml(datas)
+              #              !pragma layout elk
               out = %(@startuml
-!pragma layout elk
 skinparam classFontSize 14
 !define LIGHTORANGE
 skinparam groupInheritance 1
@@ -204,32 +216,32 @@ title #{datas.first[:metadata][:title]} - #{datas.first[:metadata][:version]} -
 
               out += "\npackage #{datas.first[:ontologies][:base][:prefix]} {\n"
               datas.each do |data|
-              data[:entities].each do |entity_name, metadata|
-                out += "\nclass #{entity_name}"
-
-                properties = metadata[:properties]
-                relations = []
-                unless properties.nil? || properties.empty?
-                  out += "{\n"
-                  properties.each do |property, property_metadata|
-                    out += "\t{field} #{property_metadata[:datatype]} : #{property} \n"
-
-                    if property_metadata[:datatype].split(':').first.eql?(data[:ontologies][:base][:prefix].to_s)
-                      relations << "#{property_metadata[:datatype].split(':').last} - #{property_metadata[:cardinality].key?(:max) && !property_metadata[:cardinality][:max].empty? ? "\"#{property_metadata[:cardinality][:max]}\"" : ''} #{entity_name} : #{property} >"
+                data[:entities].each do |entity_name, metadata|
+                  out += "\nclass #{entity_name}"
+
+                  properties = metadata[:properties]
+                  relations = []
+                  unless properties.nil? || properties.empty?
+                    out += "{\n"
+                    properties.each do |property, property_metadata|
+                      out += "\t{field} #{property_metadata[:datatype]} : #{property} \n"
+
+                      if property_metadata[:datatype].split(':').first.eql?(data[:ontologies][:base][:prefix].to_s)
+                        relations << "#{property_metadata[:datatype].split(':').last} - #{property_metadata[:cardinality].key?(:max) && !property_metadata[:cardinality][:max].empty? ? "\"#{property_metadata[:cardinality][:max]}\"" : ''} #{entity_name} : #{property} >"
+                      end
                     end
+                    out += "}\n"
+                    out += relations.join("\n")
                   end
-                  out += "}\n"
-                  out += relations.join("\n")
-                end
 
-                out += "\n"
-                sub_classes = metadata[:sub_class_of]
-                sub_classes = [sub_classes] unless sub_classes.is_a?(Array)
-                sub_classes.each do |sub_class|
-                  out += "#{entity_name} --|> #{sub_class.split(':').last}\n" unless sub_class.empty?
+                  out += "\n"
+                  sub_classes = metadata[:sub_class_of]
+                  sub_classes = [sub_classes] unless sub_classes.is_a?(Array)
+                  sub_classes.each do |sub_class|
+                    out += "#{entity_name} --|> #{sub_class.split(':').last}\n" unless sub_class.empty?
+                  end
                 end
               end
-              end
               out += %(
 hide circle
 hide methods
@@ -263,61 +275,72 @@ hide empty members
 
               datas.each do |data|
                 data[:entities].each do |entity_name, metadata|
-                graph_prefix = data[:ontologies][:base][:prefix]
-                graph_name = data[:ontologies][:base][:uri]
-
-                description = metadata[:comment]
-                label = metadata[:label]
-                target_class = "#{graph_prefix}:#{entity_name}"
-                node = metadata[:sub_class_of]
-
-                if node && !node.empty?
-                  node = node.first if node.is_a?(Array)
-                  node = node.strip
-                  node += 'Shape' if node != /Shape$/ # && node =~ /^#{graph_prefix}:/
-                else
-                  node = target_class
-                end
+                  graph_prefix = data[:ontologies][:base][:prefix]
+                  graph_name = data[:ontologies][:base][:uri]
+
+                  description = metadata[:comment]
+                  label = metadata[:label]
+                  target_class = "#{graph_prefix}:#{entity_name}"
+                  node = metadata[:sub_class_of]
+
+                  if node && !node.empty?
+                    node = node.first if node.is_a?(Array)
+                    node = node.strip
+                    node += 'Shape' if node != /Shape$/ # && node =~ /^#{graph_prefix}:/
+                  else
+                    node = target_class
+                  end
 
-                out += %(
-                #{graph_prefix}:#{entity_name}Shape
+                  out += %(
+#{graph_prefix}:#{entity_name}Shape
     a               #{shacl_prefix}:NodeShape ;
     #{shacl_prefix}:description "#{description&.gsub('"', "'")&.gsub(/\n|\r/, '')}" ;
     #{shacl_prefix}:targetClass  #{target_class} ;#{
-                  unless node.nil? || node.empty?
-                    "\n    #{shacl_prefix}:node         #{node} ;"
-                  end}
+                    unless node.nil? || node.empty?
+                      "\n    #{shacl_prefix}:node         #{node} ;"
+                    end}
                 #{shacl_prefix}:name         "#{label}" ;
 )
-                metadata[:properties].each do |property, property_metadata|
-                  attribute = property.to_s.strip
-                  next if attribute.empty?
-
-                  description = property_metadata[:description]&.gsub('"', "'")&.gsub(/\n|\r/, '').strip
-                  path = "#{graph_prefix}:#{attribute}"
-                  datatype = property_metadata[:datatype].strip
-                  min_count = property_metadata[:cardinality][:min].strip
-                  max_count = property_metadata[:cardinality][:max].strip
-
-                  if datatype =~ /^#{graph_prefix}:/ || datatype =~ /^<#{graph_name}/
-                    out += %(    #{shacl_prefix}:property [#{shacl_prefix}:path #{path} ;
+                  metadata[:properties].each do |property, property_metadata|
+                    attribute = property.to_s.strip
+                    next if attribute.empty?
+
+                    description = property_metadata[:description]&.gsub('"', "'")&.gsub(/\n|\r/, '').strip
+                    path = "#{graph_prefix}:#{attribute}"
+                    datatype = property_metadata[:datatype].strip
+                    min_count = property_metadata[:cardinality][:min].strip
+                    max_count = property_metadata[:cardinality][:max].strip
+
+                    if datatype =~ /^#{graph_prefix}:/ || datatype =~ /^<#{graph_name}/
+                      out += %(    #{shacl_prefix}:property [#{shacl_prefix}:path #{path} ;
                  #{shacl_prefix}:name "#{attribute}" ;
                  #{shacl_prefix}:description "#{description}" ;
                  #{shacl_prefix}:nodeKind #{shacl_prefix}:IRI ;
                  #{shacl_prefix}:class    #{datatype} ;#{min_count =~ /\d+/ ? "\n                 #{shacl_prefix}:minCount #{min_count} ;" : ''}#{max_count =~ /\d+/ ? "\n                 #{shacl_prefix}:maxCount #{max_count} ;" : ''}
     ] ;
 )
-                  else
-                    out += %(    #{shacl_prefix}:property [#{shacl_prefix}:path #{path} ;
+                    else
+                      if datatype.eql?('rdf:langString')
+                        out += %(    #{shacl_prefix}:property [#{shacl_prefix}:path #{path} ;
+                 #{shacl_prefix}:name "#{attribute}";
+                 #{shacl_prefix}:description "#{description}" ;
+                 #{shacl_prefix}:uniqueLang true ;
+                 #{shacl_prefix}:datatype #{datatype} ;#{min_count =~ /\d+/ ? "\n                 #{shacl_prefix}:minCount #{min_count} ;" : ''}
+    ] ;
+)
+                      else
+                        out += %(    #{shacl_prefix}:property [#{shacl_prefix}:path #{path} ;
                  #{shacl_prefix}:name "#{attribute}";
                  #{shacl_prefix}:description "#{description}" ;
                  #{shacl_prefix}:datatype #{datatype} ;#{min_count =~ /\d+/ ? "\n                 #{shacl_prefix}:minCount #{min_count} ;" : ''}#{max_count =~ /\d+/ ? "\n                 #{shacl_prefix}:maxCount #{max_count} ;" : ''}
     ] ;
 )
+                      end
+
+                    end
                   end
+                  out += ".\n"
                 end
-                out += ".\n"
-              end
               end
               out
             rescue StandardError => e
@@ -411,15 +434,15 @@ hide empty members
               graph.graph_name = RDF::URI(graph_name)
 
               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]
-                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
-                puts e.message
-              end
+                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]
+                  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
+                  puts e.message
+                end
               end
 
               graph << o.to_enum
@@ -432,10 +455,10 @@ hide empty members
             def build_inflections(datas)
               inflections = {}
               datas.each do |data|
-              data[:entities].each do |entity, metadata|
-                inflections[entity] = metadata[:plural]
-                inflections[entity.to_s.underscore.to_sym] = metadata[:plural].underscore
-              end
+                data[:entities].each do |entity, metadata|
+                  inflections[entity] = metadata[:plural]
+                  inflections[entity.to_s.underscore.to_sym] = metadata[:plural].underscore
+                end
               end
 
               inflections.to_json
@@ -591,13 +614,13 @@ hide empty members
           end
 
           sheet_data = read_sheets(key, spreadsheet_id, options)
-
+          #TODO: cleanup
           if sheet_data.is_a?(Hash)
             raise "No _REFERENCES sheet found" unless sheet_data.key?("_REFERENCES")
-          #read other ontologies
+            # read other ontologies
             Solis::LOGGER.info('Reading referenced ontologies')
             references = sheet_data['_REFERENCES'].map do |reference|
-              {sheet_url: reference['sheeturl'], description: reference['description']}
+              { sheet_url: reference['sheeturl'], description: reference['description'] }
             end
 
             cache_dir = ConfigFile.include?(:cache) ? ConfigFile[:cache] : '/tmp'
@@ -629,7 +652,8 @@ hide empty members
           schema = build_schema(datas)
           Solis::LOGGER.info('Generating INFLECTIONS')
           inflections = build_inflections(datas)
-          { inflections: inflections, shacl: shacl, schema: schema, plantuml: plantuml}
+
+          { inflections: inflections, shacl: shacl, schema: schema, plantuml: plantuml }
         end
       end
     end

data/lib/solis/version.rb

@@ -1,3 +1,3 @@
 module Solis
-  VERSION = "0.78.0"
+  VERSION = "0.80.0"
 end

data/solis.gemspec

@@ -35,12 +35,12 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'google_drive', '~> 3.0'
   spec.add_runtime_dependency 'json', '~> 2.7'
   spec.add_runtime_dependency 'hashdiff', '~> 1.1'
-  spec.add_runtime_dependency  'iso8601', '~> 0.13.0'
-  spec.add_runtime_dependency  'connection_pool', '~> 2.4'
-  spec.add_runtime_dependency  'uuidtools', '~> 2.2.0'
-  spec.add_runtime_dependency  'dry-struct', '~> 1.6'
-  spec.add_runtime_dependency  'psych', '~> 5.1'
-  #spec.add_runtime_dependency  'hashdiff', '~> 1.1'
+  spec.add_runtime_dependency 'iso8601', '~> 0.13.0'
+  spec.add_runtime_dependency 'connection_pool', '~> 2.4'
+  spec.add_runtime_dependency 'uuidtools', '~> 2.2.0'
+  spec.add_runtime_dependency 'dry-struct', '~> 1.6'
+  spec.add_runtime_dependency 'psych', '~> 5.1'
+  #  spec.add_runtime_dependency 'rdf-edtf', '~> 1.1.2'
 
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency  'minitest', '~> 5.19'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solis
 version: !ruby/object:Gem::Version
-  version: 0.78.0
+  version: 0.80.0
 platform: ruby
 authors:
 - Mehmet Celik
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-11-13 00:00:00.000000000 Z
+date: 2025-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -295,7 +295,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.10
+rubygems_version: 3.5.14
 signing_key:
 specification_version: 4
 summary: Turn any SHACL file into an API, ORM, documentation, ...