rails_autolink 1.0.6 → 1.0.7

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+=== 1.0.7 / 2012-04-27
+
+* Added support for non-latin characters in autolinked urls
+
 === 1.0.6 / 2012-03-12
 
 * Added sanitize_options arg

data/lib/rails_autolink.rb

@@ -1,5 +1,5 @@
 module RailsAutolink
-  VERSION = '1.0.6'
+  VERSION = '1.0.7'
 
   class Railtie < ::Rails::Railtie
     initializer 'rails_autolink' do |app|

data/lib/rails_autolink/helpers.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module RailsAutolink
   require 'active_support/core_ext/object/blank'
   require 'active_support/core_ext/array/extract_options'
@@ -80,6 +82,8 @@ module RailsAutolink
 
           BRACKETS = { ']' => '[', ')' => '(', '}' => '{' }
 
+          WORD_PATTERN = RUBY_VERSION < '1.9' ? '\w' : '\p{Word}'
+
           # Turns all urls into clickable links.  If a block is given, each url
           # is yielded and the result is used as the link text.
           def auto_link_urls(text, html_options = {}, options = {})
@@ -93,7 +97,7 @@ module RailsAutolink
                 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
@@ -149,4 +153,4 @@ module RailsAutolink
       end
     end
   end
-end
+end

data/test/test_rails_autolink.rb

@@ -298,6 +298,7 @@ class TestRailsAutolink < 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://около.кола/колокола
     )
 
     urls.each do |url|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_autolink
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-12 00:00:00.000000000 Z
+date: 2012-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2152957660 !ruby/object:Gem::Requirement
+  requirement: &2151842080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,10 +23,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *2152957660
+  version_requirements: *2151842080
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &2152956620 !ruby/object:Gem::Requirement
+  requirement: &2151839760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -34,10 +34,10 @@ dependencies:
         version: '2.11'
   type: :development
   prerelease: false
-  version_requirements: *2152956620
+  version_requirements: *2151839760
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2152955520 !ruby/object:Gem::Requirement
+  requirement: &2151836700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -45,10 +45,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *2152955520
+  version_requirements: *2151836700
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &2152954180 !ruby/object:Gem::Requirement
+  requirement: &2151834680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -56,7 +56,7 @@ dependencies:
         version: '2.13'
   type: :development
   prerelease: false
-  version_requirements: *2152954180
+  version_requirements: *2151834680
 description: ! 'This is an extraction of the `auto_link` method from rails.  The `auto_link`
 
   method was removed from Rails in version Rails 3.1.  This gem is meant to
@@ -82,7 +82,6 @@ files:
 - lib/rails_autolink.rb
 - lib/rails_autolink/helpers.rb
 - test/test_rails_autolink.rb
-- test/test_loco.rb
 - .gemtest
 homepage: http://github.com/tenderlove/rails_autolink
 licenses: []
@@ -111,5 +110,4 @@ signing_key:
 specification_version: 3
 summary: This is an extraction of the `auto_link` method from rails
 test_files:
-- test/test_loco.rb
 - test/test_rails_autolink.rb

data/test/test_loco.rb

@@ -1,64 +0,0 @@
-# encoding: utf-8
-
-require "minitest/autorun"
-require "rails"
-require "rails_autolink/helpers"
-require 'erb'
-require 'cgi'
-require 'active_support/core_ext/class/attribute_accessors'
-require 'action_pack'
-require 'action_view/helpers/capture_helper'
-require 'action_view/helpers/sanitize_helper'
-require 'action_view/helpers/url_helper'
-require 'action_view/helpers/tag_helper'
-require 'active_support/core_ext/module/attribute_accessors'
-require 'active_support/core_ext/string/encoding'
-require 'action_dispatch/testing/assertions'
-require 'action_view/helpers/text_helper'
-require 'action_view/helpers/output_safety_helper'
-
-class TestRailsAutolink < MiniTest::Unit::TestCase
-  include ActionView::Helpers::CaptureHelper
-  include ActionView::Helpers::TextHelper
-  include ActionView::Helpers::SanitizeHelper
-  include ActionView::Helpers::TagHelper
-  include ActionView::Helpers::UrlHelper
-  include ActionView::Helpers::OutputSafetyHelper
-  include ActionDispatch::Assertions::DomAssertions
-  
-  
-  def test_loco
-    t = "OOOOOOOOOOOOOOOOOOOOOOO     <h1>textile<a  href=\"http://ruby-lang.org\" class='asdasd' target='_blank' >Ruby</a>\n</h1> otro link: www.hola.com"
-    assert_equal "loco", auto_link(t, :link=> 'urls', :sanitize_options => {:attributes => ["target", "class"], :tags=>[]}, :html=> {:target => '_blank', :mememe=> 'MEM'})
-  end
-
-  private
-  def generate_result(link_text, href = nil, escape = false)
-    href ||= link_text
-    if escape
-      %{<a href="#{CGI::escapeHTML href}">#{CGI::escapeHTML link_text}</a>}
-    else
-      %{<a href="#{href}">#{link_text}</a>}
-    end
-  end
-
-  # from ruby core
-  def build_message(head, template=nil, *arguments)
-    template &&= template.chomp
-    template.gsub(/\?/) { mu_pp(arguments.shift) }
-  end
-
-  # Temporarily replaces KCODE for the block
-  def with_kcode(kcode)
-    if RUBY_VERSION < '1.9'
-      old_kcode, $KCODE = $KCODE, kcode
-      begin
-        yield
-      ensure
-        $KCODE = old_kcode
-      end
-    else
-      yield
-    end
-  end
-end