solis 0.75.0 → 0.77.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d927fa3a6e648f3d4359df7bc05f60d3ac2cdd62e36ae8a3c1bd7b9845c6c13c
-  data.tar.gz: 92475ada9028fa045fe7f8f5b07a9ccd8b03db2ecb81f67a978dbecdd6eef714
+  metadata.gz: d19144e051731d0bebae424722a0c9ccc463b5ba7a22b00b889f8704427d97e9
+  data.tar.gz: ac9ba93e90607b7d676cbc8aee316ea73fc15fa0c6289cd6496f3658d81bcd41
 SHA512:
-  metadata.gz: cb0e60d9e4d347e488bac8429e6c1481ad3344cdf1acc5170da37079d82cdc5a1e412ca28b648edaf4db642d6481a3fa07afb45bb176688cbef142b32c9d96b3
-  data.tar.gz: 8fab47cd98128888ed69e3c1af21df1a19bc2872dc05be70fd23a66fc25b2738b344353b28ebce4e7a7d26fb81647d1bc8b0e61ad5bd70fbfaa633fe7d45e57c
+  metadata.gz: 7e09a77d9bc7576b5cf5332e2f0892c0d8995f84f3beea784662633a144d3d7d0881e1b56b15e0f07ff1efe23a7d090eed28c3c21844eaded207f9d07404e7f9
+  data.tar.gz: 33fe02937e9de9236ea87616fc92597e5ab95c53760e52d00e453b5a80d2bb5b4e48be9a291ac5aedde89f2d529a380664c8f81e1ef7f916a8e267a2d1266e10

data/lib/solis/graph.rb

@@ -309,7 +309,8 @@ module Solis
                       remote_resource.id =~ /^http/ ? remote_resource.id.split('/').last : remote_resource.id
                     end
                   end
-                  "#{resource.class.graph_name.gsub(/\/$/,'')}/#{belongs_to_resource.name.tableize}?filter[id]=#{resource_ids.join(',')}" unless remote_resources.nil? || resource_ids.empty?
+                  #"#{resource.class.graph_name.gsub(/\/$/,'')}/#{belongs_to_resource.name.tableize}?filter[id]=#{resource_ids.join(',')}" unless remote_resources.nil? || resource_ids.empty?
+                  "#{resource.class.graph_name.gsub(/\/$/,'')}/#{remote_resources.first.name.tableize}?filter[id]=#{resource_ids.join(',')}" unless remote_resources.nil? || resource_ids.empty?
                 end
               end
               #

data/lib/solis/model.rb

@@ -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
@@ -394,6 +397,10 @@ values ?s {<#{self.graph_id}>}
       m
     end
 
+    def self.construct(level = 0)
+      raise 'to bo implemented'
+    end
+
     def self.model_before_read(&blk)
       self.before_read_proc = blk
     end

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.75.0"
+  VERSION = "0.77.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 'graphiti', '~> 1.3'
+  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.75.0
+  version: 0.77.0
 platform: ruby
 authors:
 - Mehmet Celik
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-03-27 00:00:00.000000000 Z
+date: 2024-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -30,28 +30,28 @@ 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
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: moneta
   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
@@ -295,7 +295,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.6
+rubygems_version: 3.5.10
 signing_key:
 specification_version: 4
 summary: Turn any SHACL file into an API, ORM, documentation, ...