scrivito_sdk 0.40.0 → 0.41.0.rc1

data/lib/scrivito/configuration.rb

@@ -81,15 +81,50 @@ module Scrivito
         self.find_user_proc = find_user_proc
       end
 
-      # The +Scrivito+ makes heavy use of filesystem caching.
-      # Use this method to configure the directory that should be used to store cached data.
-      # By default, +RAILS_ROOT/tmp/scrivito_cache+ will be used.
+      #
+      # Set the path for the filesystem cache.
+      #
+      # +Scrivito+ makes heavy use of filesystem caching. Use this method to configure the directory
+      # that should be used to store cached data. By default, +RAILS_ROOT/tmp/scrivito_cache+ will
+      # be used.
+      #
+      # @api public
+      #
       # @param path [String] Path to directory that should be used to store cached data.
+      #
       # @example Configure +Scrivito+ to store its cache under +/tmp/my_cache+.
-      #     Scrivito::Configuration.cache_path = '/tmp/my_cache'
-      # @api public
+      #
+      #   Scrivito.configure do |config|
+      #     config.cache_path = '/tmp/my_cache'
+      #   end
+      #
       def cache_path=(path)
-        CmsCacheStorage.backend_cache = ActiveSupport::Cache::FileStore.new(path)
+        CmsDataCache.cache_path = path
+      end
+
+      #
+      # Sets the second level cache.
+      #
+      # If it is set, then +Scrivito+ will additionaly store its cache in both: the filesystem cache
+      # and the second level cache. Also +Scrivito+ will search in the second level cache if
+      # searching in the filesystem cache returns no results. If the second level cache returns
+      # results, then the results will be store in the filesystem cache.
+      #
+      # By default it is not set.
+      #
+      # @api public
+      #
+      # @param cache_store [ActiveSupport::Cache::Store] cache store to be used as the second level
+      #   cache
+      #
+      #  @example Use Memcached as the second level cache (https://rubygems.org/gems/dalli)
+      #
+      #   Scrivito.configure do |config|
+      #     config.second_level_cache = ActiveSupport::Cache::DalliStore.new("localhost", "server-downstairs.localnetwork:8229")
+      #   end
+      #
+      def second_level_cache=(cache_store)
+        CmsDataCache.second_level_cache = cache_store
       end
 
       #

data/lib/scrivito/content_state.rb

@@ -11,14 +11,14 @@ class ContentState < Struct.new(:content_state_id, :changes, :changes_index, :fr
     def create(attributes)
       new(attributes).tap do |content_state|
         content_state.index_changes!
-        CmsCacheStorage.write_content_state(content_state.content_state_id, content_state.to_hash)
+        CmsDataCache.write_content_state(content_state.content_state_id, content_state.to_hash)
       end
     end
 
     # Finds a previously saved content state.
     # Returns nil if not found.
     def find(content_state_id)
-      if content_state_data = CmsCacheStorage.read_content_state(content_state_id)
+      if content_state_data = CmsDataCache.read_content_state(content_state_id)
         new(content_state_data)
       end
     end
@@ -38,22 +38,22 @@ class ContentState < Struct.new(:content_state_id, :changes, :changes_index, :fr
   # Stores arbitrary data in cache.
   # Cache key is build from given index and key.
   def save_obj_data(index, key, data)
-    CmsCacheStorage.write_obj_data(content_state_id, index, key, data)
+    CmsDataCache.write_obj_data(content_state_id, index, key, data)
   end
 
   # Fetches previously stored arbitrary data from cache.
   # Returns nil if nothing found.
   # Cache key is build from given index and key.
   def find_obj_data(index, key)
-    CmsCacheStorage.read_obj_data(content_state_id, index, key)
+    CmsDataCache.read_obj_data(content_state_id, index, key)
   end
 
   def save_obj_classes_data(data)
-    CmsCacheStorage.write_obj_classes_data(content_state_id, data)
+    CmsDataCache.write_obj_classes_data(content_state_id, data)
   end
 
   def find_obj_classes_data
-    CmsCacheStorage.read_obj_classes_data(content_state_id)
+    CmsDataCache.read_obj_classes_data(content_state_id)
   end
 
   # Fetches and caches the ancestor.

data/lib/scrivito/controller_actions.rb

@@ -17,9 +17,10 @@ module ControllerActions
 
   included do
     before_filter :require_authenticated_editor, only: [
-      :details_page,
       :show_widget,
       :widget_details,
+      :page_details,
+      :resource_details,
     ]
 
     before_filter :load_object
@@ -48,7 +49,12 @@ module ControllerActions
     render template_path, layout: 'scrivito_dialog', locals: {widget: widget}
   end
 
-  def details_page
+  def page_details
+    assert_dialog_layout
+    render @obj.details_view_path, layout: 'scrivito_dialog'
+  end
+
+  def resource_details
     assert_dialog_layout
     @scrivito_resource = editing_context.selected_workspace.objs
         .find_including_deleted(params[:resource_id])

data/lib/scrivito/obj_params_parser.rb

@@ -36,8 +36,10 @@ module Scrivito
           case action
           when 'create' then Widget.new(widget_params)
           when 'copy'
-            widget_id = widget_params['src_widget_id']
-            widget = Obj.find(widget_params['src_obj_id']).widgets[widget_id]
+            widget_id = widget_params['widget_id']
+            widget = Workspace.find(widget_params['workspace_id'])
+              .objs.find(widget_params['obj_id'])
+              .widgets[widget_id]
             raise ResourceNotFound, "Could not find Widget with id #{widget_id}" unless widget
             widget.copy
           else raise UnknownWidgetAction

data/lib/scrivito/workspace_data_from_service.rb

@@ -5,7 +5,7 @@ class WorkspaceDataFromService
     # Fetches a workspace data previously store in cache storage.
     # Returns nil if not found.
     def find_from_cache(id)
-      if data = CmsCacheStorage.read_workspace_data(id)
+      if data = CmsDataCache.read_workspace_data(id)
         new(data)
       end
     end
@@ -56,7 +56,7 @@ class WorkspaceDataFromService
   # Also creates an appropriate content state if needed.
   def store_in_cache
     create_content_state if content_state_id
-    CmsCacheStorage.write_workspace_data(id, to_hash)
+    CmsDataCache.write_workspace_data(id, to_hash)
   end
 
   private

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scrivito_sdk
 version: !ruby/object:Gem::Version
-  version: 0.40.0
+  version: 0.41.0.rc1
 platform: ruby
 authors:
 - Infopark AG
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-26 00:00:00.000000000 Z
+date: 2015-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -167,9 +167,11 @@ files:
 - app/controllers/scrivito/webservice_controller.rb
 - app/controllers/scrivito/workspaces_controller.rb
 - app/helpers/scrivito_helper.rb
+- app/models/scrivito/content_widget.rb
 - app/views/google_maps_widget/show.html.erb
 - app/views/scrivito/_editing_auth_warning.html.erb
 - app/views/scrivito/blobs/upload_permission.json.jbuilder
+- app/views/scrivito/content_widget/show.html.erb
 - app/views/scrivito/objs/copy_widget.html.erb
 - app/views/scrivito/objs/create_widget.html.erb
 - app/views/scrivito/objs/format_missing_error.json.jbuilder
@@ -219,8 +221,10 @@ files:
 - lib/generators/scrivito/install/templates/app/models/page.rb
 - lib/generators/scrivito/install/templates/app/models/text_widget.rb
 - lib/generators/scrivito/install/templates/app/models/widget.rb
+- lib/generators/scrivito/install/templates/app/views/download/embed.html.erb
 - lib/generators/scrivito/install/templates/app/views/headline_widget/show.html.erb
 - lib/generators/scrivito/install/templates/app/views/headline_widget/thumbnail.html.erb
+- lib/generators/scrivito/install/templates/app/views/image/embed.html.erb
 - lib/generators/scrivito/install/templates/app/views/image_widget/show.html.erb
 - lib/generators/scrivito/install/templates/app/views/image_widget/thumbnail.html.erb
 - lib/generators/scrivito/install/templates/app/views/layouts/scrivito_dialog.html.erb
@@ -257,13 +261,16 @@ files:
 - lib/scrivito/basic_widget.rb
 - lib/scrivito/binary.rb
 - lib/scrivito/cache.rb
+- lib/scrivito/cache/chainable.rb
+- lib/scrivito/cache/file_store.rb
+- lib/scrivito/cache/ram_store.rb
 - lib/scrivito/cache_garbage_collector.rb
 - lib/scrivito/cache_middleware.rb
 - lib/scrivito/child_list_tag.rb
 - lib/scrivito/client_config.rb
 - lib/scrivito/client_error.rb
 - lib/scrivito/cms_backend.rb
-- lib/scrivito/cms_cache_storage.rb
+- lib/scrivito/cms_data_cache.rb
 - lib/scrivito/cms_dispatch_controller.rb
 - lib/scrivito/cms_env.rb
 - lib/scrivito/cms_field_tag.rb
@@ -362,9 +369,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5