twitter-text 1.1.6 → 1.1.7

data/Rakefile

@@ -9,7 +9,7 @@ require 'digest'
 
 spec = Gem::Specification.new do |s|
   s.name = "twitter-text"
-  s.version = "1.1.6"
+  s.version = "1.1.7"
   s.authors = ["Matt Sanford", "Patrick Ewing", "Ben Cherry", "Britt Selvitelle", "Raffi Krikorian"]
   s.email = ["matt@twitter.com", "patrick.henry.ewing@gmail.com", "bcherry@gmail.com", "bs@brittspace.com", "raffi@twitter.com"]
   s.homepage = "http://twitter.com"

data/lib/regex.rb

@@ -33,9 +33,9 @@ module Twitter
 
     major, minor, patch = RUBY_VERSION.split(/\./)
     if major.to_i >= 1 && minor.to_i >= 9
-      REGEXEN[:list_name] = /^[a-zA-Z\u0080-\u00ff].{0,79}$/
+      REGEXEN[:list_name] = /[a-zA-Z][a-zA-Z0-9_\-\u0080-\u00ff]{0,24}/
     else
-      REGEXEN[:list_name] = /^[a-zA-Z\x80-\xff].{0,79}$/
+      REGEXEN[:list_name] = /[a-zA-Z][a-zA-Z0-9_\-\x80-\xff]{0,24}/
     end
 
     # Latin accented characters (subtracted 0xD7 from the range, it's a confusable multiplication sign. Looks like "x")
@@ -45,7 +45,7 @@ module Twitter
     # Characters considered valid in a hashtag but not at the beginning, where only a-z and 0-9 are valid.
     HASHTAG_CHARACTERS = /[a-z0-9_#{LATIN_ACCENTS}]/io
     REGEXEN[:auto_link_hashtags] = /(^|[^0-9A-Z&\/]+)(#|＃)([0-9A-Z_]*[A-Z_]+#{HASHTAG_CHARACTERS}*)/io
-    REGEXEN[:auto_link_usernames_or_lists] = /([^a-zA-Z0-9_]|^)([@＠]+)([a-zA-Z0-9_]{1,20})(\/[a-zA-Z][a-zA-Z0-9\u0080-\u00ff\-]{0,79})?/
+    REGEXEN[:auto_link_usernames_or_lists] = /([^a-zA-Z0-9_]|^)([@＠]+)([a-zA-Z0-9_]{1,20})(\/#{REGEXEN[:list_name]})?/o
     REGEXEN[:auto_link_emoticon] = /(8\-\#|8\-E|\+\-\(|\`\@|\`O|\<\|:~\(|\}:o\{|:\-\[|\>o\<|X\-\/|\[:-\]\-I\-|\/\/\/\/Ö\\\\\\\\|\(\|:\|\/\)|∑:\*\)|\( \| \))/
 
     # URL related hash regex collection

data/spec/autolinking_spec.rb

@@ -171,12 +171,12 @@ describe Twitter::Autolink do
 
       context "username over twenty characters" do
         def original_text
-          @eighty_character_list = "jack/" + ("a" * 80)
-          "@#{@eighty_character_list}12345"
+          @twentyfive_character_list = "jack/" + ("a" * 25)
+          "@#{@twentyfive_character_list}12345"
         end
 
         it "should be linked" do
-          @autolinked_text.should link_to_list_path(@eighty_character_list)
+          @autolinked_text.should link_to_list_path(@twentyfive_character_list)
         end
       end
     end

data/spec/regex_spec.rb

@@ -34,11 +34,5 @@ describe "Twitter::Regex regular expressions" do
       name.should match(Twitter::Regex[:list_name])
     end
 
-    it "should match Japense names less than 25 characters" do
-      name = CGI.unescape("%E4%B9%97")
-      name.length.should < 25
-      name.should match(Twitter::Regex[:list_name])
-    end
-
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: twitter-text
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 1
   - 1
-  - 6
-  version: 1.1.6
+  - 7
+  version: 1.1.7
 platform: ruby
 authors: 
 - Matt Sanford
@@ -19,7 +19,7 @@ autorequire: ""
 bindir: bin
 cert_chain: []
 
-date: 2010-08-10 00:00:00 -07:00
+date: 2010-08-19 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency