infopark_cloud_connector 6.8.3.73.75172665 → 6.8.3.115.227021242

data/app/controllers/rails_connector/objs_controller.rb

@@ -3,6 +3,7 @@ module RailsConnector
   class ObjsController < ActionController::Base
 
     before_filter :restrict_non_allow_access
+    before_filter :load_object
 
     respond_to :json
 
@@ -10,6 +11,15 @@ module RailsConnector
       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
+
       begin
         changed_obj = CmsRestApi.put(
           "revisions/#{Workspace.current.revision_id}/objs/#{params[:id]}",
@@ -23,6 +33,10 @@ module RailsConnector
 
     private
 
+    def load_object
+      @obj = Obj.find(params[:id])
+    end
+
     def restrict_non_allow_access
       unless allow_access?
         render(:text => 'Forbidden', :status => 403)

data/app/helpers/rails_connector/cms_tag_helper.rb

@@ -3,7 +3,7 @@ module RailsConnector
   module CmsTagHelper
 
     # A wrapper for [http://api.rubyonrails.org/classes/ActionView/Helpers/TagHelper.html#method-i-content_tag]
-    # If {cms_editor_mode?} returns true, it also renders additional data attributes, which are needed for inline editing.
+    # If {cms_editor_mode?} returns true, it also renders additional data attributes, which are needed for inplace editing.
     # @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 should be render.
@@ -14,6 +14,8 @@ module RailsConnector
         'data-ip-field-obj-class' => obj.obj_class,
         'data-ip-field-name' => attribute,
         'data-ip-field-type' => obj.type_of_attribute(attribute.to_s),
+        # Concate with empty string to disable html_safe:
+        'data-ip-field-original-content' => "" + display_original_value(obj[attribute]),
       }) if cms_editor_mode?
 
       content_tag(tag_name, display_value(obj[attribute]), options)

data/app/helpers/rails_connector/editing_helper.rb

@@ -3,13 +3,13 @@ module RailsConnector
   module EditingHelper
 
     def include_editing_stylesheet
-      if inline_editing_allowed?
+      if inplace_editing_allowed?
         stylesheet_link_tag :infopark_editing
       end
     end
 
     def include_editing_javascript
-      if inline_editing_allowed?
+      if inplace_editing_allowed?
         raw <<-EOF
           #{javascript_include_tag(:infopark_editing)}
           #{javascript_tag('$(function() { infopark.editing.initialize(); });')}
@@ -17,7 +17,7 @@ module RailsConnector
       end
     end
 
-    def inline_editing_allowed?
+    def inplace_editing_allowed?
       Configuration.editing_auth_callback.call(request.env)
     end
 

data/lib/assets/javascripts/infopark_editing.js

