solis 0.67.0 → 0.69.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10dca19492f571ddd21415a4c359cbf0dfdfef231c97683006edb31a6eb945fa
-  data.tar.gz: cd960ae1960262772debcf74bde0536e7c11c506be8ca347fb5c439bfa67e11c
+  metadata.gz: fb7b4c2f87c4dfaa321b9e986296cbcef41849230a8c29efcd3385e6168e7034
+  data.tar.gz: 9992f2c9eef0d56c9ec0fc53fa68b45a8b5efb8e9065ddd637427c9f7a3b2087
 SHA512:
-  metadata.gz: 10360c6ca52479be02933037d4976c9216854118e672705acf5e008e54661addc762ae9606f5d0230a19d699a239d061a99de389364653d704a63223ed4db87c
-  data.tar.gz: 5a35e2e1ec935e2f63e6d93d301d5bd53364ed5d6228994dd7a3f64dbb67d88d2332b8d72da26bf0e75fa2d1d0a43137af64b2f8584c92fab6662aac97a979ba
+  metadata.gz: '0284ecdce9377633bddef224daf54c25862a65e3eef78995db67b61380cae989958c088aba229c3ee100106008c948031679d61b845f4a8dbfacc5d540e0ebfb'
+  data.tar.gz: d6cbf0d9e0bcf54c7e5a129eb56575bea5af2391ab9f64afdd268c420e747c3c2f5577b5ce84d05ca8f8de6acf094287d3732e31fb5e8ceb2bddd89fc408eb29

data/lib/solis/graph.rb

@@ -275,16 +275,13 @@ module Solis
                 remote_resources = resource.instance_variable_get("@#{key}")
                 if remote_resources
                   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}"
+                  resource_ids = remote_resources.map do |remote_resource|
+                    remote_resource.id =~ /^http/ ? remote_resource.id.split('/').last : remote_resource.id
                   end
 
-                  #    return remote_resources.length == 1 ? remote_resources.first : remote_resources
                 end
 
-                remote_resources.first if remote_resources #belongs_to
+                "#{resource.class.graph_name.gsub(/\/$/,'')}/#{belongs_to_resource_name.tableize}?filter[id]=#{resource_ids.join(',')}" unless remote_resources.nil? || resource_ids.empty?
               end
             end
           else
@@ -296,18 +293,15 @@ module Solis
 
               belongs_to_resource.belongs_to(resource.model.name.tableize.singularize, foreign_key: :id, primary_key: :id, resource: graph.shape_as_resource(resource.model.name)) do
                 link do |resource|
+                  ids=[]
                   remote_resources = resource.instance_variable_get("@#{shape_name.tableize.singularize}")
                   if remote_resources
                     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}"
+                    resource_ids = remote_resources.map do |remote_resource|
+                      remote_resource.id =~ /^http/ ? remote_resource.id.split('/').last : remote_resource.id
                     end
-
-                    # return remote_resources.length == 1 ? remote_resources.first : remote_resources
                   end
-                  remote_resources if remote_resources #has_many_belongs_to
+                  "#{resource.class.graph_name.gsub(/\/$/,'')}/#{belongs_to_resource.name.tableize}?filter[id]=#{resource_ids.join(',')}" unless remote_resources.nil? || resource_ids.empty?
                 end
               end
               #
@@ -315,15 +309,12 @@ module Solis
                 remote_resources = resource.instance_variable_get("@#{key}")
                 if remote_resources
                   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(/\/$/,'')}/#{remote_resource.name.tableize}/#{resource_id}"
+                  resource_ids = remote_resources.map do |remote_resource|
+                    remote_resource.id =~ /^http/ ? remote_resource.id.split('/').last : remote_resource.id
                   end
 
-                  #return remote_resources.length == 1 ? remote_resources.first : remote_resources
                 end
-                remote_resources.first if remote_resources
+                "#{resource.class.graph_name.gsub(/\/$/,'')}/#{remote_resources.first.name.tableize}?filter[id]=#{resource_ids.join(',')}" unless remote_resources.nil? || resource_ids.empty?
               end
             end
           end

data/lib/solis/model.rb

@@ -26,9 +26,12 @@ module Solis
           elsif self.class.metadata[:attributes][attribute.to_s][:node_kind].is_a?(RDF::URI) && value.is_a?(Array)
             new_value = []
             value.each do |v|
-              next unless v.class.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)
+              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
@@ -147,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
 
@@ -408,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.67.0"
+  VERSION = "0.69.0"
 end

data/solis.gemspec

@@ -6,8 +6,8 @@ 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.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.summary       = 'Turn any SHACL file into an API, ORM, documentation, ...'
+  spec.description   = 'The SUN in latin or is it SILOS spelled backwards. Turn any SHACL file or Google sheet into an API, ORM, documentation on top of a data store'
   spec.homepage      = 'https://github.com/mehmetc/solis'
   spec.license       = 'MIT'
   spec.required_ruby_version = Gem::Requirement.new('>= 2.3.0')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solis
 version: !ruby/object:Gem::Version
-  version: 0.67.0
+  version: 0.69.0
 platform: ruby
 authors:
 - Mehmet Celik
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-11-18 00:00:00.000000000 Z
+date: 2022-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -220,9 +220,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 5.15.0
-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)
+description: The SUN in latin or is it SILOS spelled backwards. Turn any SHACL file
+  or Google sheet into an API, ORM, documentation on top of a data store
 email:
 - mehmet@celik.be
 executables: []
@@ -299,6 +298,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: []