solis 0.87.0 → 0.88.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d5926e4dab3d02865ae5333e319a8973c79e1b0b49d1fc86ec5cd17d32204ed
-  data.tar.gz: d33d664a73dcb56231d1fc0364314100a114d83b0c2c75c7c11479aa00fba4b7
+  metadata.gz: 1ea2b39d46de37ed36dd0132d993c82abac68da1fddc43c7ccae04ada175dbd1
+  data.tar.gz: 482e9fd7e9da74e9324f9836e2d820dea97918458d48c598e3267145d78337ae
 SHA512:
-  metadata.gz: 64bc93c8a1767fc786d2c2528762e7707aad9e33cbe1ec9d9d1208ccbd12f76d65e8bbd244ae88a7a2a89147eb7facc4194d41bcf38cc04c6c0d29a055da207f
-  data.tar.gz: ce928eaf3a1b43bf1a93678dd5f47544265f47e71df9c61c64d5c1819056aade67fd175fc54b611e03a6e8eb0d5d7c2b9c761b812c0e3a8a2c16a2557130d5c0
+  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/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.87.0"
+  VERSION = "0.88.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solis
 version: !ruby/object:Gem::Version
-  version: 0.87.0
+  version: 0.88.0
 platform: ruby
 authors:
 - Mehmet Celik
@@ -335,7 +335,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.8
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Turn any SHACL file into an API, ORM, documentation, ...
 test_files: []