twitter-text 1.4.17 → 1.5.0

data/spec/autolinking_spec.rb

@@ -309,7 +309,7 @@ describe Twitter::Autolink do
         end
 
         it "should be linked" do
-          @autolinked_text.should == "<a href=\"https://twitter.com/#!/search?q=%23éhashtag\" title=\"#éhashtag\" class=\"tweet-url hashtag\" rel=\"nofollow\">#éhashtag</a>"
+          @autolinked_text.should == "<a class=\"tweet-url hashtag\" href=\"https://twitter.com/#!/search?q=%23éhashtag\" rel=\"nofollow\" title=\"#éhashtag\">#éhashtag</a>"
         end
       end
 
@@ -424,10 +424,10 @@ describe Twitter::Autolink do
       end
 
       context "with a URL preceded in forbidden characters" do
-        it "should not be linked" do
+        it "should be linked" do
           matcher = TestAutolink.new
           %w| \ ' / ! = |.each do |char|
-            matcher.auto_link("#{char}#{url}").should_not have_autolinked_url(url)
+            matcher.auto_link("#{char}#{url}").should have_autolinked_url(url)
           end
         end
       end
@@ -541,13 +541,23 @@ describe Twitter::Autolink do
         auto_linked.should_not include('hashtag_classname')
       end
 
+      it "should autolink url/hashtag/mention in text with Unicode supplementary characters" do
+        auto_linked = @linker.auto_link("#{[0x10400].pack('U')} #hashtag #{[0x10400].pack('U')} @mention #{[0x10400].pack('U')} http://twitter.com/")
+        auto_linked.should have_autolinked_hashtag('#hashtag')
+        auto_linked.should link_to_screen_name('mention')
+        auto_linked.should have_autolinked_url('http://twitter.com/')
+      end
     end
 
   end
 
   describe "autolinking options" do
+    before do
+      @linker = TestAutolink.new
+    end
+
     it "should show display_url when :url_entities provided" do
