twitter-text 1.7.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af3710d1c75e90e769b7602895256d53d4855f75
-  data.tar.gz: 3576ab5879783cb921b5658c4e4df1acc53ff164
+  metadata.gz: 5f1bec22f1774f73007ab1490af65c1a5ad75786
+  data.tar.gz: bf7463dedb6b11bdc70146d6076132c4d181ba98
 SHA512:
-  metadata.gz: 42a2cf6f0d1c37d5ee1b997865d0f0714d6ef388bf295789854779be3abd8b3d42cf2cea2f9b042b5b26e3850c1fc4e1da8a0b4eb05d9f4799f349fbbbb04e2c
-  data.tar.gz: 00bf947a72ab7ecf86d2b1e66cb7863d961f6b862bf4bd8aebebd0eb58776a92d96e2722fc5d1a684fcc7378ded2373365fe4f38d09e90407e85a2127f9a1878
+  metadata.gz: 7756ea6edc3d0a818cc5c4f112c42fcea8d79ff52655e0b15207ed29467c09476d36e0a707e6324d8afef04bf35760199c6363043197d32bfff80ad78a5d71f7
+  data.tar.gz: 0a8b3ad25d09d4dee903b1579d1a549dade610863bd1e19cd0258f76415462de838a0fd9c3ce7633db1e59229a71f1d7d28a33cef374abdee3e807e0eb8ec7a1

data/.travis.yml

@@ -3,3 +3,7 @@ rvm:
   - 1.8.7
   - 1.9.3
   - 2.0.0
+  - 2.1.0
+before_install:
+  - gem update --system
+  - gem --version

data/README.rdoc

@@ -1,4 +1,4 @@
-== twitter-text {<img src="https://secure.travis-ci.org/twitter/twitter-text-rb.png" />}[http://travis-ci.org/twitter/twitter-text-rb] {<img src="https://codeclimate.com/badge.png" />}[https://codeclimate.com/github/twitter/twitter-text-rb]
+== twitter-text {<img src="https://secure.travis-ci.org/twitter/twitter-text-rb.png?branch=master" />}[http://travis-ci.org/twitter/twitter-text-rb] {<img src="https://codeclimate.com/badge.png" />}[https://codeclimate.com/github/twitter/twitter-text-rb]
 
 A gem that provides text processing routines for Twitter Tweets. The major
 reason for this is to unify the various auto-linking and extraction of

data/Rakefile

@@ -46,7 +46,7 @@ namespace :test do
   end
 
   desc "Run conformance test suite"
-  task :conformance => ['conformance:latest', 'conformance:run'] do
+  task :conformance => ['conformance:update', 'conformance:run'] do
   end
 end
 

data/lib/twitter-text/autolink.rb

@@ -64,7 +64,7 @@ module Twitter
       options[:html_attrs] = extract_html_attrs_from_options!(options)
       options[:html_attrs][:rel] ||= "nofollow" unless options[:suppress_no_follow]
 
-      Twitter::Rewriter.rewrite_entities(text, entities) do |entity, chars|
+      Twitter::Rewriter.rewrite_entities(text.dup, entities) do |entity, chars|
         if entity[:url]
           link_to_url(entity, chars, options, &block)
         elsif entity[:hashtag]
@@ -370,9 +370,9 @@ module Twitter
 
     def link_to_screen_name(entity, chars, options = {})
       name  = "#{entity[:screen_name]}#{entity[:list_slug]}"
-      chunk = name
-      chunk = yield(name) if block_given?
-      name.downcase!
+
+      chunk = name.dup
+      chunk = yield(chunk) if block_given?
 
       at = chars[entity[:indices].first]
 

data/lib/twitter-text/regex.rb

@@ -187,7 +187,20 @@ module Twitter
     REGEXEN[:valid_subdomain] = /(?:(?:#{DOMAIN_VALID_CHARS}(?:[_-]|#{DOMAIN_VALID_CHARS})*)?#{DOMAIN_VALID_CHARS}\.)/io
     REGEXEN[:valid_domain_name] = /(?:(?:#{DOMAIN_VALID_CHARS}(?:[-]|#{DOMAIN_VALID_CHARS})*)?#{DOMAIN_VALID_CHARS}\.)/io
 
-    REGEXEN[:valid_gTLD] = /(?:(?:aero|asia|biz|cat|com|coop|edu|gov|info|int|jobs|mil|mobi|museum|name|net|org|pro|tel|travel|xxx)(?=[^0-9a-z@]|$))/i
+    REGEXEN[:valid_gTLD] = %r{
+      (?:
+        (?:academy|aero|agency|arpa|asia|bargains|berlin|bike|biz|blue|boutique|build|builders|buzz|cab|camera|camp|careers|cat|catering|
+        center|ceo|cheap|cleaning|clothing|club|codes|coffee|com|community|company|computer|construction|contractors|cool|coop|cruises|
+        dance|dating|democrat|diamonds|directory|domains|edu|education|email|enterprises|equipment|estate|events|expert|exposed|farm|
+        flights|florist|gallery|gift|glass|gov|graphics|guitars|guru|holdings|holiday|house|immobilien|info|institute|int|international|
+        jobs|kaufen|kim|kitchen|kiwi|land|lighting|limo|link|luxury|management|marketing|menu|mil|mobi|moda|monash|museum|nagoya|name|net|
+        ninja|onl|org|partners|photo|photography|photos|pics|pink|plumbing|post|pro|properties|recipes|red|rentals|repair|report|rich|ruhr|
+        sexy|shiksha|shoes|singles|social|solar|solutions|support|systems|tattoo|technology|tel|tienda|tips|today|tokyo|tools|training|
+        travel|uno|ventures|viajes|voting|voyage|wang|watch|wed|wien|works|xxx|zone)
+        (?=[^0-9a-z@]|$)
+      )
+    }ix
+
     REGEXEN[:valid_ccTLD] = %r{
       (?:
         (?:ac|ad|ae|af|ag|ai|al|am|an|ao|aq|ar|as|at|au|aw|ax|az|ba|bb|bd|be|bf|bg|bh|bi|bj|bm|bn|bo|br|bs|bt|bv|bw|by|bz|ca|cc|cd|cf|cg|ch|

data/spec/autolinking_spec.rb

@@ -23,6 +23,14 @@ describe Twitter::Autolink do
         end
       end
 
+      context "username in camelCase" do
+        def original_text() "@jaCob iS cOoL" end
+
+        it "should be linked" do
+          @autolinked_text.should link_to_screen_name('jaCob')
+        end
+      end
+
       context "username at beginning of line" do
         def original_text; "@jacob you're cool"; end
 

data/spec/spec_helper.rb

@@ -59,7 +59,7 @@ RSpec::Matchers.define :link_to_screen_name do |screen_name, inner_text|
     @link = Nokogiri::HTML(text).search("a.username")
     @link &&
     @link.inner_text == expected &&
-    "https://twitter.com/#{screen_name}".downcase.should == @link.first['href']
+    "https://twitter.com/#{screen_name}".should == @link.first['href']
   end
 
   failure_message_for_should do |text|

data/test/conformance_test.rb

@@ -3,9 +3,11 @@ require 'nokogiri'
 require 'test/unit'
 require 'yaml'
 
-# Ruby 1.8 encoding check
+# Detect Ruby 1.8 and older to apply necessary encoding fixes
 major, minor, patch = RUBY_VERSION.split('.')
-if major.to_i == 1 && minor.to_i < 9
+OLD_RUBY = major.to_i == 1 && minor.to_i < 9
+
+if OLD_RUBY
   $KCODE='u'
 end
 
@@ -19,12 +21,24 @@ class ConformanceTest < Test::Unit::TestCase
 
   private
 
-  %w(description expected text json hits).each do |key|
+  %w(description expected json hits).each do |key|
     define_method key.to_sym do
       @test_info[key]
     end
   end
 
+  if OLD_RUBY
+    def text
+      @test_info['text'].gsub(/\\u([0-9a-f]{8})/i) do
+        [$1.to_i(16)].pack('U*')
+      end
+    end
+  else
+    def text
+      @test_info['text']
+    end
+  end
+
   def assert_equal_without_attribute_order(expected, actual, failure_message = nil)
     assert_block(build_message(failure_message, "<?> expected but was\n<?>", expected, actual)) do
       equal_nodes?(Nokogiri::HTML(expected).root, Nokogiri::HTML(actual).root)
@@ -53,8 +67,10 @@ class ConformanceTest < Test::Unit::TestCase
     yaml = YAML.load_file(File.join(CONFORMANCE_DIR, file))
     raise  "No such test suite: #{test_type.to_s}" unless yaml["tests"][test_type.to_s]
 
+    file_name = file.split('.').first
+
     yaml["tests"][test_type.to_s].each do |test_info|
-      name = :"test_#{test_type} #{test_info['description']}"
+      name = :"test_#{file_name}_#{test_type} #{test_info['description']}"
       define_method name do
         @test_info = test_info
         instance_eval(&block)

data/twitter-text.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "twitter-text"
-  s.version = "1.7.0"
+  s.version = "1.8.0"
   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",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: twitter-text
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Matt Sanford
@@ -16,104 +16,104 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-13 00:00:00.000000000 Z
+date: 2014-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.5.10
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.5.10
 - !ruby/object:Gem::Dependency
   name: rake
   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: rdoc
   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: rspec
   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: simplecov
   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: unf
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.1.0
 description: A gem that provides text handling for Twitter
@@ -131,11 +131,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gemtest"
-- ".gitignore"
-- ".gitmodules"
-- ".rspec"
-- ".travis.yml"
+- .gemtest
+- .gitignore
+- .gitmodules
+- .rspec
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.rdoc
@@ -174,17 +174,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Twitter text handling library