solis 0.80.0 → 0.81.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 156f64ccc4d0ce04ac67bbb450634697eab5f9c35079fafbc2024afc921aae79
-  data.tar.gz: 9ef551b57b0322740837b2ee4feaffe80b5447e6f0d119fdf865dfda43bea24b
+  metadata.gz: 5bd00b98413e1643fab9d1d14be119aa13be1cc30c140bb5a303ba946ce77938
+  data.tar.gz: e8a6a3c31cdad735a5fe1fc74aae0e5bd0315298cbc109f4b49424fa9a48a311
 SHA512:
-  metadata.gz: bf8c5a1e3ed1a80ba916aaa9868cc5965cc9cf962ecd3913e9a4a2d41417db8c5e618eb1866e1085dea71573257934a42ed8f29b9a42e3dcf6134f6b3a2d99c2
-  data.tar.gz: ac4c0296ffa93d3b10ed183e5fef30a2a75a712e81e07898bb71cb927a0296f6ff5043c2b33d9964a5eac2542031f2d3f5802dad4b4e0ffecdbe9b817693191f
+  metadata.gz: b4dd50f0792125505fd1d29567315885fc625c8c042cfe6de2e9a54584851e3bf04aced1297018126faa9234e2e44cd4e016b61f8121d57d00f52e07d60baaca
+  data.tar.gz: 7b5eac096038ce5f7e384fcbc02523a6bdb3960031150746613117ece277d3de64784022353c96ec4b75494a8286a5cb475ef8aeb577c01d14073306ae7ac788

data/lib/solis/query/run.rb

@@ -2,7 +2,7 @@ require 'solis/store/sparql/client'
 require 'solis/config_file'
 
 class Solis::Query::Runner
-    def self.run(entity, query)
+    def self.run(entity, query, options = {})
       result = {}
       context = JSON.parse %(
 {
@@ -16,7 +16,7 @@ class Solis::Query::Runner
    )
 
       c = Solis::Store::Sparql::Client.new(Solis::Options.instance.get[:sparql_endpoint], Solis::Options.instance.get[:graph_name])
-      r = c.query(query)
+      r = c.query(query, options)
       if r.is_a?(SPARQL::Client)
         g = RDF::Graph.new
         t = r.query('select * where{?s ?p ?o}')
@@ -47,11 +47,15 @@ class Solis::Query::Runner
     def self.sanitize_result(framed)
       data = framed&.key?('@graph') ? framed['@graph'] : [framed]
 
+      sanitatize_data_in_result(data)
+    end
+
+    def self.sanitatize_data_in_result(data)
       data.map do |d|
         d.delete_if { |e| e =~ /^@/ }
         if d.is_a?(Hash)
           new_d = {}
-          d.each do |k,v|
+          d.each do |k, v|
             if v.is_a?(Hash)
               if v.key?('@type')
                 type = v['@type']
@@ -71,7 +75,11 @@ class Solis::Query::Runner
                 end
                 v = sanitize_result(v) if v.is_a?(Hash)
               end
-              new_d[k] = v.class.method_defined?(:value) ? v.value : v
+              if v.is_a?(Hash)
+                new_d[k] = v.class.method_defined?(:value) ? v.value : sanitize_result(v)
+              else
+                new_d[k] = v.class.method_defined?(:value) ? v.value : v
+              end
             elsif v.is_a?(Array) #todo: make recursive
               new_d[k] = []
               v.each do |vt|
@@ -95,5 +103,8 @@ class Solis::Query::Runner
 
         d
       end
+    rescue StandardError => e
+      Solis::LOGGER.error(e.message)
+      data
     end
 end

data/lib/solis/shape/reader/sheet.rb

@@ -43,6 +43,12 @@ module Solis
                 raise "_REFERENCES tab must have ['sheeturl', 'description', 'entityrange'] as a header at row 1" unless (%w[sheeturl description entityrange] - references.header).length == 0
               end
 
+              sheets.each do |sheet_name, sheet|
+                if sheet_name !~ /^_/
+                  entities = sheets[sheet_name]
+                  raise "#{sheet_name} tab must have ['Name', 'Description', 'MIN', 'MAX', 'sameAs', 'datatype'] as a header at row 1" unless (%w[name description min max sameas datatype] - entities.header).length == 0
+                end
+              end
             end
 
             def read_sheets(key, spreadsheet_id, options)

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

@@ -7,8 +7,8 @@ module Solis
             @client = client
           end
 
-          def run(query)
-            result = @client.query(query)
+          def run(query, options = {})
+            result = @client.query(query, options)
 
             if is_construct?(query)
               repository = RDF::Repository.new

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

@@ -27,11 +27,11 @@ module Solis
           return false
         end
 
-        def query(query)
+        def query(query, options = {})
           raise Solis::Error::NotFoundError, "Server or graph(#{@graph_name} not found" unless up?
           result = nil
           @pool.with do |c|
-            result = Query.new(c).run(query)
+            result = Query.new(c).run(query, options)
           end
           result
         end

data/lib/solis/version.rb

@@ -1,3 +1,3 @@
 module Solis
-  VERSION = "0.80.0"
+  VERSION = "0.81.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solis
 version: !ruby/object:Gem::Version
-  version: 0.80.0
+  version: 0.81.0
 platform: ruby
 authors:
 - Mehmet Celik
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-02-10 00:00:00.000000000 Z
+date: 2025-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport