twitter-text 1.14.7 → 2.0.0

data/spec/spec_helper.rb

@@ -34,7 +34,7 @@ RSpec::Matchers.define :match_autolink_expression_in do |text|
     @match_data && @match_data.to_s.strip == url
   end
 
-  failure_message_for_should do |url|
+  failure_message do |url|
     "Expected to find url '#{url}' in text '#{text}', but the match was #{@match_data.captures}'"
   end
 end
@@ -47,7 +47,7 @@ RSpec::Matchers.define :have_autolinked_url do |url, inner_text|
     (inner_text && @link.inner_text == inner_text) || (!inner_text && @link.inner_text == url)
   end
 
-  failure_message_for_should do |text|
+  failure_message do |text|
     "Expected url '#{url}'#{", inner_text '#{inner_text}'" if inner_text} to be autolinked in '#{text}'"
   end
 end
@@ -57,12 +57,11 @@ RSpec::Matchers.define :link_to_screen_name do |screen_name, inner_text|
 
   match do |text|
     @link = Nokogiri::HTML(text).search("a.username")
-    @link &&
-    @link.inner_text == expected &&
-    "https://twitter.com/#{screen_name}".should == @link.first['href']
+    return false unless @link && @link.inner_text == expected
+    expect("https://twitter.com/#{screen_name}").to eq(@link.first['href'])
   end
 
-  failure_message_for_should do |text|
+  failure_message do |text|
     if @link.first
       "Expected link '#{@link.inner_text}' with href '#{@link.first['href']}' to match screen_name '#{expected}', but it does not."
     else
@@ -70,7 +69,7 @@ RSpec::Matchers.define :link_to_screen_name do |screen_name, inner_text|
     end
   end
 
-  failure_message_for_should_not do |text|
+  failure_message_when_negated do |text|
     "Expected link '#{@link.inner_text}' with href '#{@link.first['href']}' not to match screen_name '#{expected}', but it does."
   end
 
@@ -84,12 +83,11 @@ RSpec::Matchers.define :link_to_list_path do |list_path, inner_text|
 
   match do |text|
     @link = Nokogiri::HTML(text).search("a.list-slug")
-    @link &&
-    @link.inner_text == expected &&
-    "https://twitter.com/#{list_path}".downcase.should == @link.first['href']
+    return false unless @link && @link.inner_text == expected
+    expect("https://twitter.com/#{list_path}".downcase).to eq(@link.first['href'])
   end
 
-  failure_message_for_should do |text|
+  failure_message do |text|
     if @link.first
       "Expected link '#{@link.inner_text}' with href '#{@link.first['href']}' to match the list path '#{expected}', but it does not."
     else
@@ -97,7 +95,7 @@ RSpec::Matchers.define :link_to_list_path do |list_path, inner_text|
     end
   end
 
-  failure_message_for_should_not do |text|
+  failure_message_when_negated do |text|
     "Expected link '#{@link.inner_text}' with href '#{@link.first['href']}' not to match the list path '#{expected}', but it does."
   end
 
@@ -108,13 +106,13 @@ end
 
 RSpec::Matchers.define :have_autolinked_hashtag do |hashtag|
   match do |text|
-    @link = Nokogiri::HTML(text).search("a[@href='https://twitter.com/#!/search?q=#{hashtag.sub(/^#/, '%23')}']")
+    @link = Nokogiri::HTML(text).search("a[@href='https://twitter.com/search?q=#{hashtag.sub(/^#/, '%23')}']")
     @link &&
     @link.inner_text &&
     @link.inner_text == hashtag
   end
 
-  failure_message_for_should do |text|
+  failure_message do |text|
     if @link.first
       "Expected link text to be [#{hashtag}], but it was [#{@link.inner_text}] in #{text}"
     else
@@ -122,7 +120,7 @@ RSpec::Matchers.define :have_autolinked_hashtag do |hashtag|
     end
   end
 
-  failure_message_for_should_not do |text|
+  failure_message_when_negated do |text|
     "Expected link '#{@link.inner_text}' with href '#{@link.first['href']}' not to match the hashtag '#{hashtag}', but it does."
   end
 end

data/spec/test_urls.rb

@@ -10,6 +10,8 @@ module TestUrls
     "http://somedomain.com/index.php?path=/abc/def/",
     "http://www.boingboing.net/2007/02/14/katamari_damacy_phon.html",
     "http://somehost.com:3000",
+    "http://a_b.c-d.com",
+    "http://sub_domain-dash.twitter.com",
     "http://xo.com/~matthew+%-x",
     "http://en.wikipedia.org/wiki/Primer_(film)",
     "http://www.ams.org/bookstore-getitem/item=mbk-59",
@@ -22,9 +24,7 @@ module TestUrls
     "http://mrs.domain-dash.biz",
     "http://x.com/has/one/char/domain",
     "http://t.co/nwcLTFF",
-    "http://sub_domain-dash.twitter.com",
     "http://a.b.cd",
-    "http://a_b.c-d.com",
     "http://a-b.b.com",
     "http://twitter-dash.com",
     "http://msdn.microsoft.com/ja-jp/library/system.net.httpwebrequest(v=VS.100).aspx",
@@ -36,7 +36,8 @@ module TestUrls
     "http://foobar.みんな",
     "http://foobar.中国",
     "http://foobar.پاکستان",
-    "https://www.youtube.com/playlist?list=PL0ZPu8XSRTB7wZzn0mLHMvyzVFeRxbWn-"
+    "https://www.youtube.com/playlist?list=PL0ZPu8XSRTB7wZzn0mLHMvyzVFeRxbWn-",
+    "http://ああ.com"
   ] unless defined?(TestUrls::VALID)
 
   INVALID = [
@@ -56,7 +57,8 @@ module TestUrls
     "http://twitt#{[0x202B].pack('U')}er.com",
     "http://twitt#{[0x202C].pack('U')}er.com",
     "http://twitt#{[0x202D].pack('U')}er.com",
-    "http://twitt#{[0x202E].pack('U')}er.com"
+    "http://twitt#{[0x202E].pack('U')}er.com",
+    "https://somesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurl.com/foo https://somesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurl.com/foo https://somesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurlsomesuperlongurl.com/foo"
   ] unless defined?(TestUrls::INVALID)
 
   TCO = [

data/spec/twitter_text_spec.rb

@@ -13,9 +13,9 @@ if major.to_i == 1 && minor.to_i < 9
     end
 
     it "should raise with invalid KCODE on Ruby < 1.9" do
-      lambda do
+      expect(lambda do
         require 'twitter-text'
-      end.should raise_error
+      end).to raise_error
     end
   end
 end

data/spec/unicode_spec.rb

@@ -4,28 +4,28 @@ require File.dirname(__FILE__) + '/spec_helper'
 describe Twitter::Unicode do
 
   it "should lazy-init constants" do
-    Twitter::Unicode.const_defined?(:UFEB6).should == false
-    Twitter::Unicode::UFEB6.should_not be_nil
-    Twitter::Unicode::UFEB6.should be_kind_of(String)
-    Twitter::Unicode.const_defined?(:UFEB6).should == true
+    expect(Twitter::Unicode.const_defined?(:UFEB6)).to eq(false)
+    expect(Twitter::Unicode::UFEB6).to_not be_nil
+    expect(Twitter::Unicode::UFEB6).to be_kind_of(String)
+    expect(Twitter::Unicode.const_defined?(:UFEB6)).to eq(true)
   end
 
   it "should return corresponding character" do
-    Twitter::Unicode::UFEB6.should == [0xfeb6].pack('U')
+    expect(Twitter::Unicode::UFEB6).to be == [0xfeb6].pack('U')
   end
 
   it "should allow lowercase notation" do
-    Twitter::Unicode::Ufeb6.should == Twitter::Unicode::UFEB6
-    Twitter::Unicode::Ufeb6.should === Twitter::Unicode::UFEB6
+    expect(Twitter::Unicode::Ufeb6).to be == Twitter::Unicode::UFEB6
+    expect(Twitter::Unicode::Ufeb6).to be === Twitter::Unicode::UFEB6
   end
 
   it "should allow underscore notation" do
-    Twitter::Unicode::U_FEB6.should == Twitter::Unicode::UFEB6
-    Twitter::Unicode::U_FEB6.should === Twitter::Unicode::UFEB6
+    expect(Twitter::Unicode::U_FEB6).to be == Twitter::Unicode::UFEB6
+    expect(Twitter::Unicode::U_FEB6).to be === Twitter::Unicode::UFEB6
   end
 
   it "should raise on invalid codepoints" do
-    lambda { Twitter::Unicode::FFFFFF }.should raise_error(NameError)
+    expect(lambda { Twitter::Unicode::FFFFFF }).to raise_error(NameError)
   end
 
 end

data/spec/validation_spec.rb

@@ -8,36 +8,60 @@ end
 describe Twitter::Validation do
 
   it "should disallow invalid BOM character" do
-    TestValidation.new.tweet_invalid?("Bom:#{Twitter::Unicode::UFFFE}").should == :invalid_characters
-    TestValidation.new.tweet_invalid?("Bom:#{Twitter::Unicode::UFEFF}").should == :invalid_characters
+    expect(TestValidation.new.tweet_invalid?("Bom:#{Twitter::Unicode::UFFFE}")).to be == :invalid_characters
+    expect(TestValidation.new.tweet_invalid?("Bom:#{Twitter::Unicode::UFEFF}")).to be == :invalid_characters
   end
 
   it "should disallow invalid U+FFFF character" do
-    TestValidation.new.tweet_invalid?("Bom:#{Twitter::Unicode::UFFFF}").should == :invalid_characters
+    expect(TestValidation.new.tweet_invalid?("Bom:#{Twitter::Unicode::UFFFF}")).to be == :invalid_characters
   end
 
   it "should disallow direction change characters" do
     [0x202A, 0x202B, 0x202C, 0x202D, 0x202E].map{|cp| [cp].pack('U') }.each do |char|
-      TestValidation.new.tweet_invalid?("Invalid:#{char}").should == :invalid_characters
+      expect(TestValidation.new.tweet_invalid?("Invalid:#{char}")).to eq(:invalid_characters)
     end
   end
 
   it "should disallow non-Unicode" do
-    TestValidation.new.tweet_invalid?("not-Unicode:\xfff0").should == :invalid_characters
+    expect(TestValidation.new.tweet_invalid?("not-Unicode:\xfff0")).to be == :invalid_characters
   end
 
   it "should allow <= 140 combined accent characters" do
     char = [0x65, 0x0301].pack('U')
-    TestValidation.new.tweet_invalid?(char * 139).should == false
-    TestValidation.new.tweet_invalid?(char * 140).should == false
-    TestValidation.new.tweet_invalid?(char * 141).should == :too_long
+    expect(TestValidation.new.tweet_invalid?(char * 139)).to be false
+    expect(TestValidation.new.tweet_invalid?(char * 140)).to be false
+    expect(TestValidation.new.tweet_invalid?(char * 141)).to eq(:too_long)
   end
 
   it "should allow <= 140 multi-byte characters" do
     char = [ 0x1d106 ].pack('U')
-    TestValidation.new.tweet_invalid?(char * 139).should == false
-    TestValidation.new.tweet_invalid?(char * 140).should == false
-    TestValidation.new.tweet_invalid?(char * 141).should == :too_long
+    expect(TestValidation.new.tweet_invalid?(char * 139)).to be false
+    expect(TestValidation.new.tweet_invalid?(char * 140)).to be false
+    expect(TestValidation.new.tweet_invalid?(char * 141)).to eq(:too_long)
   end
 
+  context "when returning results" do
+    it "should properly create new fully-populated results from arguments" do
+      results = Twitter::Validation::ParseResults.new(weighted_length: 26, permillage: 92, valid: true, display_range_start: 0, display_range_end: 16, valid_range_start: 0, valid_range_end:16)
+      expect(results).to_not be nil
+      expect(results[:weighted_length]).to eq(26)
+      expect(results[:permillage]).to eq(92)
+      expect(results[:valid]).to be true
+      expect(results[:display_range_start]).to eq(0)
+      expect(results[:display_range_end]).to eq(16)
+      expect(results[:valid_range_start]).to eq(0)
+      expect(results[:valid_range_end]).to eq(16)
+    end
+
+    it "should properly create empty results" do
+      results = Twitter::Validation::ParseResults.empty()
+      expect(results[:weighted_length]).to eq(0)
+      expect(results[:permillage]).to eq(0)
+      expect(results[:valid]).to be true
+      expect(results[:display_range_start]).to eq(0)
+      expect(results[:display_range_end]).to eq(0)
+      expect(results[:valid_range_start]).to eq(0)
+      expect(results[:valid_range_end]).to eq(0)
+    end
+  end
 end

data/test/conformance_test.rb

@@ -62,6 +62,16 @@ class ConformanceTest < Test::Unit::TestCase
     element.attribute_nodes.map{|attr| [attr.name, attr.value]}.sort
   end
 
+  def assert_equal_parse_results(expected, actual, failure_message = nil)
+    e = {}
+    # Note that we don't assert display and valid ranges because of differences
+    # in how ruby counts characters (wrt surrogate pairs) vs. other platforms
+    range_keys = [:display_range_start, :display_range_end, :valid_range_start, :valid_range_end]
+    expected.keys.each { |k| e[k.gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').gsub(/([a-z\d])([A-Z])/,'\1_\2').tr("-", "_").downcase.to_sym] = expected[k] }
+    [e, actual].each { |a| range_keys.each { |k| a.delete(k) } }
+    assert_equal e, actual, failure_message
+  end
+
   CONFORMANCE_DIR = ENV['CONFORMANCE_DIR'] || File.expand_path("../../../conformance", __FILE__)
 
   def self.def_conformance_test(file, test_type, &block)
@@ -208,4 +218,8 @@ class ConformanceTest < Test::Unit::TestCase
   def_conformance_test("validate.yml", :lengths) do
     assert_equal expected, tweet_length(text), description
   end
+
+  def_conformance_test("validate.yml", :WeightedTweetsCounterTest) do
+    assert_equal_parse_results expected, parse_tweet(text), description
+  end
 end

data/twitter-text.gemspec

@@ -2,11 +2,10 @@
 
 Gem::Specification.new do |s|
   s.name = "twitter-text"
-  s.version = "1.14.7"
-  s.authors = ["Matt Sanford", "Patrick Ewing", "Ben Cherry", "Britt Selvitelle",
-               "Raffi Krikorian", "J.P. Cummins", "Yoshimasa Niwa", "Keita Fujii", "James Koval"]
-  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", "keita@twitter.com", "jkoval@twitter.com"]
+  s.version = "2.0.0"
+  s.authors = ["David LaMacchia", "Sudheer Guntupalli", "Kaushik Lakshmikanth", "Jose Antonio Marquez Russo", "Lee Adams",
+               "Yoshimasa Niwa"]
+  s.email = ["opensource@twitter.com"]
   s.homepage = "http://twitter.com"
   s.description = s.summary = "A gem that provides text handling for Twitter"
   s.license = "Apache 2.0"
@@ -15,14 +14,17 @@ Gem::Specification.new do |s|
   s.has_rdoc = true
   s.summary = "Twitter text handling library"
 
+  s.add_development_dependency "pry"
   s.add_development_dependency "test-unit"
   s.add_development_dependency "multi_json", "~> 1.3"
-  s.add_development_dependency "nokogiri", "~> 1.5.10"
-  s.add_development_dependency "rake", "~> 11.1" # 12 removes method named `last_comment`
+  s.add_development_dependency "nokogiri", "~> 1.8.0"
+  s.add_development_dependency "rake"
   s.add_development_dependency "rdoc"
-  s.add_development_dependency "rspec", "~> 2.14.0"
-  s.add_development_dependency "simplecov", "~> 0.8.0"
+  s.add_development_dependency "rspec", "~> 3.0"
+  s.add_development_dependency "simplecov"
   s.add_runtime_dependency     "unf", "~> 0.1.0"
+  # Use of idn-ruby requires libidn to be installed separately
+  s.add_runtime_dependency     "idn-ruby"
 
   s.files         = `git ls-files`.split("\n") + ['lib/assets/tld_lib.yml']
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

metadata

@@ -1,23 +1,34 @@
 --- !ruby/object:Gem::Specification
 name: twitter-text
 version: !ruby/object:Gem::Version
-  version: 1.14.7
+  version: 2.0.0
 platform: ruby
 authors:
-- Matt Sanford
-- Patrick Ewing
-- Ben Cherry
-- Britt Selvitelle
-- Raffi Krikorian
-- J.P. Cummins
+- David LaMacchia
+- Sudheer Guntupalli
+- Kaushik Lakshmikanth
+- Jose Antonio Marquez Russo
+- Lee Adams
 - Yoshimasa Niwa
-- Keita Fujii
-- James Koval
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-03 00:00:00.000000000 Z
+date: 2017-12-15 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
@@ -52,28 +63,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.10
+        version: 1.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.10
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '11.1'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '11.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -94,28 +105,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: unf
   requirement: !ruby/object:Gem::Requirement
@@ -130,17 +141,23 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.0
+- !ruby/object:Gem::Dependency
+  name: idn-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A gem that provides text handling for Twitter
 email:
-- matt@twitter.com
-- patrick.henry.ewing@gmail.com
-- bcherry@gmail.com
-- bs@brittspace.com
-- raffi@twitter.com
-- jcummins@twitter.com
-- niw@niw.at
-- keita@twitter.com
-- jkoval@twitter.com
+- opensource@twitter.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -156,6 +173,7 @@ files:
 - lib/assets/tld_lib.yml
 - lib/twitter-text.rb
 - lib/twitter-text/autolink.rb
+- lib/twitter-text/configuration.rb
 - lib/twitter-text/deprecation.rb
 - lib/twitter-text/extractor.rb
 - lib/twitter-text/hash_helper.rb
@@ -164,9 +182,11 @@ files:
 - lib/twitter-text/rewriter.rb
 - lib/twitter-text/unicode.rb
 - lib/twitter-text/validation.rb
+- lib/twitter-text/weighted_range.rb
 - script/destroy
 - script/generate
 - spec/autolinking_spec.rb
+- spec/configuration_spec.rb
 - spec/extractor_spec.rb
 - spec/hithighlighter_spec.rb
 - spec/regex_spec.rb
@@ -198,12 +218,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.7.0
 signing_key: 
 specification_version: 4
 summary: Twitter text handling library
 test_files:
 - spec/autolinking_spec.rb
+- spec/configuration_spec.rb
 - spec/extractor_spec.rb
 - spec/hithighlighter_spec.rb
 - spec/regex_spec.rb