solis 0.82.0 → 0.84.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 148a2ed5b726f859738b0a345a66df17f252409f6ef13b093292cdae06ba752e
-  data.tar.gz: d5079802a5d56d7076d02eadd47e50d55a6adc1f00ff8cfc776eb0ab88ed4dfb
+  metadata.gz: a2980fd83ee3bd59017c9831136d40f24402c80c3591578b27d3cc03ad132b90
+  data.tar.gz: 248019990f65b20f0bfb2b605f868c2658b002e02db3c5a61a7657d83e071bd0
 SHA512:
-  metadata.gz: 7a5b1d02a96dfe0c6469624487ab61db13c5ba88862a39bfd575bd92df5b0e26b7abde650101007b9426d7dde49e2dd1d791c217c0eb736a1050edd56d49cc75
-  data.tar.gz: '0815bbee7954c53515a6c7d3c49000d6d002a2d23bc5c577c93ab02b6f2ba3fa9b1cb6fd9e34e3b61d991a143e6556df97041873abb08233281dd5f0c625d127'
+  metadata.gz: 720dd30ae84033d977cf04f6d6736745f24d8b32b06b3dedd01e09c05d5f72726a6ee2f2c74249ea8e87bc1bde8daf9bd2fe810bf139dc8d48e8ff70c7dd611d
+  data.tar.gz: 82855397f33cf99f61f6a7d53b3939035305f0570b2ee7965ca353402891d6b752351d19c414c2a3ee74bda22e7774a3f70f7d223b2f974c0c227610307e41a1

data/lib/solis/config_file.rb

@@ -76,6 +76,7 @@ class ConfigFile
       end
     end
 
+    @config_file_path = File.expand_path(@config_file_path)
     #puts "#{@config_file_name} found at #{@config_file_path}"
   end
 

data/lib/solis/model.rb

@@ -485,8 +485,31 @@ values ?s {<#{self.graph_id}>}
     def make_graph(graph, hierarchy, id, klass, klass_metadata, resolve_all)
       klass_metadata[:attributes].each do |attribute, metadata|
         data = klass.instance_variable_get("@#{attribute}")
-        if data.nil? && metadata[:mincount] > 0 && graph.query(RDF::Query.new({ attribute.to_sym => { RDF.type => metadata[:node] } })).size == 0
-          raise Solis::Error::InvalidAttributeError, "#{hierarchy.join('.')}.#{attribute} min=#{metadata[:mincount]} and max=#{metadata[:maxcount]}"
+
+        if data.nil? && metadata.key?(:mincount) && ( metadata[:mincount].nil? || metadata[:mincount] > 0) && graph.query(RDF::Query.new({ attribute.to_sym => { RDF.type => metadata[:node] } })).size == 0
+          if data.nil?
+            uuid = id.value.split('/').last
+            original_klass = klass.query.filter({ filters: { id: [ uuid ] } }).find_all { |f| f.id == uuid }.first || nil
+            unless original_klass.nil?
+              klass = original_klass
+              data = klass.instance_variable_get("@#{attribute}")
+            end
+          end
+          #if data is still nil
+          raise Solis::Error::InvalidAttributeError, "#{hierarchy.join('.')}~#{klass.name}.#{attribute} min=#{metadata[:mincount]} and max=#{metadata[:maxcount]}" if data.nil?
+        end
+
+        if data.nil? && metadata.key?(:maxcount) && ( metadata[:maxcount].nil? || metadata[:maxcount] > 0) && graph.query(RDF::Query.new({ attribute.to_sym => { RDF.type => metadata[:node] } })).size == 0
+          if data.nil?
+            uuid = id.value.split('/').last
+            original_klass = klass.query.filter({ filters: { id: [ uuid ] } }).find_all { |f| f.id == uuid }.first || nil
+            unless original_klass.nil?
+              klass = original_klass
+              data = klass.instance_variable_get("@#{attribute}")
+            end
+          end
+          #if data is still nil
+          raise Solis::Error::InvalidAttributeError, "#{hierarchy.join('.')}~#{klass.name}.#{attribute} min=#{metadata[:mincount]} and max=#{metadata[:maxcount]}" if data.nil?
         end
 
         # skip if nil or an object that is empty

data/lib/solis/query.rb

@@ -267,6 +267,11 @@ PREFIX #{@model.class.graph_prefix}: <#{@model.class.graph_name}>"
               record_uri = statement.s.value
               attribute = statement.p.value.split('/').last.underscore
 
+              unless solution_model.metadata[:attributes].key?(attribute)
+                Solis::LOGGER.error "Attribute found in data that is not part of the model model #{solution_model.name}(#{record_uri.split('/').last}).#{attribute}"
+                next
+              end
+
               if statement.o.valid?
                 if statement.o.is_a?(RDF::URI)
                   object = statement.o.canonicalize.value
@@ -335,6 +340,10 @@ PREFIX #{@model.class.graph_prefix}: <#{@model.class.graph_name}>"
                 end
               end
             rescue StandardError => e
+              unless solution_model.metadata[:attributes].key?(attribute)
+                Solis::LOGGER.error("#{record_uri} - graph_to_object - #{attribute} - #{e.message}")
+                raise  "'#{attribute}' not in model"
+              end
               puts e.backtrace.first
               Solis::LOGGER.error("#{record_uri} - graph_to_object - #{attribute} - #{e.message}")
               g = RDF::Graph.new

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

@@ -5,7 +5,7 @@ module Solis
     module Reader
       class File
         def self.read(filename, options = {})
-          @filename = filename
+          @filename = ::File.expand_path(filename)
           raise "File not found #{@filename}" unless ::File.exist?(@filename)
 
           RDF::Graph.load(@filename, **options)

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

@@ -472,6 +472,38 @@ hide empty members
               puts e.message
             end
 
+            def build_json_schema(shacl_file)
+                graph = RDF::Graph.load(StringIO.new(shacl_file), format: :ttl)
+                json_schema = {
+                  "$schema" => "http://json-schema.org/draft-07/schema#",
+                  "type" => "object",
+                  "properties" => {},
+                  "required" => []
+                }
+
+                graph.query([nil, RDF.type, SHACL.NodeShape]) do |shape|
+                  shape_subject = shape.subject
+
+                  graph.query([shape_subject, SHACL.property, nil]) do |prop_stmt|
+                    prop_subject = prop_stmt.object
+                    prop_name = graph.query([prop_subject, SHACL.path, nil]).first&.object.to_s
+                    datatype = graph.query([prop_subject, SHACL.datatype, nil]).first&.object
+                    min_count = graph.query([prop_subject, SHACL.minCount, nil]).first&.object&.to_i
+                    max_count = graph.query([prop_subject, SHACL.maxCount, nil]).first&.object&.to_i
+                    pattern = graph.query([prop_subject, SHACL.pattern, nil]).first&.object&.to_s
+
+                    json_schema["properties"][prop_name] = {}
+                    json_schema["properties"][prop_name]["type"] = datatype.to_s.split("#").last.downcase if datatype
+                    json_schema["properties"][prop_name]["pattern"] = pattern if pattern
+
+                    json_schema["required"] << prop_name if min_count && min_count > 0
+                    json_schema["properties"][prop_name]["maxItems"] = max_count if max_count
+                  end
+                end
+
+                JSON.pretty_generate(json_schema)
+            end
+
             def every_entity(data)
               all_references = []
               graph_prefix = data[:ontologies][:base][:prefix]
@@ -658,8 +690,10 @@ hide empty members
           schema = build_schema(datas)
           Solis::LOGGER.info('Generating INFLECTIONS')
           inflections = build_inflections(datas)
+          Solis::LOGGER.info('Generating JSON SCHEMA')
+          json_schema = build_json_schema(shacl)
 
-          { inflections: inflections, shacl: shacl, schema: schema, plantuml: plantuml }
+          { inflections: inflections, shacl: shacl, schema: schema, plantuml: plantuml, json_schema: json_schema }
         end
       end
     end

data/lib/solis/version.rb

@@ -1,3 +1,3 @@
 module Solis
-  VERSION = "0.82.0"
+  VERSION = "0.84.0"
 end

data/solis.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'activesupport', '~> 7.0'
+  spec.add_runtime_dependency 'activesupport', '~> 8.0'
   spec.add_runtime_dependency 'http', '~> 5.2'
   spec.add_runtime_dependency 'graphiti', '~> 1.7'
   spec.add_runtime_dependency 'moneta', '~> 1.6'

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: solis
 version: !ruby/object:Gem::Version
-  version: 0.82.0
+  version: 0.84.0
 platform: ruby
 authors:
 - Mehmet Celik
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-02-23 00:00:00.000000000 Z
+date: 2025-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,14 +15,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '8.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '8.0'
 - !ruby/object:Gem::Dependency
   name: http
   requirement: !ruby/object:Gem::Requirement
@@ -308,7 +307,6 @@ metadata:
   homepage_uri: https://github.com/mehmetc/solis
   source_code_uri: https://github.com/mehmetc/solis
   changelog_uri: https://github.com/mehmetc/solis
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -323,8 +321,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.14
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Turn any SHACL file into an API, ORM, documentation, ...
 test_files: []