solis 0.93.0 → 0.94.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64e83a503bd969f31420c26a39d34caa135a923facd034c87b49d2c3c99d3816
-  data.tar.gz: '08085672c31de214783632756d11750dc188b5512fe69b3572f7242b209d2dd9'
+  metadata.gz: 36a3cb8c2712803966b8da5b1fda51f0ecbdebc2d52fc11c91d5a6045ad395b8
+  data.tar.gz: 56b2c6bc5e69977dddefa79a36bb6db2a759d8cdc9090fef97b0b751a571e315
 SHA512:
-  metadata.gz: bccabb0614de2446d1f6ce802f2e5b28e1982395015dc1783f3509becd4c76c016ab285325816f079e096f7f2d9dfaa740630ea1782e1b9872f9656dcbd0fc9a
-  data.tar.gz: b2f70fdb4f6ad3d981b15406d3e034e6375db3e28b03eb19131639ef00992a51fefb76be50782be885ef51752db87e4e3ef26f02fcae993e44cacfadd47ca296
+  metadata.gz: 6367fc29b396be4a11456d96bfa5b8d89dc260c466021cf2ee2539ab8f80a2e2a253ca7a742b4de857cacc83e22ea642c11f984731a430c1451e9fb04d1068ab
+  data.tar.gz: ba2b061b4f30397c81153e87f01b24d6fd6e40c7f45f1a07158384117af924cdf391c9c4b3e9dc75aadf519c3691b875d87ce952ae1d74e9c5293393c754409a

data/lib/solis/graph.rb

@@ -367,7 +367,7 @@ module Solis
     def flush_all(graph_name=nil, force = false)
       raise Solis::Error::NotFoundError, "Supplied graph_name '#{graph_name}' does not equal graph name defined in config file '#{@graph_name}', set force to true" unless graph_name.eql?(@graph_name) && !force
 
-      @sparql_client = SPARQL::Client.new(@sparql_endpoint)
+      @sparql_client = Solis::Store::Sparql::Client.new(@sparql_endpoint)
       result = @sparql_client.query("with <#{graph_name}> delete {?s ?p ?o} where{?s ?p ?o}")
       LOGGER.info(result)
       true

data/lib/solis/model.rb

@@ -109,7 +109,7 @@ module Solis
 
     def destroy
       raise "I need a SPARQL endpoint" if self.class.sparql_endpoint.nil?
-      sparql = SPARQL::Client.new(self.class.sparql_endpoint)
+      sparql = Solis::Store::Sparql::Client.new(self.class.sparql_endpoint)
 
       raise Solis::Error::QueryError, "#{self.id} is still referenced, refusing to delete" if is_referenced?(sparql)
       # sparql.query('delete{}')
@@ -309,7 +309,7 @@ values ?s {<#{self.graph_id}>}
 
     def self.make_id_for(model)
       raise "I need a SPARQL endpoint" if self.sparql_endpoint.nil?
-      sparql = SPARQL::Client.new(self.sparql_endpoint)
+      sparql = Solis::Store::Sparql::Client.new(self.sparql_endpoint)
       id = model.instance_variable_get("@id")
       if id.nil? || (id.is_a?(String) && id&.empty?)
         id_retries = 0

data/lib/solis/query/construct.rb

@@ -6,7 +6,8 @@ module Solis
       def initialize(model)
         @model = model
         @sparql_endpoint = @model.class.sparql_endpoint
-        @sparql_client = SPARQL::Client.new(@sparql_endpoint, graph: @model.class.graph_name, read_timeout: 120)
+        #@sparql_client = SPARQL::Client.new(@sparql_endpoint, graph: @model.class.graph_name, read_timeout: 120)
+        @sparql_client = Solis::Store::Sparql::Client.new(@sparql_endpoint, graph: @model.class.graph_name, read_timeout: 120)
         @construct_cache = File.absolute_path(Solis::Options.instance.get[:cache])
         @moneta = Moneta.new(:File, dir: "#{@construct_cache}/construct", expires: Solis::Options.instance.get[:cache_expire])
       end
@@ -38,7 +39,7 @@ module Solis
           if @moneta.key?(file_path_hash) && from_cache.eql?('1')
             sparql_repository = @moneta[file_path_hash]
           else
-            @sparql_client = SPARQL::Client.new(@sparql_endpoint, read_timeout: 120)
+            #@sparql_client = SPARQL::Client.new(@sparql_endpoint, read_timeout: 120)
             result = @sparql_client.query(construct_query)
             repository=RDF::Repository.new
             result.each {|s| repository << [s[:s], s[:p], s[:o]]}

data/lib/solis/query/filter.rb

@@ -114,13 +114,11 @@ module Solis
                   v=normalize_string(v)
                   filter = "?concept <#{metadata[:path]}> ?__search#{i} FILTER(?__search#{i} #{not_operator}#{value[:operator]} \"#{v}\"#{datatype}) .\n"
                 end
-
-
               end
             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}\")."
+                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

data/lib/solis/query/run.rb

@@ -15,7 +15,7 @@ class Solis::Query::Runner
 }
    )
 
-      c = Solis::Store::Sparql::Client.new(Solis::Options.instance.get[:sparql_endpoint], graph_name)
+      c = Solis::Store::Sparql::Client.new(Solis::Options.instance.get[:sparql_endpoint], graph_name: graph_name)
       r = c.query(query, options)
       if r.is_a?(SPARQL::Client)
         g = RDF::Graph.new

data/lib/solis/query.rb

@@ -65,11 +65,10 @@ module Solis
       @metadata = @model.class.metadata
       @sparql_endpoint = @model.class.sparql_endpoint
       if Solis::Options.instance.get.key?(:graphs) && Solis::Options.instance.get[:graphs].size > 0
-        @sparql_client = SPARQL::Client.new(@sparql_endpoint)
+        @sparql_client = Solis::Store::Sparql::Client.new(@sparql_endpoint)
       else
-        @sparql_client = SPARQL::Client.new(@sparql_endpoint, graph: @model.class.graph_name)
+        @sparql_client = Solis::Store::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 = ''
@@ -166,7 +165,6 @@ module Solis
       offset = @offset || 0
 
       sparql_client = model_construct? ? Solis::Query::Construct.new(@model).run : @sparql_client
-      #sparql_client = model_construct? ? SPARQL::Client.new(run_construct) : @sparql_client
 
       relationship = ''
       if options.key?(:relationship)

data/lib/solis/store/sparql/client.rb

@@ -7,13 +7,22 @@ module Solis
   module Store
     module Sparql
       class Client
-        def initialize(endpoint, graph_name)
+        def initialize(endpoint, options = {})
           @endpoint = endpoint
-          @graph_name = graph_name
+          @graph_name = options[:graph_name] || ''
+          @read_timeout = options[:read_timeout] || 120
+          @logger = options[:logger] || Solis::LOGGER
 
             @pool = ConnectionPool.new(size:5, timeout: 160) do
-            SPARQL::Client.new(@endpoint, graph: @graph_name)
-            #SPARQL::Client.new(@endpoint)
+              Solis::LOGGER.level = Logger::DEBUG if ConfigFile[:debug]
+
+              if @graph_name
+                client = SPARQL::Client.new(@endpoint, graph: @graph_name, read_timeout: @read_timeout, logger: @logger)
+              else
+                client = SPARQL::Client.new(@endpoint, read_timeout: @read_timeout, logger: @logger)
+              end
+
+              client
           end
         end
 

data/lib/solis/version.rb

@@ -1,3 +1,3 @@
 module Solis
-  VERSION = "0.93.0"
+  VERSION = "0.94.0"
 end

data/solis.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'activesupport', '~> 8.0'
   spec.add_runtime_dependency 'http', '~> 5.2'
-  spec.add_runtime_dependency 'graphiti', '~> 1.7'
+  spec.add_runtime_dependency 'graphiti', '~> 1.8'
   spec.add_runtime_dependency 'moneta', '~> 1.6'
   spec.add_runtime_dependency 'linkeddata', '~> 3.3'
   spec.add_runtime_dependency 'google_drive', '~> 3.0'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solis
 version: !ruby/object:Gem::Version
-  version: 0.93.0
+  version: 0.94.0
 platform: ruby
 authors:
 - Mehmet Celik
@@ -43,14 +43,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: moneta
   requirement: !ruby/object:Gem::Requirement