twitter-text 1.6.0 → 1.6.1

data/.travis.yml

@@ -1,4 +1,4 @@
 language: ruby
 rvm:
   - 1.8.7
-  - 1.9.3
+  - 1.9.3

data/Rakefile

@@ -1,4 +1,3 @@
-#!/usr/bin/env rake
 require 'bundler'
 include Rake::DSL
 Bundler::GemHelper.install_tasks

data/lib/twitter-text.rb

@@ -8,10 +8,6 @@ else
   true
 end
 
-require 'active_support'
-require 'active_support/core_ext/string/multibyte.rb'
-require 'active_support/core_ext/hash/keys.rb'
-
 %w(
   deprecation
   regex

data/lib/twitter-text/autolink.rb

@@ -1,6 +1,7 @@
 # encoding: UTF-8
 
 require 'set'
+require 'twitter-text/core_ext/hash'
 
 module Twitter
   # A module for including Tweet auto-linking in a class. The primary use of this is for helpers/views so they can auto-link
@@ -437,5 +438,6 @@ module Twitter
         attrs
       end
     end
+
   end
 end

data/lib/twitter-text/core_ext/hash.rb

@@ -0,0 +1,21 @@
+class Hash
+
+  # Return a new hash with all keys converted to symbols, as long as
+  # they respond to +to_sym+.
+  #
+  #   { 'name' => 'Rob', 'years' => '28' }.symbolize_keys
+  #   #=> { :name => "Rob", :years => "28" }
+  def symbolize_keys
+    dup.symbolize_keys!
+  end
+
+  # Destructively convert all keys to symbols, as long as they respond
+  # to +to_sym+. Same as +symbolize_keys+, but modifies +self+.
+  def symbolize_keys!
+    keys.each do |key|
+      self[(key.to_sym rescue key) || key] = delete(key)
+    end
+    self
+  end
+
+end

data/lib/twitter-text/regex.rb

@@ -195,7 +195,7 @@ module Twitter
         gn|gp|gq|gr|gs|gt|gu|gw|gy|hk|hm|hn|hr|ht|hu|id|ie|il|im|in|io|iq|ir|is|it|je|jm|jo|jp|ke|kg|kh|ki|km|kn|kp|kr|kw|ky|kz|la|lb|lc|li|
         lk|lr|ls|lt|lu|lv|ly|ma|mc|md|me|mg|mh|mk|ml|mm|mn|mo|mp|mq|mr|ms|mt|mu|mv|mw|mx|my|mz|na|nc|ne|nf|ng|ni|nl|no|np|nr|nu|nz|om|pa|pe|
         pf|pg|ph|pk|pl|pm|pn|pr|ps|pt|pw|py|qa|re|ro|rs|ru|rw|sa|sb|sc|sd|se|sg|sh|si|sj|sk|sl|sm|sn|so|sr|ss|st|su|sv|sy|sz|tc|td|tf|tg|th|
-        tj|tk|tl|tm|tn|to|tp|tr|tt|tv|tw|tz|ua|ug|uk|us|uy|uz|va|vc|ve|vg|vi|vn|vu|wf|ws|ye|yt|za|zm|zw)
+        tj|tk|tl|tm|tn|to|tp|tr|tt|tv|tw|tz|ua|ug|uk|us|uy|uz|va|vc|ve|vg|vi|vn|vu|wf|ws|ye|yt|za|zm|zw|sx)
         (?=[^0-9a-z]|$)
       )
     }ix

data/lib/twitter-text/validation.rb

@@ -1,3 +1,5 @@
+require 'unf'
+
 module Twitter
   module Validation extend self
     MAX_LENGTH = 140
@@ -23,7 +25,7 @@ module Twitter
     def tweet_length(text, options = {})
       options = DEFAULT_TCO_URL_LENGTHS.merge(options)
 
-      length = ActiveSupport::Multibyte::Chars.new(text).normalize(:c).length
+      length = text.to_nfc.unpack("U*").length
 
       Twitter::Extractor.extract_urls_with_indices(text) do |url, start_position, end_position|
         length += start_position - end_position
@@ -47,7 +49,7 @@ module Twitter
       begin
         return :too_long if tweet_length(text) > MAX_LENGTH
         return :invalid_characters if Twitter::Regex::INVALID_CHARACTERS.any?{|invalid_char| text.include?(invalid_char) }
-      rescue ArgumentError, ActiveSupport::Multibyte::EncodingError => e
+      rescue ArgumentError => e
         # non-Unicode value.
         return :invalid_characters
       end

data/test/conformance_test.rb

@@ -1,6 +1,7 @@
+require 'multi_json'
+require 'nokogiri'
 require 'test/unit'
 require 'yaml'
-require 'nokogiri'
 
 # Ruby 1.8 encoding check
 major, minor, patch = RUBY_VERSION.split('.')
@@ -138,7 +139,7 @@ class ConformanceTest < Test::Unit::TestCase
   end
 
   def_conformance_test("autolink.yml", :json) do
-    assert_equal_without_attribute_order expected, auto_link_with_json(text, ActiveSupport::JSON.decode(json), :suppress_no_follow => true), description
+    assert_equal_without_attribute_order expected, auto_link_with_json(text, MultiJson.load(json), :suppress_no_follow => true), description
   end
 
   # HitHighlighter Conformance

data/twitter-text.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "twitter-text"
-  s.version = "1.6.0"
+  s.version = "1.6.1"
   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",
@@ -14,12 +14,13 @@ Gem::Specification.new do |s|
   s.has_rdoc = true
   s.summary = "Twitter text handling library"
 
+  s.add_development_dependency "multi_json", "~> 1.3"
   s.add_development_dependency "nokogiri"
   s.add_development_dependency "rake"
   s.add_development_dependency "rdoc"
   s.add_development_dependency "rspec"
   s.add_development_dependency "simplecov"
-  s.add_runtime_dependency "activesupport"
+  s.add_runtime_dependency     "unf", "~> 0.0.5"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

metadata

@@ -1,15 +1,10 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: twitter-text
-version: !ruby/object:Gem::Version 
-  hash: 15
+version: !ruby/object:Gem::Version
   prerelease: 
-  segments: 
-  - 1
-  - 6
-  - 0
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
-authors: 
+authors:
 - Matt Sanford
 - Patrick Ewing
 - Ben Cherry
@@ -22,95 +17,122 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-03-01 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: nokogiri
+date: 2013-03-11 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+    none: false
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  name: multi_json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rake
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rdoc
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rspec
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  prerelease: false
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: simplecov
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: activesupport
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.5
+    none: false
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  name: unf
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.5
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
   type: :runtime
-  version_requirements: *id006
 description: A gem that provides text handling for Twitter
-email: 
+email:
 - matt@twitter.com
 - patrick.henry.ewing@gmail.com
 - bcherry@gmail.com
@@ -121,12 +143,9 @@ email:
 - keita@twitter.com
 - jkoval@twitter.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gemtest
 - .gitignore
 - .gitmodules
@@ -136,9 +155,9 @@ files:
 - LICENSE
 - README.rdoc
 - Rakefile
-- TODO
 - lib/twitter-text.rb
 - lib/twitter-text/autolink.rb
+- lib/twitter-text/core_ext/hash.rb
 - lib/twitter-text/deprecation.rb
 - lib/twitter-text/extractor.rb
 - lib/twitter-text/hit_highlighter.rb
@@ -162,38 +181,35 @@ files:
 - twitter-text.gemspec
 homepage: http://twitter.com
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -209443876529914673
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: -209443876529914673
+  none: false
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Twitter text handling library
-test_files: 
+test_files:
 - spec/autolinking_spec.rb
 - spec/extractor_spec.rb
 - spec/hithighlighter_spec.rb
@@ -205,4 +221,3 @@ test_files:
 - spec/unicode_spec.rb
 - spec/validation_spec.rb
 - test/conformance_test.rb
-has_rdoc: true

data/TODO

@@ -1,3 +0,0 @@
-TODO:
-
- * @mentions preceded by a dash should work. "I am great -@greatguy"