solis 0.85.0 → 0.87.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5ae153b954901d398a8c6a517037479a328328f73ca6be4aa09329b9a3a8520
-  data.tar.gz: e88033fe5e255ae465ec8b8dbfa2f41e068992096d947f8c7eef1a1725c1e714
+  metadata.gz: 7d5926e4dab3d02865ae5333e319a8973c79e1b0b49d1fc86ec5cd17d32204ed
+  data.tar.gz: d33d664a73dcb56231d1fc0364314100a114d83b0c2c75c7c11479aa00fba4b7
 SHA512:
-  metadata.gz: 127c75074573b7890e27af2563059cc74cbb87e0b8d60f8d9617619cc5028458e13feecabd64691881bc33fa990dbc67b300f2eea6f4f1ed257b6ce8ee2d1890
-  data.tar.gz: c197b88286906b2640d2b5bf13315cff2ceafe9c2980ba8d513c948f4520de6dd692aaf821ba22356f79937e2dace79964a4297b1b2a20ddf9025bc966a12c9b
+  metadata.gz: 64bc93c8a1767fc786d2c2528762e7707aad9e33cbe1ec9d9d1208ccbd12f76d65e8bbd244ae88a7a2a89147eb7facc4194d41bcf38cc04c6c0d29a055da207f
+  data.tar.gz: ce928eaf3a1b43bf1a93678dd5f47544265f47e71df9c61c64d5c1819056aade67fd175fc54b611e03a6e8eb0d5d7c2b9c761b812c0e3a8a2c16a2557130d5c0

data/lib/solis/model.rb

@@ -192,6 +192,7 @@ values ?s {<#{self.graph_id}>}
       id = attributes.delete('id')
 
       sparql = SPARQL::Client.new(self.class.sparql_endpoint)
+      #sparql = Solis::Store::Sparql::Client.new(self.class.sparql_endpoint, self.class.graph_name)
 
       original_klass = self.query.filter({ language: nil, filters: { id: [id] } }).find_all.map { |m| m }&.first
       raise Solis::Error::NotFoundError if original_klass.nil?
@@ -274,10 +275,12 @@ values ?s {<#{self.graph_id}>}
       after_update_proc&.call(updated_klass, data)
 
       data
+      #rescue EOFError => e
     rescue StandardError => e
       original_graph = as_graph(original_klass, false)
       Solis::LOGGER.error(e.message)
       Solis::LOGGER.error original_graph.dump(:ttl)
+      Solis::LOGGER.error delete_insert_query
       sparql.insert_data(original_graph, graph: original_graph.name)
 
       raise e
@@ -308,6 +311,10 @@ values ?s {<#{self.graph_id}>}
         end
         LOGGER.info("ID(#{id}) generated for #{self.name} in #{id_retries} retries") if ConfigFile[:debug]
         model.instance_variable_set("@id", id)
+      elsif id.to_s =~ /^https?:\/\//
+        id = id.to_s.split('/').last
+        LOGGER.info("ID(#{id}) normalised for #{self.name}") if ConfigFile[:debug]
+        model.instance_variable_set("@id", id)
       end
       model
     rescue StandardError => e

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

@@ -481,16 +481,16 @@ hide empty members
                   "required" => []
                 }
 
-                graph.query([nil, RDF.type, SHACL.NodeShape]) do |shape|
+                graph.query([nil, RDF.type, RDF::Vocab::SHACL.NodeShape]) do |shape|
                   shape_subject = shape.subject
 
-                  graph.query([shape_subject, SHACL.property, nil]) do |prop_stmt|
+                  graph.query([shape_subject, RDF::Vocab::SHACL.property, nil]) do |prop_stmt|
                     prop_subject = prop_stmt.object
-                    prop_name = graph.query([prop_subject, SHACL.path, nil]).first&.object.to_s
-                    datatype = graph.query([prop_subject, SHACL.datatype, nil]).first&.object
-                    min_count = graph.query([prop_subject, SHACL.minCount, nil]).first&.object&.to_i
-                    max_count = graph.query([prop_subject, SHACL.maxCount, nil]).first&.object&.to_i
-                    pattern = graph.query([prop_subject, SHACL.pattern, nil]).first&.object&.to_s
+                    prop_name = graph.query([prop_subject, RDF::Vocab::SHACL.path, nil]).first&.object.to_s
+                    datatype = graph.query([prop_subject, RDF::Vocab::SHACL.datatype, nil]).first&.object
+                    min_count = graph.query([prop_subject, RDF::Vocab::SHACL.minCount, nil]).first&.object&.to_i
+                    max_count = graph.query([prop_subject, RDF::Vocab::SHACL.maxCount, nil]).first&.object&.to_i
+                    pattern = graph.query([prop_subject, RDF::Vocab::SHACL.pattern, nil]).first&.object&.to_s
 
                     json_schema["properties"][prop_name] = {}
                     json_schema["properties"][prop_name]["type"] = datatype.to_s.split("#").last.downcase if datatype

data/lib/solis/version.rb

@@ -1,3 +1,3 @@
 module Solis
-  VERSION = "0.85.0"
+  VERSION = "0.87.0"
 end

data/solis.gemspec

@@ -42,6 +42,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'psych', '~> 5.1'
   spec.add_runtime_dependency 'csv'
   spec.add_runtime_dependency 'mutex_m'
+  spec.add_runtime_dependency 'ostruct'
   #  spec.add_runtime_dependency 'rdf-edtf', '~> 1.1.2'
 
   spec.add_development_dependency 'rake', '~> 13.0'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: solis
 version: !ruby/object:Gem::Version
-  version: 0.85.0
+  version: 0.87.0
 platform: ruby
 authors:
 - Mehmet Celik
 bindir: exe
 cert_chain: []
-date: 2025-03-25 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -219,6 +219,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ostruct
+  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
@@ -321,7 +335,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.8
 specification_version: 4
 summary: Turn any SHACL file into an API, ORM, documentation, ...
 test_files: []