scrivito_sdk 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f89019184f21b4bdfa167ae1a20c755a41bd7094
-  data.tar.gz: e2e24931a530ee482d43383a014fb9aff47fcb32
+  metadata.gz: 7d05fe28646563318dacb38147e10bf7643f4797
+  data.tar.gz: 1130736dde1f78f4deee7bed4df6f88450093610
 SHA512:
-  metadata.gz: 13376090043889af634c6085c5d0751c2cfcb29a4127656001f98b7f573fed3923641097592a832a78701825bf1f30bc8706ff9c2ba5355564738725732ec819
-  data.tar.gz: cf8f20a0c9ce6b03146acd51870c93b07d51b05233b6132c327de4dfb7bc98bdb1bc0f71e814689b8ccf7a81e948f93c3174de973bcfb7029911e198d0303d52
+  metadata.gz: ed8fbee9c8690874f06054054d40a6113af665af9dce485374e7e1e29f50db15cc5032ee27ed6a262270237a75e687f42c0dc9a312b1a845363d231527081a53
+  data.tar.gz: 695b9073a9277664139d183f23ba02db241bbdb01150f38f8ce5840aae3aeb92fcfe7534105cefecab4fc4a0718b28079790c401b7825e5430760143f4519541

data/config/ca-bundle.crt

@@ -1,7 +1,7 @@
 ##
 ## Bundle of CA Root Certificates
 ##
-## Certificate data from Mozilla as of: Fri Jul  8 12:28:41 2016
+## Certificate data from Mozilla as of: Fri Jul  8 13:40:02 2016
 ##
 ## This is a bundle of X.509 certificates of public Certificate Authorities
 ## (CA). These were automatically extracted from Mozilla's root certificates

data/lib/scrivito/backend/content_state_node.rb

@@ -64,16 +64,26 @@ class ContentStateNode < Struct.new(:content_state_id)
 
   # the most recent nodes are considered unstable,
   # since they may "disappear" from the tree when nodes are compacted.
-  # nodes without predecessor are always considered stable, since they
-  # cannot be compacted.
   def next_stable_node
-    predecessor || self
+    if compactable?
+      predecessor
+    else
+      self
+    end
   end
 
   private
 
+  # nodes without predecessor cannot be compacted, by definition.
+  # nodes with changes that can no longer be expanded also aren't compacted de-facto,
+  # since it's no longer possible to update outdated query results.
+  def compactable?
+    predecessor && ObjDataCache.expand_changes_index(changes)
+  end
+  memoize :compactable?
+
   def write_successor(successor_content_state_id, successor_changes)
-    if predecessor
+    if compactable?
       # try to built a compacted node,
       # i.e. create a new node by mering the new changes and the
       # changes from this node (similar to git "squashing" commits)

data/lib/scrivito/backend/obj_data_cache.rb

@@ -41,6 +41,15 @@ module ObjDataCache
     Hash[obj_ids.zip(tags)]
   end
 
+  # accepts a "change index" (id --> tag), looks up each
+  # tag in the cache and return an "expanded index" (id --> data).
+  # return `nil` if any tag cannot be found in the cache.
+  def self.expand_changes_index(change_index)
+    # using "merge(self)" to map over a hash
+    change_index.merge(change_index) do |id, tag|
+      CmsDataCache.read_data_from_tag(tag) or return nil
+    end
+  end
 
   class SimpleCacheView < Struct.new(:cache_id)
 
@@ -98,7 +107,7 @@ module ObjDataCache
 
         return nil unless updated_result
 
-        if cached_at != stable_csid
+        unless recent?(cached_at)
           write_cache_updatable(index, key, updated_result)
         end
 
@@ -137,7 +146,7 @@ module ObjDataCache
 
         return nil unless updated_tag
 
-        if cached_at != stable_csid
+        unless recent?(cached_at)
           write_cache_updatable("id", id, updated_tag)
         end
 
@@ -155,7 +164,17 @@ module ObjDataCache
 
     private
 
+    # is the given csid reachable with at most one ContentStateNode traversal?
+    def recent?(csid)
+      return true if csid == viewed_state.content_state_id
+
+      predecessor = viewed_state.predecessor
+
+      predecessor && csid == predecessor.content_state_id
+    end
+
     def write_cache_updatable(index, key, data, **options)
+      stable_csid = viewed_state.next_stable_node.content_state_id
       write_cache(index, key, stable_csid, data, **options)
     end
 
@@ -177,28 +196,13 @@ module ObjDataCache
 
       return nil if change_index == ContentStateNode::CACHE_MISS
 
-      expanded_index = expand_index(change_index)
+      expanded_index = ObjDataCache.expand_changes_index(change_index)
 
       # if the data of changed objs was evicted, treat as cache-miss
       return nil if !expanded_index
 
       update_function.call(key, cached_result, expanded_index)
     end
-
-    # accepts a "change index" (id --> tag), looks up each
-    # tag in the cache and return an "expanded index" (id --> data).
-    # return `nil` if any tag cannot be found in the cache.
-    def expand_index(change_index)
-      # using "merge(self)" to map over a hash
-      change_index.merge(change_index) do |id, tag|
-        CmsDataCache.read_data_from_tag(tag) or return nil
-      end
-    end
-
-    def stable_csid
-      viewed_state.next_stable_node.content_state_id
-    end
-
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scrivito_sdk
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Infopark AG