gr_autolink 1.0.8 → 1.0.9

data/CHANGELOG.rdoc

@@ -1,3 +1,11 @@
+=== 1.0.9 / 2012-03-30
+
+* adding patterns to match...now anything that's alphanum + period + 2 or more alphanum + / other stuff will match as a url. this will get some false positives "...yes/no", but at least the regex is still simple and will catch a lot of cases the old version did not.
+
+=== 1.0.8 / 2012-03-30
+
+* handling escaping of href and link text
+
 === 1.0.7 / 2012-03-30
 
 * forking off into gr_autolink as it will behave differently from parent

data/lib/gr_autolink.rb

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

data/lib/gr_autolink/helpers.rb

@@ -80,7 +80,7 @@ module GrAutolink
         private
 
           AUTO_LINK_RE = %r{
-              (?: ([0-9A-Za-z+.:-]+:)// | www\. )
+              (?: ([0-9A-Za-z+.:-]+:)// | www\. | [a-zA-Z0-9.]+\.[a-zA-Z0-9]{2,}\/)
               [^\s<>]+
             }x
 

data/test/test_gr_autolink.rb

@@ -149,7 +149,6 @@ class TestGrAutolink < MiniTest::Unit::TestCase
     assert_equal linked_email, auto_link(linked_email)
   end
 
-
   def test_auto_link_at_eol
     url1 = "http://api.rubyonrails.com/Foo.html"
     url2 = "http://www.ruby-doc.org/core/Bar.html"
@@ -157,7 +156,7 @@ class TestGrAutolink < MiniTest::Unit::TestCase
     assert_equal %(<p><a href="#{url1}">#{url1}</a><br /><a href="#{url2}">#{url2}</a><br /></p>), auto_link("<p>#{url1}<br />#{url2}<br /></p>")
   end
 
-  def test_auto_link_should_be_html_safe
+  def test_auto_link_should_be_html_safe_with_sanitize
     email_raw         = 'santiago@wyeworks.com'
     link_raw          = 'http://www.rubyonrails.org'
     malicious_script  = '<script>alert("malicious!")</script>'
@@ -303,6 +302,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
+      bit.ly/asdf
     )
 
     urls.each do |url|
@@ -329,6 +329,9 @@ class TestGrAutolink < MiniTest::Unit::TestCase
   private
   def generate_result(link_text, href = nil)
     href ||= link_text
+    if href !~ /:\/\//
+      href = "http://#{href}"
+    end
     if !link_text.html_safe?
       %{<a href="#{CGI::escapeHTML href}">#{CGI::escapeHTML link_text}</a>}
     else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gr_autolink
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
   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: &2156556080 !ruby/object:Gem::Requirement
+  requirement: &2165102560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -24,10 +24,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *2156556080
+  version_requirements: *2165102560
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2156555580 !ruby/object:Gem::Requirement
+  requirement: &2165101880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -35,10 +35,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *2156555580
+  version_requirements: *2165101880
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &2156554800 !ruby/object:Gem::Requirement
+  requirement: &2165101320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -46,7 +46,7 @@ dependencies:
         version: '2.16'
   type: :development
   prerelease: false
-  version_requirements: *2156554800
+  version_requirements: *2165101320
 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