infopark_cloud_connector 6.9.0.3.197272233 → 6.9.1.3.22208381

data/app/controllers/rails_connector/blobs_controller.rb

@@ -0,0 +1,10 @@
+module RailsConnector
+
+class BlobsController < WebserviceController
+  def upload_permission
+    permission = CmsRestApi.get('blobs/upload_permission')
+    render json: permission
+  end
+end
+
+end

data/app/controllers/rails_connector/objs_controller.rb

@@ -1,41 +1,42 @@
 module RailsConnector
 
-  class ObjsController < ActionController::Base
-    rescue_from ClientError do |exception|
-      render json: {error: exception.message}, status: exception.http_code
-    end
-
-    before_filter :merge_correctly_parsed_json_params
-    before_filter :restrict_non_allow_access
+  class ObjsController < WebserviceController
     before_filter :load_object, only: [:update, :destroy, :create_widget]
 
-    respond_to :json
+    def create
+      created_obj = CmsRestApi.post(
+        "revisions/#{Workspace.current.revision_id}/objs",
+        {obj: obj_params}
+      )
+      render json: created_obj
+    end
 
     def update
-      raise "Required parameter 'obj' is missing." unless params[:obj].present?
-      raise "Parameter 'obj' is not a hash." unless params[:obj].is_a?(Hash)
-
-      convert_html_keys = params[:obj].keys.select do |key|
-        @obj.type_of_attribute(key.to_s) == 'html'
-      end
-
-      convert_html_keys.each do |key|
-        params[:obj][key] = ContentConversion.convert_html_links(
-            params[:obj][key], request.host, request.port)
-      end
-
       changed_obj = CmsRestApi.put(
         "revisions/#{Workspace.current.revision_id}/objs/#{params[:id]}",
-        { :obj => params[:obj] }
+        {obj: obj_params}
       )
-      render :json => changed_obj
+      render json: changed_obj
     end
 
     def destroy
-      CmsRestApi.delete("revisions/#{Workspace.current.revision_id}/objs/#{params[:id]}")
+      @obj.destroy
       render json: {}
     end
 
+    def page_class_selection
+      thumbnails = {}
+      obj_classes = CmsRestApi.get("revisions/#{Workspace.current.revision_id}/obj_classes")
+      obj_classes['results'].each do |obj_class|
+        begin
+          name = obj_class['name']
+          thumbnails[name] = render_to_string("#{name.underscore}/thumbnail")
+        rescue ActionView::MissingTemplate
+        end
+      end
+      render json: thumbnails
+    end
+
     def widget_class_selection
       widgets = {}
       Dir[Rails.root + 'app/widgets/*'].each do |widget_path|
@@ -53,7 +54,7 @@ module RailsConnector
       }})
 
       @widget = Obj.find(widget['id'])
-      @container = Obj.find(params[:container_id]) if params[:container_id].present?
+      @current_page = Obj.find(params[:current_page_id]) if params[:current_page_id].present?
 
       render json: {markup: render_to_string(layout: false)}
     end
@@ -64,25 +65,20 @@ module RailsConnector
       @obj = Obj.find(params[:id])
     end
 
-    def restrict_non_allow_access
-      unless allow_access?
-        render(:text => 'Forbidden', :status => 403)
-      end
-    end
+    def obj_params
+      params[:obj].tap do |p|
+        raise "Required parameter 'obj' is missing." unless p.present?
+        raise "Parameter 'obj' is not a hash." unless p.is_a?(Hash)
 
-    # If +true+, allow access to ObjsController, else deny access.
-    # See {RailsConnector::Configuration.editing_auth} for details.
-    # @return [Bool]
-    def allow_access?
-      Configuration.editing_auth_callback.call(request.env)
-    end
+        if @obj
+          convert_html_keys = p.keys.select do |key|
+            @obj.type_of_attribute(key.to_s) == 'html'
+          end
 
-    # Workaround for https://github.com/rails/rails/issues/8832
-    def merge_correctly_parsed_json_params
-      if request.format.json?
-        body = request.body.read
-        request.body.rewind
-        params.merge!(ActiveSupport::JSON.decode(body)) if body.present?
+          convert_html_keys.each do |key|
+            p[key] = ContentConversion.convert_html_links(p[key], request.host, request.port)
+          end
+        end
       end
     end
   end

data/app/controllers/rails_connector/tasks_controller.rb

@@ -0,0 +1,11 @@
+module RailsConnector
+
+  class TasksController < WebserviceController
+
+    def show
+      render json: CmsRestApi.get("tasks/#{params[:id]}")
+    end
+
+  end
+
+end

data/app/controllers/rails_connector/webservice_controller.rb

@@ -0,0 +1,36 @@
+module RailsConnector
+
+class WebserviceController < ActionController::Base
+  rescue_from ClientError do |exception|
+    render json: {error: exception.message}, status: exception.http_code
+  end
+
+  before_filter :merge_correctly_parsed_json_params
+  before_filter :authorize
+
+  private
+
+  def authorize
+    unless allow_access?
+      render text: 'Forbidden', status: 403
+    end
+  end
+
+  # If +true+, allow access to ObjsController, else deny access.
+  # See {RailsConnector::Configuration.editing_auth} for details.
+  # @return [Bool]
+  def allow_access?
+    Configuration.editing_auth_callback.call(request.env)
+  end
+
+  # Workaround for https://github.com/rails/rails/issues/8832
+  def merge_correctly_parsed_json_params
+    if request.format.json?
+      body = request.body.read
+      request.body.rewind
+      params.merge!(ActiveSupport::JSON.decode(body)) if body.present?
+    end
+  end
+end
+
+end

data/app/controllers/rails_connector/workspaces_controller.rb

@@ -0,0 +1,33 @@
+module RailsConnector
+
+  class WorkspacesController < WebserviceController
+    def index
+      render json: CmsRestApi.get('workspaces')
+    end
+
+    def create
+      render json: CmsRestApi.post('workspaces', {workspace: workspace_params})
+    end
+
+    def update
+      render json: CmsRestApi.put("workspaces/#{params[:id]}", {workspace: workspace_params})
+    end
+
+    def destroy
+      render json: CmsRestApi.delete("workspaces/#{params[:id]}")
+    end
+
+    def publish
+      render json: CmsRestApi.put("workspaces/#{params[:id]}/publish", {})
+    end
+
+    private
+
+    def workspace_params
+      raise "Required parameter 'workspace' is missing." unless params[:workspace].present?
+      raise "Parameter 'workspace' is not a hash." unless params[:workspace].is_a?(Hash)
+      params[:workspace]
+    end
+  end
+
+end

data/app/helpers/rails_connector/cms_asset_helper.rb

@@ -0,0 +1,100 @@
+module RailsConnector
+
+  # This module contains helpers that can be used to reference images and other assets stored in the CMS.
+  #
+  # @api public
+  module CmsAssetHelper
+
+    # Calculates an HTML image tag for an image stored in the CMS.
+    #
+    # @note There are two different signatures of this method: the first one generates an HTML image tag with no
+    #   inplace editing possible, the second one generated an HTML image tag for inplace editing.
+    #
+    # @overload cms_image_tag target, tag_options={}
+    #   @note If you do not specify an HTML +alt+ attribute, the helper method will use +target+'s +display_title+.
+    #   Calculates HTML image tag (no inplace editing possible).
+    #
+    #   @param [Obj, Link] target Target containing image stored in CMS.
+    #   @param [Hash] tag_options Additional HTML attributes for the tag.
+    #
+    #   @example
+    #     cms_image_tag @target
+    #     cms_image_tag @target, alt: 'Interesting picture', class: 'my_image'
+    #
+    # @overload cms_image_tag obj, linklist, tag_options={}, editing_options={}
+    #   @note If you do not specify an HTML +alt+ attribute, the helper method will use +obj+'s +display_title+.
+    #   Calculates HTML image tag for inplace editing.
+    #
+    #   @param [Obj] obj Obj with an attribute of type {LinkList}.
+    #   @param [String, Symbol] linklist Name of {LinkList} attribute, which contains the image.
+    #   @param [Hash] tag_options Additional HTML attributes for the tag.
+    #
+    #   @param [Hash] editing_options Additional options for inplace editing.
+    #   @option editing_options [String] :placeholder ('/assets/rails_connector/image_placeholder.png') URL or path to image to be displayed if target is missing.
+    #
+    #   @example
+    #     cms_image_tag @obj, :my_linklist
+    #     cms_image_tag @obj, :my_linklist, alt: 'Interesting picture', class: 'my_image'
+    #     cms_image_tag @obj, :my_linklist, {}, placeholder: image_path('my_placeholder.png')
+    #     cms_image_tag @obj, :my_linklist, {class: 'my_image'}, placeholder: 'http://placehold.it/350x150'
+    #
+    # @return [String] HTML image tag
+    # @api public
+    def cms_image_tag(*args)
+      if args.second.nil? || args.second.is_a?(Hash)
+        target = args.first
+        if target.is_a?(LinkList)
+          ActiveSupport::Deprecation.warn(%{
+            Calling "cms_image_tag" with a "LinkList" is not allowed anymore.
+            Please use following syntax instead: cms_image_tag(@obj, :linklist).
+          })
+        end
+
+        tag_options = args.second || {}
+        tag_options.symbolize_keys!
+        tag_options[:src] = cms_path(target)
+        tag_options[:alt] ||= display_title(target)
+      else
+        obj = args.first
+        attribute_name = args.second
+        target = obj[attribute_name]
+        tag_options = args.third || {}
+        editing_options = args.fourth || {}
+
+        tag_options.symbolize_keys!
+        editing_options.symbolize_keys!
+
+        tag_options[:src] ||= begin
+          target_path = cms_path(target)
+          if target_path == RailsConnector::DefaultCmsRoutingHelper::LINK_TO_EMPTY_LINKLIST
+            editing_options[:placeholder] || image_path('rails_connector/image_placeholder.png')
+          else
+            target_path
+          end
+        end
+
+        if inplace_editing_allowed?
+          tag_options.merge!(
+            'data-ip-resource-source-obj-id' => obj.id,
+            'data-ip-resource-source-field-name' => attribute_name
+          )
+        end
+
+        tag_options.reverse_merge!(alt: display_title(target))
+      end
+
+      tag('img', tag_options)
+    end
+
+    private
+
+    def display_title(target)
+      if target.respond_to?(:display_title)
+        return target.display_title
+      elsif target.respond_to?(:first) && target.first.respond_to?(:display_title)
+        return target.first.display_title
+      end
+    end
+
+  end
+end

data/app/helpers/rails_connector/cms_tag_helper.rb

@@ -13,7 +13,7 @@ module RailsConnector
     # @param tag_name [String, Symbol] Name of the html tag (e.g. +:h1+ or +:div+).
     # @param obj [Obj] A {Obj} from which attribute is read.
     # @param attribute [String, Symbol] Which attribute of the Obj should be rendered.
-    # @param options [Hash] Additional options, which are passed to +content_tag+. Use them to add HTML attrbutes to the tag.
+    # @param options [Hash] Additional options, which are passed to +content_tag+. Use them to add HTML attributes to the tag.
     # @return [String] The rendered html tag
     #
     # Example Usage:
@@ -21,14 +21,18 @@ module RailsConnector
     # (renders an <h2> tag containing the text of the +headline+ attribute of +@obj+ and assigns the tag a css class called +very_important+.)
     # @api public
     def cms_tag(tag_name, obj, attribute, options = {})
-      field_type = obj.type_of_attribute(attribute.to_s)
+      begin
+        field_type = obj.type_of_attribute(attribute.to_s)
+      rescue RailsConnectorError => e
+        return content_tag(tag_name, '', options)
+      end
 
       options = options.merge({
         'data-ip-field-id' => obj.id,
         'data-ip-field-obj-class' => obj.obj_class,
         'data-ip-field-name' => attribute,
         'data-ip-field-type' => field_type,
-      }) if cms_editor_mode?
+      }) if inplace_editing_allowed?
 
       if field_type == 'widget'
         rendered_widgets = obj.widgets(attribute).map do |widget|
@@ -36,7 +40,7 @@ module RailsConnector
         end
         inner_html = safe_join(rendered_widgets)
       else
-        if cms_editor_mode?
+        if inplace_editing_allowed?
           original_value = display_original_value(obj[attribute]) || ''
           # Concate with empty string to disable html_safe:
           options['data-ip-field-original-content'] = '' + original_value
