twitter-text 1.11.0 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f435b95a47697def8e995b0d2dbdbbbde2b7e568
-  data.tar.gz: 10d1c8186c09520f2dfcbb9de8a3d336fdac7b04
+  metadata.gz: a706e8ee1d21343caef2e2b896874b3f9090a9a2
+  data.tar.gz: 827debc4bafe00c2ea02ee1301357b82dbcccefa
 SHA512:
-  metadata.gz: 0d4584b362d0bf89d5173d44949f4fa1187c8d82dd69c61fc4f6038b8fd0f7badbbb78551f04b63c63aa5074de3539784f7291891231a7e120592bd1dd0edfca
-  data.tar.gz: 065adc1b81bf6452b162a94f23cc91748b5cf1938ef6dc54211825a3c08139304deb3911f1c2484d81980fe3125a6190bef83c9f7f5a61f4ed271b911ee3829a
+  metadata.gz: fb821bc90373b97cb25906f3a6df862e8b01a6786d2d2f3202557630406185800447095458d77daabf78045bd555ee849b35bfc8ffb9af2357ee4402abe5f3f5
+  data.tar.gz: ff2af029c1489c365648f6c7f5dff51fb0fad6b284917a9f1347cb131ae4bee5c13cf49219720dc6e49945e2673b774323d8edda9bfc36f761cf1defada678b8

data/lib/assets/tld_lib.yml

@@ -255,63 +255,70 @@ country:
 - za
 - zm
 - zw
-- "бел"
-- "мкд"
-- "мон"
-- "рф"
-- "срб"
-- "укр"
-- "қаз"
-- "հայ"
-- "الاردن"
-- "الجزائر"
-- "السعودية"
-- "المغرب"
-- "امارات"
-- "ایران"
-- "بھارت"
-- "تونس"
-- "سودان"
-- "سورية"
-- "عراق"
-- "عمان"
-- "فلسطين"
-- "قطر"
-- "مصر"
-- "مليسيا"
-- "پاکستان"
-- "भारत"
-- "বাংলা"
-- "ভারত"
-- "ਭਾਰਤ"
-- "ભારત"
-- "இந்தியா"
-- "இலங்கை"
-- "சிங்கப்பூர்"
-- "భారత్"
-- "ලංකා"
-- "ไทย"
-- "გე"
-- "中国"
-- "中國"
-- "台湾"
-- "台灣"
-- "新加坡"
-- "香港"
-- "한국"
+- бел
+- мкд
+- мон
+- рф
+- срб
+- укр
+- қаз
+- հայ
+- الاردن
+- الجزائر
+- السعودية
+- المغرب
+- امارات
+- ایران
+- بھارت
+- تونس
+- سودان
+- سورية
+- عراق
+- عمان
+- فلسطين
+- قطر
+- مصر
+- مليسيا
+- پاکستان
+- भारत
+- বাংলা
+- ভারত
+- ਭਾਰਤ
+- ભારત
+- இந்தியா
+- இலங்கை
+- சிங்கப்பூர்
+- భారత్
+- ලංකා
+- ไทย
+- გე
+- 中国
+- 中國
+- 台湾
+- 台灣
+- 新加坡
+- 澳門
+- 香港
+- 한국
 generic:
+- abbott
 - abogado
 - academy
+- accountant
 - accountants
 - active
 - actor
+- ads
 - adult
 - aero
+- afl
 - agency
 - airforce
 - allfinanz
 - alsace
+- amsterdam
 - android
+- apartments
 - aquarelle
 - archi
 - army
@@ -324,14 +331,20 @@ generic:
 - autos
 - axa
 - band
+- bank
 - bar
+- barclaycard
+- barclays
 - bargains
+- bauhaus
 - bayern
+- bbc
 - beer
 - berlin
 - best
 - bid
 - bike
+- bingo
 - bio
 - biz
 - black
@@ -340,6 +353,8 @@ generic:
 - blue
 - bmw
 - bnpparibas
+- boats
+- bond
 - boo
 - boutique
 - brussels
@@ -350,10 +365,12 @@ generic:
 - buzz
 - bzh
 - cab
+- cafe
 - cal
 - camera
 - camp
 - cancerresearch
+- canon
 - capetown
 - capital
 - caravan
@@ -364,13 +381,18 @@ generic:
 - cartier
 - casa
 - cash
+- casino
 - cat
 - catering
+- cbn
 - center
 - ceo
 - cern
+- cfd
 - channel
+- chat
 - cheap
+- chloe
 - christmas
 - chrome
 - church
@@ -399,6 +421,7 @@ generic:
 - cool
 - coop
 - country
+- courses
 - credit
 - creditcard
 - cricket
@@ -406,10 +429,15 @@ generic:
 - cruises
 - cuisinella
 - cymru
+- cyou
+- dabur
 - dad
 - dance
+- date
 - dating
+- datsun
 - day
+- dclk
 - deals
 - degree
 - delivery
@@ -417,6 +445,8 @@ generic:
 - dental
 - dentist
 - desi
+- design
+- dev
 - diamonds
 - diet
 - digital
@@ -424,7 +454,11 @@ generic:
 - directory
 - discount
 - dnp
+- docs
+- doha
 - domains
+- doosan
+- download
 - durban
 - dvag
 - eat
@@ -436,7 +470,9 @@ generic:
 - engineer
 - engineering
 - enterprises
+- epson
 - equipment
+- erni
 - esq
 - estate
 - eurovision
@@ -446,21 +482,30 @@ generic:
 - exchange
 - expert
 - exposed
+- express
 - fail
+- faith
+- fan
+- fans
 - farm
 - fashion
 - feedback
+- film
 - finance
 - financial
 - firmdale
 - fish
 - fishing
+- fit
 - fitness
 - flights
 - florist
+- flowers
 - flsmidth
 - fly
 - foo
+- football
+- forex
 - forsale
 - foundation
 - frl
@@ -470,8 +515,11 @@ generic:
 - futbol
 - gal
 - gallery
+- garden
 - gbiz
+- gdn
 - gent
+- ggee
 - gift
 - gifts
 - gives
@@ -482,6 +530,11 @@ generic:
 - gmail
 - gmo
 - gmx
+- gold
+- goldpoint
+- golf
+- goo
+- goog
 - google
 - gop
 - gov
@@ -489,14 +542,17 @@ generic:
 - gratis
 - green
 - gripe
+- guge
 - guide
 - guitars
 - guru
 - hamburg
+- hangout
 - haus
 - healthcare
 - help
 - here
+- hermes
 - hiphop
 - hiv
 - holdings
@@ -508,9 +564,11 @@ generic:
 - house
 - how
 - ibm
+- ifm
 - immo
 - immobilien
 - industries
+- infiniti
 - info
 - ing
 - ink
@@ -520,42 +578,58 @@ generic:
 - international
 - investments
 - irish
+- iwc
+- java
+- jcb
 - jetzt
+- jewelry
 - jobs
 - joburg
 - juegos
 - kaufen
+- kddi
 - kim
 - kitchen
 - kiwi
 - koeln
+- komatsu
 - krd
 - kred
+- kyoto
 - lacaixa
 - land
+- lat
 - latrobe
 - lawyer
 - lds
 - lease
+- leclerc
 - legal
 - lgbt
+- lidl
 - life
 - lighting
 - limited
 - limo
 - link
+- loan
 - loans
 - london
+- lotte
 - lotto
+- love
 - ltda
 - luxe
 - luxury
 - madrid
+- maif
 - maison
 - management
 - mango
 - market
 - marketing
+- markets
+- marriott
 - media
 - meet
 - melbourne
@@ -565,6 +639,7 @@ generic:
 - miami
 - mil
 - mini
+- mma
 - mobi
 - moda
 - moe
@@ -575,6 +650,9 @@ generic:
 - moscow
 - motorcycles
 - mov
+- movie
+- mtn
+- mtpc
 - museum
 - nagoya
 - name
@@ -583,21 +661,30 @@ generic:
 - network
 - neustar
 - new
+- news
 - nexus
 - ngo
 - nhk
+- nico
 - ninja
+- nissan
 - nra
 - nrw
+- ntt
 - nyc
 - okinawa
+- one
 - ong
 - onl
+- online
 - ooo
 - org
 - organic
+- osaka
 - otsuka
 - ovh
+- page
+- panerai
 - paris
 - partners
 - parts
@@ -607,12 +694,15 @@ generic:
 - photography
 - photos
 - physio
+- piaget
 - pics
+- pictet
 - pictures
 - pink
 - pizza
 - place
 - plumbing
+- plus
 - pohl
 - poker
 - porn
@@ -628,9 +718,11 @@ generic:
 - pub
 - qpon
 - quebec
+- racing
 - realtor
 - recipes
 - red
+- redstone
 - rehab
 - reise
 - reisen
@@ -642,6 +734,7 @@ generic:
 - republican
 - rest
 - restaurant
+- review
 - reviews
 - rich
 - rio
@@ -652,27 +745,45 @@ generic:
 - ruhr
 - ryukyu
 - saarland
+- sale
 - samsung
+- sap
 - sarl
+- saxo
 - sca
 - scb
 - schmidt
+- scholarships
+- school
 - schule
+- schwarz
 - science
 - scot
+- seat
 - services
+- sew
+- sex
 - sexy
 - shiksha
 - shoes
+- show
+- shriram
 - singles
+- site
+- sky
 - social
 - software
 - sohu
 - solar
 - solutions
+- sony
 - soy
 - space
 - spiegel
+- spreadbetting
+- study
+- style
+- sucks
 - supplies
 - supply
 - support
@@ -685,18 +796,27 @@ generic:
 - tatar
 - tattoo
 - tax
+- team
+- tech
 - technology
 - tel
+- temasek
+- tennis
+- tickets
 - tienda
 - tips
+- tires
 - tirol
 - today
 - tokyo
 - tools
 - top
+- toshiba
+- tours
 - town
 - toys
 - trade
+- trading
 - training
 - travel
 - trust
@@ -712,6 +832,7 @@ generic:
 - versicherung
 - vet
 - viajes
+- video
 - villas
 - vision
 - vlaanderen
@@ -727,61 +848,74 @@ generic:
 - website
 - wed
 - wedding
+- weir
 - whoswho
 - wien
 - wiki
 - williamhill
+- win
 - wme
 - work
 - works
 - world
 - wtc
 - wtf
+- xerox
+- xin
 - xxx
 - xyz
 - yachts
 - yandex
+- yodobashi
 - yoga
 - yokohama
 - youtube
 - zip
 - zone
-- "дети"
-- "москва"
-- "онлайн"
-- "орг"
-- "рус"
-- "сайт"
-- "بازار"
-- "شبكة"
-- "موقع"
-- "संगठन"
-- "みんな"
-- "グーグル"
-- "世界"
-- "中信"
-- "中文网"
-- "企业"
-- "佛山"
-- "八卦"
-- "公司"
-- "公益"
-- "商城"
-- "商店"
-- "商标"
-- "在线"
-- "广东"
-- "我爱你"
-- "手机"
-- "政务"
-- "机构"
-- "游戏"
-- "移动"
-- "组织机构"
-- "网址"
-- "网店"
-- "网络"
-- "谷歌"
-- "集团"
-- "삼성"
+- zuerich
+- дети
+- москва
+- онлайн
+- орг
+- рус
+- сайт
+- بازار
+- شبكة
+- موقع
+- संगठन
+- みんな
+- グーグル
+- 世界
+- 中信
+- 中文网
+- 企业
+- 佛山
+- 信息
+- 健康
+- 八卦
+- 公司
+- 公益
+- 商城
+- 商店
+- 商标
+- 在线
+- 广东
+- 慈善
+- 我爱你
+- 手机
+- 政务
+- 政府
+- 时尚
+- 机构
+- 淡马锡
+- 游戏
+- 移动
+- 组织机构
+- 网址
+- 网店
+- 网络
+- 谷歌
+- 集团
+- 飞利浦
+- 삼성
 - onion

data/lib/twitter-text/autolink.rb

@@ -329,7 +329,7 @@ module Twitter
       hash = chars[entity[:indices].first]
       hashtag = entity[:hashtag]
       hashtag = yield(hashtag) if block_given?
-      hashtag_class = options[:hashtag_class]
+      hashtag_class = options[:hashtag_class].to_s
 
       if hashtag.match Twitter::Regex::REGEXEN[:rtl_chars]
         hashtag_class += ' rtl'

data/lib/twitter-text/regex.rb

@@ -105,8 +105,8 @@ module Twitter
 
     # A hashtag must contain at least one unicode letter or mark, as well as numbers, underscores, and select special characters.
     HASHTAG_ALPHA = /[\p{L}\p{M}]/
-    HASHTAG_ALPHANUMERIC = /[\p{L}\p{M}\p{Nd}_\u200c\u0482\ua673\ua67e\u05be\u05f3\u05f4\u309b\u309c\u30a0\u30fb\u3003\u0f0b\u0f0c\u0f0d]/
-    HASHTAG_BOUNDARY = /\A|\z|[^&\p{L}\p{M}\p{Nd}_\u200c\u0482\ua673\ua67e\u05be\u05f3\u05f4\u309b\u309c\u30a0\u30fb\u3003\u0f0b\u0f0c\u0f0d]/
+    HASHTAG_ALPHANUMERIC = /[\p{L}\p{M}\p{Nd}_\u200c\u200d\u0482\ua673\ua67e\u05be\u05f3\u05f4\u309b\u309c\u30a0\u30fb\u3003\u0f0b\u0f0c\u00b7]/
+    HASHTAG_BOUNDARY = /\A|\z|[^&\p{L}\p{M}\p{Nd}_\u200c\u200d\u0482\ua673\ua67e\u05be\u05f3\u05f4\u309b\u309c\u30a0\u30fb\u3003\u0f0b\u0f0c\u00b7]/
 
     HASHTAG = /(#{HASHTAG_BOUNDARY})(#|＃)(#{HASHTAG_ALPHANUMERIC}*#{HASHTAG_ALPHA}#{HASHTAG_ALPHANUMERIC}*)/io
 

data/lib/twitter-text/rewriter.rb

@@ -5,13 +5,17 @@ module Twitter
       chars = text.to_s.to_char_a
 
       # sort by start index
-      entities = entities.sort_by{|entity| entity[:indices].first}
+      entities = entities.sort_by do |entity|
+        indices = entity.respond_to?(:indices) ? entity.indices : entity[:indices]
+        indices.first
+      end
 
       result = []
       last_index = entities.inject(0) do |index, entity|
-        result << chars[index...entity[:indices].first]
+        indices = entity.respond_to?(:indices) ? entity.indices : entity[:indices]
+        result << chars[index...indices.first]
         result << yield(entity, chars)
-        entity[:indices].last
+        indices.last
       end
       result << chars[last_index..-1]
 

data/twitter-text.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "twitter-text"
-  s.version = "1.11.0"
+  s.version = "1.12.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.11.0
+  version: 1.12.0
 platform: ruby
 authors:
 - Matt Sanford
@@ -16,7 +16,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-27 00:00:00.000000000 Z
+date: 2015-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -184,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.4
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Twitter text handling library