solis 0.86.0 → 0.88.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7970257cfdc060571c01b55b557d8146d536dbb52455b456a82f01e7b6482363
-  data.tar.gz: f6a0cf69a9aab6fddede73a70832c4ba97968ffdaae9fda244f2b9a9881b7a88
+  metadata.gz: 1ea2b39d46de37ed36dd0132d993c82abac68da1fddc43c7ccae04ada175dbd1
+  data.tar.gz: 482e9fd7e9da74e9324f9836e2d820dea97918458d48c598e3267145d78337ae
 SHA512:
-  metadata.gz: b0ae8c97bdfd0420a3679797bb23c63990a6814cb341b549642766ed7a48b83a482b2599c34c414925049185c3593bbb1281960603fa4473a602be9cd5ab6aa3
-  data.tar.gz: 1426ecf0a1dead864cc82afde451bddf40136e6d447a106034689fc51807338eee411f3ac3fe18f92d88581a699fdb2caf27990d6c325fb200ae48f5e5d4f184
+  metadata.gz: 654347d6d6a72464e6b513be9cbf31412f5fde09da73cf013bda2a46e7a205839af11550fe7b0b2c4b77c55b370c08b6e1f3e651c5168a894b46544060e7be45
+  data.tar.gz: 38631633199f44e18b21cd07833f0a3b79e851276bf41b2fad49639eb23f1350d69fa811cb55cd2535fa4a4f756867994bb3630c59fae5da4cb549c54889d55b

data/lib/solis/graph.rb

@@ -292,6 +292,23 @@ module Solis
                 "#{resource.class.graph_name.gsub(/\/$/,'')}/#{belongs_to_resource_name.tableize}?filter[id]=#{resource_ids.join(',')}" unless remote_resources.nil? || resource_ids.empty?
               end
             end
+          elsif (value[:mincount] && value[:mincount] == 1) || (value[:maxcount] && value[:maxcount] == 1)
+            has_one_resource_name = value[:datatype].nil? ? value[:class].gsub(self.model.graph_name, '') : value[:datatype].to_s.classify
+            LOGGER.info "\t\t\t#{resource_name}(#{resource_name.gsub('Resource','').tableize.singularize}) has_one #{has_one_resource_name}(#{key})"
+            resource.has_one(key.to_sym, foreign_key: :id, primary_key: :id, resource: graph.shape_as_resource("#{has_one_resource_name}", stack_level << has_one_resource_name)) do
+              link do |resource|
+                remote_resources = resource.instance_variable_get("@#{key}")
+                if remote_resources
+                  remote_resources = [remote_resources] unless remote_resources.is_a?(Array)
+                  resource_ids = remote_resources.map do |remote_resource|
+                    remote_resource.id =~ /^http/ ? remote_resource.id.split('/').last : remote_resource.id
+                  end
+
+                end
+
+                "#{resource.class.graph_name.gsub(/\/$/,'')}/#{has_one_resource_name.tableize}?filter[id]=#{resource_ids.join(',')}" unless remote_resources.nil? || resource_ids.empty?
+              end
+            end
           else
             has_many_resource_name = value[:datatype].nil? ? value[:class].gsub(self.model.graph_name, '') : value[:datatype].to_s.classify
             LOGGER.info "\t\t\t#{resource_name}(#{resource_name.gsub('Resource','').tableize.singularize}) has_many #{has_many_resource_name}(#{key})"

data/lib/solis/model.rb

@@ -225,6 +225,9 @@ values ?s {<#{self.graph_id}>}
           end
         end
 
+        maxcount = original_klass.class.metadata[:attributes][key][:maxcount]
+        value = value.first if maxcount && maxcount == 1 && value.is_a?(Array)
+
         updated_klass.instance_variable_set("@#{key}", value)
       end
 
@@ -483,7 +486,12 @@ values ?s {<#{self.graph_id}>}
         end
       end
 
-      make_graph(graph, hierarchy, id, original_klass, klass_metadata, resolve_all)
+      begin
+        make_graph(graph, hierarchy, id, original_klass, klass_metadata, resolve_all)
+      rescue => e
+        Solis::LOGGER.error(e.message)
+        raise e
+      end
 
       hierarchy.pop
       id

data/lib/solis/query.rb

@@ -320,7 +320,7 @@ PREFIX #{@model.class.graph_prefix}: <#{@model.class.graph_name}>"
 
               if data.key?(attribute) # attribute exists
                 raise "Cardinality error, max = #{solution_model.metadata[:attributes][attribute][:maxcount]}" if solution_model.metadata[:attributes][attribute][:maxcount] == 0
-                if solution_model.metadata[:attributes][attribute][:maxcount] == 1 && data.key?(attribute)
+                if solution_model.metadata[:attributes][attribute][:maxcount] == 1 && data.key?(attribute) && data[attribute].is_a?(Array) && data[attribute].length > 1
                   raise "Cardinality error, max = #{solution_model.metadata[:attributes][attribute][:maxcount]}"
                 elsif solution_model.metadata[:attributes][attribute][:maxcount] == 1
                   data[attribute] = object

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

@@ -481,16 +481,16 @@ hide empty members
                   "required" => []
                 }
 
-                graph.query([nil, RDF.type, SHACL.NodeShape]) do |shape|
+                graph.query([nil, RDF.type, RDF::Vocab::SHACL.NodeShape]) do |shape|
                   shape_subject = shape.subject
 
-                  graph.query([shape_subject, SHACL.property, nil]) do |prop_stmt|
+                  graph.query([shape_subject, RDF::Vocab::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
+                    prop_name = graph.query([prop_subject, RDF::Vocab::SHACL.path, nil]).first&.object.to_s
+                    datatype = graph.query([prop_subject, RDF::Vocab::SHACL.datatype, nil]).first&.object
+                    min_count = graph.query([prop_subject, RDF::Vocab::SHACL.minCount, nil]).first&.object&.to_i
+                    max_count = graph.query([prop_subject, RDF::Vocab::SHACL.maxCount, nil]).first&.object&.to_i
+                    pattern = graph.query([prop_subject, RDF::Vocab::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

data/lib/solis/store/sparql/client.rb

@@ -11,7 +11,7 @@ module Solis
           @endpoint = endpoint
           @graph_name = graph_name
 
-          @pool = ConnectionPool.new(size:5, timeout: 60) do
+            @pool = ConnectionPool.new(size:5, timeout: 160) do
             SPARQL::Client.new(@endpoint, graph: @graph_name)
             #SPARQL::Client.new(@endpoint)
           end

data/lib/solis/version.rb

@@ -1,3 +1,3 @@
 module Solis
-  VERSION = "0.86.0"
+  VERSION = "0.88.0"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: solis
 version: !ruby/object:Gem::Version
-  version: 0.86.0
+  version: 0.88.0
 platform: ruby
 authors:
 - Mehmet Celik
 bindir: exe
 cert_chain: []
-date: 2025-04-14 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -335,7 +335,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Turn any SHACL file into an API, ORM, documentation, ...
 test_files: []