zenweb 3.10.7 → 3.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 01e3cb1c4a6f9989e24beda9df68db5371f2080146b9b25b01a95af133f61e77
-  data.tar.gz: 0ad4b847828bbc507ee26cc30d68abf9df3899a2df582840a47d3096a5eab788
+  metadata.gz: 84df6337b405ae77d3a2ed5fb1c6aa940ce2ad08ba6dd904a9b3cde365a47623
+  data.tar.gz: bc471952a820c258e6704dc1e73039c16978edf51b7016ee12db27514e9eeb2e
 SHA512:
-  metadata.gz: 3ea4ac607e3341abfb5120abe57cd3614671b8c2659feddad45c621aac669300737864b6b4418e6966d3dbd53bd830862f622fa498a61cefe4096c8244bb882b
-  data.tar.gz: c5765b977e8798763cd16a9f3cf0cba8bf19c5fd9bb8804899191e8f5170db8fee001a3152538fc9e700df48461636ab8651d911bf416721841d7b33feef68c3
+  metadata.gz: '08fbb2f23c3ebb0ca4323a5a79d0604f84d61f5904c3c758e2c3ef2e5956fc2044cf1eec66b3a3a93b18b914e12fa47247b4bcc7e3a6498750c7201b9d5fa8b7'
+  data.tar.gz: 26452812d1d9459a0413ca40b8fa9a394372b7c4f2cdcacc6ce7cef7b85bb8a69b4c78e3e7def7e9356ed6f1af2ac584434d9da4465b8b8c861e8c1ea729229d

data/History.rdoc

@@ -1,3 +1,15 @@
+=== 3.11.0 / 2023-09-28
+
+* 1 minor enhancement:
+
+  * Added Page#link_head helper method to clean up <link...> tags
+
+=== 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:

data/example-site/atom.xml.erb

@@ -22,8 +22,8 @@ rss_length: 15
     <email>{{ email }}</email>
   </author>
 
-  <link href="{{ feed_url }}" rel="self"/>
-  <link href="{{ domain }}/"/>
+  {{ link_head href:feed_url, rel:"self" }}
+  {{ link_head href:domain }}
 
   <rights> © {{ author }} - {{ email }} </rights>
 
@@ -33,7 +33,7 @@ rss_length: 15
       <title>{{ h post.title }}</title>
       <updated>{{ post.date.iso8601 }}</updated>
 
-      <link rel="alternate" href="{{ domain }}{{ post.url }}"/>
+      {{ link_head rel:"alternate", href:"{{ domain }}{{ post.url }}" }}
 
       <published>{{ post.date.iso8601 }}</published>
       <content type="html">{{ h post.subrender }}</content>

data/lib/zenweb/page.rb

@@ -330,6 +330,13 @@ module Zenweb
       %(<meta #{label}="#{name}" content="#{val}">) if val
     end
 
+    ##
+    # Stupid helper method to make declaring header link lines cleaner
+
+    def link_head **kws
+      %(<link #{kws.map { |k,v| "#{k}=#{v.inspect}" }.join " "} />)
+    end
+
     ##
     # Access a config variable and only warn if it isn't accessible.
     # If +msg+ starts with render, go ahead and pass that up to the
@@ -373,7 +380,7 @@ module Zenweb
     # Stupid helper method to make declaring stylesheets cleaner
 
     def stylesheet name
-      %(<link rel="stylesheet" type="text/css" href="/css/#{name}.css">)
+      link_head rel:"stylesheet", type:"text/css", href:"/css/#{name}.css"
     end
 
     ##

data/lib/zenweb/plugins/markdown.rb

@@ -40,7 +40,10 @@ class Zenweb::Page
     require "coderay/zenweb_extensions"
 
     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.7"
+  VERSION = "3.11.0"
 end
 
 require "zenweb/site"

data/test/test_zenweb_page.rb

@@ -441,7 +441,7 @@ class TestZenwebPage < Minitest::Test
   end
 
   def test_stylesheet
-    exp = %(<link rel="stylesheet" type="text/css" href="/css/woot.css">)
+    exp = %(<link rel="stylesheet" type="text/css" href="/css/woot.css" />)
     assert_equal exp, page.stylesheet("woot")
   end
 

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.7
+  version: 3.11.0
 platform: ruby
 authors:
 - Ryan Davis
@@ -29,7 +29,7 @@ cert_chain:
   ROfWo9Uyp8ba/j9eVG14KkYRaLydAY1MNQk2yd3R5CGfeOpD1kttxjoypoUJ2dOG
   nsNBRuQJ1UfiCG97a6DNm+Fr
   -----END CERTIFICATE-----
-date: 2023-07-25 00:00:00.000000000 Z
+date: 2023-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake

metadata.gz.sig

@@ -1 +1,3 @@
-�ߏ�i��W�)��Y6�q˟��ۦ3*��Ë����A9*��-����A6�-���1��7H5��_����ƈ��_5b����$�)���6J���K
+r������2�u\5���84��f �y�vBϥg� 6!���7�J6;�9!GJ�V�m������
+e	�6Y/���=�ᢞbN2q�EEE_;�<<0����Ƌ*�
w�	˚J��cQe�	�rU�_�)���>}j-=]�D/Z�x���$E�;I�/��{O�ȭ�*�,���Wɝ	S>��0�`��/Y��n�ڴ�C�����	�V���R<�C��燅�[Mf��
_��4�><;���׸�p{��Y���
+�\�)