gr_autolink 1.0.7 → 1.0.8

data/README.rdoc

@@ -23,7 +23,7 @@ parent gem we forked from:
 
 By default gr_autolink returns retains html-safeness of input strings.
 
-This is original gem's behavior and this gem does NOT include this behavio:
+This is original gem's behavior and this gem does NOT include this behavior:
 
 * This behaviour can be overriden setting the <tt>:sanitize</tt> option to false 
 (thus making it insecure if you don't have the content under control).

data/lib/gr_autolink.rb

@@ -1,5 +1,5 @@
 module GrAutolink
-  VERSION = '1.0.7'
+  VERSION = '1.0.8'
 
   class Railtie < ::Rails::Railtie
     initializer 'gr_autolink' do |app|

data/lib/gr_autolink/helpers.rb

@@ -50,6 +50,8 @@ module GrAutolink
         def auto_link(text, *args, &block)#link = :all, html = {}, &block)
           return ''.html_safe if text.blank?
 
+          input_html_safe = text.html_safe?
+
           options = args.size == 2 ? {} : args.extract_options! # this is necessary because the old auto_link API has a Hash as its last parameter
           unless args.empty?
             options[:link] = args[0] || :all
@@ -59,11 +61,20 @@ module GrAutolink
           sanitize = (options[:sanitize] != false)
           sanitize_options = options[:sanitize_options] || {}
           text = conditional_sanitize(text, sanitize, sanitize_options).to_str
-          case options[:link].to_sym
-            when :all             then conditional_html_safe(auto_link_email_addresses(auto_link_urls(text, options[:html], options, &block), options[:html], &block), sanitize)
-            when :email_addresses then conditional_html_safe(auto_link_email_addresses(text, options[:html], &block), sanitize)
-            when :urls            then conditional_html_safe(auto_link_urls(text, options[:html], options, &block), sanitize)
-          end
+
+          autolinked_text =
+            case options[:link].to_sym
+            when :all
+              conditional_html_safe(auto_link_email_addresses(auto_link_urls(text, options[:html], options, &block), options[:html], &block), sanitize)
+            when :email_addresses
+              conditional_html_safe(auto_link_email_addresses(text, options[:html], &block), sanitize)
+            when :urls
+              conditional_html_safe(auto_link_urls(text, options[:html], options, &block), sanitize)
+            end
+
+          # regardless of sanitizing, make sure output is safe if input was safe
+          autolinked_text = input_html_safe ? autolinked_text.html_safe : autolinked_text
+          autolinked_text
         end
 
         private
@@ -153,8 +164,8 @@ module GrAutolink
             condition ? sanitize(target, sanitize_options) : target
           end
 
-          def conditional_html_safe(target, condition)
-            condition ? target.html_safe : target
+          def conditional_html_safe(target, mark_as_html_safe)
+            mark_as_html_safe ? target.html_safe : target
           end
       end
     end

data/test/test_gr_autolink.rb

@@ -310,6 +310,22 @@ class TestGrAutolink < MiniTest::Unit::TestCase
     end
   end
 
+  def test_auto_link_retains_html_safeness_on_strings_with_no_url_sanitize_false
+    assert auto_link("abc123".html_safe, :sanitize => false).html_safe?
+  end
+
+  def test_auto_link_retains_non_html_safeness_on_strings_with_no_url_sanitize_false
+    assert !auto_link("abc123", :sanitize => false).html_safe?, "converted non-html-safe string to html safe!"
+  end
+
+  def test_auto_link_retains_html_safeness_on_strings_with_urls_to_autolink_sanitize_false
+    assert auto_link("my link is http://123.abc.org".html_safe, :sanitize => false).html_safe?
+  end
+
+  def test_auto_link_retains_non_html_safeness_on_strings_with_urls_to_autolink_sanitize_false
+    assert !auto_link("my link is http://123.abc.org", :sanitize => false).html_safe?
+  end
+
   private
   def generate_result(link_text, href = nil)
     href ||= link_text

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gr_autolink
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -16,7 +16,7 @@ date: 2012-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2168727060 !ruby/object:Gem::Requirement
+  requirement: &2156556080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -24,10 +24,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *2168727060
+  version_requirements: *2156556080
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2168726500 !ruby/object:Gem::Requirement
+  requirement: &2156555580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -35,10 +35,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *2168726500
+  version_requirements: *2156555580
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &2168725960 !ruby/object:Gem::Requirement
+  requirement: &2156554800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -46,7 +46,7 @@ dependencies:
         version: '2.16'
   type: :development
   prerelease: false
-  version_requirements: *2168725960
+  version_requirements: *2156554800
 description: ! "This is an adaptation of the extraction of the `auto_link` method
   from rails\nthat is the rails_autolink gem.  The `auto_link`\nmethod was removed
   from Rails in version Rails 3.1.  This gem is meant to\nbridge the gap for people