@@ -4307,44 +4307,47 @@ eval(function(p,a,c,k,e,d){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a
 var infopark = (function(that) {
   var editing_active = false;
 
-  var save_obj_attribute = function(obj_id, attribute_name, content, success, error) {
+  var save_obj_attribute = function(obj_id, attribute_name, content) {
     var url = window.location.protocol+"//"+window.location.host + "/__ipcms/objs/" + obj_id;
     var elements = {};
     elements[attribute_name] = content;
 
-    jQuery.ajax(url, {
+    return jQuery.ajax(url, {
       type: 'PUT',
       dataType: 'json',
       contentType: 'application/json; charset=utf-8',
       data: JSON.stringify({
         obj: elements
-      }),
-      success: function(data, textStatus, jqXHR) {
-        success();
-      },
-      error: function(jqXHR, textStatus, errorThrown) {
-        error(textStatus);
-      }
+      })
+    }).then(function(data, textStatus, jqXHR) {
+      return;
+    }, function(jqXHR, textStatus, errorThrown) {
+      return textStatus;
     });
   };
 
   var save_action = function(obj, event, key) {
     var obj_id = obj.$content.data('ip-field-id');
     var attribute_name = obj.$content.data('ip-field-name');
-    var new_content = $.trim(obj.$editor.text());
+    var new_content;
+    if(obj.$content.data('ip-field-type') === 'string') {
+      new_content = obj.$editor.text();
+    } else {
+      new_content = obj.getCode();
+    }
+    new_content = $.trim(new_content);
 
     obj.$box.addClass('ip_field_saving');
 
-    var success = function() {
+    save_obj_attribute(
+      obj_id, attribute_name, new_content
+    ).done(function() {
       obj.$editor.destroyEditor();
-      obj.$content.removeData('ip-field-original-content');
-    };
-    var error = function(error_message) {
+      obj.$content.data('ip-field-original-content', new_content);
+    }).fail(function(error_message) {
       obj.$box.removeClass('ip_field_saving');
       infopark.alert(error_message);
-    };
-
-    save_obj_attribute(obj_id, attribute_name, new_content, success, error);
+    });
   };
 
   var cancel_action = function(obj, event, key) {
@@ -4381,6 +4384,20 @@ var infopark = (function(that) {
         };
         break;
 
+      case 'html':
+        special_options = {
+          buttons: ['saveButton', 'cancelButton',
+            '|', 'formatting',
+            '|', 'bold', 'italic', 'deleted', 'underline',
+            '|', 'unorderedlist', 'orderedlist',
+            '|', 'table', 'link',
+            '|', 'fontcolor', 'backcolor',
+            '|', 'horizontalrule',
+            '|', 'html'
+          ]
+        };
+        break;
+
       default:
         return null;
     }
@@ -4413,7 +4430,7 @@ var infopark = (function(that) {
             $(dom_item).on('click.ip-editing', function(e) {
               e.preventDefault();
 
-              $(dom_item).data('ip-field-original-content', $(dom_item).html());
+              $(dom_item).html($(dom_item).data('ip-field-original-content'));
               $(dom_item).redactor(redactor_options);
             });
           }

data/lib/rails_connector/cloud_engine.rb

@@ -1,5 +1,9 @@
 module ::RailsConnector
   class CloudEngine < Rails::Engine
+    initializer "cloud_connector.add_assets" do |app|
+      # Specify which file should be precompiled for packaging
+      app.config.assets.precompile += %w( infopark_editing.js infopark_editing.css )
+    end
   end
 end
 

data/lib/rails_connector/content_conversion.rb

@@ -0,0 +1,89 @@
+require 'nokogiri'
+require 'addressable/uri'
+
+module RailsConnector
+
+  class ContentConversion
+    def self.convert_html_links(input, request_host, request_port)
+      doc = Nokogiri::HTML.parse("<div class='internal_jump_point'>#{input}</div>")
+
+      doc.css('body a').each do |a_tag|
+        item = a_tag.attributes['href']
+        item.value = convert_link(item.value, request_host, request_port)
+      end
+
+      doc.css('body img').each do |img_tag|
+        item = img_tag.attributes['src']
+        item.value = convert_link(item.value, request_host, request_port)
+      end
+
+      new_html = doc.css('body div.internal_jump_point').inner_html
+
+      nbsp = Nokogiri::HTML("&nbsp;").text
+      new_html.gsub(nbsp, "&nbsp;")
+    end
+
+    private
+
+    def self.convert_link(target, request_host, request_port)
+      if target.present?
+        uri = Addressable::URI.parse(target)
+
+        if uri.absolute?
+          if internal_url?(uri, request_host, request_port)
+            target = convert_single_link(uri)
+          end
+        else
+          if uri.path.present?
+            target = convert_single_link(uri)
+          end
+        end
+      end
+
+      target
+    end
+
+    def self.internal_url?(uri, request_host, request_port)
+      if request_host == uri.host
+        if uri.port.present?
+          uri.port == Integer(request_port)
+        else
+          true
+        end
+      else
+        false
+      end
+    end
+
+    def self.convert_single_link(uri)
+      uri.path = '/' unless uri.path.present?
+      uri.port = nil
+      uri.host = nil
+      uri.scheme = nil
+
+      if obj_id = determine_obj_id(uri.to_s)
+        uri.scheme = 'objid'
+        uri.path = obj_id
+      else
+        uri.scheme = 'external'
+      end
+
+      uri.to_s
+    end
+
+    def self.determine_obj_id(target)
+      route = Rails.application.routes.recognize_path(target, :method => :get)
+      if route[:controller] == 'rails_connector/cms_dispatch'
+        begin
+          if id = route[:id]
+            Obj.find(id).id
+          elsif permalink = route[:permalink]
+            CmsEnv.find_permalink_by_param(permalink).id
+          end
+        rescue RailsConnector::ResourceNotFound
+        end
+      end
+    end
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: infopark_cloud_connector
 version: !ruby/object:Gem::Version
-  version: 6.8.3.73.75172665
+  version: 6.8.3.115.227021242
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-25 00:00:00.000000000 Z
+date: 2013-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -43,6 +43,38 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.5.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.5.6
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.3.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.3.2
 - !ruby/object:Gem::Dependency
   name: kvom
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +82,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.8.3.73.75172665
+        version: 6.8.3.115.227021242
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +90,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.8.3.73.75172665
+        version: 6.8.3.115.227021242
 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.
@@ -98,6 +130,7 @@ files:
 - lib/rails_connector/cms_cache_storage.rb
 - lib/rails_connector/cms_rest_api.rb
 - lib/rails_connector/content_cache.rb
+- lib/rails_connector/content_conversion.rb
 - lib/rails_connector/content_service.rb
 - lib/rails_connector/content_state.rb
 - lib/rails_connector/content_state_caching.rb
@@ -152,7 +185,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -859921965
+      hash: 723525395
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: