solis 0.76.0 → 0.78.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14e23fd1f3bfd75d6c0349299ec95fd1b298224be106532bd0af5e85ea7eeef2
-  data.tar.gz: 73e6ccc7ca60e80c6afe349c0384b416b00a9de7661509995ac7cffe7b35aa2e
+  metadata.gz: 424ee1c91533e6fe3238285da382f034457c338c7bbd4e8f44c9a6cb2bfffd88
+  data.tar.gz: fbe89a99f3a7c162dba2446769127779f988163051331913cf7be44f7dd51b00
 SHA512:
-  metadata.gz: 6994d3c3a89e1456c71b3e09bd846c20a93076d4b3d1a179fa129ba313066ba2534b1eb3288b71c06eb5e0ea90d9a0c7d7c31270e7972e832fb7212b9b6373eb
-  data.tar.gz: b382ce56230855d7a6716b90e43f97734bd9b82335f0cdeac14708787a551cab2c573c61d60c2b4c6df691249d1abea7a04c1da24e30097750da41e4af6b9bd1
+  metadata.gz: 02a9645e8fa481276cfaa6320de404482be850035930d54df7c214a420746710afadd5ced2ec23bc7df3c06a1c08f47759fd641aff20cbd9e2904fc8e1bef4a5
+  data.tar.gz: 0af8c1358122caff1c2ecd36b2994cec8730d5db6f9cf5d59db367cd76f1eb20edf154629c97788a295df8db37bbec5b8816c3e5119510220c1dae062b3ab513

data/lib/solis/model.rb

@@ -175,8 +175,8 @@ values ?s {<#{self.graph_id}>}
         result = sparql.insert_data(graph, graph: graph.name)
       end
 
-      after_create_proc&.call(result)
-      result
+      after_create_proc&.call(self)
+      self
     rescue StandardError => e
       Solis::LOGGER.error e.message
       Solis::LOGGER.error e.message
@@ -210,7 +210,7 @@ values ?s {<#{self.graph_id}>}
                 embedded_data = properties_to_hash(embedded)
                 embedded.update(embedded_data, validate_dependencies, false)
               else
-                embedded.save(validate_dependencies, false)
+                value = embedded.save(validate_dependencies, false)
               end
             else
               Solis::LOGGER.info("#{embedded.class.name} is embedded not allowed to change. Skipping")
@@ -245,9 +245,9 @@ values ?s {<#{self.graph_id}>}
 
         insert_graph = as_graph(updated_klass, true)
 
-        # puts delete_graph.dump(:ttl) #if ConfigFile[:debug]
-        # puts insert_graph.dump(:ttl) #if ConfigFile[:debug]
-        # puts where_graph.dump(:ttl) #if ConfigFile[:debug]
+        # puts delete_graph.dump(:ttl) if ConfigFile[:debug]
+        # puts insert_graph.dump(:ttl) if ConfigFile[:debug]
+        # puts where_graph.dump(:ttl) if ConfigFile[:debug]
 
         # if ConfigFile[:debug]
         delete_insert_query = SPARQL::Client::Update::DeleteInsert.new(delete_graph, insert_graph, where_graph, graph: insert_graph.name).to_s
@@ -296,7 +296,7 @@ values ?s {<#{self.graph_id}>}
       if id.nil? || (id.is_a?(String) && id&.empty?)
         id_retries = 0
 
-        while id.nil? || sparql.query("ASK WHERE { ?s <#{self.graph_name}/id>  \"#{id}\" }")
+        while id.nil? || sparql.query("ASK WHERE { ?s <#{self.graph_name}id>  \"#{id}\" }")
           id = SecureRandom.uuid
           id_retries+=1
         end
@@ -304,6 +304,9 @@ values ?s {<#{self.graph_id}>}
         model.instance_variable_set("@id", id)
       end
       model
+    rescue StandardError => e
+      Solis::LOGGER.error(e.message)
+      raise Solis::Error::GeneralError, "Error generating id for #{@model_name}"
     end
 
     def self.metadata

data/lib/solis/query.rb

@@ -119,7 +119,7 @@ module Solis
       core_query = core_query(relationship)
       count_query = core_query.gsub(/SELECT .* WHERE/, 'SELECT (COUNT(distinct ?concept) as ?count) WHERE')
 
-      count_query = count_query.split('a ?type')[0]+'a ?type }'
+      # count_query = count_query.split('a ?type')[0]+'a ?type }'
       result = sparql_client.query(count_query)
       solution = result.first
       solution.nil? ? 0 : solution[:count].object || 0

data/lib/solis/shape/data_types.rb

@@ -219,7 +219,7 @@ read_lang_string_array_type = lang_string_array_definition.constructor do |i|
   # i = i.is_a?(String) ? {:"@value" => i, :"@language" => language} : i
   # i[:"@value"]=[i[:"@value"]] unless i[:"@value"].is_a?(Array)
 
-  i
+  i.is_a?(Array) ? i : [i]
 rescue StandardError => e
   i
 end

data/lib/solis/version.rb

@@ -1,3 +1,3 @@
 module Solis
-  VERSION = "0.76.0"
+  VERSION = "0.78.0"
 end

data/lib/solis.rb

@@ -1,6 +1,7 @@
 require "bundler"
 Bundler.require
 
+require 'ostruct'
 require 'logger'
 require "solis/version"
 require 'solis/config_file'

data/solis.gemspec

@@ -28,13 +28,13 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_runtime_dependency 'activesupport', '~> 7.0'
-  spec.add_runtime_dependency 'http', '~> 5.1'
+  spec.add_runtime_dependency 'http', '~> 5.2'
   spec.add_runtime_dependency 'graphiti', '~> 1.7'
   spec.add_runtime_dependency 'moneta', '~> 1.6'
   spec.add_runtime_dependency 'linkeddata', '~> 3.3'
   spec.add_runtime_dependency 'google_drive', '~> 3.0'
-  spec.add_runtime_dependency 'json', '~> 2.6'
-  spec.add_runtime_dependency 'hashdiff', '~> 1.0'
+  spec.add_runtime_dependency 'json', '~> 2.7'
+  spec.add_runtime_dependency 'hashdiff', '~> 1.1'
   spec.add_runtime_dependency  'iso8601', '~> 0.13.0'
   spec.add_runtime_dependency  'connection_pool', '~> 2.4'
   spec.add_runtime_dependency  'uuidtools', '~> 2.2.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solis
 version: !ruby/object:Gem::Version
-  version: 0.76.0
+  version: 0.78.0
 platform: ruby
 authors:
 - Mehmet Celik
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-07-03 00:00:00.000000000 Z
+date: 2024-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: graphiti
   requirement: !ruby/object:Gem::Requirement
@@ -100,28 +100,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '2.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: hashdiff
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: iso8601
   requirement: !ruby/object:Gem::Requirement