solis 0.68.0 → 0.70.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a93afb01da132bf005f3e682986c2e15876db706550f579aa5505854c23aabb0
-  data.tar.gz: 6ab988794791e1e14abeb58c8ed610270685cef642135d49fe679248396186fa
+  metadata.gz: f8643fbce6b423cf64728ed433be0208ee53db367afecb93b8e63c131fc7fbcd
+  data.tar.gz: 22679c04f9d67219a0b6f5598029462b7e067b3c9218132b076b58b23d514f88
 SHA512:
-  metadata.gz: 7fd19bea2aa49407929aecb36760e7cf1ae31896e57c6075f43dd09ef8abd56e4f4cf15643f031ed9e5537f9249d7e3d50c10a7f8aff8d1b08138623ca729a42
-  data.tar.gz: 3bad39506d27b3cf9437c27e1a9c99a9fcd7cdcc78a50cdd1c951ef80741926e5db1ab189835a68c3a80ec2323f69500b39156c1ea99a792143583fe95b43dd1
+  metadata.gz: c2a8ec6b308230459b5a2a4ad4271ebc31305c776deedaf7bb631c6051df1e6b84c2a6cf5bef4d705fe175c0a300ab3a7fe07f0586a232f3c8fe70035ecaf542
+  data.tar.gz: 50c09efc0aa5ae63cdd45c5e9a9923461a8231dda52d6fe3600548c770eec871e3df684bbe36d3817081892fe7af3391b190257cdd1d19d7d88c4a631e0714da

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
-
-                    "#{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
 
                 end
 
-
-                remote_resources.join(',') 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.join(',') 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/query.rb

@@ -119,6 +119,7 @@ module Solis
       core_query = core_query(relationship)
       count_query = core_query.gsub(/SELECT .* WHERE/, 'SELECT (COUNT(distinct ?concept) as ?count) WHERE')
 
+      count_query = count_query.split('a ?type')[0]+'a ?type }'
       result = sparql_client.query(count_query)
       solution = result.first
       solution.nil? ? 0 : solution[:count].object || 0

data/lib/solis/version.rb

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

data/solis.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |spec|
   spec.email         = ['mehmet@celik.be']
 
   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.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.68.0
+  version: 0.70.0
 platform: ruby
 authors:
 - Mehmet Celik
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-11-18 00:00:00.000000000 Z
+date: 2023-01-05 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: []