solis 0.105.0 → 0.107.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0055d198a28d2de5ca5e7fe321831f41d7da424cb88c05e8b3846db333a33cb6
-  data.tar.gz: c6c9f7eb2dfdbaeaf50213f58acaf99dbb3a0998d4b18039f61f50545f7f52d4
+  metadata.gz: 0ce95b73b7c870b2a744239d77e8a590c8793c0f59504c560af96013e82ff42e
+  data.tar.gz: 669a40a5a83298d7ec3d46a77ee7c66b9b7075d1a6deca037d7b76ad60a2e18c
 SHA512:
-  metadata.gz: cffb31444287f984b8ad41878a11b7ebc8b4d6083a0f15c794a12b4369230fcd58fcac498ae12480658a1299329161d19e4561add65911a252555b0cf3f0d8ce
-  data.tar.gz: a6d6b3fa751a0a5c07cf672ec8151243fd2833cb639c5d5720250ca96178976b57d0f450057a6d30fdcf5ce0a0d70e2956e8b003cbe92464afa1377967c9734e
+  metadata.gz: 39bb7dcce2bc5112dac714a41ad2649267b37be1a5fb3a1c2baf01dcdc61ed919cff7f89422663b9c74e761f3a13e957e1dffd4af8460fbd967ffdc8e9897620
+  data.tar.gz: '05931d4a566eb0e560da95d690804b87d51d0a34ce5677e370a775292100077caf1a7bda7237f52fb7dc337e2985d3dbbfffa9f27937ca6faab67d4df087b54d'

data/lib/solis/query/filter.rb

@@ -75,15 +75,15 @@ module Solis
           contains = value[:value].map { |m| m.is_a?(String) ? "CONTAINS(LCASE(str(?__search#{i})), LCASE(\"#{m}\"))" : next }.join(' || ')
         end
 
+        # Ensure value[:value] is always an array for consistent handling below
+        value[:value] = [value[:value]] unless value[:value].is_a?(Array)
+        value[:value].flatten!
+
         metadata = @metadata[:attributes][key.to_s]
         if metadata
           if metadata[:path] =~ %r{/id$}
-            if value[:value].is_a?(String)
-              contains = value[:value].split(',').map { |m| "\"#{m}\"" }.join(',')
-            else
-              value[:value].flatten!
-              contains = value[:value].map { |m| "\"#{m}\"" }.join(',')
-            end
+            # value[:value] is guaranteed to be an array at this point
+            contains = value[:value].map { |m| "\"#{m}\"" }.join(',')
             if value[:is_not]
               value[:value].each do |v|
                 v=normalize_string(v)
@@ -94,9 +94,22 @@ module Solis
             end
           else
             datatype = ''
-            datatype = "^^<http://www.w3.org/2001/XMLSchema#boolean>" if metadata[:datatype].eql?(:boolean)
+            case metadata[:datatype]
+            when :boolean
+              datatype = "^^<http://www.w3.org/2001/XMLSchema#boolean>"
+            when :integer
+              datatype = "^^<http://www.w3.org/2001/XMLSchema#integer>"
+            when :float, :double
+              datatype = "^^<http://www.w3.org/2001/XMLSchema#double>"
+            when :date
+              datatype = "^^<http://www.w3.org/2001/XMLSchema#date>"
+            when :datetime, :time
+              datatype = "^^<http://www.w3.org/2001/XMLSchema#dateTime>"
+            when :anyuri
+              datatype = "^^<http://www.w3.org/2001/XMLSchema#anyURI>"
+            end
 
-            if ["=", "<", ">"].include?(value[:operator])
+            if ["=", "<", ">", ">=", "<="].include?(value[:operator])
               not_operator = value[:is_not] ? '!' : ''
               value[:value].each do |v|
                 if metadata[:datatype_rdf].eql?('http://www.w3.org/1999/02/22-rdf-syntax-ns#langString')
@@ -110,6 +123,16 @@ module Solis
 
                     search_for = normalize_string(search_for)
                     filter += "FILTER(str(?__search#{i}) #{not_operator}#{value[:operator]} \"#{search_for}\"#{datatype}) .\n"
