solis 0.113.0 → 0.114.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 250f917e5faee6c5f5babc190c2f225defe07b9a32f53908e929b81714b61908
-  data.tar.gz: ed611b0714eada966c6b9e82e1b44aabfbd45563ceead625ad249d5896f7583e
+  metadata.gz: 0c79cee8453b41aeab243fc45e69132a9192f9bc3481b447e68db95895d8e1e2
+  data.tar.gz: 1afd13dbd1e5e95505f5363766c829730e88d56e3e89471b8f770044f4e8b6e8
 SHA512:
-  metadata.gz: 29050d4e0148efb7cc7992d1fbd75902290a6f35c16f528eb35aafe2a3d65cb02657c148c02daefe3123145b22fad24238f8e377fed0e9b5317567e8aabd65d7
-  data.tar.gz: d18917f52c79246927e8235f0ae1eacaf769b361c661294319ad03e09848ad4459dfc0159115a0fc403ace2c7c8efcc79aa48b84ae2a3b26471dd9efa7262c70
+  metadata.gz: 1e8fc91acdcf2f17f029907895be2ea35b3e0813aca875dc6f46f3787907ec7a02b66c8c46d012eb4e7f65e1920035e9eb57d576751c474ac6078c73963ee3aa
+  data.tar.gz: 1ba7210919daa84eed4be4994515834c0561f5d22f1d03ddb18f78cffb499be1f0c400946f10f5f8792437098f6cd204cb8ad0741bbf93aa9f55f54156d4c022

data/lib/solis/model.rb

@@ -22,7 +22,16 @@ module Solis
           end
 
           if self.class.metadata[:attributes][attribute.to_s][:node_kind].is_a?(RDF::URI) && value.is_a?(Hash)
-            inner_model = self.class.graph.shape_as_model(self.class.metadata[:attributes][attribute.to_s][:datatype].to_s)
+            inner_class = self.class.metadata[:attributes][attribute.to_s][:datatype].to_s
+            inner_model = self.class.graph.shape_as_model(inner_class)
+
+            if value.key?('id') && value['id'].match?(self.class.graph_name)
+              inner_class = value['id'].gsub(self.class.graph_name, '').split('/').first.classify.to_s
+              if inner_model.descendants.map(&:to_s).include?(inner_class)
+                inner_model = self.class.graph.shape_as_model(inner_class)
+              end
+            end
+
             value = inner_model.new(value)
           elsif self.class.metadata[:attributes][attribute.to_s][:node_kind].is_a?(RDF::URI) && value.is_a?(Array)
             new_value = []

data/lib/solis/query/filter.rb

@@ -89,6 +89,9 @@ module Solis
                 v=normalize_string(v)
                 filter = "filter( !exists {?concept <#{@model.class.graph_name}id> \"#{v}\"})"
               end
+            elsif ['>', '<', '>=', '<='].include?(value[:operator])
+              v = normalize_string(value[:value].first)
+              filter = "?concept <#{@model.class.graph_name}id> ?__search FILTER (?__search #{value[:operator]} \"#{v}\") .\n"
             else
               filter = "?concept <#{@model.class.graph_name}id> ?__search FILTER (?__search IN(#{contains})) .\n"
             end

data/lib/solis/sparql_adaptor.rb

@@ -44,10 +44,10 @@ module Solis
         big_decimal: [:eq, :not_eq, :gt, :lt],
         date: [:eq, :not_eq, :gt, :gte, :lt, :lte],
         boolean: [:eq, :not_eq],
-        uuid: [:eq, :not_eq],
+        uuid: [:eq, :not_eq, :gt, :lt],
         enum: [:eq],
         datetime: [:eq, :not_eq, :gt, :lt],
-        anyuri: [:eq, :not_eq],
+        anyuri: [:eq, :not_eq, :gt, :lt],
       }
     end
 
@@ -106,6 +106,7 @@ module Solis
     alias :filter_uuid_gt :filter_gt
     alias :filter_enum_gt :filter_gt
     alias :filter_datetime_gt :filter_gt
+    alias :filter_anyuri_gt :filter_gt
 
     def filter_not_gt(scope, attribute, value)
       filter_eq(scope, attribute, value, true, '>')
@@ -134,6 +135,7 @@ module Solis
     alias :filter_uuid_lt :filter_lt
     alias :filter_enum_lt :filter_lt
     alias :filter_datetime_lt :filter_lt
+    alias :filter_anyuri_lt :filter_lt
 
     def filter_not_lt(scope, attribute, value)
       filter_eq(scope, attribute, value, true, '<')

data/lib/solis/version.rb

@@ -1,3 +1,3 @@
 module Solis
-  VERSION = "0.113.0"
+  VERSION = "0.114.0"
 end

data/solis.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_runtime_dependency 'activesupport', '~> 8.0'
-  spec.add_runtime_dependency 'http', '~> 5.2'
+  spec.add_runtime_dependency 'http', '~> 5.3'
   spec.add_runtime_dependency 'graphiti', '~> 1.8'
   spec.add_runtime_dependency 'moneta', '~> 1.6'
   spec.add_runtime_dependency 'linkeddata', '~> 3.3'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solis
 version: !ruby/object:Gem::Version
-  version: 0.113.0
+  version: 0.114.0
 platform: ruby
 authors:
 - Mehmet Celik
@@ -29,14 +29,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '5.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '5.3'
 - !ruby/object:Gem::Dependency
   name: graphiti
   requirement: !ruby/object:Gem::Requirement