dtext_rb 1.0.4 → 1.0.5

data/ext/dtext/dtext.rl

@@ -3,6 +3,7 @@
 #define PRETTY_PRINT 0
 
 #include <ruby.h>
+#include <ruby/encoding.h>
 #include <stdio.h>
 #include <stdint.h>
 #include <stdbool.h>
@@ -388,6 +389,9 @@ inline := |*
     } else if (dstack_check(sm, BLOCK_P)) {
       g_debug("  rewind p");
       dstack_rewind(sm);
+    } else if (sm->header_mode) {
+      g_debug("  rewind header");
+      dstack_rewind(sm);
     }
 
     g_debug("  next list");
@@ -587,7 +591,6 @@ inline := |*
 
     if (sm->list_mode) {
       dstack_close_list(sm);
-      sm->list_mode = false;
     }
 
     fexec sm->ts;
@@ -884,7 +887,7 @@ main := |*
     dstack_push(sm, &BLOCK_EXPAND);
     append_block(sm, "<div class=\"expandable\"><div class=\"expandable-header\">");
     append(sm, true, "<span>");
-    append_segment_html_escaped(sm, sm->a1, sm->a2 - 2);
+    append_segment_html_escaped(sm, sm->a1, sm->a2 - 1);
     append(sm, true, "</span>");
     append_block(sm, "<input type=\"button\" value=\"Show\" class=\"expandable-button\"/></div>");
     append_block(sm, "<div class=\"expandable-content\">");
@@ -934,6 +937,8 @@ main := |*
     if (sm->header_mode) {
       sm->header_mode = false;
       dstack_rewind(sm);
+    } else if (sm->list_mode) {
+      dstack_close_list(sm);
     } else {
       dstack_close_before_block(sm);
     }
@@ -1211,6 +1216,9 @@ static void dstack_close_list(StateMachine * sm) {
   while (dstack_check(sm, BLOCK_LI) || dstack_check(sm, BLOCK_UL)) {
     dstack_rewind(sm);
   }
+
+  sm->list_mode = false;
+  sm->list_nest = 0;
 }
 
 static inline bool is_boundary_c(char c) {
@@ -1280,6 +1288,7 @@ static VALUE parse(int argc, VALUE * argv, VALUE self) {
   VALUE opt_inline;
   VALUE opt_strip;
   VALUE ret;
+  rb_encoding * encoding = NULL;
   StateMachine * sm = NULL;
 
   g_debug("start\n");
@@ -1315,7 +1324,8 @@ static VALUE parse(int argc, VALUE * argv, VALUE self) {
 
   dstack_close(sm);
 
-  ret = rb_str_new(sm->output->str, sm->output->len);
+  encoding = rb_enc_find("utf-8");
+  ret = rb_enc_str_new(sm->output->str, sm->output->len, encoding);
 
   free_machine(sm);
 

data/test/dtext_test.rb

@@ -75,6 +75,7 @@ class DTextTest < Minitest::Test
 
   def test_headers
     assert_parse("<h1>header</h1>", "h1. header")
+    assert_parse("<ul><li>a</li></ul><h1>header</h1><ul><li>list</li></ul>", "* a\n\nh1. header\n* list")
   end
 
   def test_quote_blocks

data/test/test_wiki_pages.rb

@@ -1,4 +1,4 @@
-Dir["/dev_exclusions/dtext_bench/wiki_pages/*.txt"].sort.slice(20, 10).each do |file|
+Dir["/dev_exclusions/dtext_bench/wiki_pages/*.txt"].sort.slice(30, 10).each do |file|
   input = File.read(file)
   o1 = DTextRagel.parse(input.dup).gsub(/\s+<\/p>/, "</p>")
   o2 = DTextRuby.parse(input.dup).gsub(/\r/, "").gsub(/\s+<\/p>/, "</p>")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dtext_rb
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - r888888888
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-25 00:00:00.000000000 Z
+date: 2016-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest