solis 0.120.0 → 0.122.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 663d9c6ac4bec283d623346be498856494152c103c1f347a48a79cac7bc19662
-  data.tar.gz: 65e2d8370f3e4ff4638e00293b522b6c4d927b91fcb95259dcb3e21e11c5ae39
+  metadata.gz: 02e35b7cfb4fd0efe75a619eb1261dabde1d6ea130ba4508fb4bac17a644207b
+  data.tar.gz: f04e921636d9aed215883796f83904cc24a618d3c8f7697ef2f691ca3e7768fa
 SHA512:
-  metadata.gz: b28a6189d553f6e444ebb33760ae7b29abe6ffc084995ba13c69b482a9fc9d562294f293671955e94111e915472aef7a419a2d4b5a9eb1b623dc15f149f9c9df
-  data.tar.gz: 24c7b79c0f720b349ecf85c1832ee4e43f3a63d59ba208ce588faa6bf09ed68c09907f57a118832a8a9441e78fb318d7fd50d329d93956ec47b4be4862380a2c
+  metadata.gz: 4e22f052c08a4e7cebcb2c78a114b752d2fe00ee898caf1e23d9331aef19cf55aa4616501bcfe0684c048e8f232e2d7304973368a5b6006321fb6ccd41ab9e55
+  data.tar.gz: d27220cf49606664cc05aacbad1d8f67a1282c0badb5bae1017535888ebf952ca87da6f2de48309f50bd058ffa97b4bd6342a5369193892fc8c25eab70ca9b0e

data/lib/solis/model.rb

@@ -250,7 +250,12 @@ values ?s {<#{self.graph_id}>}
       id = attributes.delete('id')
       sparql = sparql_client || SPARQL::Client.new(self.class.sparql_endpoint)
 
-      original_klass = prefetched_original || self.query.filter({ language: self.class.language, filters: { id: [id] } }).find_all.map { |m| m }&.first
+      original_klass = prefetched_original
+      # A prefetched original may be an id-only stub (embedded relations are loaded that
+      # way by Query#graph_to_object). It cannot seed updated_klass — omitted mandatory
+      # attributes would be lost — so re-load the full entity from the store.
+      original_klass = nil if original_klass && shallow_stub?(original_klass)
+      original_klass ||= self.query.filter({ language: self.class.language, filters: { id: [id] } }).find_all.map { |m| m }&.first
       raise Solis::Error::NotFoundError if original_klass.nil?
       updated_klass = original_klass.deep_dup
 
@@ -806,7 +811,10 @@ values ?s {<#{self.graph_id}>}
       if original_klass.nil?
         original_klass = klass
       else
-        resolve_all = false
+        # A store-fetched original carries id-only stub children, so its subgraph is
+        # not re-resolved. In the create path (skip_store_fetch) known_entities is
+        # pre-populated with full in-memory entities whose children must still be built.
+        resolve_all = false unless skip_store_fetch
         klass.instance_variables.map { |m| m.to_s.gsub(/^@/, '') }
              .select { |s| !["model_name", "model_plural_name"].include?(s) }.each do |attribute|
           data = klass.instance_variable_get("@#{attribute}")
@@ -830,18 +838,6 @@ values ?s {<#{self.graph_id}>}
     end
 
     def make_graph(graph, hierarchy, id, klass, klass_metadata, resolve_all, known_entities = {}, skip_store_fetch: false)
-      # klass may arrive as an id-only stub (embedded relation from Query#graph_to_object,
-      # or passed via prefetched_original). Resolve it to the full stored entity once so
-      # every attribute is emitted into the graph.
-      if !skip_store_fetch && shallow_stub?(klass)
-        uuid = id.value.split('/').last
-        fetched = klass.query.filter({ filters: { id: [uuid] } }).find_all { |f| f.id == uuid }.first
-        unless fetched.nil?
-          klass = fetched
-          known_entities[uuid] = fetched
-        end
-      end
-
       klass_metadata[:attributes].each do |attribute, metadata|
         data = klass.instance_variable_get("@#{attribute}")
 

data/lib/solis/version.rb

@@ -1,3 +1,3 @@
 module Solis
-  VERSION = "0.120.0"
+  VERSION = "0.122.0"
 end

metadata

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