twitter-text 1.4.1 → 1.4.2

data/lib/autolink.rb

@@ -16,6 +16,10 @@ module Twitter
     DEFAULT_TARGET = nil
     # HTML attribute for robot nofollow behavior (default)
     HTML_ATTR_NO_FOLLOW = " rel=\"nofollow\""
+    # Options which should not be passed as HTML attributes
+    OPTIONS_NOT_ATTRIBUTES = [:url_class, :list_class, :username_class, :hashtag_class,
+                              :username_url_base, :list_url_base, :hashtag_url_base,
+                              :suppress_lists, :suppress_no_follow]
 
     HTML_ENTITIES = {
       '&' => '&',
@@ -101,7 +105,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]}\" #{target_tag(options)}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>#{slash_listname}"
               end
             end
           end
@@ -143,11 +147,12 @@ module Twitter
     def auto_link_urls_custom(text, href_options = {})
       options = href_options.dup
       options[:rel] = "nofollow" unless options.delete(:suppress_no_follow)
+      options[:class] = options.delete(:url_class)
 
       text.gsub(Twitter::Regex[:valid_url]) do
         all, before, url, protocol, domain, path, query_string = $1, $2, $3, $4, $5, $6, $7
         if !protocol.blank?
-          html_attrs = tag_options(options.stringify_keys) || ""
+          html_attrs = tag_options(options.reject{|k,v| OPTIONS_NOT_ATTRIBUTES.include?(k) }.stringify_keys) || ""
           "#{before}<a href=\"#{html_escape(url)}\"#{html_attrs}>#{html_escape(url)}</a>"
         else
           all

data/spec/autolinking_spec.rb

@@ -108,6 +108,7 @@ describe Twitter::Autolink do
         it "should not be linked" do
           @autolinked_text = TestAutolink.new.auto_link_usernames_or_lists("hello @jacob/my-list", :suppress_lists => true)
           @autolinked_text.should_not link_to_list_path('jacob/my-list')
+          @autolinked_text.should include('my-list')
         end
       end
 
@@ -524,6 +525,13 @@ describe Twitter::Autolink do
         auto_linked.should have_autolinked_url('http://twitter.com/#search')
       end
 
+      it "should not add invalid option in HTML tags" do
+        auto_linked = @linker.auto_link("http://twitter.com/ is a URL, not a hashtag", :hashtag_class => 'hashtag_classname')
+        auto_linked.should have_autolinked_url('http://twitter.com/')
+        auto_linked.should_not include('hashtag_class')
+        auto_linked.should_not include('hashtag_classname')
+      end
+
     end
 
   end

data/twitter-text.gemspec

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: twitter-text
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: 
   segments: 
   - 1
   - 4
-  - 1
-  version: 1.4.1
+  - 2
+  version: 1.4.2
 platform: ruby
 authors: 
 - Matt Sanford