twitter-text 1.12.0 → 1.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a706e8ee1d21343caef2e2b896874b3f9090a9a2
-  data.tar.gz: 827debc4bafe00c2ea02ee1301357b82dbcccefa
+  metadata.gz: bba5fb63e86ec7388a267dd85e07dd82b343cff3
+  data.tar.gz: a469ff1a40ca5bf59a8c1e58c4c4faf51420dced
 SHA512:
-  metadata.gz: fb821bc90373b97cb25906f3a6df862e8b01a6786d2d2f3202557630406185800447095458d77daabf78045bd555ee849b35bfc8ffb9af2357ee4402abe5f3f5
-  data.tar.gz: ff2af029c1489c365648f6c7f5dff51fb0fad6b284917a9f1347cb131ae4bee5c13cf49219720dc6e49945e2673b774323d8edda9bfc36f761cf1defada678b8
+  metadata.gz: a35474299563dd6d64573b3289f5de44608d62070c33bf92900e161eb0739e06a08f54bc076bb4bdbb957fd25b0cdd7bf486e4e24fe2154a47842ea9bb864866
+  data.tar.gz: 88a929e5568e581954d670b90e4e5cb29fdc2b8008f811e737c7d383689b14c2501e84e39264b8554f1b9e19a084ab51537a0bd3abdd162aa0de0680bafd54e1

data/lib/assets/tld_lib.yml

@@ -255,70 +255,78 @@ country:
 - za
 - zm
 - zw
-- бел
-- мкд
-- мон
-- рф
-- срб
-- укр
-- қаз
-- հայ
-- الاردن
-- الجزائر
-- السعودية
-- المغرب
-- امارات
-- ایران
-- بھارت
-- تونس
-- سودان
-- سورية
-- عراق
-- عمان
-- فلسطين
-- قطر
-- مصر
-- مليسيا
-- پاکستان
-- भारत
-- বাংলা
-- ভারত
-- ਭਾਰਤ
-- ભારત
-- இந்தியா
-- இலங்கை
-- சிங்கப்பூர்
-- భారత్
-- ලංකා
-- ไทย
-- გე
-- 中国
-- 中國
-- 台湾
-- 台灣
-- 新加坡
-- 澳門
-- 香港
-- 한국
+- "ελ"
+- "бел"
+- "мкд"
+- "мон"
+- "рф"
+- "срб"
+- "укр"
+- "қаз"
+- "հայ"
+- "الاردن"
+- "الجزائر"
+- "السعودية"
+- "المغرب"
+- "امارات"
+- "ایران"
+- "بھارت"
+- "تونس"
+- "سودان"
+- "سورية"
+- "عراق"
+- "عمان"
+- "فلسطين"
+- "قطر"
+- "مصر"
+- "مليسيا"
+- "پاکستان"
+- "भारत"
+- "বাংলা"
+- "ভারত"
+- "ਭਾਰਤ"
+- "ભારત"
+- "இந்தியா"
+- "இலங்கை"
+- "சிங்கப்பூர்"
+- "భారత్"
+- "ලංකා"
+- "ไทย"
+- "გე"
+- "中国"
+- "中國"
+- "台湾"
+- "台灣"
+- "新加坡"
+- "澳門"
+- "香港"
+- "한국"
 generic:
+- abb
 - abbott
 - abogado
 - academy
+- accenture
 - accountant
 - accountants
+- aco
 - active
 - actor
 - ads
 - adult
+- aeg
 - aero
 - afl
 - agency
+- aig
 - airforce
+- airtel
 - allfinanz
 - alsace
 - amsterdam
 - android
 - apartments
+- app
 - aquarelle
 - archi
 - army
@@ -328,22 +336,32 @@ generic:
 - attorney
 - auction
 - audio
+- auto
 - autos
 - axa
+- azure
 - band
 - bank
 - bar
+- barcelona
 - barclaycard
 - barclays
 - bargains
 - bauhaus
 - bayern
 - bbc
+- bbva
+- bcn
 - beer
+- bentley
 - berlin
 - best
+- bet
+- bharti
+- bible
 - bid
 - bike
+- bing
 - bingo
 - bio
 - biz
@@ -352,11 +370,17 @@ generic:
 - bloomberg
 - blue
 - bmw
+- bnl
 - bnpparibas
 - boats
 - bond
 - boo
+- boots
 - boutique
+- bradesco
+- bridgestone
+- broker
+- brother
 - brussels
 - budapest
 - build
@@ -378,17 +402,22 @@ generic:
 - care
 - career
 - careers
