wikitext 4.8 → 4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e8f6d2944215c85806ff343a6ff9eb39bd28011c56d83094881eae708e5e9f1
-  data.tar.gz: 582cde35c2d1f18a4048f9dc0f8a47b0d4b7f59e43a81f8913a14b5373ed026f
+  metadata.gz: ed3e58945b3689bd970b458d92a8a041b31dc6c0c83378e8b0409c4b46c0fa9d
+  data.tar.gz: 17cb2780a9034593794d92c91c6388e0249e44cb1f14d98807a147508b4b1811
 SHA512:
-  metadata.gz: 3988ec125535ee363500931c5a89196b0221f948e39894c905065d6472266a19e9472ff51a9fcee431f21ed9d94813add222db06aa6e4d73b42995f4f8da718d
-  data.tar.gz: a635de3289089b87b22b3917f2e8f91058fab3548712dc7b41a97d9a0bbb2a290ce3c2014cadadc1e9cd945f33511315363bb1eb54cb1939d965f29bb9b0b880
+  metadata.gz: 3a550d41ebe0a3a1ccd02613b3834765e8c3c2aae8b9c8de34dbf69ae7c11e240652e347a76098416d6d46ab7ddd9d2b397012d8af8946112c33175a60f802ed
+  data.tar.gz: adac43e11f069a88853448cd62ae3271d889d6e1a48fd385d76aa56e34f07af3f3c3bdee413300038ce381194e4a4adac9628a6b168e573dcafcd3fa13cc00bb

data/ext/wikitext/parser.c

@@ -2585,16 +2585,29 @@ VALUE Wikitext_parser_parse(int argc, VALUE *argv, VALUE self)
         // reset current token; forcing lexer to return another token at the top of the loop
         token = NULL;
     } while (1);
+
 return_output:
-    // nasty hack to avoid re-allocating our return value
-    str_append(parser->output, null_str, 1); // null-terminate
-    len = parser->output->len - 1; // don't count null termination
+    str_append(parser->output, null_str, 1); // Null-terminate.
+#if defined(RUBY_API_VERSION_CODE) && RUBY_API_VERSION_CODE >= 30200
+    // Ruby string internals changed around 3.2, ending the 14-year non-breaking
+    // streak mentioned in 10808fef5921b7acff203da4fdaa0fdbaec2f603.
+    //
+    // Instead of hackily trying to avoid a reallocation, just eat the cost and
+    // create a new string (Ruby will copy the data). Ruby has gotten faster
+    // over the years anyway, and we can hope that the cost of parsing outweighs
+    // the allocation and copying.
+    return rb_str_new(parser->output->ptr, parser->output->len - 1);
+#else
+    // Nasty hack to avoid re-allocating our return value by reaching into Ruby
+    // string internals.
+    len = parser->output->len - 1; // Don't count null termination.
 
     VALUE out = rb_str_buf_new(RSTRING_EMBED_LEN_MAX + 1);
     free(RSTRING_PTR(out));
     RSTRING(out)->as.heap.aux.capa = len;
     RSTRING(out)->as.heap.ptr = parser->output->ptr;
     RSTRING(out)->as.heap.len = len;
-    parser->output->ptr = NULL; // don't double-free
+    parser->output->ptr = NULL; // Don't double-free.
     return out;
+#endif
 }

data/ext/wikitext/ruby_compat.h

@@ -23,6 +23,10 @@
 
 #include <ruby.h>
 
+#ifdef HAVE_RUBY_VERSION_H
+#include <ruby/version.h>
+#endif
+
 // for compatibility with Ruby 1.8.5, which doesn't declare RSTRING_PTR
 #ifndef RSTRING_PTR
 #define RSTRING_PTR(s) (RSTRING(s)->ptr)

data/ext/wikitext/wikitext.c

@@ -35,30 +35,13 @@ VALUE cWikitextParserToken   = 0;   // class Wikitext::Parser::Token
 //     require 'wikitext/rails_template_handler'
 //   end
 //
