rails_autolink 1.0.8 → 1.0.9

data/lib/rails_autolink/helpers.rb

@@ -60,18 +60,18 @@ module RailsAutolink
           options.reverse_merge!(:link => :all, :html => {})
           sanitize = (options[:sanitize] != false)
           sanitize_options = options[:sanitize_options] || {}
-          text = case options[:link].to_sym
+          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
-          conditional_sanitize(text, sanitize, sanitize_options).to_str
         end
 
         private
 
           AUTO_LINK_RE = %r{
-              (?: ([0-9A-Za-z+.:-]+:)// | www\. )
+              (?: ((?:ed2k|ftp|http|https|irc|mailto|news|gopher|nntp|telnet|webcal|xmpp|callto|feed|svn|urn|aim|rsync|tag|ssh|sftp|rtsp|afs):)// | www\. )
               [^\s<]+
             }x
 

data/lib/rails_autolink.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rails_autolink
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 1
   - 0
-  - 8
-  version: 1.0.8
+  - 9
+  version: 1.0.9
 platform: ruby
 authors: 
 - Aaron Patterson
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-24 00:00:00 Z
+date: 2012-05-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails