scrivito_sdk 1.4.1.rc1 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1172652ee83e4d7e8a6bfe7b592ceed9feedad25
-  data.tar.gz: b6d9a1e28755ba06ced084c53f91f29248fee0a5
+  metadata.gz: f89019184f21b4bdfa167ae1a20c755a41bd7094
+  data.tar.gz: e2e24931a530ee482d43383a014fb9aff47fcb32
 SHA512:
-  metadata.gz: a254e12c57feb5c00a757c4075d841850f66bc89457bd6f147702bd7b9909e8731e095a5b26a1c8002ba130dbeabf5421d99b65a39a9741d36908d31fe0e8e8f
-  data.tar.gz: 37b5fe2c93259baea179f05b8b1d73b05d0f5a01e230fa55af3c818988f7616b47fe87e2c8dd0c592215fe9e935bc64752d0f7cee872d82ebb81479f8f748cea
+  metadata.gz: 13376090043889af634c6085c5d0751c2cfcb29a4127656001f98b7f573fed3923641097592a832a78701825bf1f30bc8706ff9c2ba5355564738725732ec819
+  data.tar.gz: cf8f20a0c9ce6b03146acd51870c93b07d51b05233b6132c327de4dfb7bc98bdb1bc0f71e814689b8ccf7a81e948f93c3174de973bcfb7029911e198d0303d52

data/config/ca-bundle.crt

@@ -1,7 +1,7 @@
 ##
 ## Bundle of CA Root Certificates
 ##
-## Certificate data from Mozilla as of: Mon Jul  4 08:59:11 2016
+## Certificate data from Mozilla as of: Fri Jul  8 12:28:41 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,26 +64,16 @@ 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
-    if compactable?
-      predecessor
-    else
-      self
-    end
+    predecessor || self
   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 compactable?
+    if predecessor
       # 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,15 +41,6 @@ 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)
 
@@ -107,7 +98,7 @@ module ObjDataCache
 
         return nil unless updated_result
 
-        unless recent?(cached_at)
+        if cached_at != stable_csid
           write_cache_updatable(index, key, updated_result)
         end
 
@@ -146,7 +137,7 @@ module ObjDataCache
 
         return nil unless updated_tag
 
-        unless recent?(cached_at)
+        if cached_at != stable_csid
           write_cache_updatable("id", id, updated_tag)
         end
 
@@ -164,17 +155,7 @@ 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
 
@@ -196,13 +177,28 @@ module ObjDataCache
 
       return nil if change_index == ContentStateNode::CACHE_MISS
 
-      expanded_index = ObjDataCache.expand_changes_index(change_index)
+      expanded_index = expand_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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scrivito_sdk
 version: !ruby/object:Gem::Version
-  version: 1.4.1.rc1
+  version: 1.4.1
 platform: ruby
 authors:
 - Infopark AG
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-04 00:00:00.000000000 Z
+date: 2016-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -422,9 +422,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5