infopark_rails_connector 6.8.3.73.75172665 → 6.8.3.115.227021242

data/app/helpers/rails_connector/default_cms_helper.rb

@@ -22,6 +22,7 @@ module RailsConnector
     include RailsConnector::TableOfContentsHelper
     include RatingsHelper
     include RailsConnector::LayoutHelper
+    include RailsConnector::CmsTagHelper
   end
 
 end

data/app/helpers/rails_connector/default_cms_routing_helper.rb

@@ -52,12 +52,13 @@ module RailsConnector
 
     def cms_path_or_url_for_objs(obj, path_or_url, options = {})
       permalink = obj.permalink
+      ignore_body_data_url = options.delete(:ignore_body_data_url)
       if permalink && !Configuration.editor_interface_enabled?
         __send__("cms_permalink_#{path_or_url}", options.merge(:permalink => permalink))
       elsif obj.homepage? && !Configuration.editor_interface_enabled?
         __send__("root_#{path_or_url}", options)
       else
-        if obj.body_data_url
+        if obj.body_data_url && !ignore_body_data_url
           obj.body_data_url
         elsif obj.binary? && !obj.file_extension.blank?
           __send__("cms_id_#{path_or_url}",
@@ -81,6 +82,7 @@ module RailsConnector
           url = link.url
         end
 
+        options.delete(:ignore_body_data_url)
         url = merge_options(url, options) if options.any?
         url
       end

data/app/helpers/rails_connector/display_helper.rb

@@ -25,6 +25,13 @@ module RailsConnector
       end
     end
 
+    def display_original_value(value)
+      case value
+        when HtmlString then convert_links(value, :ignore_body_data_url => true).html_safe
+        else display_value(value)
+      end
+    end
+
     # Renders a field from the CMS, including an edit marker for the preview
     # If the option :marker is +false+, no edit marker will be rendered.
     #
@@ -69,7 +76,7 @@ module RailsConnector
     LINK_PATTERN = '<?\binternallink:(\d+)\b>?'
     LINK_EXPRESSION = %r(#{LINK_PATTERN})
 
-    def convert_links(content_attribute)
+    def convert_links(content_attribute, cms_path_options = {})
       return content_attribute unless content_attribute =~ LINK_EXPRESSION
       link_map = content_attribute.source.text_links.each_with_object({}) do |link, map|
         map[link.id.to_s] = link
@@ -79,7 +86,7 @@ module RailsConnector
         if link.blank?
           "#{CmsRoutingHelper::LINK_TO_UNREACHABLE}#{$2}"
         else
-          uri = "#{cms_path(link)}#{$2}"
+          uri = "#{cms_path(link, cms_path_options)}#{$2}"
           if link.markdown?
             markdown_link(link, uri)
           else

data/config/ca-bundle.crt

@@ -1,7 +1,7 @@
 ##
-## /Network/Servers/xs2.infopark/Users/develop/dcc/tmp/Rails_Connector__Kostia__issue-197_271/repos/rails_connector/config/ca-bundle.crt -- Bundle of CA Root Certificates
+## /Network/Servers/xs2.infopark/Users/develop/dcc/tmp/Rails_Connector__Alex_P___208/repos/rails_connector/config/ca-bundle.crt -- Bundle of CA Root Certificates
 ##
-## Converted at: Mon Feb 25 11:53:33 2013 UTC
+## Converted at: Fri Mar  1 08:24:34 2013 UTC
 ##
 ## This is a bundle of X.509 certificates of public Certificate Authorities
 ## (CA). These were automatically extracted from Mozilla's root certificates

data/lib/rails_connector/cms_env.rb

@@ -31,8 +31,7 @@ module RailsConnector
         if params[:id]
           Obj.find(params[:id])
         elsif params[:permalink].present?
-          permalink =  Array(params[:permalink]).join("/")
-          Obj.find_by_permalink!(permalink)
+          self.class.find_permalink_by_param(params[:permalink])
         else
           if callback = RailsConnector::Configuration.choose_homepage_callback
             callback_result = callback.call(env)
@@ -59,6 +58,11 @@ module RailsConnector
       env["action_dispatch.request.path_parameters"]
     end
 
+    def self.find_permalink_by_param(permalink_param)
+      permalink =  Array(permalink_param).join("/")
+      Obj.find_by_permalink!(permalink)
+    end
+
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: infopark_rails_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: rails
@@ -363,7 +363,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -676171663
+      hash: -826410701
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: