solis 0.107.0 → 0.109.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ce95b73b7c870b2a744239d77e8a590c8793c0f59504c560af96013e82ff42e
-  data.tar.gz: 669a40a5a83298d7ec3d46a77ee7c66b9b7075d1a6deca037d7b76ad60a2e18c
+  metadata.gz: 977072c184dcf472778863270bf8f4fd913db4980883e39ed9e33273d857cfbb
+  data.tar.gz: 377f468cddf67e8472aba17f0bca40c3a7c98a03e648da9b931cfc434de53efb
 SHA512:
-  metadata.gz: 39bb7dcce2bc5112dac714a41ad2649267b37be1a5fb3a1c2baf01dcdc61ed919cff7f89422663b9c74e761f3a13e957e1dffd4af8460fbd967ffdc8e9897620
-  data.tar.gz: '05931d4a566eb0e560da95d690804b87d51d0a34ce5677e370a775292100077caf1a7bda7237f52fb7dc337e2985d3dbbfffa9f27937ca6faab67d4df087b54d'
+  metadata.gz: '093ee81f1e9ea27941544ee43311ebe9a26bc89fc5194d7211355cdf1e2f8c296b29731f05308fb688d546317f45ae3fca8974396fc0e0ee77ec8445c5bfc1fa'
+  data.tar.gz: 4ab801e9a5b64b9ee826def3abf3a67b38438419fb3b205a4a15960c00a623678d5a2a9277badcb7a86a6e2fc19bcc097e9bb9252e1e0eee869a89ef79d253de

data/lib/solis/model.rb

@@ -409,6 +409,7 @@ values ?s {<#{self.graph_id}>}
       self.metadata[:attributes].each do |attribute, attribute_metadata|
         is_array = ((attribute_metadata[:maxcount].nil? || (attribute_metadata[:maxcount].to_i > 1)) && !attribute_metadata[:datatype].eql?(:lang_string))
         attribute_name = is_array  ? "#{attribute}[]" : attribute
+        attribute_name = attribute_metadata[:mincount].to_i > 0 ? "#{attribute_name}*" : attribute_name
         if attribute_metadata.key?(:class) && !attribute_metadata[:class].nil? && attribute_metadata[:class].value =~ /#{self.graph_name}/ && level == 0
           cm = self.graph.shape_as_model(self.metadata[:attributes][attribute][:datatype].to_s).model(level + 1)
           m[:attributes][attribute_name.to_sym] = cm[:attributes]
@@ -661,7 +662,9 @@ values ?s {<#{self.graph_id}>}
                 else
                   RDF::Literal.new(d, language: @language)
                 end
-              elsif metadata[:datatype_rdf].eql?('http://www.w3.org/2001/XMLSchema#anyURI') || metadata[:node].is_a?(RDF::URI)
+              elsif metadata[:datatype_rdf].eql?('http://www.w3.org/2001/XMLSchema#anyURI')
+                RDF::Literal.new(d.to_s, datatype: RDF::XSD.anyURI)
+              elsif metadata[:node].is_a?(RDF::URI)
                 RDF::URI(d)
               elsif metadata[:datatype_rdf] =~ /datatypes\/edtf/ || metadata[:datatype_rdf] =~ /edtf$/i
                 # Handle EDTF dates
@@ -776,7 +779,7 @@ values ?s {<#{self.graph_id}>}
                     RDF::Literal.new(d, language: self.class.language)
                   else
                     if metadata[:datatype_rdf].eql?('http://www.w3.org/2001/XMLSchema#anyURI')
-                      RDF::URI(d)
+                      RDF::Literal.new(d.to_s, datatype: RDF::XSD.anyURI)
                     else
                       RDF::Literal.new(d, datatype: datatype)
                     end

data/lib/solis/query/filter.rb

@@ -123,8 +123,9 @@ 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)
+                elsif !metadata[:node].nil? && !metadata[:datatype_rdf].eql?('http://www.w3.org/2001/XMLSchema#anyURI') && ["=", "!="].include?(value[:operator])
+                  # Special handling for URI references to other entities (object properties, only for equality/inequality)
+                  # Note: xsd:anyURI literals are handled below with standard literal matching
                   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}\"})"
@@ -139,7 +140,8 @@ module Solis
                 end
               end
             else # if "~" contains
-              if metadata[:datatype_rdf].eql?( 'http://www.w3.org/2001/XMLSchema#anyURI') || !metadata[:node].nil?
+              if !metadata[:node].nil? && !metadata[:datatype_rdf].eql?('http://www.w3.org/2001/XMLSchema#anyURI')
+                # Special handling for URI references to other entities (object properties)
                 model_graph_name = Solis::Options.instance.get.key?(:graphs) ? Solis::Options.instance.get[:graphs].select{|s| s['type'].eql?(:data)}&.first['name'] : @model.class.graph_name
                 filter = "?concept <#{metadata[:path]}> ?__search#{i} . ?__search#{i} <#{model_graph_name}id> ?__search#{i}_#{i} filter(?__search#{i}_#{i} = \"#{value[:value].first}\")."
               else

data/lib/solis/version.rb

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

metadata

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