twitter-text 1.4.8 → 1.4.9

data/spec/spec_helper.rb

@@ -1,5 +1,11 @@
 $TESTING=true
-$KCODE='u'
+
+# Ruby 1.8 encoding check
+major, minor, patch = RUBY_VERSION.split('.')
+if major.to_i == 1 && minor.to_i < 9
+  $KCODE='u'
+end
+
 $:.push File.join(File.dirname(__FILE__), '..', 'lib')
 
 require 'nokogiri'
@@ -32,16 +38,16 @@ RSpec::Matchers.define :match_autolink_expression_in do |text|
   end
 end
 
-RSpec::Matchers.define :have_autolinked_url do |url|
+RSpec::Matchers.define :have_autolinked_url do |url, inner_text|
   match do |text|
     @link = Nokogiri::HTML(text).search("a[@href='#{url}']")
     @link &&
     @link.inner_text &&
-    @link.inner_text == url
+    (inner_text && @link.inner_text == inner_text) || (!inner_text && @link.inner_text == url)
   end
 
   failure_message_for_should do |text|
-    "Expected url '#{url}' to be autolinked in '#{text}'"
+    "Expected url '#{url}'#{", inner_text '#{inner_text}'" if inner_text} to be autolinked in '#{text}'"
   end
 end
 

data/test/conformance_test.rb

@@ -1,7 +1,13 @@
 require 'test/unit'
 require 'yaml'
-$KCODE = 'UTF8'
-require File.dirname(__FILE__) + '/../lib/twitter-text'
+
+# Ruby 1.8 encoding check
+major, minor, patch = RUBY_VERSION.split('.')
+if major.to_i == 1 && minor.to_i < 9
+  $KCODE='u'
+end
+
+require File.expand_path(File.dirname(__FILE__) + '/../lib/twitter-text')
 
 class ConformanceTest < Test::Unit::TestCase
   include Twitter::Extractor
@@ -28,11 +34,18 @@ class ConformanceTest < Test::Unit::TestCase
 
     def test_mentions_with_indices_extractor_conformance
       run_conformance_test(File.join(@conformance_dir, 'extract.yml'), :mentions_with_indices) do |description, expected, input|
-        expected = expected.map{|elem| elem.symbolize_keys }
+        expected = expected.map{|elem| elem.inject({}){|h, (k,v)| h[k.to_sym] = v; h} }
         assert_equal expected, extract_mentioned_screen_names_with_indices(input), description
       end
     end
 
+    def test_mentions_or_lists_with_indices_conformance
+      run_conformance_test(File.join(@conformance_dir, 'extract.yml'), :mentions_or_lists_with_indices) do |description, expected, input|
+        expected = expected.map{|elem| elem.inject({}){|h, (k,v)| h[k.to_sym] = v; h} }
+        assert_equal expected, extract_mentions_or_lists_with_indices(input), description
+      end
+    end
+
     def test_url_extractor_conformance
       run_conformance_test(File.join(@conformance_dir, 'extract.yml'), :urls) do |description, expected, input|
         assert_equal expected, extract_urls(input), description
@@ -44,7 +57,7 @@ class ConformanceTest < Test::Unit::TestCase
 
     def test_urls_with_indices_extractor_conformance
       run_conformance_test(File.join(@conformance_dir, 'extract.yml'), :urls_with_indices) do |description, expected, input|
-        expected = expected.map{|elem| elem.symbolize_keys }
+        expected = expected.map{|elem| elem.inject({}){|h, (k,v)| h[k.to_sym] = v; h} }
         assert_equal expected, extract_urls_with_indices(input), description
       end
     end
@@ -57,7 +70,7 @@ class ConformanceTest < Test::Unit::TestCase
 
     def test_hashtags_with_indices_extractor_conformance
       run_conformance_test(File.join(@conformance_dir, 'extract.yml'), :hashtags_with_indices) do |description, expected, input|
-        expected = expected.map{|elem| elem.symbolize_keys }
+        expected = expected.map{|elem| elem.inject({}){|h, (k,v)| h[k.to_sym] = v; h} }
         assert_equal expected, extract_hashtags_with_indices(input), description
       end
     end

data/twitter-text.gemspec

@@ -1,8 +1,10 @@
 spec = Gem::Specification.new do |s|
   s.name = "twitter-text"
-  s.version = "1.4.8"
-  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.version = "1.4.9"
+  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"
   s.description = s.summary = "A gem that provides text handling for Twitter"
 
@@ -14,7 +16,7 @@ spec = Gem::Specification.new do |s|
   s.add_development_dependency "rake"
   s.add_development_dependency "rspec"
   s.add_development_dependency "simplecov"
-  s.add_runtime_dependency "actionpack"
+  s.add_runtime_dependency "activesupport"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: twitter-text
 version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: 
+  hash: 21
+  prerelease: false
   segments: 
   - 1
   - 4
-  - 8
-  version: 1.4.8
+  - 9
+  version: 1.4.9
 platform: ruby
 authors: 
 - Matt Sanford
@@ -21,7 +21,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-13 00:00:00 Z
+date: 2011-08-05 00:00:00 -07:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: nokogiri
@@ -80,7 +81,7 @@ dependencies:
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: actionpack
+  name: activesupport
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -122,6 +123,7 @@ files:
 - lib/extractor.rb
 - lib/hithighlighter.rb
 - lib/regex.rb
+- lib/rewriter.rb
 - lib/twitter-text.rb
 - lib/unicode.rb
 - lib/validation.rb
@@ -131,6 +133,7 @@ files:
 - spec/extractor_spec.rb
 - spec/hithighlighter_spec.rb
 - spec/regex_spec.rb
+- spec/rewriter_spec.rb
 - spec/spec_helper.rb
 - spec/test_urls.rb
 - spec/twitter_text_spec.rb
@@ -138,6 +141,7 @@ files:
 - spec/validation_spec.rb
 - test/conformance_test.rb
 - twitter-text.gemspec
+has_rdoc: true
 homepage: http://twitter.com
 licenses: []
 
@@ -167,7 +171,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Twitter text handling library
@@ -176,6 +180,7 @@ test_files:
 - spec/extractor_spec.rb
 - spec/hithighlighter_spec.rb
 - spec/regex_spec.rb
+- spec/rewriter_spec.rb
 - spec/spec_helper.rb
 - spec/test_urls.rb
 - spec/twitter_text_spec.rb