solis 0.111.0 → 0.113.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35623eaf326ad7c4ebd6010d14d882d4d65bd7839f797834d3cc91eca31b700b
-  data.tar.gz: 48129e7ba7cca9fd3b7891bdbd0ddce16ee5b80e3efb7a32e8fc32f8f477c9f0
+  metadata.gz: 250f917e5faee6c5f5babc190c2f225defe07b9a32f53908e929b81714b61908
+  data.tar.gz: ed611b0714eada966c6b9e82e1b44aabfbd45563ceead625ad249d5896f7583e
 SHA512:
-  metadata.gz: 3c65075967d819db5dc12e0e17d5dcc02468eb58cf1277452c89f8edcd865a65801ea77ef972c07c139aea250307edc71b8d534c1192131a6b46d236dd4b06e3
-  data.tar.gz: 23722f10edaf173597b60aa58b77650e35f17027eccb522cbe8b6ac666a14dd2bad0601208f628ee8f38e239018ab9bbfabf9d6f39497a521e6abd2e9e9044a1
+  metadata.gz: 29050d4e0148efb7cc7992d1fbd75902290a6f35c16f528eb35aafe2a3d65cb02657c148c02daefe3123145b22fad24238f8e377fed0e9b5317567e8aabd65d7
+  data.tar.gz: d18917f52c79246927e8235f0ae1eacaf769b361c661294319ad03e09848ad4459dfc0159115a0fc403ace2c7c8efcc79aa48b84ae2a3b26471dd9efa7262c70

data/lib/solis/query/run.rb

@@ -106,15 +106,28 @@ class Solis::Query::Runner
   end
 
   def self.find_root_subjects(grouped, entity)
-    # Find subjects that match the requested entity type
-    grouped.select do |subject, triples|
+    # Build set of acceptable type names (entity + all subtypes via hierarchy)
+    acceptable_types = Set.new([entity, entity.downcase, entity.tableize])
+
+    begin
+      model = Solis::Options.instance.get[:solis].shape_as_model(entity)
+      ObjectSpace.each_object(Class)
+        .select { |klass| klass < model }
+        .reject { |m| m.metadata.nil? }
+        .each do |desc|
+          name = desc.name.demodulize
+          acceptable_types.merge([name, name.downcase, name.tableize])
+        end
+    rescue; end
+
+    grouped.select do |_subject, triples|
       type_triple = triples.find { |t| t[:predicate] == RDF::RDFV.type }
       next false unless type_triple
 
       type_name = type_triple[:object].to_s.split('/').last
-      type_name.downcase == entity.downcase ||
-        type_name.tableize == entity.tableize ||
-        type_name == entity
+      acceptable_types.include?(type_name) ||
+        acceptable_types.include?(type_name.downcase) ||
+        acceptable_types.include?(type_name.tableize)
     end.keys
   end
 
@@ -149,9 +162,13 @@ class Solis::Query::Runner
       next if key.start_with?('@')  # Skip internal markers
       next if key == '_id' || key == 'id'  # Already added
 
-      if obj.key?('@type') &&Solis::Options.instance.get[:solis].shape?(obj['@type'])
-        entity = Solis::Options.instance.get[:solis].shape_as_model(obj['@type'])
-        entity_maxcount = entity.metadata[:attributes][key][:maxcount]
+      begin
+        if obj.key?('@type') && Solis::Options.instance.get[:solis].shape?(obj['@type'])
+          entity = Solis::Options.instance.get[:solis].shape_as_model(obj['@type'])
+          entity_maxcount = entity.metadata[:attributes][key][:maxcount]
+        end
+      rescue
+        entity_maxcount = nil
       end
       resolved_value = resolve_value(value, objects_index, max_depth, visited, current_depth)
       resolved_value = [resolved_value] if (entity_maxcount.nil? || entity_maxcount > 1) && !resolved_value.is_a?(Array)

data/lib/solis/query.rb

@@ -112,7 +112,7 @@ module Solis
       per_page = params[:per_page] || 10
 
       @offset = 0
-      @offset = current_page * per_page if current_page > 1
+      @offset = (current_page - 1) * per_page if current_page > 1
       @limit = per_page
       self
     end
@@ -177,7 +177,7 @@ module Solis
       if core_query =~ /IN\((.*?)\)/
         #limit = $1.gsub('"','').split(',').length
       else
-        core_query += " LIMIT #{limit} OFFSET #{offset}"
+        core_query += "ORDER BY ?concept LIMIT #{limit} OFFSET #{offset}"
       end
 
       query = %(

data/lib/solis/version.rb

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

metadata

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