zenweb 3.10.6 → 3.10.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68ee34c1081020cb2d941c8274ab68d94134e50fc7b67330335d8e030d1f3177
-  data.tar.gz: e22b30eee01734adf91e2b8bdd5ba5ffbe4d962447c35089ccee3d7920f3289b
+  metadata.gz: 448821783e1068f92a0284e93d3072d8501cf21cc0ab94da3f6fc63d251de7d0
+  data.tar.gz: 314bda2c7bc1882f01e5c7b5ff37da023dc46bfd7e0b73de67e605f7260e20f0
 SHA512:
-  metadata.gz: 574f8c47d35ab0070a6f64509b21a525c68789d2cb9b28c1fe4bcb735c0ce187afbd835711e896fbaddb1dc07b480e22dc32d7a658b94541390d9548fbba4c62
-  data.tar.gz: f5620b48cb0ff5c203d32b8902740d1a936fe46c8cf6a8946a0cfaf4e63cbf7fdf7f03e51e094ac5696b877846ca8a40c85bc1df79975ba2fae0d2d20f0c1c30
+  metadata.gz: d4753d177c0ab4b46a58e929f57e1d1c26fcda263c24aa7cc2d0b7875b2b13a2103903664af997a2c15b8903ce7d2d74dc9a13838947338c7ef4d5e45f4602de
+  data.tar.gz: 0d59fdbee4361cce03ef42aac407a39dd25ee2a4a025964de78ab50b5b68ef070d2a54c1b8ef95d0b03d0c07785606978f19367cbd8beeba3c046c17990c3c84

data/{History.txt → History.rdoc}

@@ -1,3 +1,15 @@
+=== 3.10.8 / 2023-08-30
+
+* 1 bug fix:
+
+  * Fixed configuration of no_line_numbers for kramdown v2 changes
+
+=== 3.10.7 / 2023-07-25
+
+* 1 minor enhancement:
+
+  * Updated to use kramdown 2.x + kramdown-syntax-coderay + kramdown-parser-gfm.
+
 === 3.10.6 / 2023-05-04
 
 * 1 bug fix:

data/Manifest.txt

@@ -1,7 +1,7 @@
 .autotest
-History.txt
+History.rdoc
 Manifest.txt
-README.txt
+README.rdoc
 Rakefile
 example-site/.isolate.rb
 example-site/Rakefile

data/Rakefile

@@ -9,11 +9,17 @@ Hoe.plugin :isolate
 Hoe.spec 'zenweb' do
   developer 'Ryan Davis', 'ryand-ruby@zenspider.com'
 
+  license "MIT"
+
   dependency "rake",             [">= 0.9", "< 15"]
   dependency "makerakeworkwell", "~> 1.0"
   dependency "less",             "~> 2.0"
+
   dependency "coderay",          "~> 1.0"
-  dependency "kramdown",         "~> 1.4" # TODO: 1.17.0 -> 2.1.0
+
+  dependency "kramdown",         "~> 2.0"
+  dependency "kramdown-syntax-coderay", "~> 1.0"
+  dependency "kramdown-parser-gfm", "~> 1.0"
 end
 
 # vim: syntax=ruby

data/lib/zenweb/plugins/markdown.rb

@@ -1,13 +1,18 @@
 class Zenweb::Page
   KRAMDOWN_CONFIG = { # :nodoc:
-    :toc_levels    => '2..4',
-
+    :toc_levels    => 2..4,
     :entity_output => :symbolic,
-
-    :coderay_wrap               => :div,
-    :coderay_line_numbers       => :table,
-    :coderay_tab_width          => 4,
-    :coderay_css                => :class,
+    :hard_wrap     => false,
+    :input         => "GFM",
+    :gfm_quirks    => "no_auto_typographic",
+
+    :syntax_highlighter => :coderay,
+    :syntax_highlighter_opts => {
+      :wrap         => :div,
+      :line_numbers => :table,
+      :tab_width    => 4,
+      :css          => :class,
+    },
   }
 
   ##
@@ -30,14 +35,15 @@ class Zenweb::Page
 
   def markdown content, no_line_numbers = false
     require "kramdown"
+    require "kramdown-parser-gfm"
+    require "kramdown-syntax-coderay"
     require "coderay/zenweb_extensions"
 
-    content = content.
-     gsub(/^\`\`\` *(\w+)/) { "~~~ #$1" }.
-     gsub(/^\`\`\`/, '~~~')
-
     config = KRAMDOWN_CONFIG.dup
-    config[:coderay_line_numbers] = nil if no_line_numbers
+    if no_line_numbers then
+      config[:syntax_highlighter_opts] = config[:syntax_highlighter_opts].dup
+      config[:syntax_highlighter_opts][:line_numbers] = nil
+    end
 
     Kramdown::Document.new(content, config).to_html
   end

data/lib/zenweb.rb

@@ -6,7 +6,7 @@ require "time"
 
 module Zenweb
   # duh
-  VERSION = "3.10.6"
+  VERSION = "3.10.8"
 end
 
 require "zenweb/site"

data/test/test_zenweb_plugins_markdown.rb

@@ -18,8 +18,8 @@ class MarkdownTest < Minitest::Test
 end
 
 class TestUgh < MarkdownTest
-  def assert_markdown_code lang, line, *exps
-    act = page.markdown "``` #{lang}\n#{line}\n```"
+  def assert_markdown_code lang, line, *exps, no_lineno: false
+    act = page.markdown "``` #{lang}\n#{line}\n```", no_lineno
 
     exps.each do |exp|
       assert_includes act, exp, act
@@ -33,6 +33,14 @@ class TestUgh < MarkdownTest
                          '<span class="keyword">def</span>')
   end
 
+  def test_coderay_ruby__no_line_numbers
+    assert_markdown_code("ruby",
+                         "def x\n  42\nend",
+                         '<div class="language-ruby highlighter-coderay"><div class="CodeRay">',
+                         '<span class="keyword">def</span>',
+                         no_lineno: true)
+  end
+
   def test_coderay_clojure
     assert_markdown_code("clojure",
                          "(+ 1 1)",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zenweb
 version: !ruby/object:Gem::Version
-  version: 3.10.6
+  version: 3.10.8
 platform: ruby
 authors:
 - Ryan Davis
@@ -29,7 +29,7 @@ cert_chain:
   ROfWo9Uyp8ba/j9eVG14KkYRaLydAY1MNQk2yd3R5CGfeOpD1kttxjoypoUJ2dOG
   nsNBRuQJ1UfiCG97a6DNm+Fr
   -----END CERTIFICATE-----
-date: 2023-05-05 00:00:00.000000000 Z
+date: 2023-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -99,14 +99,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: kramdown-syntax-coderay
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: kramdown-parser-gfm
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -160,9 +188,9 @@ email:
 executables: []
 extensions: []
 extra_rdoc_files:
-- History.txt
+- History.rdoc
 - Manifest.txt
-- README.txt
+- README.rdoc
 - example-site/about/index.html.md
 - example-site/blog/2012-01-02-page1.html.md
 - example-site/blog/2012-01-03-page2.html.md
@@ -172,9 +200,9 @@ extra_rdoc_files:
 - example-site/pages/nonblogpage.html.md
 files:
 - ".autotest"
-- History.txt
+- History.rdoc
 - Manifest.txt
-- README.txt
+- README.rdoc
 - Rakefile
 - example-site/.isolate.rb
 - example-site/Rakefile
@@ -241,7 +269,7 @@ metadata:
 post_install_message:
 rdoc_options:
 - "--main"
-- README.txt
+- README.rdoc
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement

metadata.gz.sig

@@ -1,2 +1 @@
-x�m�i��U~ke�@����W7�4$�V���u���h<�!c����Ope���"��v�޷�5��� ��
-+
+W��F\:�:Nڌ�=(:��	AKi�^*��=��A�zr���^�ӧK[2����I��