markly 0.2.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93a192bb4cf0e216365ffa17fc619ecc726cb7cbd9a3661ae3357ce5a8dbb1c4
-  data.tar.gz: ec39190db7ad173cdbbcddd73850fc07faa578d37892217cedd329efad060610
+  metadata.gz: 382ef4ee5a2e69398268595c59f914fc694c1fa0e450b7ba2f74a6ef06d17ede
+  data.tar.gz: 5d7119359d1f485980ac4ba9736384f0c67ac0002133021fccf3aa81896ef46e
 SHA512:
-  metadata.gz: 5668b9796316e769f73a6d97c495116e3361b9cc0a12fa92c8ec35461954a63d7568e8975af4720d060605ccb2ecdcc96bf123da2074271216a2e55e3afa378d
-  data.tar.gz: 132e25acaad81e6953c4c25a206dc6e37ba0f2cff3176887fb81882817edd81fa6c2a8eb24cf274046635b30f1179832f2daeb00ec78e18f4afb537166e4aab7
+  metadata.gz: 9b941bb485e19ed83aa4268e5586f39fdc4919e9dc6362dd729980b698a5f35e26299a742382e6055ee644d297393c0c1e95ef8cac5003765beb9ff47f1dc384
+  data.tar.gz: 356b61f0db0b4c0fa57d2cca31943264daaad9c31ed2bc5a04d7cdebf0fa27d863215c1ae1a48372d5ccc1b9a52a287ad8fee3657a778667d76cb3bf37592dff

data/ext/markly/markly.c

@@ -41,11 +41,15 @@ static VALUE sym_right;
 static VALUE sym_center;
 
 static void rb_Markly_Node_free(void *data) {
-	// It's important that the `free` function does not inspect the node data, as it may be part of a tree that was already freed.
-	cmark_node *node = (cmark_node*)data;
-	
-	if (cmark_node_parent(node) == NULL) {
-		cmark_node_free(node);
+	// If a parent of this node is already freed, `rb_Markly_Node_freed` will ensure all the nodes are nullified.
+	if (data) {
+		cmark_node *node = (cmark_node*)data;
+		
+		if (cmark_node_parent(node) == NULL) {
+			cmark_node_free(node);
+		} else {
+			cmark_node_set_user_data(node, NULL);
+		}
 	}
 }
 
@@ -79,6 +83,12 @@ static const rb_data_type_t rb_Markly_Node_Type = {
 	.flags = RUBY_TYPED_FREE_IMMEDIATELY,
 };
 
+static void rb_Markly_Node_freed(cmark_mem *mem, void *user_data) {
+	VALUE self = (VALUE)user_data;
+	
+	RTYPEDDATA_DATA(self) = NULL;
+}
+
 static VALUE rb_Markly_Node_wrap(cmark_node *node) {
 	if (node == NULL)
 		return Qnil;
@@ -91,6 +101,7 @@ static VALUE rb_Markly_Node_wrap(cmark_node *node) {
 	
 	VALUE self = TypedData_Wrap_Struct(rb_Markly_Node, &rb_Markly_Node_Type, node);
 	cmark_node_set_user_data(node, (void *)self);
+	cmark_node_set_user_data_free_func(node, rb_Markly_Node_freed);
 	
 	return self;
 }
@@ -121,16 +132,6 @@ static const rb_data_type_t rb_Markly_Parser_Type = {
 	.flags = RUBY_TYPED_FREE_IMMEDIATELY,
 };
 
-static VALUE rb_Markly_Parser_root(VALUE self) {
-	cmark_parser *parser = NULL;
-	
-	TypedData_Get_Struct(self, cmark_parser, &rb_Markly_Parser_Type, parser);
-	
-	assert(parser != NULL);
-	
-	return rb_Markly_Node_wrap(parser->root);
-}
-
 static VALUE rb_Markly_Parser_alloc(VALUE self) {
 	return TypedData_Wrap_Struct(self, &rb_Markly_Parser_Type, NULL);
 }
@@ -330,10 +331,10 @@ static VALUE rb_node_set_string_content(VALUE self, VALUE s) {
  * Returns a {Symbol} representing the node's type.
  */
 static VALUE rb_node_get_type(VALUE self) {
-  int node_type;
-  cmark_node *node;
-  VALUE symbol;
-  const char *s;
+  int node_type = 0;
+  cmark_node *node = NULL;
+  VALUE symbol = NULL;
+  const char *s = NULL;
 
   TypedData_Get_Struct(self, cmark_node, &rb_Markly_Node_Type, node);
 
@@ -1193,7 +1194,6 @@ __attribute__((visibility("default"))) void Init_markly() {
 	rb_define_method(rb_Markly_Parser, "initialize", rb_Markly_Parser_initialize, 1);
 	rb_define_method(rb_Markly_Parser, "enable", rb_Markly_Parser_enable, 1);
 	rb_define_method(rb_Markly_Parser, "parse", rb_Markly_Parser_parse, 1);
-	rb_define_method(rb_Markly_Parser, "root", rb_Markly_Parser_root, 0);
 	
   rb_Markly_Node = rb_define_class_under(rb_Markly, "Node", rb_cObject);
   rb_define_singleton_method(rb_Markly_Node, "new", rb_node_new, 1);

data/lib/markly/renderer/html_renderer.rb

@@ -1,14 +1,36 @@
 # frozen_string_literal: true
 
+require 'cgi'
+
 module Markly
-  class HtmlRenderer < Renderer
+  class HTMLRenderer < Renderer
+    def initialize(ids: false, **options)
+      super(**options)
+      
+      @ids = ids
+      @section = nil
+    end
+    
     def document(_)
+      @section = false
       super
       out("</ol>\n</section>\n") if @written_footnote_ix
+      out("</section>") if @section
+    end
+
+    def id_for(node)
+      if @ids
+        id = node.to_plaintext.chomp.downcase.gsub(/\s+/, '-')
+        
+        return " id=\"#{CGI.escape_html id}\""
+      end
     end
 
     def header(node)
       block do
+        out('</section>') if @section
+        @section = true
+        out("<section #{id_for(node)}>")
         out('<h', node.header_level, "#{source_position(node)}>", :children,
             '</h', node.header_level, '>')
       end
@@ -249,4 +271,7 @@ module Markly
       node.tasklist_item_checked?
     end
   end
+  
+  # Legacy.
+  HtmlRenderer = HTMLRenderer
 end

data/lib/markly/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Markly
-	VERSION = '0.2.0'
+	VERSION = '0.5.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: markly
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Garen Torikian
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-13 00:00:00.000000000 Z
+date: 2020-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bake
@@ -26,34 +26,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: bake-bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: bake-modernize
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -178,7 +150,7 @@ files:
 - ext/markly/xml.c
 - lib/markly.rb
 - lib/markly/flags.rb
-- lib/markly/markly.so
+- lib/markly/markly.bundle
 - lib/markly/node.rb
 - lib/markly/node/inspect.rb
 - lib/markly/renderer.rb