dtext_rb 1.0.12 → 1.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6dc8726968b6ed437ba690472b77761d8d9d1e3
-  data.tar.gz: e0ef0b7f8183e18ca1406f116796a5e59c35ac64
+  metadata.gz: 9821e7f5baf5116232cdf41d824b576e97e497dd
+  data.tar.gz: 3f9da0fcfb340e3edb2fddbefb67e116ef3b2357
 SHA512:
-  metadata.gz: 2b4b8c8f1cbf0819209b63e338425d0fea927ead929396536f9f44b15ed90eecae9182eab32bef172dcb5fb2b0d7342cda7b66b598fe781f89a9340b415df18e
-  data.tar.gz: 57807906d40b4f86ea8c57ea9fa61d039a45b6659e97ca69a7bc58314daa5a0cd2f552319fe49e6bb62c95c61396e8e93da54cc42d344cd9151d2975790404de
+  metadata.gz: 7cbb109618adcc8c1bd52d7a38009edc59c4dea62e8247f7f5186bd9aa01044f95488b9c6fef28d1253e4f9699ba8b21f2fe28aa1491e9b187c6114114fdfc86
+  data.tar.gz: 58fc6527a37ee34def27534a1ad2311e6366977fee897048d01beff1ec551e99df25ef8eee364cfe951ad36e26964f480626201d63b7f12536592f5b75d22a2c

data/VERSION

@@ -1 +1 @@
-1.0.12
+1.0.13

data/dtext_rb.gemspec

@@ -2,17 +2,17 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: dtext_rb 1.0.12 ruby lib
+# stub: dtext_rb 1.0.13 ruby lib
 # stub: ext/dtext/extconf.rb
 
 Gem::Specification.new do |s|
   s.name = "dtext_rb"
-  s.version = "1.0.12"
+  s.version = "1.0.13"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["r888888888"]
-  s.date = "2016-09-08"
+  s.date = "2016-09-23"
   s.description = "Compield DText parser"
   s.email = "r888888888@gmail.com"
   s.extensions = ["ext/dtext/extconf.rb"]

data/ext/dtext/dtext.rl

@@ -120,10 +120,16 @@ nonpipe = ^'|';
 nonpipebracket = nonpipe & nonbracket;
 noncurly = ^'}';
 
-mention = '@' graph+ >mark_a1 %mark_a2;
+utf8graph = (0x00..0x7F) & graph
+          | 0xC2..0xDF 0x80..0xBF
+          | 0xE0..0xEF 0x80..0xBF 0x80..0xBF
+          | 0xF0..0xF4 0x80..0xBF 0x80..0xBF 0x80..0xBF;
 
-url = 'http' 's'? '://' graph+;
-internal_url = '/' graph+;
+
+mention = '@' utf8graph+ >mark_a1 %mark_a2;
+
+url = 'http' 's'? '://' utf8graph+;
+internal_url = '/' utf8graph+;
 basic_textile_link = '"' nonquote+ >mark_a1 '"' >mark_a2 ':' (url | internal_url) >mark_b1 %mark_b2;
 bracketed_textile_link = '"' nonquote+ >mark_a1 '"' >mark_a2 ':[' (url | internal_url) >mark_b1 %mark_b2 :>> ']';
 

data/test/dtext_test.rb

@@ -256,4 +256,16 @@ class DTextTest < Minitest::Test
   def test_old_asterisks
     assert_parse("<p>hello *world* neutral</p>", "hello *world* neutral")
   end
+
+  def test_utf8_mentions
+    assert_parse('<p><a rel="nofollow" href="/users?name=葉月">@葉月</a></p>', "@葉月")
+    assert_parse('<p>Hello <a rel="nofollow" href="/users?name=葉月">@葉月</a> and <a rel="nofollow" href="/users?name=Alice">@Alice</a></p>', "Hello @葉月 and @Alice")
+    assert_parse('<p>Should not parse 葉月@葉月</p>', "Should not parse 葉月@葉月")
+  end
+
+  def test_utf8_links
+    assert_parse('<p><a href="/posts?tags=approver:葉月">7893</a></p>', '"7893":/posts?tags=approver:葉月')
+    assert_parse('<p><a href="/posts?tags=approver:葉月">7893</a></p>', '"7893":[/posts?tags=approver:葉月]')
+    assert_parse('<p><a href="http://danbooru.donmai.us/posts?tags=approver:葉月">http://danbooru.donmai.us/posts?tags=approver:葉月</a></p>', 'http://danbooru.donmai.us/posts?tags=approver:葉月')
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dtext_rb
 version: !ruby/object:Gem::Version
-  version: 1.0.12
+  version: 1.0.13
 platform: ruby
 authors:
 - r888888888
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-08 00:00:00.000000000 Z
+date: 2016-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest