redcarpet 3.6.0 → 3.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff95ccb3cfac7e8785f4e93f3984ee2c86b04008628555b9ab64cbd50886860d
-  data.tar.gz: 7daf631354b3e0edb0104387ead39674bdce554dfec90041b0f2c57c4d97621f
+  metadata.gz: 462c33d63034f594e30924779a9c9f7af0259236599f54146374b5d428d2e720
+  data.tar.gz: 8c7177817c2ef112e46b51f60f578c4b67d7e541c2e6967b08657fafba30021e
 SHA512:
-  metadata.gz: b2829bb96f83da4db1e81ab8ff8e22678fc73b2c0a073a84d789d04cb88b84e39da2a2ad4de1ac6229b370368a69828e635af5020a094b73773477fcad118283
-  data.tar.gz: 4ee41dbbb347d5125478d1bca1fc9820bf825fc210bd27b1d2183934a23e7b0acbf5a72bc04445787c4129c73fd3d8d9bb612db1758c14d21b6df21f20752f20
+  metadata.gz: 5595f573f3c3b903fabd07d126cf2ceeb80685538b081978eec0ae9a1d24a33d8bed2c21c16289d1b5e7394194536f082d7f6b5c68b98392d22f810df0d9dea0
+  data.tar.gz: 56b799de0bd8df8b1c3bc462757dd0dc30340f73239822d4888c704fb43aacc12fc9a42f46adbdb2161aff60da0781487a61f9935b38d9dc43e21583a59a94ad

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## Version 3.6.1
+
+* Migrate Markdown objects to the `TypedData` API.
+
+  Refs #785.
+
+  *Jean Boussier*
+
 ## Version 3.6.0
 
 * Avoid warnings running on Ruby 3.2+.

data/README.markdown

@@ -1,7 +1,7 @@
 Redcarpet is written with sugar, spice and everything nice
 ============================================================
 
-[![Build Status](https://travis-ci.org/vmg/redcarpet.svg?branch=master)](https://travis-ci.org/vmg/redcarpet)
+[![Build status](https://github.com/vmg/redcarpet/actions/workflows/test.yml/badge.svg)](https://github.com/vmg/redcarpet/actions/workflows/test.yml)
 [![Help Contribute to Open Source](https://www.codetriage.com/vmg/redcarpet/badges/users.svg)](https://www.codetriage.com/vmg/redcarpet)
 [![Gem Version](https://badge.fury.io/rb/redcarpet.svg)](https://badge.fury.io/rb/redcarpet)
 
@@ -341,8 +341,8 @@ Redcarpet::Render::SmartyPants.render("<p>Oh SmartyPants, you're so crazy...</p>
 ~~~~
 
 SmartyPants works on top of already-rendered HTML, and will ignore replacements
-inside the content of HTML tags and inside specific HTML blocks such as
-`<code>` or `<pre>`.
+inside the content of HTML tags and inside specific HTML blocks (`pre`, `code`,
+`var`, `samp`, `kbd`, `math`, `script`, `style`).
 
 What? You really want to mix Markdown renderers?
 ------------------------------------------------

data/ext/redcarpet/rc_markdown.c

@@ -85,6 +85,17 @@ rb_redcarpet_md__free(void *markdown)
 	sd_markdown_free((struct sd_markdown *)markdown);
 }
 
+static const rb_data_type_t rb_redcarpet_md__type = {
+	"Redcarpet/md",
+	{
+		NULL, // Nothing to mark
+		rb_redcarpet_md__free,
+	},
+	0,
+	0,
+	RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED,
+};
+
 static VALUE rb_redcarpet_md__new(int argc, VALUE *argv, VALUE klass)
 {
 	VALUE rb_markdown, rb_rndr, hash, rndr_options;
@@ -111,7 +122,7 @@ static VALUE rb_redcarpet_md__new(int argc, VALUE *argv, VALUE klass)
 	if (rb_obj_is_kind_of(rb_rndr, rb_cRenderHTML_TOC))
 		extensions |= MKDEXT_FENCED_CODE;
 
-	Data_Get_Struct(rb_rndr, struct rb_redcarpet_rndr, rndr);
+	rndr = rb_redcarpet_rndr_unwrap(rb_rndr);
 
 	/* Merge the current options in the @options hash */
 	if (hash != Qnil) {
@@ -123,7 +134,7 @@ static VALUE rb_redcarpet_md__new(int argc, VALUE *argv, VALUE klass)
 	if (!markdown)
 		rb_raise(rb_eRuntimeError, "Failed to create new Renderer class");
 
-	rb_markdown = Data_Wrap_Struct(klass, NULL, rb_redcarpet_md__free, markdown);
+	rb_markdown = TypedData_Wrap_Struct(klass, &rb_redcarpet_md__type, markdown);
 	rb_iv_set(rb_markdown, "@renderer", rb_rndr);
 
 	return rb_markdown;
@@ -138,15 +149,14 @@ static VALUE rb_redcarpet_md_render(VALUE self, VALUE text)
 	Check_Type(text, T_STRING);
 
 	rb_rndr = rb_iv_get(self, "@renderer");
-	Data_Get_Struct(self, struct sd_markdown, markdown);
+	TypedData_Get_Struct(self, struct sd_markdown, &rb_redcarpet_md__type, markdown);
 
 	if (rb_respond_to(rb_rndr, rb_intern("preprocess")))
 		text = rb_funcall(rb_rndr, rb_intern("preprocess"), 1, text);
 	if (NIL_P(text))
 		return Qnil;
 
-	struct rb_redcarpet_rndr *renderer;
-	Data_Get_Struct(rb_rndr, struct rb_redcarpet_rndr, renderer);
+	struct rb_redcarpet_rndr *renderer = rb_redcarpet_rndr_unwrap(rb_rndr);
 	renderer->options.active_enc = rb_enc_get(text);
 
 	/* initialize buffers */

data/ext/redcarpet/rc_render.c

@@ -299,17 +299,6 @@ cb_link_attribute(VALUE key, VALUE val, VALUE payload)
 	return 0;
 }
 
-static void
-rndr_link_attributes(struct buf *ob, const struct buf *url, void *opaque)
-{
-	struct redcarpet_renderopt *opt = opaque;
-	struct rb_redcarpet_rndr *rndr;
-
-	Data_Get_Struct(opt->self, struct rb_redcarpet_rndr, rndr);
-	Check_Type(opt->link_attributes, T_HASH);
-	rb_hash_foreach(opt->link_attributes, &cb_link_attribute, (VALUE)ob);
-}
-
 static struct sd_callbacks rb_redcarpet_callbacks = {
 	rndr_blockcode,
 	rndr_blockquote,
@@ -388,22 +377,47 @@ static const char *rb_redcarpet_method_names[] = {
 
 static const size_t rb_redcarpet_method_count = sizeof(rb_redcarpet_method_names)/sizeof(char *);
 
-static void rb_redcarpet_rbase_mark(struct rb_redcarpet_rndr *rndr)
+static void rb_redcarpet_rbase_mark(void *data)
 {
+	struct rb_redcarpet_rndr *rndr = (struct rb_redcarpet_rndr *)data;
 	if (rndr->options.link_attributes)
 		rb_gc_mark(rndr->options.link_attributes);
 }
 
-static void rndr_deallocate(void *rndr)
+static const rb_data_type_t rb_redcarpet_rndr_type = {
+	"Redcarpet/rndr",
+	{
+		rb_redcarpet_rbase_mark,
+		RUBY_TYPED_DEFAULT_FREE,
+	},
+	0,
+	0,
+	RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED,
+};
+
+struct rb_redcarpet_rndr * rb_redcarpet_rndr_unwrap(VALUE self)
 {
-  xfree(rndr);
+	struct rb_redcarpet_rndr *rndr;
+	TypedData_Get_Struct(self, struct rb_redcarpet_rndr, &rb_redcarpet_rndr_type, rndr);
+	return rndr;
 }
 
 static VALUE rb_redcarpet_rbase_alloc(VALUE klass)
 {
 	struct rb_redcarpet_rndr *rndr = ALLOC(struct rb_redcarpet_rndr);
 	memset(rndr, 0x0, sizeof(struct rb_redcarpet_rndr));
-	return Data_Wrap_Struct(klass, rb_redcarpet_rbase_mark, rndr_deallocate, rndr);
+	return TypedData_Wrap_Struct(klass, &rb_redcarpet_rndr_type, rndr);
+}
+
+static void
+rndr_link_attributes(struct buf *ob, const struct buf *url, void *opaque)
+{
+	struct redcarpet_renderopt *opt = opaque;
+	struct rb_redcarpet_rndr *rndr;
+
+	TypedData_Get_Struct(opt->self, struct rb_redcarpet_rndr, &rb_redcarpet_rndr_type, rndr);
+	Check_Type(opt->link_attributes, T_HASH);
+	rb_hash_foreach(opt->link_attributes, &cb_link_attribute, (VALUE)ob);
 }
 
 static void rb_redcarpet__overload(VALUE self, VALUE base_class)
@@ -411,7 +425,7 @@ static void rb_redcarpet__overload(VALUE self, VALUE base_class)
 	struct rb_redcarpet_rndr *rndr;
 	VALUE options_ivar;
 
-	Data_Get_Struct(self, struct rb_redcarpet_rndr, rndr);
+	TypedData_Get_Struct(self, struct rb_redcarpet_rndr, &rb_redcarpet_rndr_type, rndr);
 	rndr->options.self = self;
 	rndr->options.base_class = base_class;
 
@@ -448,7 +462,7 @@ static VALUE rb_redcarpet_html_init(int argc, VALUE *argv, VALUE self)
 	unsigned int render_flags = 0;
 	VALUE hash, link_attr = Qnil;
 
-	Data_Get_Struct(self, struct rb_redcarpet_rndr, rndr);
+	TypedData_Get_Struct(self, struct rb_redcarpet_rndr, &rb_redcarpet_rndr_type, rndr);
 
 	if (rb_scan_args(argc, argv, "01", &hash) == 1) {
 		Check_Type(hash, T_HASH);
@@ -500,7 +514,7 @@ static VALUE rb_redcarpet_html_init(int argc, VALUE *argv, VALUE self)
 	rb_redcarpet__overload(self, rb_cRenderHTML);
 
 	if (!NIL_P(link_attr)) {
-		rndr->options.link_attributes = link_attr;
+		RB_OBJ_WRITE(self, &rndr->options.link_attributes, link_attr);
 		rndr->options.html.link_attributes = &rndr_link_attributes;
 	}
 
@@ -513,7 +527,7 @@ static VALUE rb_redcarpet_htmltoc_init(int argc, VALUE *argv, VALUE self)
 	unsigned int render_flags = HTML_TOC;
 	VALUE hash, nesting_level = Qnil;
 
-	Data_Get_Struct(self, struct rb_redcarpet_rndr, rndr);
+	TypedData_Get_Struct(self, struct rb_redcarpet_rndr, &rb_redcarpet_rndr_type, rndr);
 
 	if (rb_scan_args(argc, argv, "01", &hash) == 1) {
 		Check_Type(hash, T_HASH);

data/ext/redcarpet/redcarpet.h

@@ -49,4 +49,6 @@ struct rb_redcarpet_rndr {
 	struct redcarpet_renderopt options;
 };
 
+struct rb_redcarpet_rndr * rb_redcarpet_rndr_unwrap(VALUE);
+
 #endif

data/lib/redcarpet.rb

@@ -2,7 +2,7 @@ require 'redcarpet.so'
 require 'redcarpet/compat'
 
 module Redcarpet
-  VERSION = '3.6.0'
+  VERSION = '3.6.1'
 
   class Markdown
     attr_reader :renderer

data/redcarpet.gemspec

@@ -1,10 +1,10 @@
 # encoding: utf-8
 Gem::Specification.new do |s|
   s.name = 'redcarpet'
-  s.version = '3.6.0'
+  s.version = '3.6.1'
   s.summary = "Markdown that smells nice"
   s.description = 'A fast, safe and extensible Markdown to (X)HTML parser'
-  s.date = '2023-01-29'
+  s.date = '2025-02-25'
   s.email = 'vicent@github.com'
   s.homepage = 'https://github.com/vmg/redcarpet'
   s.authors = ["Natacha Porté", "Vicent Martí"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redcarpet
 version: !ruby/object:Gem::Version
-  version: 3.6.0
+  version: 3.6.1
 platform: ruby
 authors:
 - Natacha Porté
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-29 00:00:00.000000000 Z
+date: 2025-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -114,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.11
+rubygems_version: 3.5.23
 signing_key:
 specification_version: 4
 summary: Markdown that smells nice