scrivito_sdk 0.66.0 → 0.70.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4cdabe0c3d8f058d37b6ab909fce7231a616635f
-  data.tar.gz: 251a1e0d3579e39d5fd8b752b2d0dba72e5a0570
+  metadata.gz: db9dbbb4e8e68455e0fe9b3bc987ac8034f36751
+  data.tar.gz: 05117844c6a7c272dd31645ee5cad9b374b5c661
 SHA512:
-  metadata.gz: 5d90aaf3ad8fd408516d947f4fff7accbb1ee574c417c50ee588ffd39f7a11426e1d6609498cef4407c324e73f1507732f3297eb3b4ccc7f111ab18c1d6b207b
-  data.tar.gz: 5d0c6ae6c502d9534a5908c7d728156864bf78cf852eb9de18cfc8194ac241204f19f0519474f32722fc884ce464dec1d102f8c4198fa040d0c3338f43415b87
+  metadata.gz: d6ba62c8a1296eedd929af7246b95df7bdbb8b770e81eebef8f049378d35b8a9efcdb6899f1b8d92f3ee2e5bc6c85feb5998c286d532500eb9b8f9e9ecbbd204
+  data.tar.gz: c5cd61adaa67b40927297df9283b38b919629bc0914be07244bc2f9ebb6bc86d2feac2d78ea8925c801cd12fe9783b240468af440d464557c82d0645cc2e15ad

data/app/controllers/scrivito/blobs_controller.rb

@@ -4,6 +4,11 @@ class BlobsController < WebserviceController
   def upload_permission
     @permission = CmsRestApi.task_unaware_request(:get, 'blobs/upload_permission')
   end
+
+  def activate_upload
+    CmsRestApi.activate_upload(params.slice(:upload, :obj_id, :filename, :content_type))
+    render_empty_json
+  end
 end
 
 end

data/app/controllers/scrivito/objs_controller.rb

@@ -54,7 +54,8 @@ module Scrivito
 
     def destroy
       in_selected_workspace do
-        @redirect_to = scrivito_path(current_obj.parent || Obj.homepage)
+        parent = current_obj.parent
+        @redirect_to = parent ? scrivito_path(parent) : scrivito_root_path
         current_obj.destroy
       end
     end

data/app/controllers/scrivito/ui_controller.rb

@@ -2,13 +2,43 @@ module Scrivito
 
 class UiController < ActionController::Base
   def index
+    @application_src = application_src
+    if editing_context.editor
+      @ui_config = UiConfig.new(
+        editing_context: editing_context,
+        resource: resource,
+        return_to: params[:return_to],
+        app_extension_tags: app_extension_tags,
+      ).to_json
+    else
+      redirect_to @application_src
+    end
+  end
+
+  private
+
+  def application_src
+    return "/" if resource_details?
+
     given_query = request.env['QUERY_STRING']
     query = "?#{given_query}" if given_query.present?
-    @application_src = "/#{params['application_path']}#{query}"
-    redirect_to @application_src unless editing_context.editor
+    "/#{params['application_path']}#{query}"
   end
 
-  private
+  def resource_details?
+    params[:resource_id].present?
+  end
+
+  def resource
+    if resource_details?
+      editing_context.selected_workspace.objs.find_including_deleted(params[:resource_id])
+    end
+  end
+
+  def app_extension_tags
+    view_context.javascript_include_tag('scrivito_app_extensions') +
+      view_context.stylesheet_link_tag('scrivito_app_extensions')
+  end
 
   def editing_context
     EditingContextMiddleware.from_request(request)

data/app/helpers/scrivito_helper.rb

@@ -122,6 +122,9 @@ module ScrivitoHelper
   # @option editing_options [String] :placeholder ('/assets/scrivito/image_placeholder.png') URL
   #   or path to image to be displayed if target is missing
   #
+  # @option editing_options [Hash] :transform if set, the displayed image will be transformed using
+  #   the definition in the given hash, see {Scrivito::Binary#transform}.
+  #
   # @example
   #   scrivito_image_tag(@obj, :my_linklist)
   #   scrivito_image_tag(@obj, :my_linklist, alt: 'Interesting picture', class: 'my_image')
@@ -140,6 +143,9 @@ module ScrivitoHelper
   # @example Render an image tag for a binary Obj
   #   scrivito_image_tag(@image)
   #
+  # @example Render an image tag with an on-the-fly calculated thumbnail
+  #   scrivito_image_tag @obj, :my_binary, {}, transform: {width: 50, height: 50}
+  #
   # @return [String] HTML image tag
   #
   # @raise [ScrivitoError] if +field_name+ is not set and Obj is not binary
@@ -356,7 +362,7 @@ module ScrivitoHelper
   # @api public
   #
   def scrivito_body_tags
-    Scrivito::LayoutTags.new(self).client_config(@obj, @scrivito_resource)
+    Scrivito::LayoutTags.new(self).page_config(@obj)
   end
 
   {
@@ -379,16 +385,11 @@ module ScrivitoHelper
     end
   end
 
-  #
-  # Returns the current user.
-  #
   # @api public
-  # @return [Scrivito::User] if the {Scrivito::Configuration.editing_auth} callback returns an
-  #   instance of {Scrivito::User}.
-  # @return +nil+ otherwise.
-  #
+  # @return [Scrivito::User, nil]
+  # See {Scrivito::ControllerActions#scrivito_user} for details.
   def scrivito_user
-    Scrivito::EditingContextHelper.new(request).scrivito_user
+    Scrivito::EditingContextMiddleware.from_request(request).editor
   end
 
   def inplace_editing_allowed?
@@ -398,15 +399,8 @@ module ScrivitoHelper
     }
   end
 
-  #
-  # Returns whether the GUI is in the +editable+ view.
-  #
-  # @api public
-  # @return +true+ if the current visitor is an authenticated editor, the selected workspace is
-  #   editable and the display mode is +editing+.
-  # @return +false+ otherwise.
-  #
-  def scrivito_in_editable_view?
-    Scrivito::EditingContextHelper.new(request).in_editable_view?
-  end
+  # @!method scrivito_in_editable_view?
+  #   @return [Boolean]
+  #   See {Scrivito::ControllerActions#scrivito_in_editable_view?} for details.
+  #   @api public
 end

data/app/views/scrivito/objs/update.json.jbuilder

@@ -1 +1 @@
-json.merge! current_obj.as_client_json
+json.merge! Scrivito::ClientAttributeSerializer.serialize_obj(current_obj)

data/app/views/scrivito/ui/index.html.erb

@@ -9,6 +9,6 @@
 </head>
 <body id="scrivito_ui">
   <iframe name="scrivito_application" src="<%= @application_src %>"></iframe>
-  <%= scrivito_body_tags %>
+  <%= content_tag(:div, '', 'data-scrivito-private-ui-config' => @ui_config) %>
 </body>
 </html>

data/app/views/scrivito/webservice/_workspace.json.jbuilder

@@ -1,8 +1,9 @@
 json.extract! workspace, :id, :title
+json.is_accessible can_user_read_workspace?(workspace)
 
 json.memberships workspace.memberships do |membership|
   json.extract! membership, :user_id, :role
   json.description membership.user.description
 end
 
-json.is_accessible can_user_read_workspace?(workspace)
+json.outdated workspace.outdated?

data/config/ca-bundle.crt

@@ -1,7 +1,7 @@
 ##
 ## Bundle of CA Root Certificates
 ##
-## Certificate data from Mozilla as of: Wed Jul 22 11:23:10 2015
+## Certificate data from Mozilla as of: Wed Sep  2 13:20:26 2015
 ##
 ## This is a bundle of X.509 certificates of public Certificate Authorities
 ## (CA). These were automatically extracted from Mozilla's root certificates

data/config/precedence_routes.rb

@@ -34,6 +34,8 @@ Scrivito::SdkEngine.routes.draw do
 
   get '__scrivito/blobs/upload_permission' => 'scrivito/blobs#upload_permission',
     defaults: {format: :json}
+  put '__scrivito/blobs/activate_upload' => 'scrivito/blobs#activate_upload',
+    defaults: {format: :json}
 
   resources :workspaces,
     controller: 'scrivito/workspaces',
@@ -53,8 +55,7 @@ Scrivito::SdkEngine.routes.draw do
   get '__scrivito/render_widget/:id/widget_details/:widget_id' => 'scrivito/cms_dispatch#widget_details'
 
   get '__scrivito/page_details/:id' => 'scrivito/cms_dispatch#page_details'
-
-  get '__scrivito/resource_details/:resource_id' => 'scrivito/cms_dispatch#resource_details'
+  get '__scrivito/resource_details/:resource_id', to: 'scrivito/ui#index'
 
   get '__scrivito/to_binary' => 'scrivito/binary_redirect#to_binary', as: :binary
 

data/lib/assets/javascripts/scrivito.js

@@ -0,0 +1,46 @@
+(function() {
+  if (window.parent !== window) {
+    var scrivito_ui = window.parent.scrivito;
+    if (scrivito_ui) {
+      // In an iframe and parent window contains the UI: in UI mode.
+      var cms_document = scrivito_ui.cms_element.from_dom_element(document);
+      cms_document.install_public_api();
+      cms_document.add_app_extensions();
+
+      // wait for app to be fully loaded
+      document.addEventListener("DOMContentLoaded", function() {
+        // wait for UI to be fully loaded
+        scrivito_ui.on("load", function() {
+          cms_document.assert_user_logged_in();
+          cms_document.connect();
+        });
+      });
+    }
+  } else {
+    document.addEventListener("DOMContentLoaded", function() {
+      // Not in UI mode, but editing is allowed: redirect to the UI mode.
+      if (document.querySelector('[data-scrivito-private-page-config]')) {
+        console.log('Scrivito config found: redirecting to the UI...');
+        window.location = '/scrivito' +
+            window.location.pathname +
+            window.location.search +
+            window.location.hash;
+      }
+    });
+  }
+
+  // If the SDK is completely missing, the custom callbacks should nevertheless run.
+  if (!window.scrivito) {
+    window.scrivito = {
+      on: function(event_name, callback) {
+        if (event_name === 'content') {
+          document.addEventListener("DOMContentLoaded", function() {
+            callback(window.document);
+          });
+        }
+      },
+
+      in_editable_view: function() { return false; }
+    };
+  }
+}());