gr_autolink 1.0.11 → 1.0.13

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 2707768129fe2d6532822ff1ce6abcd9a72a1fd0
+  data.tar.gz: 25700284fffe52ac1ab67ac3a4724f5660acfc17
+SHA512:
+  metadata.gz: 300627d7b18d355068ff11a3bb0c179c38d4b8a5e6d84d78b41b7e3797a094f844b4ce91ddc1f26c56e03c509282a82468fb8725d0cf2209fa9770872af94613
+  data.tar.gz: badb1913f9bdcfae0f1cb183bd0d85c88d36d5738ecc034d119886569ff0f27d0a18e66804402e3200bf14f84601e4a5f336715bbd8db4bc8c605b42d6056162

data/.gitignore

@@ -0,0 +1,3 @@
+*~
+pkg
+

data/CHANGELOG.rdoc

@@ -1,3 +1,12 @@
+=== 1.0.13  / 2014-03-26
+
+* fix handling of img tags (again)
+
+=== 1.0.12  / 2014-03-26
+
+* merge changes in from rails_autolink
+* fix handling of single-quotes
+
 === 1.0.11 / 2012-04-17
 
 * adding ability to truncate the URL as link text to specified length

data/Gemfile

@@ -1,7 +1,4 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
-gem 'rails'
-gem 'arel'
-gem 'rack'
-gem 'hoe'
-gem 'minitest'
+# Specify your gem's dependencies in gr_autolink.gemspec
+gemspec

data/Rakefile

@@ -1,22 +1,13 @@
-# -*- ruby -*-
+#!/usr/bin/env rake
+# -*- coding: utf-8 -*-
+require "bundler/gem_tasks"
 
-require 'rubygems'
-require 'hoe'
+require 'rake/testtask'
 
-Hoe.plugins.delete :rubyforge
-Hoe.plugin :minitest
-Hoe.plugin :gemspec # `gem install hoe-gemspec`
-Hoe.plugin :git     # `gem install hoe-git`
-
-Hoe.spec 'gr_autolink' do
-  developer('Aaron Patterson', 'aaron@tenderlovemaking.com')
-  developer('Juanjo Bazan', 'jjbazan@gmail.com')
-  developer('Akira Matsuda', 'ronnie@dio.jp')
-  developer('Brian Percival', 'bpercival@goodreads.com')
-  self.readme_file   = 'README.rdoc'
-  self.history_file  = 'CHANGELOG.rdoc'
-  self.extra_rdoc_files  = FileList['*.rdoc']
-  self.extra_deps       << ['rails', '~> 3.1']
+Rake::TestTask.new do |t|
+  t.libs << 'lib/gr_autolink'
+  t.test_files = FileList['test/test*.rb']
+  t.verbose = true
 end
 
-# vim: syntax=ruby
+task :default => :test

data/gr_autolink.gemspec

@@ -0,0 +1,41 @@
+# -*- encoding: utf-8 -*-
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require "gr_autolink/version"
+
+Gem::Specification.new do |s|
+  s.name        = "gr_autolink"
+  s.version     = GrAutolink::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ['Aaron Patterson', 'Juanjo Bazan', 'Akira Matsuda', 'Brian Percival', 'Jonathan Schatz']
+  s.email       = ['aaron@tenderlovemaking.com', 'jjbazan@gmail.com', 'bpercival@goodreads.com', 'jon@divisionbyzero.com']
+  s.homepage    = "https://github.com/goodreads/gr_autolink"
+  s.summary     = %{Forked version of rails_autolink with new functionality}
+  s.description = <<-EOF
+This is an adaptation of the extraction of the `auto_link` method from rails
+that is the rails_autolink gem.  The `auto_link`
+method was removed from Rails in version Rails 3.1.  This gem is meant to
+bridge the gap for people migrating...and behaves a little differently from the
+parent gem we forked from:
+
+* performs html-escaping of characters such as '&' in strings that are getting
+  linkified if the incoming string is not html_safe?
+* retains html-safety of incoming string (if input string is unsafe, will return
+  unsafe and vice versa)
+* fixes at least one bug:
+  (<img src="http://some.u.rl"> => <img src="<a href="http://some.u.rl">http://some.u.rl</a>">)
+  though can't imagine this is intended behavior, also have trouble believing that
+  this was an open bug in rails...
+EOF
+  s.rubyforge_project = "gr_autolink"
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+
+  s.add_runtime_dependency "rails", '~> 3.1'
+  s.add_development_dependency "arel"
+  s.add_development_dependency "rack"
+  s.add_development_dependency "minitest"
+end

data/lib/gr_autolink.rb

@@ -1,6 +1,4 @@
 module GrAutolink
-  VERSION = '1.0.11'
-
   class Railtie < ::Rails::Railtie
     initializer 'gr_autolink' do |app|
       ActiveSupport.on_load(:action_view) do

data/lib/gr_autolink/helpers.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 module GrAutolink
   require 'active_support/core_ext/object/blank'
   require 'active_support/core_ext/array/extract_options'
@@ -13,7 +14,7 @@ module GrAutolink
         # <tt>:email_addresses</tt>, and <tt>:urls</tt>. If a block is given, each URL and
         # e-mail address is yielded and the result is used as the link text. By default the
         # text given is sanitized, you can override this behaviour setting the
-        # <tt>:sanitize</tt> option to false, or you can add options to the sanitization of 
+        # <tt>:sanitize</tt> option to false, or you can add options to the sanitization of
         # the text using the <tt>:sanitize_options</tt> option hash.
         # An optional flag <tt>:max_link_length</tt> can be passed to let the function truncate
         # the url text to the specified amount of characters
@@ -82,16 +83,22 @@ module GrAutolink
         end
 
         private
+          WORD_PATTERN = RUBY_VERSION < '1.9' ? '\w' : '\p{Word}'
+
+          PROTOCOLS = %w{ed2k ftp http https irc mailto news gopher nntp telnet
+                         webcal xmpp callto feed svn urn aim rsync tag ssh sftp
+                         rtsp afs file z39.50r chrome}.map{|p| Regexp.escape p}.join('|')
 
           AUTO_LINK_RE = %r{
-              (?: ([0-9A-Za-z+.:-]+:)// | www\. | [a-zA-Z0-9.]+[a-zA-Z0-9]\.[a-zA-Z0-9]{2,}\/)
-              [^\s<>]+
-            }x
+              (?: ((?:view\-source\:)?(?:#{PROTOCOLS}):)// | www\. | [a-zA-Z0-9.]+[a-zA-Z0-9]\.[a-zA-Z0-9]{2,}\/)
+              [^\s<>\u00A0]+
+            }ix
 
           # regexps for determining context, used high-volume
           AUTO_LINK_CRE = [/<[^>]+$/, /^[^>]*>/, /<a\b.*?>/i, /<\/a>/i]
 
-          AUTO_EMAIL_RE = /[\w.!#\$%+-]+@[\w-]+(?:\.[\w-]+)+/
+          AUTO_EMAIL_LOCAL_RE = /[\w.!#\$%&'*\/=?^`{|}~+-]/
+          AUTO_EMAIL_RE = /[\w.!#\$%+-]\.?#{AUTO_EMAIL_LOCAL_RE}*@[\w-]+(?:\.[\w-]+)+/
 
           BRACKETS = { ']' => '[', ')' => '(', '}' => '{' }
 
@@ -102,13 +109,12 @@ module GrAutolink
             text.gsub(AUTO_LINK_RE) do
               scheme, href = $1, $&
               punctuation = []
-
               if auto_linked?($`, $')
                 # do not change string; URL is already linked
                 href
               else
                 # don't include trailing punctuation character as part of the URL
-                while href.sub!(/[^\w\/-]$/, '')
+                while href.sub!(/[^#{WORD_PATTERN}\/-]$/, '')
                   punctuation.push $&
                   if opening = BRACKETS[punctuation.last] and href.scan(opening).size > href.scan(punctuation.last).size
                     href << punctuation.pop
@@ -119,9 +125,8 @@ module GrAutolink
                 link_text = if block_given?
                               yield(href)
                             else
-                              text.html_safe? ? href : escape_once(href)
+                              text.html_safe? ? href : escape(href)
                             end
-
                 href = 'http://' + href unless scheme
 
                 unless options[:sanitize] == false
@@ -130,7 +135,7 @@ module GrAutolink
                 end
 
                 unless text.html_safe?
-                  href = escape_once(href)
+                  href = escape(href)
                 end
 
                 if options[:max_link_length]
@@ -142,6 +147,12 @@ module GrAutolink
             end
           end
 
+          def escape(href)
+            # escape_once doesn't escape single-quotes but we need to since we're
+            # potentially putting content in an attribute tag
+            escape_once(href).gsub("'", '&#39;')
+          end
+
           # 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.
           def auto_link_email_addresses(text, html_options = {}, options = {})

data/lib/gr_autolink/version.rb

@@ -0,0 +1,3 @@
+module GrAutolink
+  VERSION = '1.0.13'
+end

data/test/test_gr_autolink.rb

@@ -16,7 +16,7 @@ require 'action_dispatch/testing/assertions'
 require 'action_view/helpers/text_helper'
 require 'action_view/helpers/output_safety_helper'
 
-class TestGrAutolink < MiniTest::Unit::TestCase
+class TestGrAutolink < MiniTest::Test
   include ActionView::Helpers::CaptureHelper
   include ActionView::Helpers::TextHelper
   include ActionView::Helpers::SanitizeHelper
@@ -25,12 +25,29 @@ class TestGrAutolink < MiniTest::Unit::TestCase
   include ActionView::Helpers::OutputSafetyHelper
   include ActionDispatch::Assertions::DomAssertions
 
+  def assert_dom_equal(expected, actual, message = "")
+    expected_dom = HTML::Document.new(expected).root
+    actual_dom   = HTML::Document.new(actual).root
+    assert_equal expected_dom, actual_dom
+  end
+
+  def assert_dom_not_equal(expected, actual, message = "")
+    expected_dom = HTML::Document.new(expected).root
+    actual_dom   = HTML::Document.new(actual).root
+    refute_equal expected_dom, actual_dom
+  end
+
   def test_auto_link_within_tags
     link_raw    = 'http://www.rubyonrails.org/images/rails.png'
     link_result = %Q(<img src="#{link_raw}" />)
     assert_equal link_result, auto_link(link_result)
   end
 
+  def test_auto_link_with_img_src
+    text = 'hello <img src="http://www.google.com/"> kitty'
+    assert_equal text, auto_link(text)
+  end
+
   def test_auto_link_with_brackets
     link1_raw = 'http://en.wikipedia.org/wiki/Sprite_(computer_graphics)'
     link1_result = generate_result(link1_raw)
@@ -87,17 +104,17 @@ class TestGrAutolink < MiniTest::Unit::TestCase
     assert_equal %{<a href="http://www.rubyonrails.com?id=1&amp;num=2">http://www.rubyonrails.com?id=1&amp;num=2</a>}, auto_link("#{link_raw}#{malicious_script}")
     assert auto_link("#{link_raw}#{malicious_script}").html_safe?
   end
-  
+
   def test_auto_link_should_sanitize_input_with_sanitize_options
     link_raw     = %{http://www.rubyonrails.com?id=1&num=2}
     malicious_script  = '<script>alert("malicious!")</script>'
     text_with_attributes = %{<a href="http://ruby-lang-org" target="_blank" data-malicious="inject">Ruby</a>}
-    
+
     text_result = %{<a class="big" href="http://www.rubyonrails.com?id=1&amp;num=2">http://www.rubyonrails.com?id=1&amp;num=2</a><a href="http://ruby-lang-org" target="_blank">Ruby</a>}
     assert_equal text_result, auto_link("#{link_raw}#{malicious_script}#{text_with_attributes}",
                                         :sanitize_options => {:attributes => ["target", "href"]},
                                         :html => {:class => 'big'})
-    
+
     assert auto_link("#{link_raw}#{malicious_script}#{text_with_attributes}",
                      :sanitize_options => {:attributes => ["target", "href"]},
                      :html => {:class => 'big'}).html_safe?
@@ -111,7 +128,7 @@ class TestGrAutolink < MiniTest::Unit::TestCase
   def test_auto_link_should_not_sanitize_input_when_sanitize_option_is_false
     link_raw     = %{http://www.rubyonrails.com?id=1&num=2}
     malicious_script  = '<script>alert("malicious!")</script>'
-    
+
     assert_equal %{<a href="http://www.rubyonrails.com?id=1&amp;num=2">http://www.rubyonrails.com?id=1&amp;num=2</a><script>alert("malicious!")</script>}, auto_link("#{link_raw}#{malicious_script}", :sanitize => false)
     assert !auto_link("#{link_raw}#{malicious_script}", :sanitize => false).html_safe?
   end
@@ -159,14 +176,14 @@ class TestGrAutolink < MiniTest::Unit::TestCase
     email_raw         = 'santiago@wyeworks.com'
     link_raw          = 'http://www.rubyonrails.org'
     malicious_script  = '<script>alert("malicious!")</script>'
-    
+
     assert auto_link(nil).html_safe?, 'should be html safe'
     assert auto_link('').html_safe?, 'should be html safe'
     assert auto_link("#{link_raw} #{link_raw} #{link_raw}").html_safe?, 'should be html safe'
     assert auto_link("hello #{email_raw}").html_safe?, 'should be html safe'
     assert auto_link("hello #{email_raw} #{malicious_script}").html_safe?, 'should be html safe'
   end
-  
+
   def test_auto_link_should_not_be_html_safe_when_sanitize_option_false
     email_raw         = 'santiago@wyeworks.com'
     link_raw          = 'http://www.rubyonrails.org'
@@ -176,6 +193,14 @@ class TestGrAutolink < MiniTest::Unit::TestCase
     assert !auto_link("hello #{email_raw}", :sanitize => false).html_safe?, 'should not be html safe'
   end
 
+  def test_auto_link_email_addres_with_especial_chars
+    email_raw    = "and&re$la*+r-a.o'rea=l~ly@tenderlovemaking.com"
+    email_sanitized = "and&amp;re$la*+r-a.o&#x27;rea=l~ly@tenderlovemaking.com"
+    email_result = %{<a href="mailto:#{email_raw}">#{email_sanitized}</a>}
+    assert_equal email_result, auto_link(email_raw)
+    assert !auto_link_email_addresses(email_result).html_safe?, 'should not be html safe'
+  end
+
   def test_auto_link_email_address
     email_raw    = 'aaron@tenderlovemaking.com'
     email_result = %{<a href="mailto:#{email_raw}">#{email_raw}</a>}
@@ -207,6 +232,8 @@ class TestGrAutolink < MiniTest::Unit::TestCase
     email2_raw    = '+david@loudthinking.com'
     email2_result = %{<a href="mailto:#{email2_raw}">#{email2_raw}</a>}
     assert_equal email2_result, auto_link(email2_raw)
+    assert_equal email2_result, auto_link(email2_raw, :all)
+    assert_equal email2_result, auto_link(email2_raw, :email_addresses)
 
     email3_raw    = '+david@loudthinking.com'
     email3_result = %{<a href="&#109;&#97;&#105;&#108;&#116;&#111;&#58;+%64%61%76%69%64@%6c%6f%75%64%74%68%69%6e%6b%69%6e%67.%63%6f%6d">#{email3_raw}</a>}
@@ -278,6 +305,14 @@ class TestGrAutolink < MiniTest::Unit::TestCase
     with_kcode 'u' do
       assert_equal %(浅草.rbの公式サイトはこちら#{link11_result}), auto_link("浅草.rbの公式サイトはこちら#{link11_raw}")
     end
+
+    link12_raw    = 'http://tools.ietf.org/html/rfc3986'
+    link12_result = generate_result(link12_raw)
+    assert_equal %(<p>#{link12_result} text-after-nonbreaking-space</p>), auto_link("<p>#{link12_raw} text-after-nonbreaking-space</p>")
+
+    link13_raw    = 'HTtP://www.rubyonrails.com'
+    assert_equal generate_result(link13_raw), auto_link(link13_raw)
+
   end
 
   def test_auto_link_parsing
@@ -301,6 +336,7 @@ class TestGrAutolink < MiniTest::Unit::TestCase
       http://connect.oraclecorp.com/search?search[q]=green+france&search[type]=Group
       http://of.openfoundry.org/projects/492/download#4th.Release.3
       http://maps.google.co.uk/maps?f=q&q=the+london+eye&ie=UTF8&ll=51.503373,-0.11939&spn=0.007052,0.012767&z=16&iwloc=A
+      http://около.кола/колокола
       bit.ly/asdf
     )
 
@@ -329,7 +365,7 @@ class TestGrAutolink < MiniTest::Unit::TestCase
   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
-  
+
   def test_auto_link_truncation_option
     link_text = "http://www.a1234567890.com"
     input = "my link needs truncation #{link_text} and so forth"
@@ -339,6 +375,19 @@ class TestGrAutolink < MiniTest::Unit::TestCase
     assert auto_link(input, :max_link_length=>link_text.size+1) == expected_without_truncation
   end
 
+  def test_auto_link_does_not_timeout_when_parsing_odd_email_input
+    inputs = %w(
+       foo@...................................
+       foo@........................................
+       foo@.............................................
+    ) << "A" * 100000
+    inputs.each do |input|
+      Timeout.timeout(0.2) do
+        assert_equal input, auto_link(input)
+      end
+    end
+  end
+
   private
   def generate_result(link_text, href = nil)
     href ||= link_text

metadata

@@ -1,112 +1,134 @@
 --- !ruby/object:Gem::Specification
 name: gr_autolink
 version: !ruby/object:Gem::Version
-  version: 1.0.11
-  prerelease: 
+  version: 1.0.13
 platform: ruby
 authors:
 - Aaron Patterson
 - Juanjo Bazan
 - Akira Matsuda
 - Brian Percival
+- Jonathan Schatz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-18 00:00:00.000000000 Z
+date: 2014-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2160991140 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *2160991140
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
 - !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: &2160990480 !ruby/object:Gem::Requirement
-    none: false
+  name: arel
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160990480
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: hoe
-  requirement: &2160989780 !ruby/object:Gem::Requirement
-    none: false
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.16'
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160989780
-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
-  migrating...and behaves a little differently from the\nparent gem we forked from:\n\n*
-  performs html-escaping of characters such as '&' in strings that are getting\n  linkified
-  if the incoming string is not html_safe?\n* retains html-safety of incoming string
-  (if input string is unsafe, will return\n  unsafe and vice versa)\n* fixes at least
-  one bug:\n  (<img src=\"http://some.u.rl\"> => <img src=\"<a href=\"http://some.u.rl\">http://some.u.rl</a>\">)\n
-  \ though can't imagine this is intended behavior, also have trouble believing that\n
-  \ this was an open bug in rails..."
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: |
+  This is an adaptation of the extraction of the `auto_link` method from rails
+  that is the rails_autolink gem.  The `auto_link`
+  method was removed from Rails in version Rails 3.1.  This gem is meant to
+  bridge the gap for people migrating...and behaves a little differently from the
+  parent gem we forked from:
+
+  * performs html-escaping of characters such as '&' in strings that are getting
+    linkified if the incoming string is not html_safe?
+  * retains html-safety of incoming string (if input string is unsafe, will return
+    unsafe and vice versa)
+  * fixes at least one bug:
+    (<img src="http://some.u.rl"> => <img src="<a href="http://some.u.rl">http://some.u.rl</a>">)
+    though can't imagine this is intended behavior, also have trouble believing that
+    this was an open bug in rails...
 email:
 - aaron@tenderlovemaking.com
 - jjbazan@gmail.com
-- ronnie@dio.jp
 - bpercival@goodreads.com
+- jon@divisionbyzero.com
 executables: []
 extensions: []
-extra_rdoc_files:
-- CHANGELOG.rdoc
-- Manifest.txt
-- README.rdoc
-- TODO.txt
+extra_rdoc_files: []
 files:
-- .autotest
+- ".autotest"
+- ".gitignore"
 - CHANGELOG.rdoc
 - Gemfile
 - Manifest.txt
 - README.rdoc
 - Rakefile
+- TODO.txt
+- gr_autolink.gemspec
 - lib/gr_autolink.rb
 - lib/gr_autolink/helpers.rb
+- lib/gr_autolink/version.rb
 - test/test_gr_autolink.rb
-- TODO.txt
-- .gemtest
-homepage: http://github.com/goodreads/gr_autolink
+homepage: https://github.com/goodreads/gr_autolink
 licenses: []
+metadata: {}
 post_install_message: 
-rdoc_options:
-- --main
-- README.rdoc
+rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: gr_autolink
-rubygems_version: 1.8.15
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
-summary: This is an adaptation of the extraction of the `auto_link` method from rails
-  that is the rails_autolink gem
+specification_version: 4
+summary: Forked version of rails_autolink with new functionality
 test_files:
 - test/test_gr_autolink.rb