solis 0.80.0 → 0.82.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 156f64ccc4d0ce04ac67bbb450634697eab5f9c35079fafbc2024afc921aae79
-  data.tar.gz: 9ef551b57b0322740837b2ee4feaffe80b5447e6f0d119fdf865dfda43bea24b
+  metadata.gz: 148a2ed5b726f859738b0a345a66df17f252409f6ef13b093292cdae06ba752e
+  data.tar.gz: d5079802a5d56d7076d02eadd47e50d55a6adc1f00ff8cfc776eb0ab88ed4dfb
 SHA512:
-  metadata.gz: bf8c5a1e3ed1a80ba916aaa9868cc5965cc9cf962ecd3913e9a4a2d41417db8c5e618eb1866e1085dea71573257934a42ed8f29b9a42e3dcf6134f6b3a2d99c2
-  data.tar.gz: ac4c0296ffa93d3b10ed183e5fef30a2a75a712e81e07898bb71cb927a0296f6ff5043c2b33d9964a5eac2542031f2d3f5802dad4b4e0ffecdbe9b817693191f
+  metadata.gz: 7a5b1d02a96dfe0c6469624487ab61db13c5ba88862a39bfd575bd92df5b0e26b7abde650101007b9426d7dde49e2dd1d791c217c0eb736a1050edd56d49cc75
+  data.tar.gz: '0815bbee7954c53515a6c7d3c49000d6d002a2d23bc5c577c93ab02b6f2ba3fa9b1cb6fd9e34e3b61d991a143e6556df97041873abb08233281dd5f0c625d127'

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,7 +7,7 @@ module Solis
             @client = client
           end
 
-          def run(query)
+          def run(query, options = {})
             result = @client.query(query)
 
             if is_construct?(query)

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.82.0"
 end

data/solis.gemspec

@@ -40,6 +40,8 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'uuidtools', '~> 2.2.0'
   spec.add_runtime_dependency 'dry-struct', '~> 1.6'
   spec.add_runtime_dependency 'psych', '~> 5.1'
+  spec.add_runtime_dependency 'csv'
+  spec.add_runtime_dependency 'mutex_m'
   #  spec.add_runtime_dependency 'rdf-edtf', '~> 1.1.2'
 
   spec.add_development_dependency 'rake', '~> 13.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solis
 version: !ruby/object:Gem::Version
-  version: 0.80.0
+  version: 0.82.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
@@ -192,6 +192,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.1'
+- !ruby/object:Gem::Dependency
+  name: csv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mutex_m
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement