infopark_cloud_connector 6.8.0.beta.200.785.05d4af9 → 6.8.0.beta.200.809.bdfa8c3

data/lib/rails_connector/cache.rb

@@ -2,32 +2,29 @@
 module RailsConnector
 
 class Cache
-  @cache = {}
-  @context = false
-
-  def self.begin_context
-    @context = true
-  end
-
-  def self.end_context
-    @context = false
-    reset
+  def initialize(options = {})
+    @fallback_backend, @cache_prefix = options[:fallback_backend], options[:cache_prefix]
+    @cache = {}
   end
 
-  def self.in_context?
-    @context
+  def read(key)
+    value = @cache[key]
+    if !value && @fallback_backend
+      value = @fallback_backend.read(cache_key_for_fallback_backend(key))
+      @cache[key] = value
+    end
+    value
   end
 
-  def self.load(key)
-    @cache[key]
+  def write(key, value)
+    @fallback_backend.write(cache_key_for_fallback_backend(key), value) if @fallback_backend
+    @cache[key] = value
   end
 
-  def self.store(key, value)
-    @cache[key] = value if @context
-  end
+  private
 
-  def self.reset
-    @cache.clear
+  def cache_key_for_fallback_backend(key)
+    @cache_prefix ? "#{@cache_prefix}/#{key}" : key
   end
 end
 

data/lib/rails_connector/cache_middleware.rb

@@ -7,10 +7,10 @@ class CacheMiddleware
   end
 
   def call(env)
-    Cache.begin_context
+    Revision.begin_caching
     @app.call(env)
   ensure
-    Cache.end_context
+    Revision.end_caching
   end
 end
 

data/lib/rails_connector/couch_blob.rb

@@ -3,17 +3,11 @@ module RailsConnector
 class CouchBlob
 
   def self.find(id, options)
-    cache_key = [:blob, id]
-    attachment = Cache.load(cache_key)
-    unless attachment
-      ActiveSupport::Notifications.instrumenter.instrument("cms_load.rails_connector",
-        :name => "Blob Load", :index => "blobs", :keys => [options[:context]]
-      ) do
-        attachment = CmsBaseModel.adapter.blob_attachment(id)
-        Cache.store(cache_key, attachment)
-      end
+    ActiveSupport::Notifications.instrumenter.instrument("cms_load.rails_connector",
+      :name => "Blob Load", :index => "blobs", :keys => [options[:context]]
+    ) do
+      new(id, CmsBaseModel.adapter.blob_attachment(id))
     end
-    new(id, attachment)
   end
 
   def self.configure(spec)

data/lib/rails_connector/obj.rb

@@ -194,10 +194,6 @@ module RailsConnector
       end
     end
 
-    def object_id # :nodoc:
-      obj_id
-    end
-
     # Returns the root Obj, i.e. the Obj with the path "/"
     def self.root
       Obj.find_by_path("/") or raise ResourceNotFound, "Obj.root not found: There is no Obj with path '/'."

data/lib/rails_connector/revision.rb

@@ -2,6 +2,7 @@
 module RailsConnector
 
   class Revision < CmsBaseModel
+    CACHE_PREFIX = 'revision'
 
     self.key_prefix = "rev"
 
@@ -9,6 +10,7 @@ module RailsConnector
     property :base_revision_id
     property :title
     property :content_cache_id
+    property :editable
 
     # Selects the revision with the given id as current revision
     def self.current=(revision)
@@ -28,8 +30,29 @@ module RailsConnector
       find_by_label("published")
     end
 
+    def self.begin_caching
+      @editable_cache = Configuration.cache_editable_workspaces ? persistent_cache : Cache.new
+      @read_only_cache = persistent_cache
+    end
+
+    def self.end_caching
+      @editable_cache = @read_only_cache = nil
+    end
+
+    def self.caching?
+      @read_only_cache && @editable_cache
+    end
+
+    def self.cache_for(revision)
+      revision.editable ? @editable_cache : @read_only_cache
+    end
+
     def find_obj_data_by(index, keys)