-// here in C we have to jump through some hoops using the following two
-// functions.
-//
-// First we have wikitext_on_load_block(), which is a function which defines
-// the "block" of code that we want to have evaluated.
-//
-// To actually pass this block in to the ActiveSupport::on_load method we
-// need the help of an intermediate helper function,
-// wikitext_block_forwarder(), which we invoke with the aid of rb_iterate()
-// later on.
-//
-// This works because the rb_funcall() function in wikitext_block_forwarder()
-// propagates the block through to the called method.
-VALUE wikitext_on_load_block(VALUE yielded, VALUE other)
+// We use rb_block_call to call the on_load method with a block.
+// The wikitext_on_load_block() function defines the block code.
+VALUE wikitext_on_load_block(VALUE yielded, VALUE data, int argc, const VALUE *argv, VALUE blockarg)
 {
     return rb_require("wikitext/rails_template_handler");
 }
 
-VALUE wikitext_block_forwarder(VALUE receiver)
-{
-    return rb_funcall(receiver, rb_intern("on_load"), 1,
-        ID2SYM(rb_intern("action_view")));
-}
-
 void Init_wikitext()
 {
     // Wikitext
@@ -112,7 +95,8 @@ void Init_wikitext()
 
         VALUE active_support = rb_const_get(rb_cObject,
             rb_intern("ActiveSupport"));
-        rb_iterate(wikitext_block_forwarder, active_support,
+        VALUE arg = ID2SYM(rb_intern("action_view"));
+        rb_block_call(active_support, rb_intern("on_load"), 1, &arg,
             wikitext_on_load_block, Qnil);
     }
 }

data/lib/wikitext/version.rb

@@ -22,5 +22,5 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 module Wikitext
-  VERSION = '4.8'
+  VERSION = '4.9'
 end # module Wikitext

data/spec/external_link_spec.rb

@@ -59,7 +59,7 @@ describe Wikitext::Parser, 'external links' do
   end
 
   it 'formats external mailto links where the linktext is itself an email' do
-    # reported here: https://wincent.com/issues/1955
+    # reported here: https://wincent.dev/issues/1955
     expected = %{<p><a href="mailto:user@example.com" class="mailto">user@example.com</a></p>\n}
     @parser.parse('[mailto:user@example.com user@example.com]').should == expected
 
@@ -71,7 +71,7 @@ describe Wikitext::Parser, 'external links' do
   end
 
   it 'allows email addreses in link text' do
-    # more general case of bug reported here: https://wincent.com/issues/1955
+    # more general case of bug reported here: https://wincent.dev/issues/1955
     expected = %{<p><a href="http://google.com/?q=user@example.com" class="external">Google for user@example.com</a></p>\n}
     @parser.parse('[http://google.com/?q=user@example.com Google for user@example.com]').should == expected
   end

data/spec/regressions_spec.rb

@@ -50,7 +50,7 @@ describe Wikitext::Parser, 'regressions' do
     @parser.parse(input).should == expected
   end
 
-  # discovered at: http://rails.wincent.com/wiki/nginx_log_rotation
+  # discovered at: https://wincent.dev/wiki/nginx_log_rotation
   # fixed by 0a328f1
   it 'should allow empty lines in PRE blocks marked up with a leading space' do
     input = dedent <<-END
@@ -70,7 +70,7 @@ describe Wikitext::Parser, 'regressions' do
     @parser.parse(input).should == expected
   end
 
-  # discovered at: http://rails.wincent.com/wiki/Installing_Ragel_5.2.0_on_Mac_OS_X_Tiger
+  # discovered at: https://wincent.dev/wiki/Installing_Ragel_5.2.0_on_Mac_OS_X_Tiger
   # fixed by a616841
   it 'should handle PRE_START blocks which follow unordered lists' do
     input = dedent <<-END
@@ -91,7 +91,7 @@ describe Wikitext::Parser, 'regressions' do
     @parser.parse(input).should == expected
   end
 
-  # discovered at: http://rails.wincent.com/wiki/Movable_Type_security_notes
+  # discovered at: https://wincent.dev/wiki/Movable_Type_security_notes
   # fixed by a616841
   it 'should handle PRE_START blocks which follow ordered lists' do
     input = dedent <<-END
@@ -108,7 +108,7 @@ describe Wikitext::Parser, 'regressions' do
     @parser.parse(input).should == expected
   end
 
-  # discovered at: http://rails.wincent.com/wiki/Movable_Type_security_notes
+  # discovered at: https://wincent.dev/wiki/Movable_Type_security_notes
   # fixed by 191b75d
   it 'should respect additional indentation found inside PRE blocks' do
     # note the two extra spaces on each line
@@ -752,7 +752,7 @@ describe Wikitext::Parser, 'regressions' do
     @parser.parse(input).should == expected
   end
 
-  # discovered at: http://rails.wincent.com/wiki/Testing_cookies_in_Rails
+  # discovered at: https://wincent.dev/wiki/Testing_cookies_in_Rails
   it 'should handle BLOCKQUOTE_START blocks which follow lists' do
     # example text taken from wiki article and edited for brevity
     input = dedent <<-END
@@ -770,7 +770,7 @@ describe Wikitext::Parser, 'regressions' do
     @parser.parse(input).should == expected
   end
 
-  # https://wincent.com/issues/818
+  # https://wincent.dev/issues/818
   it 'should handle BLOCKQUOTE_START blocks which follow BLOCKQUOTE shorthand' do
     input = dedent <<-END
       > foo
@@ -787,7 +787,7 @@ describe Wikitext::Parser, 'regressions' do
     @parser.parse(input).should == expected
   end
 
-  # https://wincent.com/issues/818
+  # https://wincent.dev/issues/818
   it 'should handle PRE_START blocks which follow BLOCKQUOTE shorthand' do
     input = dedent <<-END
       > foo
@@ -802,7 +802,7 @@ describe Wikitext::Parser, 'regressions' do
     @parser.parse(input).should == expected
   end
 
-  # https://wincent.com/issues/818
+  # https://wincent.dev/issues/818
   it 'should handle BLOCKQUOTE_START blocks which follow nested BLOCKQUOTE shorthand' do
     input = dedent <<-END
       >>> foo
@@ -823,7 +823,7 @@ describe Wikitext::Parser, 'regressions' do
     @parser.parse(input).should == expected
   end
 
-  # https://wincent.com/issues/818
+  # https://wincent.dev/issues/818
   it 'should handle PRE_START blocks which follow nested BLOCKQUOTE shorthand' do
     input = dedent <<-END
       >>> foo
@@ -842,7 +842,7 @@ describe Wikitext::Parser, 'regressions' do
     @parser.parse(input).should == expected
   end
 
-  # https://wincent.com/issues/1289
+  # https://wincent.dev/issues/1289
   it 'should handle empty (zero-width) link targets' do
     # these were badly broken (caused exceptions to be raised)
     @parser.parse('[[]]').should == "<p>[[]]</p>\n"
@@ -864,7 +864,7 @@ describe Wikitext::Parser, 'regressions' do
     @parser.parse('[[  |foo]]').should == "<p>[[  |foo]]</p>\n"
   end
 
-  # first manifested itself in this comment: https://wincent.com/comments/6427
+  # first manifested itself in this comment: https://wincent.dev/comments/6427
   it 'handles "`[/`"' do
     # This is, of course, an invalid link, but it could be handled more
     # gracefully (we were opening a <code> span and instead of just rolling
@@ -877,7 +877,7 @@ describe Wikitext::Parser, 'regressions' do
     # PATH sequence (any such token would just be dropped on the floor).
     @parser.parse('with `[/` then').should == "<p>with <code>[/</code> then</p>\n"
 
-    # related example from the original ticket: https://wincent.com/issues/1726
+    # related example from the original ticket: https://wincent.dev/issues/1726
     @parser.parse('[/bar?baz=bat link]').should == "<p>[/bar?baz=bat link]</p>\n"
   end
 
@@ -890,7 +890,7 @@ describe Wikitext::Parser, 'regressions' do
     @parser.parse('[http://foo.com]').should == expected
   end
 
-  # https://wincent.com/issues/1891
+  # https://wincent.dev/issues/1891
   it 'handles shorthand PRE blocks containing lines starting with slashes' do
     expected = "<pre>/a\n/b\n/c</pre>\n"
     @parser.parse(" /a\n /b\n /c").should == expected

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: wikitext
 version: !ruby/object:Gem::Version
-  version: '4.8'
+  version: '4.9'
 platform: ruby
 authors:
 - Greg Hurrell
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-25 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -16,42 +15,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.13'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.13'
-- !ruby/object:Gem::Dependency
-  name: thor
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.17.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -152,7 +137,6 @@ homepage: https://github.com/wincent/wikitext
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - ext
@@ -168,8 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Wikitext-to-HTML translator
 test_files: []