solis 0.84.0 → 0.86.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2980fd83ee3bd59017c9831136d40f24402c80c3591578b27d3cc03ad132b90
-  data.tar.gz: 248019990f65b20f0bfb2b605f868c2658b002e02db3c5a61a7657d83e071bd0
+  metadata.gz: 7970257cfdc060571c01b55b557d8146d536dbb52455b456a82f01e7b6482363
+  data.tar.gz: f6a0cf69a9aab6fddede73a70832c4ba97968ffdaae9fda244f2b9a9881b7a88
 SHA512:
-  metadata.gz: 720dd30ae84033d977cf04f6d6736745f24d8b32b06b3dedd01e09c05d5f72726a6ee2f2c74249ea8e87bc1bde8daf9bd2fe810bf139dc8d48e8ff70c7dd611d
-  data.tar.gz: 82855397f33cf99f61f6a7d53b3939035305f0570b2ee7965ca353402891d6b752351d19c414c2a3ee74bda22e7774a3f70f7d223b2f974c0c227610307e41a1
+  metadata.gz: b0ae8c97bdfd0420a3679797bb23c63990a6814cb341b549642766ed7a48b83a482b2599c34c414925049185c3593bbb1281960603fa4473a602be9cd5ab6aa3
+  data.tar.gz: 1426ecf0a1dead864cc82afde451bddf40136e6d447a106034689fc51807338eee411f3ac3fe18f92d88581a699fdb2caf27990d6c325fb200ae48f5e5d4f184

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
@@ -499,16 +506,7 @@ values ?s {<#{self.graph_id}>}
           raise Solis::Error::InvalidAttributeError, "#{hierarchy.join('.')}~#{klass.name}.#{attribute} min=#{metadata[:mincount]} and max=#{metadata[:maxcount]}" if data.nil?
         end
 
-        if data.nil? && metadata.key?(:maxcount) && ( metadata[:maxcount].nil? || metadata[:maxcount] > 0) && graph.query(RDF::Query.new({ attribute.to_sym => { RDF.type => metadata[:node] } })).size == 0
-          if data.nil?
-            uuid = id.value.split('/').last
-            original_klass = klass.query.filter({ filters: { id: [ uuid ] } }).find_all { |f| f.id == uuid }.first || nil
-            unless original_klass.nil?
-              klass = original_klass
-              data = klass.instance_variable_get("@#{attribute}")
-            end
-          end
-          #if data is still nil
+        if data && metadata.key?(:maxcount) && ( metadata[:maxcount] && metadata[:maxcount] > 0) && graph.query(SPARQL.parse("select (count(?s) as ?max_subject) where { ?s #{self.class.graph_prefix}:#{attribute} ?p}")).first.max_subject > metadata[:maxcount].to_i
           raise Solis::Error::InvalidAttributeError, "#{hierarchy.join('.')}~#{klass.name}.#{attribute} min=#{metadata[:mincount]} and max=#{metadata[:maxcount]}" if data.nil?
         end
 

data/lib/solis/version.rb

@@ -1,3 +1,3 @@
 module Solis
-  VERSION = "0.84.0"
+  VERSION = "0.86.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.84.0
+  version: 0.86.0
 platform: ruby
 authors:
 - Mehmet Celik
 bindir: exe
 cert_chain: []
-date: 2025-03-24 00:00:00.000000000 Z
+date: 2025-04-14 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