-      find_obj_data_from_cache_or_database_by(index, keys)
+      if self.class.caching?
+        find_obj_data_from_cache_or_database_by(index, keys)
+      else
+        find_obj_data_from_database_by(index, keys)
+      end
     end
 
     def chain
@@ -72,6 +95,10 @@ module RailsConnector
 
     COMPOUND_KEY_INDICES = [:ppath].freeze
 
+    def self.persistent_cache
+      Cache.new(:fallback_backend => Rails.cache, :cache_prefix => CACHE_PREFIX)
+    end
+
     def find_obj_data_from_database_by(index, keys)
       return [] if keys.blank?
       instrumenter = ActiveSupport::Notifications.instrumenter
@@ -86,10 +113,10 @@ module RailsConnector
     end
 
     def find_obj_data_from_cache_or_database_by(index, keys)
-      # load results from cache
       keys_from_database = []
+      # load results from cache
       results_from_cache = keys.map do |key|
-        Cache.load([:obj, index, key]).tap do |objs|
+        cache.read(cache_key_for(index, key)).tap do |objs|
           keys_from_database << key unless objs
         end
       end
@@ -128,7 +155,11 @@ module RailsConnector
     end
 
     def store_item_in_cache(index, key, item)
-      Cache.store([:obj, index, key], item)
+      cache.write(cache_key_for(index, key), item) if self.class.caching?
+    end
+
+    def cache_key_for(index, key)
+      "#{id}/obj/#{index}/#{key}"
     end
 
     def extract_obj_data(data)
@@ -146,6 +177,9 @@ module RailsConnector
     def rtc
       @rtc ||= DictStorage.get(read_attribute("rtc_ref"))
     end
-  end
 
+    def cache
+      self.class.cache_for(self)
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: infopark_cloud_connector
 version: !ruby/object:Gem::Version 
-  hash: 77657614921
+  hash: 88245288957
   prerelease: 6
   segments: 
   - 6
@@ -9,13 +9,12 @@ version: !ruby/object:Gem::Version
   - 0
   - beta
   - 200
-  - 785
-  - 5
-  - d
-  - 4
-  - af
-  - 9
-  version: 6.8.0.beta.200.785.05d4af9
+  - 809
+  - bdfa
+  - 8
+  - c
+  - 3
+  version: 6.8.0.beta.200.809.bdfa8c3
 platform: ruby
 authors: 
 - Infopark AG
@@ -23,10 +22,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-18 00:00:00 +02:00
+date: 2012-07-19 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  type: :runtime
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -38,11 +38,11 @@ dependencies:
         - 1
         - 2
         version: 1.1.2
-  version_requirements: *id001
-  name: couchrest
   prerelease: false
-  type: :runtime
+  name: couchrest
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
+  type: :runtime
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -54,34 +54,32 @@ dependencies:
         - 3
         - 6
         version: 1.3.6
-  version_requirements: *id002
-  name: aws-sdk
   prerelease: false
-  type: :runtime
+  name: aws-sdk
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
+  type: :runtime
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 77657614921
+        hash: 88245288957
         segments: 
         - 6
         - 8
         - 0
         - beta
         - 200
-        - 785
-        - 5
-        - d
-        - 4
-        - af
-        - 9
-        version: 6.8.0.beta.200.785.05d4af9
-  version_requirements: *id003
-  name: kvom
+        - 809
+        - bdfa
+        - 8
+        - c
+        - 3
+        version: 6.8.0.beta.200.809.bdfa8c3
   prerelease: false
-  type: :runtime
+  name: kvom
+  version_requirements: *id003
 description: The Cloud Connector for Infopark CMS Fiona enables you to develop modern, dynamic Web 2.0 applications using Ruby on Rails and at the same time display CMS managed content.
 email: info@infopark.de
 executables: []