@@ -47,15 +51,86 @@ module RailsConnector
       content_tag(tag_name, inner_html, options)
     end
 
-    def cms_editor_mode?
-      !Workspace.current.published?
+    class List
+
+      attr_reader :output
+
+      def initialize(template)
+        @template = template
+      end
+
+      # @param tag_name [String, Symbol] Name of the html tag (e.g. +:div+ or +:span+).
+      # @param options [Hash] Additional options, which are passed to +content_tag+. Use them to add HTML attributes to the tag.
+      # @return [String] The rendered html tag
+      #
+      # @example Render a <div> tag containing the text "random content" and assigns the tag a css class called +very_important+.
+      #   <%= list.tag :div, class: "very_important" do %>
+      #     random content
+      #   <% end %>
+      def tag(tag_name, options = {}, &block)
+        if @output.present?
+          raise '"list.tag" can only be called once per iteration!'
+        else
+          @output = @template.content_tag(tag_name, options, &block) + "\n"
+
+          nil
+        end
+      end
+
+    end
+
+    # @param tag_name [String, Symbol] Name of the html tag (e.g. +:h1+ or +:div+).
+    # @param obj [Obj] A {Obj} from which method_name is read.
+    # @param method_name [String, Symbol] Which method_name of the Obj should be rendered. Currently only +toclist+ is supported
+    # @param options [Hash] Additional options, which are passed to +content_tag+. Use them to add HTML attributes to the tag.
+    # @yieldparam [List] list An instance, where +tag+ should be called once.
+    # @yieldparam [Obj] child Each child of +toclist+
+    # @return [String] The rendered html tag
+    #
+    # @example
+    #   <%= cms_tag_list :div, @obj, :toclist, class: "very_important" do |list, child| %>
+    #     <%= list.tag :div, class: "also_important" do %>
+    #       <%= link_to cms_path(child) do %>
+    #         <%= cms_tag :span, child, :title %>
+    #       <% end %>
+    #     <% end %>
+    #   <% end %>
+    #
+    #   # results for an obj with two children in
+    #
+    #   <div class="very_important">
+    #     <div class="also_important"><a href="/child1"><span>Child 1</span></a></div>
+    #     <div class="also_important"><a href="/child2"><span>Child 2</span></a></div>
+    #   </div>
+    def cms_tag_list(tag_name, obj, method_name, options = {})
+      if method_name.to_s == 'toclist'
+        items = obj.toclist
+      else
+        raise "#{method_name} is not (yet) supported. Currently only toclist is supported."
+      end
+
+      inner_html = "\n".html_safe
+
+      items.each do |item|
+        list = List.new(self)
+
+        yield list, item
+
+        inner_html << list.output
+      end
+
+      options = options.merge({
+        'data-ip-child-list-path' => obj.path,
+      }) if inplace_editing_allowed?
+
+      content_tag(tag_name, inner_html, options)
     end
 
     def render_widget(widget, obj, field_name, container)
       options = {
         'data-ip-widget-id' => widget.id,
         'data-ip-widget-obj-class' => widget.obj_class,
-      } if cms_editor_mode?
+      } if inplace_editing_allowed?
 
       content_tag(:div, options || {}) do
         WidgetRenderer.new(request).process('show', widget, obj, field_name, container)

data/app/views/rails_connector/_editing_javascript.html.erb

@@ -2,8 +2,14 @@
 <%= javascript_tag do %>
   $(function() {
     infopark.i18n.set_locale("<%= I18n.locale %>");
-    infopark.editing.initialize();
-    infopark.obj.current_container_id = "<%= @obj.try(:id) %>";
+    infopark.editing.set_workspace(
+      infopark.workspace.from_data({
+        id: "<%= escape_javascript(RailsConnector::Workspace.current.id).html_safe %>",
+        title: "<%= escape_javascript(RailsConnector::Workspace.current.title).html_safe %>"
+      })
+    );
+    infopark.obj.current_page_id = "<%= @obj.try(:id) %>";
     infopark.admin_gui_base_url = "<%= RailsConnector::CmsRestApi.credentials[:url] %>";
+    infopark.editing.initialize();
   });
 <% end %>