twitter-text 1.2.1 → 1.2.2

data/Rakefile

@@ -11,7 +11,7 @@ require 'digest'
 
 spec = Gem::Specification.new do |s|
   s.name = "twitter-text"
-  s.version = "1.2.1"
+  s.version = "1.2.2"
   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"

data/lib/autolink.rb

@@ -24,7 +24,7 @@ module Twitter
       "'" => '''
     }
 
-    def encode(text)
+    def html_escape(text)
       text && text.gsub(/[&"'><]/) do |character|
         HTML_ENTITIES[character]
       end
@@ -88,7 +88,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=\"#{encode(options[:list_url_base])}#{encode(list.downcase)}\"#{extra_html}>#{encode(chunk)}</a>"
+              "#{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>"
             else
               if after =~ Twitter::Regex[:end_screen_name_match]
                 # Followed by something that means we don't autolink
@@ -97,7 +97,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=\"#{encode(options[:username_url_base])}#{encode(chunk)}\"#{extra_html}>#{encode(chunk)}</a>"
+                "#{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>"
               end
             end
           end
@@ -126,7 +126,7 @@ module Twitter
         hash = $2
         text = $3
         text = yield(text) if block_given?
-        "#{before}<a href=\"#{options[:hashtag_url_base]}#{encode(text)}\" title=\"##{encode(text)}\" class=\"#{options[:url_class]} #{options[:hashtag_class]}\"#{extra_html}>#{encode(hash)}#{encode(text)}</a>"
+        "#{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>"
       end
     end
 
@@ -143,7 +143,7 @@ module Twitter
         if !protocol.blank? || domain =~ Twitter::Regex[:probable_tld]
           html_attrs = tag_options(options.stringify_keys) || ""
           full_url = ((protocol =~ Twitter::Regex[:www] || protocol.blank?) ? "http://#{url}" : url)
-          "#{before}<a href=\"#{encode(full_url)}\"#{html_attrs}>#{encode(url)}</a>"
+          "#{before}<a href=\"#{html_escape(full_url)}\"#{html_attrs}>#{html_escape(url)}</a>"
         else
           all
         end

data/spec/autolinking_spec.rb

@@ -518,22 +518,22 @@ describe Twitter::Autolink do
 
   end
 
-  describe "encode" do
+  describe "html_escape" do
     before do
       @linker = TestAutolink.new
     end
     it "should escape html entities properly" do
-      @linker.encode("&").should == "&"
-      @linker.encode(">").should == ">"
-      @linker.encode("<").should == "&lt;"
-      @linker.encode("\"").should == "&quot;"
-      @linker.encode("'").should == "&#39;"
-      @linker.encode("&<>\"").should == "&amp;&lt;&gt;&quot;"
-      @linker.encode("<div>").should == "&lt;div&gt;"
-      @linker.encode("a&b").should == "a&amp;b"
-      @linker.encode("<a href=\"http://twitter.com\" target=\"_blank\">twitter & friends</a>").should == "&lt;a href=&quot;http://twitter.com&quot; target=&quot;_blank&quot;&gt;twitter &amp; friends&lt;/a&gt;"
-      @linker.encode("&amp;").should == "&amp;amp;"
-      @linker.encode(nil).should == nil
+      @linker.html_escape("&").should == "&amp;"
+      @linker.html_escape(">").should == "&gt;"
+      @linker.html_escape("<").should == "&lt;"
+      @linker.html_escape("\"").should == "&quot;"
+      @linker.html_escape("'").should == "&#39;"
+      @linker.html_escape("&<>\"").should == "&amp;&lt;&gt;&quot;"
+      @linker.html_escape("<div>").should == "&lt;div&gt;"
+      @linker.html_escape("a&b").should == "a&amp;b"
+      @linker.html_escape("<a href=\"http://twitter.com\" target=\"_blank\">twitter & friends</a>").should == "&lt;a href=&quot;http://twitter.com&quot; target=&quot;_blank&quot;&gt;twitter &amp; friends&lt;/a&gt;"
+      @linker.html_escape("&amp;").should == "&amp;amp;"
+      @linker.html_escape(nil).should == nil
     end
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: twitter-text
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 1
   - 2
-  - 1
-  version: 1.2.1
+  - 2
+  version: 1.2.2
 platform: ruby
 authors: 
 - Matt Sanford
@@ -19,7 +19,7 @@ autorequire: ""
 bindir: bin
 cert_chain: []
 
-date: 2010-10-05 00:00:00 -07:00
+date: 2010-10-08 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency