dtext_rb 1.0.11 → 1.0.12

data/ext/dtext/dtext.rl

@@ -26,6 +26,7 @@ typedef struct StateMachine {
   const char * b2;
   bool f_inline;
   bool f_strip;
+  bool f_mentions;
   bool list_mode;
   bool header_mode;
   GString * output;
@@ -321,7 +322,7 @@ inline := |*
     append(sm, true, "<a href=\"");
     append_segment_html_escaped(sm, sm->b1, sm->b2 - sm->d);
     append(sm, true, "\">");
-    link_content_sm = parse_helper(sm->a1, sm->a2 - sm->a1, false, true);
+    link_content_sm = parse_helper(sm->a1, sm->a2 - sm->a1, false, true, false);
     append(sm, true, link_content_sm->output->str);
     free_machine(link_content_sm);
     link_content_sm = NULL;
@@ -366,23 +367,30 @@ inline := |*
   };
 
   mention => {
-    if (is_boundary_c(fc)) {
-      sm->b = true;
-      sm->d = 2;
+    if (!sm->f_mentions || (sm->a1 > sm->pb && sm->a1 - 1 > sm->pb && sm->a1[-2] != ' ' && sm->a1[-2] != '\r' && sm->a1[-2] != '\n')) {
+      // handle emails
+      append_c(sm, '@');
+      append_segment_html_escaped(sm, sm->a1, sm->a2 - 1);
+
     } else {
-      sm->b = false;
-      sm->d = 1;
-    }
+      if (is_boundary_c(fc)) {
+        sm->b = true;
+        sm->d = 2;
+      } else {
+        sm->b = false;
+        sm->d = 1;
+      }
 
-    append(sm, true, "<a rel=\"nofollow\" href=\"/users?name=");
-    append_segment_uri_escaped(sm, sm->a1, sm->a2 - sm->d);
-    append(sm, true, "\">");
-    append_c(sm, '@');
-    append_segment_html_escaped(sm, sm->a1, sm->a2 - sm->d);
-    append(sm, true, "</a>");
+      append(sm, true, "<a rel=\"nofollow\" href=\"/users?name=");
+      append_segment_uri_escaped(sm, sm->a1, sm->a2 - sm->d);
+      append(sm, true, "\">");
+      append_c(sm, '@');
+      append_segment_html_escaped(sm, sm->a1, sm->a2 - sm->d);
+      append(sm, true, "</a>");
 
-    if (sm->b) {
-      append_c_html_escaped(sm, fc);
+      if (sm->b) {
+        append_c_html_escaped(sm, fc);
+      }
     }
   };
 
@@ -807,6 +815,7 @@ main := |*
   header_with_id => {
     char header = *sm->a1;
     GString * id_name = g_string_new_len(sm->b1, sm->b2 - sm->b1);
+    id_name = g_string_prepend(id_name, "dtext-");
 
     if (sm->f_inline) {
       header = '6';
@@ -1338,6 +1347,7 @@ static void init_machine(StateMachine * sm, const char * src, size_t len) {
   sm->b2 = NULL;
   sm->f_inline = false;
   sm->f_strip = false;
+  sm->f_mentions = true;
   sm->stack = g_array_sized_new(FALSE, TRUE, sizeof(int), 16);
   sm->dstack = g_queue_new();
   sm->list_nest = 0;
@@ -1355,7 +1365,7 @@ static void free_machine(StateMachine * sm) {
   g_free(sm);
 }
 
-static StateMachine * parse_helper(const char * src, size_t len, bool f_strip, bool f_inline) {
+static StateMachine * parse_helper(const char * src, size_t len, bool f_strip, bool f_inline, bool f_mentions) {
   StateMachine * sm = NULL;
   StateMachine * link_content_sm = NULL;
 
@@ -1363,6 +1373,7 @@ static StateMachine * parse_helper(const char * src, size_t len, bool f_strip, b
   init_machine(sm, src, len);
   sm->f_strip = f_strip;
   sm->f_inline = f_inline;
+  sm->f_mentions = f_mentions;
 
   %% write init;
   %% write exec;
@@ -1378,11 +1389,13 @@ static VALUE parse(int argc, VALUE * argv, VALUE self) {
   VALUE options;
   VALUE opt_inline;
   VALUE opt_strip;
+  VALUE opt_mentions;
   VALUE ret;
   rb_encoding * encoding = NULL;
   StateMachine * sm = NULL;
   bool f_strip = false;
   bool f_inline = false;
+  bool f_mentions = true;
 
   g_debug("start\n");
 
@@ -1412,10 +1425,15 @@ static VALUE parse(int argc, VALUE * argv, VALUE self) {
       if (RTEST(opt_inline)) {
         f_inline = true;
       }
+
+      opt_mentions = rb_hash_aref(options, ID2SYM(rb_intern("disable_mentions")));
+      if (RTEST(opt_mentions)) {
+        f_mentions = false;
+      }
     }
   }
 
-  sm = parse_helper(RSTRING_PTR(input0), RSTRING_LEN(input0), f_strip, f_inline);
+  sm = parse_helper(RSTRING_PTR(input0), RSTRING_LEN(input0), f_strip, f_inline, f_mentions);
 
   encoding = rb_enc_find("utf-8");
   ret = rb_enc_str_new(sm->output->str, sm->output->len, encoding);

data/test/dtext_test.rb

@@ -10,7 +10,9 @@ class DTextTest < Minitest::Test
     assert_parse('<p><a rel="nofollow" href="/users?name=bob">@bob</a></p>', "@bob")
     assert_parse('<p>hi <a rel="nofollow" href="/users?name=bob">@bob</a></p>', "hi @bob")
     assert_parse('<p>this is not @.@ @_@ <a rel="nofollow" href="/users?name=bob">@bob</a></p>', "this is not @.@ @_@ @bob")
+    assert_parse('<p>this is an email@address.com and should not trigger</p>', "this is an email@address.com and should not trigger")
     assert_parse('<p>multiple <a rel="nofollow" href="/users?name=bob">@bob</a> <a rel="nofollow" href="/users?name=anna">@anna</a></p>', "multiple @bob @anna")
+    assert_equal('<p>hi @bob</p>', DTextRagel.parse("hi @bob", :disable_mentions => true))
   end
 
   def test_sanitize_heart
@@ -83,7 +85,7 @@ class DTextTest < Minitest::Test
   end
 
   def test_headers_with_ids
-    assert_parse("<h1 id=\"blah-blah\">header</h1>", "h1#blah-blah. header")
+    assert_parse("<h1 id=\"dtext-blah-blah\">header</h1>", "h1#blah-blah. header")
   end
 
   def test_headers_with_ids_with_quote

metadata

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