+                elsif (metadata[:datatype_rdf].eql?('http://www.w3.org/2001/XMLSchema#anyURI') || !metadata[:node].nil?) && ["=", "!="].include?(value[:operator])
+                  # Special handling for anyURI references to other entities (only for equality/inequality)
+                  model_graph_name = Solis::Options.instance.get.key?(:graphs) ? Solis::Options.instance.get[:graphs].select{|s| s['type'].eql?(:main)}&.first['name'] : @model.class.graph_name
+                  if value[:is_not]
+                    #filter = "filter( !exists {?concept <#{metadata[:path]}> ?__search#{i} . ?__search#{i} <#{model_graph_name}id> \"#{v}\"})"
+                    filter = "filter( !exists {?concept <#{metadata[:path]}> <#{v}>})"
+                  else
+                    #filter = "?concept <#{metadata[:path]}> ?__search#{i} . ?__search#{i} <#{model_graph_name}id> ?__search#{i}_#{i} filter(?__search#{i}_#{i} = \"#{v}\")."
+                    filter = "?concept <#{metadata[:path]}> <#{v}>."
+                  end
                 else
                   v=normalize_string(v)
                   filter = "?concept <#{metadata[:path]}> ?__search#{i} FILTER(?__search#{i} #{not_operator}#{value[:operator]} \"#{v}\"#{datatype}) .\n"

data/lib/solis/sparql_adaptor.rb

@@ -42,11 +42,12 @@ module Solis
         integer: [:eq, :not_eq, :gt, :lt],
         float: [:eq, :not_eq, :gt, :lt],
         big_decimal: [:eq, :not_eq, :gt, :lt],
-        date: [:eq, :not_eq, :gt, :lt],
+        date: [:eq, :not_eq, :gt, :gte, :lt, :lte],
         boolean: [:eq, :not_eq],
         uuid: [:eq, :not_eq],
         enum: [:eq],
         datetime: [:eq, :not_eq, :gt, :lt],
+        anyuri: [:eq, :not_eq],
       }
     end
 
@@ -67,6 +68,7 @@ module Solis
     alias :filter_enum_eq :filter
     alias :filter_datetime_eq :filter
     alias :filter_lang_string_eq :filter
+    alias :filter_anyuri_eq :filter
 
     def filter_not_eq(scope, attribute, value)
       filter_eq(scope, attribute, value, true, '=')
@@ -82,6 +84,7 @@ module Solis
     alias :filter_enum_not_eq :filter_not_eq
     alias :filter_datetime_not_eq :filter_not_eq
     alias :filter_lang_string_not_eq :filter_not_eq
+    alias :filter_anyuri_not_eq :filter_not_eq
 
     def filter_contains(scope, attribute, value)
       filter_eq(scope, attribute, value, false, '~')
@@ -146,6 +149,30 @@ module Solis
     alias :filter_enum_not_lt :filter_not_lt
     alias :filter_datetime_not_lt :filter_not_lt
 
+    def filter_gte(scope, attribute, value)
+      filter_eq(scope, attribute, value, false, '>=')
+    end
+
+    alias :filter_date_gte :filter_gte
+
+    def filter_not_gte(scope, attribute, value)
+      filter_eq(scope, attribute, value, true, '>=')
+    end
+
+    alias :filter_date_not_gte :filter_not_gte
+
+    def filter_lte(scope, attribute, value)
+      filter_eq(scope, attribute, value, false, '<=')
+    end
+
+    alias :filter_date_lte :filter_lte
+
+    def filter_not_lte(scope, attribute, value)
+      filter_eq(scope, attribute, value, true, '<=')
+    end
+
+    alias :filter_date_not_lte :filter_not_lte
+
     def transaction(*)
       yield
     end

data/lib/solis/version.rb

@@ -1,3 +1,3 @@
 module Solis
-  VERSION = "0.105.0"
+  VERSION = "0.107.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solis
 version: !ruby/object:Gem::Version
-  version: 0.105.0
+  version: 0.107.0
 platform: ruby
 authors:
 - Mehmet Celik