imagine_cms 3.0.17 → 3.0.18

data/app/assets/javascripts/imagine.js

@@ -822,10 +822,12 @@ function scanForPageObjects(page_id, parent_key, version) {
     var matches = $A($('page_objects_' + parent_key).value.match(regex));
     
     matches.each(function (match) {
-        if (regex.test(match)) {
-            name = match.replace(regex, "$1");
-            type = match.replace(regex, "$2");
-            opts = match.replace(regex, "$3");
+        // regex2 should be exactly the same as regex. Global regexes have a lastIndex which is not reset.
+        var regex2 = /<%=\s*insert_object\(?\s*['"]([-\w\s\d]+)['"],\s*:(\w+)\s*(.*?)\)?\s*%>/gm;
+        if (regex2.test(match)) {
+            name = match.replace(regex2, "$1");
+            type = match.replace(regex2, "$2");
+            opts = match.replace(regex2, "$3");
             found[name] = type;
         }
     });

data/lib/auto_link_email_addresses.rb

@@ -0,0 +1,61 @@
+module ActionView::Helpers::TextHelper
+  
+  # Turns all email addresses into clickable links.  If a block is given,
+  # each email is yielded and the result is used as the link text.
+  # Example:
+  #   auto_link_email_addresses(post.body) do |text|
+  #     truncate(text, 15)
+  #   end
+  def auto_link_email_addresses(content)
+    re = %r{
+            (<\w+[^\<\>]*?\>|[\s[:punct:]]|mailto:|^) # leading text
+            (
+              [\w\.\!\#\$\%\-\+\.]+                   # username
+              \@
+              [-\w]+                                  # subdomain or domain
+              (?:\.[-\w]+)+                           # remaining subdomains or domain
+            ) 
+            ([[:punct:]]|\s|\<|$)                     # trailing text
+           }x
+    
+    content.gsub(re) do |all|
+      # this seems incredibly stupid, but $1, $2, $3 weren't being set
+      re.match(all)
+      
+      a, b, c = $1, $2, $3
+      
+      if a =~ /\<a\s|[='"]$/i
+        all
+      elsif a =~ /mailto:/i
+        url_src = b
+        
+        url = ''
+        url_src.length.times do |i|
+          url << (i % 2 == 0 ? sprintf("%%%x", url_src[i].ord) : url_src[i])
+        end
+        
+        "#{a}#{url}#{c}"
+      else
+        url_src = b
+        text_src = b
+        text_src = yield(text_src) if block_given?
+        
+        unless url_src && text_src
+          all
+        else
+          url = ''
+          text = ''
+          url_src.length.times do |i|
+            url << (i % 2 == 0 ? sprintf("%%%x", url_src[i].ord) : url_src[i])
+          end
+          text_src.length.times do |i|
+            text << (i % 4 == 0 ? '<span>' << text_src[i] << '</span>' : text_src[i])
+          end
+          
+          "#{a}<a href=\"mailto:#{url}\">#{text}</a>#{c}"
+        end
+      end
+    end.html_safe
+  end
+  
+end

data/lib/extensions/action_controller.rb

@@ -48,12 +48,14 @@ module ActionControllerExtensions
       when :string
         content = substitute_placeholders(@page_objects[key] || '', @pg)
         content = erb_render(content)
-        content = auto_link(content, :all, :target => '_blank') unless options[:disable_auto_link]
+        content = auto_link(content, :urls, :target => '_blank') unless options[:disable_auto_link]
+        content = auto_link_email_addresses(content) unless options[:disable_auto_link]
         content_tag :span, content, html_options
       when :text
         content = substitute_placeholders(@page_objects[key] || '', @pg)
         content = erb_render(content)
-        # content = auto_link(content, :all, :target => '_blank') unless options[:disable_auto_link]
+        content = auto_link(content, :urls, :target => '_blank') unless options[:disable_auto_link]
+        content = auto_link_email_addresses(content) unless options[:disable_auto_link]
         content_tag :div, content, html_options
       when :page_list
         @rss_feeds ||= []

data/lib/imagine_cms/engine.rb

@@ -44,6 +44,8 @@ module ImagineCms
     require 'upload_progress/lib/upload_progress'
     require 'upload_progress/lib/upload_progress_helper'
     
+    require 'auto_link_email_addresses'
+    
     #
     # load provided classes
     #

data/lib/imagine_cms/version.rb

@@ -1,3 +1,3 @@
 module ImagineCms
-  VERSION = "3.0.17"
+  VERSION = "3.0.18"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: imagine_cms
 version: !ruby/object:Gem::Version
-  version: 3.0.17
+  version: 3.0.18
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-10 00:00:00.000000000 Z
+date: 2013-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -453,6 +453,7 @@ files:
 - lib/acts_as_versioned/test/migration_test.rb
 - lib/acts_as_versioned/test/schema.rb
 - lib/acts_as_versioned/test/versioned_test.rb
+- lib/auto_link_email_addresses.rb
 - lib/dynamic_methods.rb
 - lib/extensions/action_controller.rb
 - lib/extensions/array.rb