+- cars
 - cartier
 - casa
 - cash
 - casino
 - cat
 - catering
+- cba
 - cbn
+- ceb
 - center
 - ceo
 - cern
+- cfa
 - cfd
+- chanel
 - channel
 - chat
 - cheap
@@ -396,6 +425,7 @@ generic:
 - christmas
 - chrome
 - church
+- cisco
 - citic
 - city
 - claims
@@ -403,6 +433,7 @@ generic:
 - click
 - clinic
 - clothing
+- cloud
 - club
 - coach
 - codes
@@ -410,6 +441,7 @@ generic:
 - college
 - cologne
 - com
+- commbank
 - community
 - company
 - computer
@@ -420,11 +452,14 @@ generic:
 - cooking
 - cool
 - coop
+- corsica
 - country
+- coupons
 - courses
 - credit
 - creditcard
 - cricket
+- crown
 - crs
 - cruises
 - cuisinella
@@ -441,6 +476,7 @@ generic:
 - deals
 - degree
 - delivery
+- delta
 - democrat
 - dental
 - dentist
@@ -455,12 +491,15 @@ generic:
 - discount
 - dnp
 - docs
+- dog
 - doha
 - domains
 - doosan
 - download
+- drive
 - durban
 - dvag
+- earth
 - eat
 - edu
 - education
@@ -483,8 +522,10 @@ generic:
 - expert
 - exposed
 - express
+- fage
 - fail
 - faith
+- family
 - fan
 - fans
 - farm
@@ -507,22 +548,27 @@ generic:
 - football
 - forex
 - forsale
+- forum
 - foundation
 - frl
 - frogans
 - fund
 - furniture
 - futbol
+- fyi
 - gal
 - gallery
+- game
 - garden
 - gbiz
 - gdn
 - gent
+- genting
 - ggee
 - gift
 - gifts
 - gives
+- giving
 - glass
 - gle
 - global
@@ -542,6 +588,7 @@ generic:
 - gratis
 - green
 - gripe
+- group
 - guge
 - guide
 - guitars
@@ -554,17 +601,28 @@ generic:
 - here
 - hermes
 - hiphop
+- hitachi
 - hiv
+- hockey
 - holdings
 - holiday
+- homedepot
 - homes
+- honda
 - horse
 - host
 - hosting
+- hoteles
+- hotmail
 - house
 - how
+- hsbc
 - ibm
+- icbc
+- ice
+- icu
 - ifm
+- iinet
 - immo
 - immobilien
 - industries
@@ -577,14 +635,21 @@ generic:
 - int
 - international
 - investments
+- ipiranga
 - irish
+- ist
+- istanbul
+- itau
 - iwc
 - java
 - jcb
 - jetzt
 - jewelry
+- jlc
+- jll
 - jobs
 - joburg
+- jprs
 - juegos
 - kaufen
 - kddi
@@ -597,67 +662,86 @@ generic:
 - kred
 - kyoto
 - lacaixa
+- lancaster
 - land
+- lasalle
 - lat
 - latrobe
+- law
 - lawyer
 - lds
 - lease
 - leclerc
 - legal
+- lexus
 - lgbt
+- liaison
 - lidl
 - life
 - lighting
 - limited
 - limo
 - link
+- live
+- lixil
 - loan
 - loans
+- lol
 - london
 - lotte
 - lotto
 - love
 - ltda
+- lupin
 - luxe
 - luxury
 - madrid
 - maif
 - maison
+- man
 - management
 - mango
 - market
 - marketing
 - markets
 - marriott
+- mba
 - media
 - meet
 - melbourne
 - meme
 - memorial
+- men
 - menu
 - miami
+- microsoft
 - mil
 - mini
 - mma
 - mobi
 - moda
 - moe
+- mom
 - monash
 - money
+- montblanc
 - mormon
 - mortgage
 - moscow
 - motorcycles
 - mov
 - movie
+- movistar
 - mtn
 - mtpc
 - museum
+- nadex
 - nagoya
 - name
 - navy
+- nec
 - net
+- netbank
 - network
 - neustar
 - new
@@ -668,16 +752,21 @@ generic:
 - nico
 - ninja
 - nissan
+- nokia
 - nra
 - nrw
 - ntt
 - nyc
+- office
 - okinawa
+- omega
 - one
 - ong
 - onl
 - online
 - ooo
+- oracle
+- orange
 - org
 - organic
 - osaka
@@ -689,7 +778,9 @@ generic:
 - partners
 - parts
 - party
+- pet
 - pharmacy
+- philips
 - photo
 - photography
 - photos
@@ -701,6 +792,7 @@ generic:
 - pink
 - pizza
 - place
+- play
 - plumbing
 - plus
 - pohl
@@ -720,6 +812,7 @@ generic:
 - quebec
 - racing
 - realtor
+- realty
 - recipes
 - red
 - redstone
@@ -728,6 +821,7 @@ generic:
 - reisen
 - reit
 - ren
+- rent
 - rentals
 - repair
 - report
@@ -737,16 +831,22 @@ generic:
 - review
 - reviews
 - rich
+- ricoh
 - rio
 - rip
 - rocks
 - rodeo
 - rsvp
 - ruhr
+- run
 - ryukyu
 - saarland
+- sakura
 - sale
 - samsung
+- sandvik
+- sandvikcoromant
+- sanofi
 - sap
 - sarl
 - saxo
@@ -758,8 +858,11 @@ generic:
 - schule
 - schwarz
 - science
+- scor
 - scot
 - seat
+- seek
+- sener
 - services
 - sew
 - sex
@@ -770,7 +873,11 @@ generic:
 - shriram
 - singles
 - site
+- ski
 - sky
+- skype
+- sncf
+- soccer
 - social
 - software
 - sohu
@@ -781,6 +888,10 @@ generic:
 - space
 - spiegel
 - spreadbetting
+- srl
+- starhub
+- statoil
+- studio
 - study
 - style
 - sucks
@@ -790,18 +901,25 @@ generic:
 - surf
 - surgery
 - suzuki
+- swatch
+- swiss
 - sydney
 - systems
 - taipei
+- tatamotors
 - tatar
 - tattoo
 - tax
+- taxi
 - team
 - tech
 - technology
 - tel
+- telefonica
 - temasek
 - tennis
+- thd
+- theater
 - tickets
 - tienda
 - tips
@@ -811,9 +929,11 @@ generic:
 - tokyo
 - tools
 - top
+- toray
 - toshiba
 - tours
 - town
+- toyota
 - toys
 - trade
 - trading
@@ -821,6 +941,7 @@ generic:
 - travel
 - trust
 - tui
+- ubs
 - university
 - uno
 - uol
@@ -834,7 +955,10 @@ generic:
 - viajes
 - video
 - villas
+- vin
 - vision
+- vista
+- vistaprint
 - vlaanderen
 - vodka
 - vote
@@ -842,6 +966,7 @@ generic:
 - voto
 - voyage
 - wales
+- walter
 - wang
 - watch
 - webcam
@@ -854,14 +979,18 @@ generic:
 - wiki
 - williamhill
 - win
+- windows
+- wine
 - wme
 - work
 - works
 - world
 - wtc
 - wtf
+- xbox
 - xerox
 - xin
+- xperia
 - xxx
 - xyz
 - yachts
@@ -873,49 +1002,64 @@ generic:
 - zip
 - zone
 - zuerich
-- дети
-- москва
-- онлайн
-- орг
-- рус
-- сайт
-- بازار
-- شبكة
-- موقع
-- संगठन
-- みんな
-- グーグル
-- 世界
-- 中信
-- 中文网
-- 企业
-- 佛山
-- 信息
-- 健康
-- 八卦
-- 公司
-- 公益
-- 商城
-- 商店
-- 商标
-- 在线
-- 广东
-- 慈善
-- 我爱你
-- 手机
-- 政务
-- 政府
-- 时尚
-- 机构
-- 淡马锡
-- 游戏
-- 移动
-- 组织机构
-- 网址
-- 网店
-- 网络
-- 谷歌
-- 集团
-- 飞利浦
-- 삼성
+- "дети"
+- "ком"
+- "москва"
+- "онлайн"
+- "орг"
+- "рус"
+- "сайт"
+- "קום"
+- "بازار"
+- "شبكة"
+- "كوم"
+- "موقع"
+- "कॉम"
+- "नेट"
+- "संगठन"
+- "คอม"
+- "みんな"
+- "グーグル"
+- "コム"
+- "世界"
+- "中信"
+- "中文网"
+- "企业"
+- "佛山"
+- "信息"
+- "健康"
+- "八卦"
+- "公司"
+- "公益"
+- "商城"
+- "商店"
+- "商标"
+- "在线"
+- "大拿"
+- "娱乐"
+- "工行"
+- "广东"
+- "慈善"
+- "我爱你"
+- "手机"
+- "政务"
+- "政府"
+- "新闻"
+- "时尚"
+- "机构"
+- "淡马锡"
+- "游戏"
+- "点看"
+- "移动"
+- "组织机构"
+- "网址"
+- "网店"
+- "网络"
+- "谷歌"
+- "集团"
+- "飞利浦"
+- "餐厅"
+- "닷넷"
+- "닷컴"
+- "삼성"
 - onion

