twitter-text 1.12.0 → 1.13.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/assets/tld_lib.yml +234 -90
- data/lib/twitter-text/autolink.rb +7 -4
- data/lib/twitter-text/hash_helper.rb +1 -1
- data/lib/twitter-text/regex.rb +2 -2
- data/lib/twitter-text/validation.rb +2 -2
- data/spec/test_urls.rb +2 -1
- data/twitter-text.gemspec +1 -1
- metadata +3 -3
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: bba5fb63e86ec7388a267dd85e07dd82b343cff3
|
4
|
+
data.tar.gz: a469ff1a40ca5bf59a8c1e58c4c4faf51420dced
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: a35474299563dd6d64573b3289f5de44608d62070c33bf92900e161eb0739e06a08f54bc076bb4bdbb957fd25b0cdd7bf486e4e24fe2154a47842ea9bb864866
|
7
|
+
data.tar.gz: 88a929e5568e581954d670b90e4e5cb29fdc2b8008f811e737c7d383689b14c2501e84e39264b8554f1b9e19a084ab51537a0bd3abdd162aa0de0680bafd54e1
|
data/lib/assets/tld_lib.yml
CHANGED
@@ -255,70 +255,78 @@ country:
|
|
255
255
|
- za
|
256
256
|
- zm
|
257
257
|
- zw
|
258
|
-
-
|
259
|
-
-
|
260
|
-
-
|
261
|
-
-
|
262
|
-
-
|
263
|
-
-
|
264
|
-
-
|
265
|
-
-
|
266
|
-
-
|
267
|
-
-
|
268
|
-
-
|
269
|
-
-
|
270
|
-
-
|
271
|
-
-
|
272
|
-
-
|
273
|
-
-
|
274
|
-
-
|
275
|
-
-
|
276
|
-
-
|
277
|
-
-
|
278
|
-
-
|
279
|
-
-
|
280
|
-
-
|
281
|
-
-
|
282
|
-
-
|
283
|
-
-
|
284
|
-
-
|
285
|
-
-
|
286
|
-
-
|
287
|
-
-
|
288
|
-
-
|
289
|
-
-
|
290
|
-
-
|
291
|
-
-
|
292
|
-
-
|
293
|
-
-
|
294
|
-
-
|
295
|
-
-
|
296
|
-
-
|
297
|
-
-
|
298
|
-
-
|
299
|
-
-
|
300
|
-
-
|
301
|
-
-
|
302
|
-
-
|
258
|
+
- "ελ"
|
259
|
+
- "бел"
|
260
|
+
- "мкд"
|
261
|
+
- "мон"
|
262
|
+
- "рф"
|
263
|
+
- "срб"
|
264
|
+
- "укр"
|
265
|
+
- "қаз"
|
266
|
+
- "հայ"
|
267
|
+
- "الاردن"
|
268
|
+
- "الجزائر"
|
269
|
+
- "السعودية"
|
270
|
+
- "المغرب"
|
271
|
+
- "امارات"
|
272
|
+
- "ایران"
|
273
|
+
- "بھارت"
|
274
|
+
- "تونس"
|
275
|
+
- "سودان"
|
276
|
+
- "سورية"
|
277
|
+
- "عراق"
|
278
|
+
- "عمان"
|
279
|
+
- "فلسطين"
|
280
|
+
- "قطر"
|
281
|
+
- "مصر"
|
282
|
+
- "مليسيا"
|
283
|
+
- "پاکستان"
|
284
|
+
- "भारत"
|
285
|
+
- "বাংলা"
|
286
|
+
- "ভারত"
|
287
|
+
- "ਭਾਰਤ"
|
288
|
+
- "ભારત"
|
289
|
+
- "இந்தியா"
|
290
|
+
- "இலங்கை"
|
291
|
+
- "சிங்கப்பூர்"
|
292
|
+
- "భారత్"
|
293
|
+
- "ලංකා"
|
294
|
+
- "ไทย"
|
295
|
+
- "გე"
|
296
|
+
- "中国"
|
297
|
+
- "中國"
|
298
|
+
- "台湾"
|
299
|
+
- "台灣"
|
300
|
+
- "新加坡"
|
301
|
+
- "澳門"
|
302
|
+
- "香港"
|
303
|
+
- "한국"
|
303
304
|
generic:
|
305
|
+
- abb
|
304
306
|
- abbott
|
305
307
|
- abogado
|
306
308
|
- academy
|
309
|
+
- accenture
|
307
310
|
- accountant
|
308
311
|
- accountants
|
312
|
+
- aco
|
309
313
|
- active
|
310
314
|
- actor
|
311
315
|
- ads
|
312
316
|
- adult
|
317
|
+
- aeg
|
313
318
|
- aero
|
314
319
|
- afl
|
315
320
|
- agency
|
321
|
+
- aig
|
316
322
|
- airforce
|
323
|
+
- airtel
|
317
324
|
- allfinanz
|
318
325
|
- alsace
|
319
326
|
- amsterdam
|
320
327
|
- android
|
321
328
|
- apartments
|
329
|
+
- app
|
322
330
|
- aquarelle
|
323
331
|
- archi
|
324
332
|
- army
|
@@ -328,22 +336,32 @@ generic:
|
|
328
336
|
- attorney
|
329
337
|
- auction
|
330
338
|
- audio
|
339
|
+
- auto
|
331
340
|
- autos
|
332
341
|
- axa
|
342
|
+
- azure
|
333
343
|
- band
|
334
344
|
- bank
|
335
345
|
- bar
|
346
|
+
- barcelona
|
336
347
|
- barclaycard
|
337
348
|
- barclays
|
338
349
|
- bargains
|
339
350
|
- bauhaus
|
340
351
|
- bayern
|
341
352
|
- bbc
|
353
|
+
- bbva
|
354
|
+
- bcn
|
342
355
|
- beer
|
356
|
+
- bentley
|
343
357
|
- berlin
|
344
358
|
- best
|
359
|
+
- bet
|
360
|
+
- bharti
|
361
|
+
- bible
|
345
362
|
- bid
|
346
363
|
- bike
|
364
|
+
- bing
|
347
365
|
- bingo
|
348
366
|
- bio
|
349
367
|
- biz
|
@@ -352,11 +370,17 @@ generic:
|
|
352
370
|
- bloomberg
|
353
371
|
- blue
|
354
372
|
- bmw
|
373
|
+
- bnl
|
355
374
|
- bnpparibas
|
356
375
|
- boats
|
357
376
|
- bond
|
358
377
|
- boo
|
378
|
+
- boots
|
359
379
|
- boutique
|
380
|
+
- bradesco
|
381
|
+
- bridgestone
|
382
|
+
- broker
|
383
|
+
- brother
|
360
384
|
- brussels
|
361
385
|
- budapest
|
362
386
|
- build
|
@@ -378,17 +402,22 @@ generic:
|
|
378
402
|
- care
|
379
403
|
- career
|
380
404
|
- careers
|
405
|
+
- cars
|
381
406
|
- cartier
|
382
407
|
- casa
|
383
408
|
- cash
|
384
409
|
- casino
|
385
410
|
- cat
|
386
411
|
- catering
|
412
|
+
- cba
|
387
413
|
- cbn
|
414
|
+
- ceb
|
388
415
|
- center
|
389
416
|
- ceo
|
390
417
|
- cern
|
418
|
+
- cfa
|
391
419
|
- cfd
|
420
|
+
- chanel
|
392
421
|
- channel
|
393
422
|
- chat
|
394
423
|
- cheap
|
@@ -396,6 +425,7 @@ generic:
|
|
396
425
|
- christmas
|
397
426
|
- chrome
|
398
427
|
- church
|
428
|
+
- cisco
|
399
429
|
- citic
|
400
430
|
- city
|
401
431
|
- claims
|
@@ -403,6 +433,7 @@ generic:
|
|
403
433
|
- click
|
404
434
|
- clinic
|
405
435
|
- clothing
|
436
|
+
- cloud
|
406
437
|
- club
|
407
438
|
- coach
|
408
439
|
- codes
|
@@ -410,6 +441,7 @@ generic:
|
|
410
441
|
- college
|
411
442
|
- cologne
|
412
443
|
- com
|
444
|
+
- commbank
|
413
445
|
- community
|
414
446
|
- company
|
415
447
|
- computer
|
@@ -420,11 +452,14 @@ generic:
|
|
420
452
|
- cooking
|
421
453
|
- cool
|
422
454
|
- coop
|
455
|
+
- corsica
|
423
456
|
- country
|
457
|
+
- coupons
|
424
458
|
- courses
|
425
459
|
- credit
|
426
460
|
- creditcard
|
427
461
|
- cricket
|
462
|
+
- crown
|
428
463
|
- crs
|
429
464
|
- cruises
|
430
465
|
- cuisinella
|
@@ -441,6 +476,7 @@ generic:
|
|
441
476
|
- deals
|
442
477
|
- degree
|
443
478
|
- delivery
|
479
|
+
- delta
|
444
480
|
- democrat
|
445
481
|
- dental
|
446
482
|
- dentist
|
@@ -455,12 +491,15 @@ generic:
|
|
455
491
|
- discount
|
456
492
|
- dnp
|
457
493
|
- docs
|
494
|
+
- dog
|
458
495
|
- doha
|
459
496
|
- domains
|
460
497
|
- doosan
|
461
498
|
- download
|
499
|
+
- drive
|
462
500
|
- durban
|
463
501
|
- dvag
|
502
|
+
- earth
|
464
503
|
- eat
|
465
504
|
- edu
|
466
505
|
- education
|
@@ -483,8 +522,10 @@ generic:
|
|
483
522
|
- expert
|
484
523
|
- exposed
|
485
524
|
- express
|
525
|
+
- fage
|
486
526
|
- fail
|
487
527
|
- faith
|
528
|
+
- family
|
488
529
|
- fan
|
489
530
|
- fans
|
490
531
|
- farm
|
@@ -507,22 +548,27 @@ generic:
|
|
507
548
|
- football
|
508
549
|
- forex
|
509
550
|
- forsale
|
551
|
+
- forum
|
510
552
|
- foundation
|
511
553
|
- frl
|
512
554
|
- frogans
|
513
555
|
- fund
|
514
556
|
- furniture
|
515
557
|
- futbol
|
558
|
+
- fyi
|
516
559
|
- gal
|
517
560
|
- gallery
|
561
|
+
- game
|
518
562
|
- garden
|
519
563
|
- gbiz
|
520
564
|
- gdn
|
521
565
|
- gent
|
566
|
+
- genting
|
522
567
|
- ggee
|
523
568
|
- gift
|
524
569
|
- gifts
|
525
570
|
- gives
|
571
|
+
- giving
|
526
572
|
- glass
|
527
573
|
- gle
|
528
574
|
- global
|
@@ -542,6 +588,7 @@ generic:
|
|
542
588
|
- gratis
|
543
589
|
- green
|
544
590
|
- gripe
|
591
|
+
- group
|
545
592
|
- guge
|
546
593
|
- guide
|
547
594
|
- guitars
|
@@ -554,17 +601,28 @@ generic:
|
|
554
601
|
- here
|
555
602
|
- hermes
|
556
603
|
- hiphop
|
604
|
+
- hitachi
|
557
605
|
- hiv
|
606
|
+
- hockey
|
558
607
|
- holdings
|
559
608
|
- holiday
|
609
|
+
- homedepot
|
560
610
|
- homes
|
611
|
+
- honda
|
561
612
|
- horse
|
562
613
|
- host
|
563
614
|
- hosting
|
615
|
+
- hoteles
|
616
|
+
- hotmail
|
564
617
|
- house
|
565
618
|
- how
|
619
|
+
- hsbc
|
566
620
|
- ibm
|
621
|
+
- icbc
|
622
|
+
- ice
|
623
|
+
- icu
|
567
624
|
- ifm
|
625
|
+
- iinet
|
568
626
|
- immo
|
569
627
|
- immobilien
|
570
628
|
- industries
|
@@ -577,14 +635,21 @@ generic:
|
|
577
635
|
- int
|
578
636
|
- international
|
579
637
|
- investments
|
638
|
+
- ipiranga
|
580
639
|
- irish
|
640
|
+
- ist
|
641
|
+
- istanbul
|
642
|
+
- itau
|
581
643
|
- iwc
|
582
644
|
- java
|
583
645
|
- jcb
|
584
646
|
- jetzt
|
585
647
|
- jewelry
|
648
|
+
- jlc
|
649
|
+
- jll
|
586
650
|
- jobs
|
587
651
|
- joburg
|
652
|
+
- jprs
|
588
653
|
- juegos
|
589
654
|
- kaufen
|
590
655
|
- kddi
|
@@ -597,67 +662,86 @@ generic:
|
|
597
662
|
- kred
|
598
663
|
- kyoto
|
599
664
|
- lacaixa
|
665
|
+
- lancaster
|
600
666
|
- land
|
667
|
+
- lasalle
|
601
668
|
- lat
|
602
669
|
- latrobe
|
670
|
+
- law
|
603
671
|
- lawyer
|
604
672
|
- lds
|
605
673
|
- lease
|
606
674
|
- leclerc
|
607
675
|
- legal
|
676
|
+
- lexus
|
608
677
|
- lgbt
|
678
|
+
- liaison
|
609
679
|
- lidl
|
610
680
|
- life
|
611
681
|
- lighting
|
612
682
|
- limited
|
613
683
|
- limo
|
614
684
|
- link
|
685
|
+
- live
|
686
|
+
- lixil
|
615
687
|
- loan
|
616
688
|
- loans
|
689
|
+
- lol
|
617
690
|
- london
|
618
691
|
- lotte
|
619
692
|
- lotto
|
620
693
|
- love
|
621
694
|
- ltda
|
695
|
+
- lupin
|
622
696
|
- luxe
|
623
697
|
- luxury
|
624
698
|
- madrid
|
625
699
|
- maif
|
626
700
|
- maison
|
701
|
+
- man
|
627
702
|
- management
|
628
703
|
- mango
|
629
704
|
- market
|
630
705
|
- marketing
|
631
706
|
- markets
|
632
707
|
- marriott
|
708
|
+
- mba
|
633
709
|
- media
|
634
710
|
- meet
|
635
711
|
- melbourne
|
636
712
|
- meme
|
637
713
|
- memorial
|
714
|
+
- men
|
638
715
|
- menu
|
639
716
|
- miami
|
717
|
+
- microsoft
|
640
718
|
- mil
|
641
719
|
- mini
|
642
720
|
- mma
|
643
721
|
- mobi
|
644
722
|
- moda
|
645
723
|
- moe
|
724
|
+
- mom
|
646
725
|
- monash
|
647
726
|
- money
|
727
|
+
- montblanc
|
648
728
|
- mormon
|
649
729
|
- mortgage
|
650
730
|
- moscow
|
651
731
|
- motorcycles
|
652
732
|
- mov
|
653
733
|
- movie
|
734
|
+
- movistar
|
654
735
|
- mtn
|
655
736
|
- mtpc
|
656
737
|
- museum
|
738
|
+
- nadex
|
657
739
|
- nagoya
|
658
740
|
- name
|
659
741
|
- navy
|
742
|
+
- nec
|
660
743
|
- net
|
744
|
+
- netbank
|
661
745
|
- network
|
662
746
|
- neustar
|
663
747
|
- new
|
@@ -668,16 +752,21 @@ generic:
|
|
668
752
|
- nico
|
669
753
|
- ninja
|
670
754
|
- nissan
|
755
|
+
- nokia
|
671
756
|
- nra
|
672
757
|
- nrw
|
673
758
|
- ntt
|
674
759
|
- nyc
|
760
|
+
- office
|
675
761
|
- okinawa
|
762
|
+
- omega
|
676
763
|
- one
|
677
764
|
- ong
|
678
765
|
- onl
|
679
766
|
- online
|
680
767
|
- ooo
|
768
|
+
- oracle
|
769
|
+
- orange
|
681
770
|
- org
|
682
771
|
- organic
|
683
772
|
- osaka
|
@@ -689,7 +778,9 @@ generic:
|
|
689
778
|
- partners
|
690
779
|
- parts
|
691
780
|
- party
|
781
|
+
- pet
|
692
782
|
- pharmacy
|
783
|
+
- philips
|
693
784
|
- photo
|
694
785
|
- photography
|
695
786
|
- photos
|
@@ -701,6 +792,7 @@ generic:
|
|
701
792
|
- pink
|
702
793
|
- pizza
|
703
794
|
- place
|
795
|
+
- play
|
704
796
|
- plumbing
|
705
797
|
- plus
|
706
798
|
- pohl
|
@@ -720,6 +812,7 @@ generic:
|
|
720
812
|
- quebec
|
721
813
|
- racing
|
722
814
|
- realtor
|
815
|
+
- realty
|
723
816
|
- recipes
|
724
817
|
- red
|
725
818
|
- redstone
|
@@ -728,6 +821,7 @@ generic:
|
|
728
821
|
- reisen
|
729
822
|
- reit
|
730
823
|
- ren
|
824
|
+
- rent
|
731
825
|
- rentals
|
732
826
|
- repair
|
733
827
|
- report
|
@@ -737,16 +831,22 @@ generic:
|
|
737
831
|
- review
|
738
832
|
- reviews
|
739
833
|
- rich
|
834
|
+
- ricoh
|
740
835
|
- rio
|
741
836
|
- rip
|
742
837
|
- rocks
|
743
838
|
- rodeo
|
744
839
|
- rsvp
|
745
840
|
- ruhr
|
841
|
+
- run
|
746
842
|
- ryukyu
|
747
843
|
- saarland
|
844
|
+
- sakura
|
748
845
|
- sale
|
749
846
|
- samsung
|
847
|
+
- sandvik
|
848
|
+
- sandvikcoromant
|
849
|
+
- sanofi
|
750
850
|
- sap
|
751
851
|
- sarl
|
752
852
|
- saxo
|
@@ -758,8 +858,11 @@ generic:
|
|
758
858
|
- schule
|
759
859
|
- schwarz
|
760
860
|
- science
|
861
|
+
- scor
|
761
862
|
- scot
|
762
863
|
- seat
|
864
|
+
- seek
|
865
|
+
- sener
|
763
866
|
- services
|
764
867
|
- sew
|
765
868
|
- sex
|
@@ -770,7 +873,11 @@ generic:
|
|
770
873
|
- shriram
|
771
874
|
- singles
|
772
875
|
- site
|
876
|
+
- ski
|
773
877
|
- sky
|
878
|
+
- skype
|
879
|
+
- sncf
|
880
|
+
- soccer
|
774
881
|
- social
|
775
882
|
- software
|
776
883
|
- sohu
|
@@ -781,6 +888,10 @@ generic:
|
|
781
888
|
- space
|
782
889
|
- spiegel
|
783
890
|
- spreadbetting
|
891
|
+
- srl
|
892
|
+
- starhub
|
893
|
+
- statoil
|
894
|
+
- studio
|
784
895
|
- study
|
785
896
|
- style
|
786
897
|
- sucks
|
@@ -790,18 +901,25 @@ generic:
|
|
790
901
|
- surf
|
791
902
|
- surgery
|
792
903
|
- suzuki
|
904
|
+
- swatch
|
905
|
+
- swiss
|
793
906
|
- sydney
|
794
907
|
- systems
|
795
908
|
- taipei
|
909
|
+
- tatamotors
|
796
910
|
- tatar
|
797
911
|
- tattoo
|
798
912
|
- tax
|
913
|
+
- taxi
|
799
914
|
- team
|
800
915
|
- tech
|
801
916
|
- technology
|
802
917
|
- tel
|
918
|
+
- telefonica
|
803
919
|
- temasek
|
804
920
|
- tennis
|
921
|
+
- thd
|
922
|
+
- theater
|
805
923
|
- tickets
|
806
924
|
- tienda
|
807
925
|
- tips
|
@@ -811,9 +929,11 @@ generic:
|
|
811
929
|
- tokyo
|
812
930
|
- tools
|
813
931
|
- top
|
932
|
+
- toray
|
814
933
|
- toshiba
|
815
934
|
- tours
|
816
935
|
- town
|
936
|
+
- toyota
|
817
937
|
- toys
|
818
938
|
- trade
|
819
939
|
- trading
|
@@ -821,6 +941,7 @@ generic:
|
|
821
941
|
- travel
|
822
942
|
- trust
|
823
943
|
- tui
|
944
|
+
- ubs
|
824
945
|
- university
|
825
946
|
- uno
|
826
947
|
- uol
|
@@ -834,7 +955,10 @@ generic:
|
|
834
955
|
- viajes
|
835
956
|
- video
|
836
957
|
- villas
|
958
|
+
- vin
|
837
959
|
- vision
|
960
|
+
- vista
|
961
|
+
- vistaprint
|
838
962
|
- vlaanderen
|
839
963
|
- vodka
|
840
964
|
- vote
|
@@ -842,6 +966,7 @@ generic:
|
|
842
966
|
- voto
|
843
967
|
- voyage
|
844
968
|
- wales
|
969
|
+
- walter
|
845
970
|
- wang
|
846
971
|
- watch
|
847
972
|
- webcam
|
@@ -854,14 +979,18 @@ generic:
|
|
854
979
|
- wiki
|
855
980
|
- williamhill
|
856
981
|
- win
|
982
|
+
- windows
|
983
|
+
- wine
|
857
984
|
- wme
|
858
985
|
- work
|
859
986
|
- works
|
860
987
|
- world
|
861
988
|
- wtc
|
862
989
|
- wtf
|
990
|
+
- xbox
|
863
991
|
- xerox
|
864
992
|
- xin
|
993
|
+
- xperia
|
865
994
|
- xxx
|
866
995
|
- xyz
|
867
996
|
- yachts
|
@@ -873,49 +1002,64 @@ generic:
|
|
873
1002
|
- zip
|
874
1003
|
- zone
|
875
1004
|
- zuerich
|
876
|
-
- дети
|
877
|
-
-
|
878
|
-
-
|
879
|
-
-
|
880
|
-
-
|
881
|
-
-
|
882
|
-
-
|
883
|
-
-
|
884
|
-
-
|
885
|
-
-
|
886
|
-
-
|
887
|
-
-
|
888
|
-
-
|
889
|
-
-
|
890
|
-
-
|
891
|
-
-
|
892
|
-
-
|
893
|
-
-
|
894
|
-
-
|
895
|
-
-
|
896
|
-
-
|
897
|
-
-
|
898
|
-
-
|
899
|
-
-
|
900
|
-
-
|
901
|
-
-
|
902
|
-
-
|
903
|
-
-
|
904
|
-
-
|
905
|
-
-
|
906
|
-
-
|
907
|
-
-
|
908
|
-
-
|
909
|
-
-
|
910
|
-
-
|
911
|
-
-
|
912
|
-
-
|
913
|
-
-
|
914
|
-
-
|
915
|
-
-
|
916
|
-
-
|
917
|
-
-
|
918
|
-
-
|
919
|
-
-
|
920
|
-
-
|
1005
|
+
- "дети"
|
1006
|
+
- "ком"
|
1007
|
+
- "москва"
|
1008
|
+
- "онлайн"
|
1009
|
+
- "орг"
|
1010
|
+
- "рус"
|
1011
|
+
- "сайт"
|
1012
|
+
- "קום"
|
1013
|
+
- "بازار"
|
1014
|
+
- "شبكة"
|
1015
|
+
- "كوم"
|
1016
|
+
- "موقع"
|
1017
|
+
- "कॉम"
|
1018
|
+
- "नेट"
|
1019
|
+
- "संगठन"
|
1020
|
+
- "คอม"
|
1021
|
+
- "みんな"
|
1022
|
+
- "グーグル"
|
1023
|
+
- "コム"
|
1024
|
+
- "世界"
|
1025
|
+
- "中信"
|
1026
|
+
- "中文网"
|
1027
|
+
- "企业"
|
1028
|
+
- "佛山"
|
1029
|
+
- "信息"
|
1030
|
+
- "健康"
|
1031
|
+
- "八卦"
|
1032
|
+
- "公司"
|
1033
|
+
- "公益"
|
1034
|
+
- "商城"
|
1035
|
+
- "商店"
|
1036
|
+
- "商标"
|
1037
|
+
- "在线"
|
1038
|
+
- "大拿"
|
1039
|
+
- "娱乐"
|
1040
|
+
- "工行"
|
1041
|
+
- "广东"
|
1042
|
+
- "慈善"
|
1043
|
+
- "我爱你"
|
1044
|
+
- "手机"
|
1045
|
+
- "政务"
|
1046
|
+
- "政府"
|
1047
|
+
- "新闻"
|
1048
|
+
- "时尚"
|
1049
|
+
- "机构"
|
1050
|
+
- "淡马锡"
|
1051
|
+
- "游戏"
|
1052
|
+
- "点看"
|
1053
|
+
- "移动"
|
1054
|
+
- "组织机构"
|
1055
|
+
- "网址"
|
1056
|
+
- "网店"
|
1057
|
+
- "网络"
|
1058
|
+
- "谷歌"
|
1059
|
+
- "集团"
|
1060
|
+
- "飞利浦"
|
1061
|
+
- "餐厅"
|
1062
|
+
- "닷넷"
|
1063
|
+
- "닷컴"
|
1064
|
+
- "삼성"
|
921
1065
|
- onion
|
@@ -47,10 +47,12 @@ module Twitter
|
|
47
47
|
entities = json.values().flatten()
|
48
48
|
|
49
49
|
# map JSON entity to twitter-text entity
|
50
|
-
|
51
|
-
|
50
|
+
# be careful not to alter arguments received
|
51
|
+
entities.map! do |entity|
|
52
|
+
entity = HashHelper.symbolize_keys(entity)
|
52
53
|
# hashtag
|
53
54
|
entity[:hashtag] = entity[:text] if entity[:text]
|
55
|
+
entity
|
54
56
|
end
|
55
57
|
|
56
58
|
auto_link_entities(text, entities, options)
|
@@ -229,8 +231,9 @@ module Twitter
|
|
229
231
|
|
230
232
|
def url_entities_hash(url_entities)
|
231
233
|
(url_entities || {}).inject({}) do |entities, entity|
|
232
|
-
|
233
|
-
|
234
|
+
# be careful not to alter arguments received
|
235
|
+
_entity = HashHelper.symbolize_keys(entity)
|
236
|
+
entities[_entity[:url]] = _entity
|
234
237
|
entities
|
235
238
|
end
|
236
239
|
end
|
@@ -6,7 +6,7 @@ module Twitter
|
|
6
6
|
# { 'name' => 'Rob', 'years' => '28' }.symbolize_keys
|
7
7
|
# #=> { :name => "Rob", :years => "28" }
|
8
8
|
def self.symbolize_keys(hash)
|
9
|
-
hash.dup
|
9
|
+
symbolize_keys!(hash.dup)
|
10
10
|
end
|
11
11
|
|
12
12
|
# Destructively convert all keys to symbols, as long as they respond
|
data/lib/twitter-text/regex.rb
CHANGED
@@ -114,7 +114,7 @@ module Twitter
|
|
114
114
|
# Used in Extractor for final filtering
|
115
115
|
REGEXEN[:end_hashtag_match] = /\A(?:[##]|:\/\/)/o
|
116
116
|
|
117
|
-
REGEXEN[:valid_mention_preceding_chars] = /(?:[^a-zA-Z0-9_!#\$%&*@@]|^|[rR][tT]:?)/o
|
117
|
+
REGEXEN[:valid_mention_preceding_chars] = /(?:[^a-zA-Z0-9_!#\$%&*@@]|^|(?:^|[^a-zA-Z0-9_+~.-])[rR][tT]:?)/o
|
118
118
|
REGEXEN[:at_signs] = /[@@]/
|
119
119
|
REGEXEN[:valid_mention_or_list] = /
|
120
120
|
(#{REGEXEN[:valid_mention_preceding_chars]}) # $1: Preceeding character
|
@@ -208,7 +208,7 @@ module Twitter
|
|
208
208
|
)/iox
|
209
209
|
|
210
210
|
REGEXEN[:valid_url_query_chars] = /[a-z0-9!?\*'\(\);:&=\+\$\/%#\[\]\-_\.,~|@]/i
|
211
|
-
REGEXEN[:valid_url_query_ending_chars] = /[a-z0-9_
|
211
|
+
REGEXEN[:valid_url_query_ending_chars] = /[a-z0-9_&=#\/\-]/i
|
212
212
|
REGEXEN[:valid_url] = %r{
|
213
213
|
( # $1 total match
|
214
214
|
(#{REGEXEN[:valid_url_preceding_chars]}) # $2 Preceeding chracter
|
@@ -5,9 +5,9 @@ module Twitter
|
|
5
5
|
MAX_LENGTH = 140
|
6
6
|
|
7
7
|
DEFAULT_TCO_URL_LENGTHS = {
|
8
|
-
:short_url_length =>
|
8
|
+
:short_url_length => 23,
|
9
9
|
:short_url_length_https => 23,
|
10
|
-
:characters_reserved_per_media =>
|
10
|
+
:characters_reserved_per_media => 23
|
11
11
|
}.freeze
|
12
12
|
|
13
13
|
# 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
CHANGED
@@ -35,7 +35,8 @@ module TestUrls
|
|
35
35
|
"t.co/nwcLTFF",
|
36
36
|
"http://foobar.みんな",
|
37
37
|
"http://foobar.中国",
|
38
|
-
"http://foobar.پاکستان"
|
38
|
+
"http://foobar.پاکستان",
|
39
|
+
"https://www.youtube.com/playlist?list=PL0ZPu8XSRTB7wZzn0mLHMvyzVFeRxbWn-"
|
39
40
|
] unless defined?(TestUrls::VALID)
|
40
41
|
|
41
42
|
INVALID = [
|
data/twitter-text.gemspec
CHANGED
@@ -2,7 +2,7 @@
|
|
2
2
|
|
3
3
|
Gem::Specification.new do |s|
|
4
4
|
s.name = "twitter-text"
|
5
|
-
s.version = "1.
|
5
|
+
s.version = "1.13.0"
|
6
6
|
s.authors = ["Matt Sanford", "Patrick Ewing", "Ben Cherry", "Britt Selvitelle",
|
7
7
|
"Raffi Krikorian", "J.P. Cummins", "Yoshimasa Niwa", "Keita Fujii", "James Koval"]
|
8
8
|
s.email = ["matt@twitter.com", "patrick.henry.ewing@gmail.com", "bcherry@gmail.com", "bs@brittspace.com",
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: twitter-text
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.
|
4
|
+
version: 1.13.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Matt Sanford
|
@@ -16,7 +16,7 @@ authors:
|
|
16
16
|
autorequire:
|
17
17
|
bindir: bin
|
18
18
|
cert_chain: []
|
19
|
-
date: 2015-
|
19
|
+
date: 2015-08-26 00:00:00.000000000 Z
|
20
20
|
dependencies:
|
21
21
|
- !ruby/object:Gem::Dependency
|
22
22
|
name: multi_json
|
@@ -184,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
184
184
|
version: '0'
|
185
185
|
requirements: []
|
186
186
|
rubyforge_project:
|
187
|
-
rubygems_version: 2.4.
|
187
|
+
rubygems_version: 2.4.7
|
188
188
|
signing_key:
|
189
189
|
specification_version: 4
|
190
190
|
summary: Twitter text handling library
|