solis 0.90.0 → 0.92.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db4b32f6a9c7af88cdb8906b2e79ede7216ea1178b1eadfb26ef4cdebfe074a1
-  data.tar.gz: 7e644c2f97bac0967c466a5bf97b1aa45ce89fee8f6c34185cf08827a6fce2e3
+  metadata.gz: e85831535e206873d8f7b40cd0a9cb5de13c31e9e726b57331ce81e641acd54b
+  data.tar.gz: 6a590a9130caa22dbf386e7431c3320c09920e6c8995c70071709ef6b68b2a1e
 SHA512:
-  metadata.gz: bfff3bcc0a4805c782c1b5f088237c4fba9e2bc90181a9701cf369e6652c9ec07fcf52b00186a42288f0d0e7f8df8711ee9cf0349a3231476f8abc48d98de7d0
-  data.tar.gz: a027a7c9b640b13e544e1b9e5ec5b61bd5fd15f4b9d96d5407751c16aef3a8fde368d1bee013e667d98540d6b970b525ba59d862d057547679d9df9336ef352b
+  metadata.gz: 3eb2c16098538ce61eea28aec3f7938fe679c5571976b89004e180679ad7bbdc676013dd6d71cc87e438faf6f2055a806f878437fc0de5cf5c0a9824b51b0d38
+  data.tar.gz: 5ad01cb9131bfbfefc5c0e21e05bf3b0c804cc1272b5b53933812d457f6705c65a5eec22185b0928cce79d864915f3e388ac84bf965583f28f6f613f14301789

data/lib/solis/graph.rb

@@ -20,8 +20,8 @@ module Solis
 
       @global_resource_stack = []
       @graph = graph
-      @graph_name = cloned_options.delete(:graph_name) || '/'
-      @graph_prefix = cloned_options.delete(:graph_prefix) || 'pf0'
+      @graph_name = cloned_options.key?(:graph_name) ? cloned_options.delete(:graph_name) : cloned_options.key?(:graphs) ? cloned_options[:graphs].select{|s| s['type'].eql?(:main)}&.first['name'] || '/' : '/'
+      @graph_prefix = cloned_options.key?(:graph_prefix) ? cloned_options.delete(:graph_prefix) : cloned_options.key?(:graphs) ? cloned_options[:graphs].select{|s| s['type'].eql?(:main)}&.first['prefix'] || 'pf0' : 'pf0'
       @sparql_endpoint = cloned_options.delete(:sparql_endpoint) || nil
 
       if cloned_options&.key?(:hooks) && cloned_options[:hooks].is_a?(Hash)

data/lib/solis/query/filter.rb

@@ -117,8 +117,13 @@ module Solis
 
 
               end
-            else
-              filter = "?concept <#{metadata[:path]}> ?__search#{i} FILTER(#{contains.empty? ? '""' : contains}) .\n"
+            else # if "~" contains
+              if metadata[:datatype_rdf].eql?( 'http://www.w3.org/2001/XMLSchema#anyURI') || !metadata[:node].nil?
+                model_graph_name = Solis::Options.instance.get.key?(:graphs) ? Solis::Options.instance.get[:graphs].select{|s| s['type'].eql?(:data)}&.first['name'] : @model.class.graph_name
+                filter = "?CONCEPT <#{metadata[:path]}> ?__search#{i} . ?__search#{i} <#{model_graph_name}id> ?__search#{i}_#{i} FILTER(?__search#{i}_#{i} = \"#{value[:value].first}\")."
+              else
+                filter = "?concept <#{metadata[:path]}> ?__search#{i} FILTER(#{contains.empty? ? '""' : contains}) .\n"
+              end
             end
           end
         end

data/lib/solis/query/run.rb

@@ -7,7 +7,7 @@ class Solis::Query::Runner
       context = JSON.parse %(
 {
     "@context": {
-        "@vocab": "#{Solis::Options.instance.get[:graph_name]}",
+        "@vocab": "#{graph_name}",
         "id": "@id"
     },
     "@type": "#{entity}",
@@ -15,7 +15,7 @@ class Solis::Query::Runner
 }
    )
 
-      c = Solis::Store::Sparql::Client.new(Solis::Options.instance.get[:sparql_endpoint], Solis::Options.instance.get[:graph_name])
+      c = Solis::Store::Sparql::Client.new(Solis::Options.instance.get[:sparql_endpoint], graph_name)
       r = c.query(query, options)
       if r.is_a?(SPARQL::Client)
         g = RDF::Graph.new
@@ -107,4 +107,8 @@ class Solis::Query::Runner
       Solis::LOGGER.error(e.message)
       data
     end
+
+    def self.graph_name
+      Solis::Options.instance.get.key?(:graphs) ? Solis::Options.instance.get[:graphs].select{|s| s['type'].eql?(:main)}&.first['name'] : ''
+    end
 end

data/lib/solis/query.rb

@@ -36,7 +36,7 @@ module Solis
         ids = [ids] unless ids.is_a?(Array)
         ids = ids.map do |m|
           if URI(m).class.eql?(URI::Generic)
-            "<#{Solis::Options.instance.get[:graph_name]}#{entity.tableize}/#{m}>"
+            "<#{@model.class.graph_name}#{entity.tableize}/#{m}>"
           else
             "<#{m}>"
           end
@@ -60,7 +60,12 @@ module Solis
       @shapes = @model.class.shapes
       @metadata = @model.class.metadata
       @sparql_endpoint = @model.class.sparql_endpoint
-      @sparql_client = SPARQL::Client.new(@sparql_endpoint, graph: @model.class.graph_name)
+      if Solis::Options.instance.get.key?(:graphs) && Solis::Options.instance.get[:graphs].size > 0
+        @sparql_client = SPARQL::Client.new(@sparql_endpoint)
+      else
+        @sparql_client = SPARQL::Client.new(@sparql_endpoint, graph: @model.class.graph_name)
+      end
+
       @filter = {values: ["VALUES ?type {#{target_class}}"], concepts: ['?concept a ?type .'] }
       @sort = 'ORDER BY ?s'
       @sort_select = ''
@@ -360,5 +365,6 @@ PREFIX #{@model.class.graph_prefix}: <#{@model.class.graph_name}>"
       # result << solution_model.new(data) unless data.empty?
       result
     end
+
   end
 end

data/lib/solis/version.rb

@@ -1,3 +1,3 @@
 module Solis
-  VERSION = "0.90.0"
+  VERSION = "0.92.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solis
 version: !ruby/object:Gem::Version
-  version: 0.90.0
+  version: 0.92.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.9
+rubygems_version: 3.7.1
 specification_version: 4
 summary: Turn any SHACL file into an API, ORM, documentation, ...
 test_files: []