twitter-text 1.3.0 → 1.3.1

data/Gemfile.lock

@@ -1,35 +1,35 @@
 PATH
   remote: .
   specs:
-    twitter-text (1.3.0)
+    twitter-text (1.3.1)
       actionpack
 
 GEM
   remote: http://rubygems.org/
   specs:
     abstract (1.0.0)
-    actionpack (3.0.1)
-      activemodel (= 3.0.1)
-      activesupport (= 3.0.1)
+    actionpack (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
-      i18n (~> 0.4.1)
+      i18n (~> 0.4)
       rack (~> 1.2.1)
-      rack-mount (~> 0.6.12)
-      rack-test (~> 0.5.4)
+      rack-mount (~> 0.6.13)
+      rack-test (~> 0.5.6)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.1)
-      activesupport (= 3.0.1)
+    activemodel (3.0.3)
+      activesupport (= 3.0.3)
       builder (~> 2.1.2)
-      i18n (~> 0.4.1)
-    activesupport (3.0.1)
+      i18n (~> 0.4)
+    activesupport (3.0.3)
     builder (2.1.2)
     diff-lcs (1.1.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    i18n (0.4.2)
-    nokogiri (1.4.3.1)
-    nokogiri (1.4.3.1-java)
+    i18n (0.5.0)
+    nokogiri (1.4.4)
+    nokogiri (1.4.4-java)
       weakling (>= 0.0.3)
     rack (1.2.1)
     rack-mount (0.6.13)
@@ -37,14 +37,14 @@ GEM
     rack-test (0.5.6)
       rack (>= 1.0)
     rake (0.8.7)
-    rspec (2.1.0)
-      rspec-core (~> 2.1.0)
-      rspec-expectations (~> 2.1.0)
-      rspec-mocks (~> 2.1.0)
-    rspec-core (2.1.0)
-    rspec-expectations (2.1.0)
+    rspec (2.3.0)
+      rspec-core (~> 2.3.0)
+      rspec-expectations (~> 2.3.0)
+      rspec-mocks (~> 2.3.0)
+    rspec-core (2.3.1)
+    rspec-expectations (2.3.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.1.0)
+    rspec-mocks (2.3.0)
     simplecov (0.3.7)
       simplecov-html (>= 0.3.7)
     simplecov-html (0.3.9)

data/lib/autolink.rb

@@ -12,6 +12,8 @@ module Twitter
     DEFAULT_USERNAME_CLASS = "username"
     # Default CSS class for auto-linked hashtags (along with the url class)
     DEFAULT_HASHTAG_CLASS = "hashtag"
+    # Default target for auto-linked urls (nil will not add a target attribute)
+    DEFAULT_TARGET = nil
     # HTML attribute for robot nofollow behavior (default)
     HTML_ATTR_NO_FOLLOW = " rel=\"nofollow\""
 
@@ -42,6 +44,7 @@ module Twitter
     # <tt>:hashtag_url_base</tt>::      the value for <tt>href</tt> attribute on hashtag links. The <tt>#hashtag</tt> (minus the <tt>#</tt>) will be appended at the end of this.
     # <tt>:suppress_lists</tt>::    disable auto-linking to lists
     # <tt>:suppress_no_follow</tt>::   Do not add <tt>rel="nofollow"</tt> to auto-linked items
+    # <tt>:target</tt>::   add <tt>target="window_name"</tt> to auto-linked items
     def auto_link(text, options = {})
       auto_link_usernames_or_lists(
         auto_link_urls_custom(
@@ -61,6 +64,7 @@ module Twitter
     # <tt>:list_url_base</tt>::      the value for <tt>href</tt> attribute on list links. The <tt>@username/list</tt> (minus the <tt>@</tt>) will be appended at the end of this.
     # <tt>:suppress_lists</tt>::    disable auto-linking to lists
     # <tt>:suppress_no_follow</tt>::   Do not add <tt>rel="nofollow"</tt> to auto-linked items
+    # <tt>:target</tt>::   add <tt>target="window_name"</tt> to auto-linked items    
     def auto_link_usernames_or_lists(text, options = {}) # :yields: list_or_username
       options = options.dup
       options[:url_class] ||= DEFAULT_URL_CLASS
@@ -68,8 +72,9 @@ module Twitter
       options[:username_class] ||= DEFAULT_USERNAME_CLASS
       options[:username_url_base] ||= "http://twitter.com/"
       options[:list_url_base] ||= "http://twitter.com/"
-      extra_html = HTML_ATTR_NO_FOLLOW unless options[:suppress_no_follow]
+      options[:target] ||= DEFAULT_TARGET
 
+      extra_html = HTML_ATTR_NO_FOLLOW unless options[:suppress_no_follow]
       new_text = ""
 
       # this -1 flag allows strings ending in ">" to work
@@ -87,7 +92,7 @@ module Twitter
               # the link is a list
               chunk = list = "#{user}#{slash_listname}"
               chunk = yield(list) if block_given?
-              "#{before}#{at}<a class=\"#{options[:url_class]} #{options[:list_class]}\" href=\"#{html_escape(options[:list_url_base])}#{html_escape(list.downcase)}\"#{extra_html}>#{html_escape(chunk)}</a>"
+              "#{before}#{at}<a class=\"#{options[:url_class]} #{options[:list_class]}\" #{target_tag(options)}href=\"#{html_escape(options[:list_url_base])}#{html_escape(list.downcase)}\"#{extra_html}>#{html_escape(chunk)}</a>"
             else
               if after =~ Twitter::Regex[:end_screen_name_match]
                 # Followed by something that means we don't autolink
@@ -96,7 +101,7 @@ module Twitter
                 # this is a screen name
                 chunk = user
                 chunk = yield(chunk) if block_given?
-                "#{before}#{at}<a class=\"#{options[:url_class]} #{options[:username_class]}\" href=\"#{html_escape(options[:username_url_base])}#{html_escape(chunk)}\"#{extra_html}>#{html_escape(chunk)}</a>"
+                "#{before}#{at}<a class=\"#{options[:url_class]} #{options[:username_class]}\" #{target_tag(options)}href=\"#{html_escape(options[:username_url_base])}#{html_escape(chunk)}\"#{extra_html}>#{html_escape(chunk)}</a>"
               end
             end
           end
@@ -113,11 +118,13 @@ module Twitter
     # <tt>:hashtag_class</tt>:: class to add to hashtag <tt><a></tt> tags
     # <tt>:hashtag_url_base</tt>::      the value for <tt>href</tt> attribute. The hashtag text (minus the <tt>#</tt>) will be appended at the end of this.
     # <tt>:suppress_no_follow</tt>::   Do not add <tt>rel="nofollow"</tt> to auto-linked items
+    # <tt>:target</tt>::   add <tt>target="window_name"</tt> to auto-linked items    
     def auto_link_hashtags(text, options = {})  # :yields: hashtag_text
       options = options.dup
       options[:url_class] ||= DEFAULT_URL_CLASS
       options[:hashtag_class] ||= DEFAULT_HASHTAG_CLASS
       options[:hashtag_url_base] ||= "http://twitter.com/search?q=%23"
+      options[:target] ||= DEFAULT_TARGET
       extra_html = HTML_ATTR_NO_FOLLOW unless options[:suppress_no_follow]
 
       text.gsub(Twitter::Regex[:auto_link_hashtags]) do
@@ -125,7 +132,7 @@ module Twitter
         hash = $2
         text = $3
         text = yield(text) if block_given?
-        "#{before}<a href=\"#{options[:hashtag_url_base]}#{html_escape(text)}\" title=\"##{html_escape(text)}\" class=\"#{options[:url_class]} #{options[:hashtag_class]}\"#{extra_html}>#{html_escape(hash)}#{html_escape(text)}</a>"
+        "#{before}<a href=\"#{options[:hashtag_url_base]}#{html_escape(text)}\" title=\"##{html_escape(text)}\" #{target_tag(options)}class=\"#{options[:url_class]} #{options[:hashtag_class]}\"#{extra_html}>#{html_escape(hash)}#{html_escape(text)}</a>"
       end
     end
 
@@ -148,5 +155,16 @@ module Twitter
       end
     end
 
+    private
+
+    def target_tag(options)
+      target_option = options[:target]
+      if target_option.blank?
+        ""
+      else
+        "target=\"#{html_escape(target_option)}\""
+      end
+    end
+
   end
 end

data/lib/regex.rb

@@ -70,7 +70,7 @@ module Twitter
     )/ix
     # Valid end-of-path chracters (so /foo. does not gobble the period).
     #   1. Allow =&# for empty URL parameters and other URL-join artifacts
-    REGEXEN[:valid_url_path_ending_chars] = /[a-z0-9=_#\/]|#{REGEXEN[:wikipedia_disambiguation]}/io
+    REGEXEN[:valid_url_path_ending_chars] = /[a-z0-9=_#\/\+\-]|#{REGEXEN[:wikipedia_disambiguation]}/io
     REGEXEN[:valid_url_query_chars] = /[a-z0-9!\*'\(\);:&=\+\$\/%#\[\]\-_\.,~]/i
     REGEXEN[:valid_url_query_ending_chars] = /[a-z0-9_&=#\/]/i
     REGEXEN[:valid_url] = %r{

data/spec/autolinking_spec.rb

@@ -517,6 +517,38 @@ describe Twitter::Autolink do
 
   end
 
+  describe "autolinking options" do
+    it "should apply :url_class as a CSS class" do
+      linked = TestAutolink.new.auto_link("http://example.com/", :url_class => 'myclass')
+      linked.should have_autolinked_url('http://example.com/')
+      linked.should match(/myclass/)
+    end
+
+    it "should add rel=nofollow by default" do
+      linked = TestAutolink.new.auto_link("http://example.com/")
+      linked.should have_autolinked_url('http://example.com/')
+      linked.should match(/nofollow/)
+    end
+
+    it "should not add rel=nofollow when passed :suppress_no_follow" do
+      linked = TestAutolink.new.auto_link("http://example.com/", :suppress_no_follow => true)
+      linked.should have_autolinked_url('http://example.com/')
+      linked.should_not match(/nofollow/)
+    end
+
+    it "should not add a target attribute by default" do
+      linked = TestAutolink.new.auto_link("http://example.com/")
+      linked.should have_autolinked_url('http://example.com/')
+      linked.should_not match(/target=/)
+    end
+
+    it "should respect the :target option" do
+      linked = TestAutolink.new.auto_link("http://example.com/", :target => 'mywindow')
+      linked.should have_autolinked_url('http://example.com/')
+      linked.should match(/target="mywindow"/)
+    end
+  end
+
   describe "html_escape" do
     before do
       @linker = TestAutolink.new

data/twitter-text.gemspec

@@ -1,6 +1,6 @@
 spec = Gem::Specification.new do |s|
   s.name = "twitter-text"
-  s.version = "1.3.0"
+  s.version = "1.3.1"
   s.authors = ["Matt Sanford", "Patrick Ewing", "Ben Cherry", "Britt Selvitelle", "Raffi Krikorian"]
   s.email = ["matt@twitter.com", "patrick.henry.ewing@gmail.com", "bcherry@gmail.com", "bs@brittspace.com", "raffi@twitter.com"]
   s.homepage = "http://twitter.com"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: twitter-text
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 1
   - 3
-  - 0
-  version: 1.3.0
+  - 1
+  version: 1.3.1
 platform: ruby
 authors: 
 - Matt Sanford
@@ -19,13 +19,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-06 00:00:00 -08:00
+date: 2011-01-06 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: nokogiri
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -34,12 +32,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id001
+  name: nokogiri
+  prerelease: false
   type: :development
-  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rake
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -48,12 +46,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id002
+  name: rake
+  prerelease: false
   type: :development
-  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rspec
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -62,12 +60,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id003
+  name: rspec
+  prerelease: false
   type: :development
-  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: simplecov
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -76,12 +74,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id004
+  name: simplecov
+  prerelease: false
   type: :development
-  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: actionpack
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -90,8 +88,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id005
+  name: actionpack
+  prerelease: false
   type: :runtime
-  version_requirements: *id005
 description: A gem that provides text handling for Twitter
 email: 
 - matt@twitter.com