data/lib/twitter-text/autolink.rb

@@ -47,10 +47,12 @@ module Twitter
       entities = json.values().flatten()
 
       # map JSON entity to twitter-text entity
-      entities.each do |entity|
-        HashHelper.symbolize_keys!(entity)
+      # be careful not to alter arguments received
+      entities.map! do |entity|
+        entity = HashHelper.symbolize_keys(entity)
         # hashtag
         entity[:hashtag] = entity[:text] if entity[:text]
+        entity
       end
 
       auto_link_entities(text, entities, options)
@@ -229,8 +231,9 @@ module Twitter
 
     def url_entities_hash(url_entities)
       (url_entities || {}).inject({}) do |entities, entity|
-        HashHelper.symbolize_keys!(entity)
-        entities[entity[:url]] = entity
+        # be careful not to alter arguments received
+        _entity = HashHelper.symbolize_keys(entity)
+        entities[_entity[:url]] = _entity
         entities
       end
     end

data/lib/twitter-text/hash_helper.rb

@@ -6,7 +6,7 @@ module Twitter
     #   { 'name' => 'Rob', 'years' => '28' }.symbolize_keys
     #   #=> { :name => "Rob", :years => "28" }
     def self.symbolize_keys(hash)
-      hash.dup.symbolize_keys!
+      symbolize_keys!(hash.dup)
     end
 
     # Destructively convert all keys to symbols, as long as they respond

data/lib/twitter-text/regex.rb

@@ -114,7 +114,7 @@ module Twitter
     # Used in Extractor for final filtering
     REGEXEN[:end_hashtag_match] = /\A(?:[#＃]|:\/\/)/o
 
-    REGEXEN[:valid_mention_preceding_chars] = /(?:[^a-zA-Z0-9_!#\$%&*@＠]|^|[rR][tT]:?)/o
+    REGEXEN[:valid_mention_preceding_chars] = /(?:[^a-zA-Z0-9_!#\$%&*@＠]|^|(?:^|[^a-zA-Z0-9_+~.-])[rR][tT]:?)/o
     REGEXEN[:at_signs] = /[@＠]/
     REGEXEN[:valid_mention_or_list] = /
       (#{REGEXEN[:valid_mention_preceding_chars]})  # $1: Preceeding character
@@ -208,7 +208,7 @@ module Twitter
     )/iox
 
     REGEXEN[:valid_url_query_chars] = /[a-z0-9!?\*'\(\);:&=\+\$\/%#\[\]\-_\.,~|@]/i
-    REGEXEN[:valid_url_query_ending_chars] = /[a-z0-9_&=#\/]/i
+    REGEXEN[:valid_url_query_ending_chars] = /[a-z0-9_&=#\/\-]/i
     REGEXEN[:valid_url] = %r{
       (                                                                                     #   $1 total match
         (#{REGEXEN[:valid_url_preceding_chars]})                                            #   $2 Preceeding chracter

data/lib/twitter-text/validation.rb

@@ -5,9 +5,9 @@ module Twitter
     MAX_LENGTH = 140
 
     DEFAULT_TCO_URL_LENGTHS = {
-      :short_url_length => 22,
+      :short_url_length => 23,
       :short_url_length_https => 23,
-      :characters_reserved_per_media => 22
+      :characters_reserved_per_media => 23
     }.freeze
 
     # Returns the length of the string as it would be displayed. This is equivilent to the length of the Unicode NFC

data/spec/test_urls.rb

@@ -35,7 +35,8 @@ module TestUrls
     "t.co/nwcLTFF",
     "http://foobar.みんな",
     "http://foobar.中国",
-    "http://foobar.پاکستان"
+    "http://foobar.پاکستان",
+    "https://www.youtube.com/playlist?list=PL0ZPu8XSRTB7wZzn0mLHMvyzVFeRxbWn-"
   ] unless defined?(TestUrls::VALID)
 
   INVALID = [

data/twitter-text.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "twitter-text"
-  s.version = "1.12.0"
+  s.version = "1.13.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.12.0
+  version: 1.13.0
 platform: ruby
 authors:
 - Matt Sanford
@@ -16,7 +16,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-30 00:00:00.000000000 Z
+date: 2015-08-26 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.6
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: Twitter text handling library