solis 0.66.0 → 0.68.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9dd4e75e587fdb57f0fecc1a80921fc36811e3cd9f90e969a5f4f519a82e9d50
-  data.tar.gz: bed2e9f59938c44df66336947b97a6f059182d24f10c6f49f8c2988d18e5a755
+  metadata.gz: a93afb01da132bf005f3e682986c2e15876db706550f579aa5505854c23aabb0
+  data.tar.gz: 6ab988794791e1e14abeb58c8ed610270685cef642135d49fe679248396186fa
 SHA512:
-  metadata.gz: b58e3d6d1c1dd065e23de313a2b362b90467a50ed460b2759c1fb1f217ceae1ccbe27cf91f436a952918d6b65a4e8b26d6f2d3504b89737383da28debeffde38
-  data.tar.gz: b8ac1314cc209a8143b71eafae4fea6e7e940bec918190beeb62c6db0950a3937ee64fe5993b8b8166a812a09ad67b9fd3057da7c12dc5eb7e3ea08e82f51489
+  metadata.gz: 7fd19bea2aa49407929aecb36760e7cf1ae31896e57c6075f43dd09ef8abd56e4f4cf15643f031ed9e5537f9249d7e3d50c10a7f8aff8d1b08138623ca729a42
+  data.tar.gz: 3bad39506d27b3cf9437c27e1a9c99a9fcd7cdcc78a50cdd1c951ef80741926e5db1ab189835a68c3a80ec2323f69500b39156c1ea99a792143583fe95b43dd1

data/lib/solis/graph.rb

@@ -277,14 +277,14 @@ module Solis
                   remote_resources = [remote_resources] unless remote_resources.is_a?(Array)
                   remote_resources = remote_resources.map do |remote_resource|
                     resource_id = remote_resource.id =~ /^http/ ? remote_resource.id.split('/').last : remote_resource.id
-                    #"/#{key.tableize}/#{resource_id}"
+
                     "#{resource.class.graph_name.gsub(/\/$/,'')}/#{belongs_to_resource_name.tableize}/#{resource_id}"
                   end
 
-                  #    return remote_resources.length == 1 ? remote_resources.first : remote_resources
                 end
 
-                remote_resources.first if remote_resources #belongs_to
+
+                remote_resources.join(',') if remote_resources #belongs_to
               end
             end
           else
@@ -323,7 +323,7 @@ module Solis
 
                   #return remote_resources.length == 1 ? remote_resources.first : remote_resources
                 end
-                remote_resources.first if remote_resources
+                remote_resources.join(',') if remote_resources
               end
             end
           end

data/lib/solis/model.rb

@@ -23,6 +23,17 @@ module Solis
           if self.class.metadata[:attributes][attribute.to_s][:node_kind].is_a?(RDF::URI) && value.is_a?(Hash)
             inner_model = self.class.graph.shape_as_model(self.class.metadata[:attributes][attribute.to_s][:datatype].to_s)
             value = inner_model.new(value)
+          elsif self.class.metadata[:attributes][attribute.to_s][:node_kind].is_a?(RDF::URI) && value.is_a?(Array)
+            new_value = []
+            value.each do |v|
+              if v.is_a?(Hash)
+                inner_model = self.class.graph.shape_as_model(self.class.metadata[:attributes][attribute.to_s][:datatype].to_s)
+                new_value << inner_model.new(v)
+              else
+                new_value << v
+              end
+            end
+            value = new_value
           end
 
           # switched off. currently language query parameters returns the value
@@ -139,7 +150,7 @@ module Solis
 
       sparql = SPARQL::Client.new(self.class.sparql_endpoint)
 
-      original_klass = self.query.filter({language: nil, filters: { id: [id] } }).find_all.map { |m| m }&.first
+      original_klass = self.query.filter({ language: nil, filters: { id: [id] } }).find_all.map { |m| m }&.first
       raise Solis::Error::NotFoundError if original_klass.nil?
       updated_klass = original_klass.deep_dup
 
@@ -400,11 +411,11 @@ module Solis
 
         data.each do |d|
           if defined?(d.name) && self.class.graph.shape?(d.name)
-            if self.class.graph.shape_as_model(d.name.to_s).metadata[:attributes].select{|_,v| v[:node_kind].is_a?(RDF::URI)}.size > 0 &&
-              hierarchy.select{|s| s =~ /^#{d.name.to_s}/}.size == 0
+            if self.class.graph.shape_as_model(d.name.to_s).metadata[:attributes].select { |_, v| v[:node_kind].is_a?(RDF::URI) }.size > 0 &&
+              hierarchy.select { |s| s =~ /^#{d.name.to_s}/ }.size == 0
               internal_resolve = false
               d = build_ttl_objekt2(graph, d, hierarchy, internal_resolve)
-            elsif self.class.graph.shape_as_model(d.name.to_s) && hierarchy.select{|s| s =~ /^#{d.name.to_s}/}.size == 0
+            elsif self.class.graph.shape_as_model(d.name.to_s) && hierarchy.select { |s| s =~ /^#{d.name.to_s}/ }.size == 0
               internal_resolve = false
               d = build_ttl_objekt2(graph, d, hierarchy, internal_resolve)
             else

data/lib/solis/query.rb

@@ -321,7 +321,11 @@ PREFIX #{@model.class.graph_prefix}: <#{@model.class.graph_name}>"
                 end
               else
                 if solution_model.metadata[:attributes][attribute][:maxcount].nil? || solution_model.metadata[:attributes][attribute][:maxcount] > 1
-                  data[attribute] = [object]
+                  if data.include?(attribute)
+                    data[attribute] << object
+                  else
+                    data[attribute] = [object]
+                  end
                 else
                   data[attribute] = object
                 end

data/lib/solis/version.rb

@@ -1,3 +1,3 @@
 module Solis
-  VERSION = "0.66.0"
+  VERSION = "0.68.0"
 end

data/solis.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ['Mehmet Celik']
   spec.email         = ['mehmet@celik.be']
 
-  spec.summary       = 'Creates a SHACL, RDF, PlantUML file from a Google sheet and a layer ontop of a data store(RDBMS, Triple store)'
+  spec.summary       = 'Turn any SHACL file into an API, ORM, documentation, ...'
   spec.description   = 'The SUN in latin or is it SILOS spelled backwards. Creates a SHACL, RDF, PlantUML file from a Google sheet and a layer ontop of a data store(RDBMS, Triple store)'
   spec.homepage      = 'https://github.com/mehmetc/solis'
   spec.license       = 'MIT'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solis
 version: !ruby/object:Gem::Version
-  version: 0.66.0
+  version: 0.68.0
 platform: ruby
 authors:
 - Mehmet Celik
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-10-20 00:00:00.000000000 Z
+date: 2022-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -299,6 +299,5 @@ requirements: []
 rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
-summary: Creates a SHACL, RDF, PlantUML file from a Google sheet and a layer ontop
-  of a data store(RDBMS, Triple store)
+summary: Turn any SHACL file into an API, ORM, documentation, ...
 test_files: []