twitter-text 2.0.2 → 2.1.0

data/lib/twitter-text/weighted_range.rb

@@ -1,18 +1,20 @@
 # encoding: UTF-8
 
 module Twitter
-  class WeightedRange
-    attr_reader :start, :end, :weight
+  module TwitterText
+    class WeightedRange
+      attr_reader :start, :end, :weight
 
-    def initialize(range = {})
-      raise ArgumentError.new("Invalid range") unless [:start, :end, :weight].all? { |key| range.key?(key) && range[key].is_a?(Integer) }
-      @start = range[:start]
-      @end = range[:end]
-      @weight = range[:weight]
-    end
+      def initialize(range = {})
+        raise ArgumentError.new("Invalid range") unless [:start, :end, :weight].all? { |key| range.key?(key) && range[key].is_a?(Integer) }
+        @start = range[:start]
+        @end = range[:end]
+        @weight = range[:weight]
+      end
 
-    def contains?(code_point)
-      code_point >= @start && code_point <= @end
+      def contains?(code_point)
+        code_point >= @start && code_point <= @end
+      end
     end
   end
 end

data/spec/autolinking_spec.rb

@@ -2,10 +2,10 @@
 require File.dirname(__FILE__) + '/spec_helper'
 
 class TestAutolink
-  include Twitter::Autolink
+  include Twitter::TwitterText::Autolink
 end
 
-describe Twitter::Autolink do
+describe Twitter::TwitterText::Autolink do
   def original_text; end
   def url; end
 

data/spec/configuration_spec.rb

@@ -1,34 +1,34 @@
 # encoding: utf-8
 require File.dirname(__FILE__) + '/spec_helper'
 
-describe Twitter::Configuration do
+describe Twitter::TwitterText::Configuration do
   context "configuration" do
     context "with invalid data" do
       it "should raise an exception" do
-        invalid_hash = Twitter::Configuration.parse_string("{\"version\":2,\"maxWeightedTweetLength\":280,\"scale\":100,\"defaultWeight\":200,\"transformedURLLength\":23,\"ranges\":[{\"start\":0,\"end\":true,\"weight\":false},{\"start\":8192,\"end\":8205,\"weight\":100},{\"start\":8208,\"end\":8223,\"weight\":100},{\"start\":8242,\"end\":8247,\"weight\":100}]}")
-        expect { Twitter::Configuration.new(invalid_hash) }.to raise_error(ArgumentError)
+        invalid_hash = Twitter::TwitterText::Configuration.parse_string("{\"version\":2,\"maxWeightedTweetLength\":280,\"scale\":100,\"defaultWeight\":200,\"transformedURLLength\":23,\"ranges\":[{\"start\":0,\"end\":true,\"weight\":false},{\"start\":8192,\"end\":8205,\"weight\":100},{\"start\":8208,\"end\":8223,\"weight\":100},{\"start\":8242,\"end\":8247,\"weight\":100}]}")
+        expect { Twitter::TwitterText::Configuration.new(invalid_hash) }.to raise_error(ArgumentError)
       end
     end
 
     context "with defaults" do
       before do
-        Twitter::Configuration.default_configuration = Twitter::Configuration.configuration_from_file(Twitter::Configuration::CONFIG_V2)
+        Twitter::TwitterText::Configuration.default_configuration = Twitter::TwitterText::Configuration.configuration_from_file(Twitter::TwitterText::Configuration::CONFIG_V2)
       end
 
       it "should define version constants" do
-        expect(Twitter::Configuration.const_defined?(:CONFIG_V1)).to be true
-        expect(Twitter::Configuration.const_defined?(:CONFIG_V2)).to be true
+        expect(Twitter::TwitterText::Configuration.const_defined?(:CONFIG_V1)).to be true
+        expect(Twitter::TwitterText::Configuration.const_defined?(:CONFIG_V2)).to be true
       end
 
       it "should define a default configuration" do
-        expect(Twitter::Configuration.default_configuration).to_not be_nil
-        expect(Twitter::Configuration.default_configuration.version).to eq(2)
+        expect(Twitter::TwitterText::Configuration.default_configuration).to_not be_nil
+        expect(Twitter::TwitterText::Configuration.default_configuration.version).to eq(2)
       end
     end
 
     context "with v1 configuration" do
       before do
-        @config = Twitter::Configuration.configuration_from_file(Twitter::Configuration::CONFIG_V1)
+        @config = Twitter::TwitterText::Configuration.configuration_from_file(Twitter::TwitterText::Configuration::CONFIG_V1)
       end
 
       it "should have a version" do
@@ -54,7 +54,7 @@ describe Twitter::Configuration do
 
     context "with v2 configuration" do
       before do
-        @config = Twitter::Configuration.configuration_from_file(Twitter::Configuration::CONFIG_V2)
+        @config = Twitter::TwitterText::Configuration.configuration_from_file(Twitter::TwitterText::Configuration::CONFIG_V2)
       end
 
       it "should have a version" do
@@ -80,7 +80,7 @@ describe Twitter::Configuration do
       it "should have a configured range" do
         expect(@config.ranges).to be_kind_of(Array)
         expect(@config.ranges.count).to be > 0
-        expect(@config.ranges[0]).to be_kind_of(Twitter::WeightedRange)
+        expect(@config.ranges[0]).to be_kind_of(Twitter::TwitterText::WeightedRange)
         weighted_range = @config.ranges[0]
         expect(weighted_range.start).to be_kind_of(Integer)
         expect(weighted_range.end).to be_kind_of(Integer)

data/spec/extractor_spec.rb

@@ -2,10 +2,10 @@
 require File.dirname(__FILE__) + '/spec_helper'
 
 class TestExtractor
-  include Twitter::Extractor
+  include Twitter::TwitterText::Extractor
 end
 
-describe Twitter::Extractor do
+describe Twitter::TwitterText::Extractor do
   before do
     @extractor = TestExtractor.new
   end
@@ -241,7 +241,7 @@ describe Twitter::Extractor do
       it "does not consider a long URL with protocol to be valid" do
         # maximum length of domain label is 32 chars.
         url = ("a" * 31) + "."
-        url *= (Twitter::Extractor::MAX_URL_LENGTH / 32)
+        url *= (Twitter::TwitterText::Extractor::MAX_URL_LENGTH / 32)
         url = "https://" + url + "com" # longer than 4096 (MAX_URL_LENGTH) chars
         expect(@extractor.is_valid_domain(url.length, url, true)).to be false
       end
@@ -249,7 +249,7 @@ describe Twitter::Extractor do
       it "does not consider a long URL without protocol to be valid" do
         # maximum length of domain label is 32 chars.
         url = ("a" * 31) + "."
-        url *= ((Twitter::Extractor::MAX_URL_LENGTH / 32) - 1)
+        url *= ((Twitter::TwitterText::Extractor::MAX_URL_LENGTH / 32) - 1)
         url = url + "com" # shorter than 4096 (MAX_URL_LENGTH) chars
         expect(@extractor.is_valid_domain(url.length, url, false)).to be true
         url = ("a" * (31 - "https://".length)) + "." + url
@@ -309,11 +309,11 @@ describe Twitter::Extractor do
         end
 
         it "should not allow the multiplication character" do
-          expect(@extractor.extract_hashtags("#pre#{Twitter::Unicode::U00D7}post")).to be == ["pre"]
+          expect(@extractor.extract_hashtags("#pre#{Twitter::TwitterText::Unicode::U00D7}post")).to be == ["pre"]
         end
 
         it "should not allow the division character" do
-          expect(@extractor.extract_hashtags("#pre#{Twitter::Unicode::U00F7}post")).to be == ["pre"]
+          expect(@extractor.extract_hashtags("#pre#{Twitter::TwitterText::Unicode::U00F7}post")).to be == ["pre"]
         end
       end
 

data/spec/hithighlighter_spec.rb

@@ -2,10 +2,10 @@
 require File.dirname(__FILE__) + '/spec_helper'
 
 class TestHitHighlighter
-  include Twitter::HitHighlighter
+  include Twitter::TwitterText::HitHighlighter
 end
 
-describe Twitter::HitHighlighter do
+describe Twitter::TwitterText::HitHighlighter do
   describe "highlight" do
     before do
       @highlighter = TestHitHighlighter.new

data/spec/regex_spec.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require File.dirname(__FILE__) + '/spec_helper'
 
-describe "Twitter::Regex regular expressions" do
+describe "Twitter::TwitterText::Regex regular expressions" do
   describe "matching URLS" do
     TestUrls::VALID.each do |url|
       it "should match the URL #{url}" do
@@ -25,13 +25,13 @@ describe "Twitter::Regex regular expressions" do
     it "should match if less than 25 characters" do
       name = "Shuffleboard Community"
       expect(name.length).to be < 25
-      expect(name).to match(Twitter::Regex::REGEXEN[:list_name])
+      expect(name).to match(Twitter::TwitterText::Regex::REGEXEN[:list_name])
     end
 
     it "should not match if greater than 25 characters" do
       name = "Most Glorious Shady Meadows Shuffleboard Community"
       expect(name.length).to be > 25
-      expect(name).to match(Twitter::Regex[:list_name])
+      expect(name).to match(Twitter::TwitterText::Regex[:list_name])
     end
 
   end

data/spec/rewriter_spec.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require File.dirname(__FILE__) + '/spec_helper'
 
-describe Twitter::Rewriter do
+describe Twitter::TwitterText::Rewriter do
   def original_text; end
   def url; end
 
@@ -19,7 +19,7 @@ describe Twitter::Rewriter do
 
   describe "rewrite usernames" do #{{{
     before do
-      @rewritten_text = Twitter::Rewriter.rewrite_usernames_or_lists(original_text, &method(:block))
+      @rewritten_text = Twitter::TwitterText::Rewriter.rewrite_usernames_or_lists(original_text, &method(:block))
     end
 
     context "username preceded by a space" do
@@ -120,7 +120,7 @@ describe Twitter::Rewriter do
 
   describe "rewrite lists" do #{{{
     before do
-      @rewritten_text = Twitter::Rewriter.rewrite_usernames_or_lists(original_text, &method(:block))
+      @rewritten_text = Twitter::TwitterText::Rewriter.rewrite_usernames_or_lists(original_text, &method(:block))
     end
 
     context "slug preceded by a space" do
@@ -201,7 +201,7 @@ describe Twitter::Rewriter do
 
   describe "rewrite hashtags" do #{{{
     before do
-      @rewritten_text = Twitter::Rewriter.rewrite_hashtags(original_text, &method(:block))
+      @rewritten_text = Twitter::TwitterText::Rewriter.rewrite_hashtags(original_text, &method(:block))
     end
 
     context "with an all numeric hashtag" do
@@ -338,7 +338,7 @@ describe Twitter::Rewriter do
     def url; "http://www.google.com"; end
 
     before do
-      @rewritten_text = Twitter::Rewriter.rewrite_urls(original_text, &method(:block))
+      @rewritten_text = Twitter::TwitterText::Rewriter.rewrite_urls(original_text, &method(:block))
     end
 
     context "when embedded in plain text" do
@@ -452,7 +452,7 @@ describe Twitter::Rewriter do
     context "with a URL ending in allowed punctuation" do
       it "does not consume ending punctuation" do
         %w| ? ! , . : ; ] ) } = \ ' |.each do |char|
-          expect(Twitter::Rewriter.rewrite_urls("#{url}#{char}") do |url|
+          expect(Twitter::TwitterText::Rewriter.rewrite_urls("#{url}#{char}") do |url|
             expect(url).to be == url
             "[rewritten]"
           end).to be == "[rewritten]#{char}"
@@ -463,7 +463,7 @@ describe Twitter::Rewriter do
     context "with a URL preceded in forbidden characters" do
       it "should be rewritten" do
         %w| \ ' / ! = |.each do |char|
-          expect(Twitter::Rewriter.rewrite_urls("#{char}#{url}") do |url|
+          expect(Twitter::TwitterText::Rewriter.rewrite_urls("#{char}#{url}") do |url|
             "[rewritten]" # should not be called here.
           end).to be == "#{char}[rewritten]"
         end

data/spec/spec_helper.rb

@@ -24,13 +24,13 @@ end
 
 RSpec::Matchers.define :match_autolink_expression do
   match do |string|
-    !Twitter::Extractor.extract_urls(string).empty?
+    !Twitter::TwitterText::Extractor.extract_urls(string).empty?
   end
 end
 
 RSpec::Matchers.define :match_autolink_expression_in do |text|
   match do |url|
-    @match_data = Twitter::Regex[:valid_url].match(text)
+    @match_data = Twitter::TwitterText::Regex[:valid_url].match(text)
     @match_data && @match_data.to_s.strip == url
   end
 

data/spec/unicode_spec.rb

@@ -1,31 +1,31 @@
 # encoding: utf-8
 require File.dirname(__FILE__) + '/spec_helper'
 
-describe Twitter::Unicode do
+describe Twitter::TwitterText::Unicode do
 
   it "should lazy-init constants" do
-    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)
+    expect(Twitter::TwitterText::Unicode.const_defined?(:UFEB6)).to eq(false)
+    expect(Twitter::TwitterText::Unicode::UFEB6).to_not be_nil
+    expect(Twitter::TwitterText::Unicode::UFEB6).to be_kind_of(String)
+    expect(Twitter::TwitterText::Unicode.const_defined?(:UFEB6)).to eq(true)
   end
 
   it "should return corresponding character" do
-    expect(Twitter::Unicode::UFEB6).to be == [0xfeb6].pack('U')
+    expect(Twitter::TwitterText::Unicode::UFEB6).to be == [0xfeb6].pack('U')
   end
 
   it "should allow lowercase notation" do
-    expect(Twitter::Unicode::Ufeb6).to be == Twitter::Unicode::UFEB6
-    expect(Twitter::Unicode::Ufeb6).to be === Twitter::Unicode::UFEB6
+    expect(Twitter::TwitterText::Unicode::Ufeb6).to be == Twitter::TwitterText::Unicode::UFEB6
+    expect(Twitter::TwitterText::Unicode::Ufeb6).to be === Twitter::TwitterText::Unicode::UFEB6
   end
 
   it "should allow underscore notation" do
-    expect(Twitter::Unicode::U_FEB6).to be == Twitter::Unicode::UFEB6
-    expect(Twitter::Unicode::U_FEB6).to be === Twitter::Unicode::UFEB6
+    expect(Twitter::TwitterText::Unicode::U_FEB6).to be == Twitter::TwitterText::Unicode::UFEB6
+    expect(Twitter::TwitterText::Unicode::U_FEB6).to be === Twitter::TwitterText::Unicode::UFEB6
   end
 
   it "should raise on invalid codepoints" do
-    expect(lambda { Twitter::Unicode::FFFFFF }).to raise_error(NameError)
+    expect(lambda { Twitter::TwitterText::Unicode::FFFFFF }).to raise_error(NameError)
   end
 
 end

data/spec/validation_spec.rb

@@ -2,18 +2,18 @@
 require File.dirname(__FILE__) + '/spec_helper'
 
 class TestValidation
-  include Twitter::Validation
+  include Twitter::TwitterText::Validation
 end
 
-describe Twitter::Validation do
+describe Twitter::TwitterText::Validation do
 
   it "should disallow invalid BOM character" do
-    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
+    expect(TestValidation.new.tweet_invalid?("Bom:#{Twitter::TwitterText::Unicode::UFFFE}")).to be == :invalid_characters
+    expect(TestValidation.new.tweet_invalid?("Bom:#{Twitter::TwitterText::Unicode::UFEFF}")).to be == :invalid_characters
   end
 
   it "should disallow invalid U+FFFF character" do
-    expect(TestValidation.new.tweet_invalid?("Bom:#{Twitter::Unicode::UFFFF}")).to be == :invalid_characters
+    expect(TestValidation.new.tweet_invalid?("Bom:#{Twitter::TwitterText::Unicode::UFFFF}")).to be == :invalid_characters
   end
 
   it "should disallow direction change characters" do
@@ -42,7 +42,7 @@ describe Twitter::Validation do
 
   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)
+      results = Twitter::TwitterText::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)
@@ -54,7 +54,7 @@ describe Twitter::Validation do
     end
 
     it "should properly create empty results" do
-      results = Twitter::Validation::ParseResults.empty()
+      results = Twitter::TwitterText::Validation::ParseResults.empty()
       expect(results[:weighted_length]).to eq(0)
       expect(results[:permillage]).to eq(0)
       expect(results[:valid]).to be true

data/test/conformance_test.rb

@@ -15,10 +15,10 @@ $:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 require 'twitter-text'
 
 class ConformanceTest < Test::Unit::TestCase
-  include Twitter::Extractor
-  include Twitter::Autolink
-  include Twitter::HitHighlighter
-  include Twitter::Validation
+  include Twitter::TwitterText::Extractor
+  include Twitter::TwitterText::Autolink
+  include Twitter::TwitterText::HitHighlighter
+  include Twitter::TwitterText::Validation
 
   private
 

data/twitter-text.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "twitter-text"
-  s.version = "2.0.2"
+  s.version = "2.1.0"
   s.authors = ["David LaMacchia", "Sudheer Guntupalli", "Kaushik Lakshmikanth", "Jose Antonio Marquez Russo", "Lee Adams",
                "Yoshimasa Niwa"]
   s.email = ["opensource@twitter.com"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: twitter-text
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.1.0
 platform: ruby
 authors:
 - David LaMacchia
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-19 00:00:00.000000000 Z
+date: 2017-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -166,6 +166,7 @@ files:
 - ".gitignore"
 - ".gitmodules"
 - ".rspec"
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md