-      linked = TestAutolink.new.auto_link("http://t.co/0JG5Mcq", :url_entities => [{
+      linked = @linker.auto_link("http://t.co/0JG5Mcq", :url_entities => [{
         "url" => "http://t.co/0JG5Mcq",
         "display_url" => "blog.twitter.com/2011/05/twitte…",
         "expanded_url" => "http://blog.twitter.com/2011/05/twitter-for-mac-update.html",
@@ -561,67 +571,233 @@ describe Twitter::Autolink do
       html.search('a[@href="http://t.co/0JG5Mcq"]').should_not be_empty
       html.search('span[@class=js-display-url]').inner_text.should == "blog.twitter.com/2011/05/twitte"
       html.inner_text.should == " http://blog.twitter.com/2011/05/twitter-for-mac-update.html …"
+      html.search('span[@style="position:absolute;left:-9999px;"]').size.should == 4
+    end
+
+    it "should accept invisible_tag_attrs option" do
+      linked = @linker.auto_link("http://t.co/0JG5Mcq",
+        {
+          :url_entities => [{
+            "url" => "http://t.co/0JG5Mcq",
+            "display_url" => "blog.twitter.com/2011/05/twitte…",
+            "expanded_url" => "http://blog.twitter.com/2011/05/twitter-for-mac-update.html",
+            "indices" => [
+              0,
+              19
+            ]
+          }],
+          :invisible_tag_attrs => "style='dummy;'"
+      })
+      html = Nokogiri::HTML(linked)
+      html.search('span[@style="dummy;"]').size.should == 4
+    end
+
+    it "should show display_url if available in entity" do
+      linked = @linker.auto_link_entities("http://t.co/0JG5Mcq",
+        [{
+          :url => "http://t.co/0JG5Mcq",
+          :display_url => "blog.twitter.com/2011/05/twitte…",
+          :expanded_url => "http://blog.twitter.com/2011/05/twitter-for-mac-update.html",
+          :indices => [0, 19]
+        }]
+      )
+      html = Nokogiri::HTML(linked)
+      html.search('a').should_not be_empty
+      html.search('a[@href="http://t.co/0JG5Mcq"]').should_not be_empty
+      html.search('span[@class=js-display-url]').inner_text.should == "blog.twitter.com/2011/05/twitte"
+      html.inner_text.should == " http://blog.twitter.com/2011/05/twitter-for-mac-update.html …"
     end
 
-    it "should apply :url_class as a CSS class" do
-      linked = TestAutolink.new.auto_link("http://example.com/", :url_class => 'myclass')
+    it "should apply :class as a CSS class" do
+      linked = @linker.auto_link("http://example.com/", :class => 'myclass')
       linked.should have_autolinked_url('http://example.com/')
       linked.should match(/myclass/)
     end
 
+    it "should apply :url_class only on URL" do
+      linked = @linker.auto_link("http://twitter.com")
+      linked.should have_autolinked_url('http://twitter.com')
+      linked.should_not match(/class/)
+
+      linked = @linker.auto_link("http://twitter.com", :url_class => 'testClass')
+      linked.should have_autolinked_url('http://twitter.com')
+      linked.should match(/class=\"testClass\"/)
+
+      linked = @linker.auto_link("#hash @tw", :url_class => 'testClass')
+      linked.should match(/class=\"tweet-url hashtag\"/)
+      linked.should match(/class=\"tweet-url username\"/)
+      linked.should_not match(/class=\"testClass\"/)
+    end
+
     it "should add rel=nofollow by default" do
-      linked = TestAutolink.new.auto_link("http://example.com/")
+      linked = @linker.auto_link("http://example.com/")
       linked.should have_autolinked_url('http://example.com/')
       linked.should match(/nofollow/)
     end
 
     it "should include the '@' symbol in a username when passed :username_include_symbol" do
-      linked = TestAutolink.new.auto_link("@user", :username_include_symbol => true)
+      linked = @linker.auto_link("@user", :username_include_symbol => true)
       linked.should link_to_screen_name('user', '@user')
     end
 
     it "should include the '@' symbol in a list when passed :username_include_symbol" do
-      linked = TestAutolink.new.auto_link("@user/list", :username_include_symbol => true)
+      linked = @linker.auto_link("@user/list", :username_include_symbol => true)
       linked.should link_to_list_path('user/list', '@user/list')
     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 = @linker.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 = @linker.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 = @linker.auto_link("http://example.com/", :target => 'mywindow')
       linked.should have_autolinked_url('http://example.com/')
       linked.should match(/target="mywindow"/)
     end
 
     it "should customize href by username_url_block option" do
-      linked = TestAutolink.new.auto_link("@test", :username_url_block => lambda{|a| "dummy"})
+      linked = @linker.auto_link("@test", :username_url_block => lambda{|a| "dummy"})
       linked.should have_autolinked_url('dummy', 'test')
     end
 
     it "should customize href by list_url_block option" do
-      linked = TestAutolink.new.auto_link("@test/list", :list_url_block => lambda{|a| "dummy"})
+      linked = @linker.auto_link("@test/list", :list_url_block => lambda{|a| "dummy"})
       linked.should have_autolinked_url('dummy', 'test/list')
     end
 
     it "should customize href by hashtag_url_block option" do
-      linked = TestAutolink.new.auto_link("#hashtag", :hashtag_url_block => lambda{|a| "dummy"})
+      linked = @linker.auto_link("#hashtag", :hashtag_url_block => lambda{|a| "dummy"})
       linked.should have_autolinked_url('dummy', '#hashtag')
     end
 
     it "should customize href by link_url_block option" do
-      linked = TestAutolink.new.auto_link("http://example.com/", :link_url_block => lambda{|a| "dummy"})
+      linked = @linker.auto_link("http://example.com/", :link_url_block => lambda{|a| "dummy"})
       linked.should have_autolinked_url('dummy', 'http://example.com/')
     end
+
+    it "should modify link attributes by link_attribute_block" do
+      linked = @linker.auto_link("#hash @mention",
+        :link_attribute_block => lambda{|entity, attributes|
+          attributes[:"dummy-hash-attr"] = "test" if entity[:hashtag]
+        }
+      )
+      linked.should match(/<a[^>]+hashtag[^>]+dummy-hash-attr=\"test\"[^>]+>/)
+      linked.should_not match(/<a[^>]+username[^>]+dummy-hash-attr=\"test\"[^>]+>/)
+      linked.should_not match(/link_attribute_block/i)
+
+      linked = @linker.auto_link("@mention http://twitter.com/",
+        :link_attribute_block => lambda{|entity, attributes|
+          attributes["dummy-url-attr"] = entity[:url] if entity[:url]
+        }
+      )
+      linked.should_not match(/<a[^>]+username[^>]+dummy-url-attr=\"http:\/\/twitter.com\/\"[^>]*>/)
+      linked.should match(/<a[^>]+dummy-url-attr=\"http:\/\/twitter.com\/\"/)
+    end
+
+    it "should modify link text by link_text_block" do
+      linked = @linker.auto_link("#hash @mention",
+        :link_text_block => lambda{|entity, text|
+          entity[:hashtag] ? "#replaced" : "pre_#{text}_post"
+        }
+      )
+      linked.should match(/<a[^>]+>#replaced<\/a>/)
+      linked.should match(/<a[^>]+>pre_mention_post<\/a>/)
+
+      linked = @linker.auto_link("#hash @mention", {
+        :link_text_block => lambda{|entity, text|
+          "pre_#{text}_post"
+        },
+        :symbol_tag => "s", :text_with_symbol_tag => "b", :username_include_symbol => true
+      })
+      linked.should match(/<a[^>]+>pre_<s>#<\/s><b>hash<\/b>_post<\/a>/)
+      linked.should match(/<a[^>]+>pre_<s>@<\/s><b>mention<\/b>_post<\/a>/)
+    end
+
+    it "should apply :url_target only to auto-linked URLs" do
+      auto_linked = @linker.auto_link("#hashtag @mention http://test.com/", {:url_target => '_blank'})
+      auto_linked.should have_autolinked_hashtag('#hashtag')
+      auto_linked.should link_to_screen_name('mention')
+      auto_linked.should have_autolinked_url('http://test.com/')
+      auto_linked.should_not match(/<a[^>]+hashtag[^>]+target[^>]+>/)
+      auto_linked.should_not match(/<a[^>]+username[^>]+target[^>]+>/)
+      auto_linked.should match(/<a[^>]+test.com[^>]+target=\"_blank\"[^>]*>/)
+    end
+  end
+
+  describe "link_url_with_entity" do
+    before do
+      @linker = TestAutolink.new
+    end
+
+    it "should use display_url and expanded_url" do
+      @linker.send(:link_url_with_entity,
+        {
+          :url => "http://t.co/abcde",
+          :display_url => "twitter.com",
+          :expanded_url => "http://twitter.com/"},
+        {:invisible_tag_attrs => "class='invisible'"}).gsub('"', "'").should == "<span class='tco-ellipsis'><span class='invisible'>&nbsp;</span></span><span class='invisible'>http://</span><span class='js-display-url'>twitter.com</span><span class='invisible'>/</span><span class='tco-ellipsis'><span class='invisible'>&nbsp;</span></span>";
+    end
+
+    it "should correctly handle display_url ending with '…'" do
+      @linker.send(:link_url_with_entity,
+        {
+          :url => "http://t.co/abcde",
+          :display_url => "twitter.com…",
+          :expanded_url => "http://twitter.com/abcdefg"},
+        {:invisible_tag_attrs => "class='invisible'"}).gsub('"', "'").should == "<span class='tco-ellipsis'><span class='invisible'>&nbsp;</span></span><span class='invisible'>http://</span><span class='js-display-url'>twitter.com</span><span class='invisible'>/abcdefg</span><span class='tco-ellipsis'><span class='invisible'>&nbsp;</span>…</span>";
+    end
+
+    it "should correctly handle display_url starting with '…'" do
+      @linker.send(:link_url_with_entity,
+        {
+          :url => "http://t.co/abcde",
+          :display_url => "…tter.com/abcdefg",
+          :expanded_url => "http://twitter.com/abcdefg"},
+        {:invisible_tag_attrs => "class='invisible'"}).gsub('"', "'").should == "<span class='tco-ellipsis'>…<span class='invisible'>&nbsp;</span></span><span class='invisible'>http://twi</span><span class='js-display-url'>tter.com/abcdefg</span><span class='invisible'></span><span class='tco-ellipsis'><span class='invisible'>&nbsp;</span></span>";
+    end
+
+    it "should not create spans if display_url and expanded_url are on different domains" do
+      @linker.send(:link_url_with_entity,
+        {
+          :url => "http://t.co/abcde",
+          :display_url => "pic.twitter.com/xyz",
+          :expanded_url => "http://twitter.com/foo/statuses/123/photo/1"},
+        {:invisible_tag_attrs => "class='invisible'"}).gsub('"', "'").should == "pic.twitter.com/xyz"
+    end
+  end
+
+  describe "symbol_tag" do
+    before do
+      @linker = TestAutolink.new
+    end
+    it "should put :symbol_tag around symbol" do
+      @linker.auto_link("@mention", {:symbol_tag => 's', :username_include_symbol=>true}).should match(/<s>@<\/s>mention/)
+      @linker.auto_link("#hash", {:symbol_tag => 's'}).should match(/<s>#<\/s>hash/)
+      result = @linker.auto_link("@mention #hash $CASH", {:symbol_tag => 'b', :username_include_symbol=>true})
+      result.should match(/<b>@<\/b>mention/)
+      result.should match(/<b>#<\/b>hash/)
+      result.should match(/<b>\$<\/b>CASH/)
+    end
+    it "should put :text_with_symbol_tag around text" do
+      result = @linker.auto_link("@mention #hash $CASH", {:text_with_symbol_tag => 'b'})
+      result.should match(/<b>mention<\/b>/)
+      result.should match(/<b>hash<\/b>/)
+      result.should match(/<b>CASH<\/b>/)
+    end
+    it "should put :symbol_tag around symbol and :text_with_symbol_tag around text" do
+      result = @linker.auto_link("@mention #hash $CASH", {:symbol_tag => 's', :text_with_symbol_tag => 'b', :username_include_symbol=>true})
+      result.should match(/<s>@<\/s><b>mention<\/b>/)
+      result.should match(/<s>#<\/s><b>hash<\/b>/)
+      result.should match(/<s>\$<\/s><b>CASH<\/b>/)
+    end
   end
 
   describe "html_escape" do

data/spec/extractor_spec.rb

@@ -107,6 +107,10 @@ describe Twitter::Extractor do
       end
       needed.should == []
     end
+
+    it "should extract screen name in text with supplementary character" do
+      @extractor.extract_mentioned_screen_names_with_indices("#{[0x10400].pack('U')} @alice").should == [{:screen_name => "alice", :indices => [2, 8]}]
+    end
   end
 
   describe "replies" do
@@ -221,6 +225,10 @@ describe Twitter::Extractor do
           extracted_url[:indices].last.should == 11 + url.chars.to_a.size
         end
       end
+
+      it "should extract URL in text with supplementary character" do
+        @extractor.extract_urls_with_indices("#{[0x10400].pack('U')} http://twitter.com").should == [{:url => "http://twitter.com", :indices => [2, 20]}]
+      end
     end
 
     describe "invalid URLS" do
@@ -352,5 +360,9 @@ describe Twitter::Extractor do
     it "should not extract numeric hashtags" do
       not_match_hashtag_in_text("#1234")
     end
+
+    it "should extract hashtag in text with supplementary character" do
+      match_hashtag_in_text("hashtag", "#{[0x10400].pack('U')} #hashtag", 2)
+    end
   end
 end

data/spec/rewriter_spec.rb

@@ -240,15 +240,6 @@ describe Twitter::Rewriter do
       end
     end
 
-    context "with a page anchor in a url" do
-      def original_text; "Here's my url: http://foobar.com/#home"; end
-
-      it "should not link the hashtag" do
-        @block_args.should be_nil
-        @rewritten_text.should == "Here's my url: http://foobar.com/#home"
-      end
-    end
-
     context "with a hashtag that starts with a number but has word characters" do
       def original_text; "#2ab"; end
 
@@ -469,11 +460,11 @@ describe Twitter::Rewriter do
     end
 
     context "with a URL preceded in forbidden characters" do
-      it "should not be rewritten" do
+      it "should be rewritten" do
         %w| \ ' / ! = |.each do |char|
           Twitter::Rewriter.rewrite_urls("#{char}#{url}") do |url|
             "[rewritten]" # should not be called here.
-          end.should == "#{char}#{url}"
+          end.should == "#{char}[rewritten]"
         end
       end
     end

data/spec/spec_helper.rb

@@ -23,7 +23,7 @@ end
 
 RSpec::Matchers.define :match_autolink_expression do
   match do |string|
-    Twitter::Regex[:valid_url].match(string)
+    !Twitter::Extractor.extract_urls(string).empty?
   end
 end