zenweb 3.10.5 → 3.10.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21c85d185e152fb057384c1defe583ab0f535a5c705f34976976f5a55506dff7
-  data.tar.gz: e5091b07884222fdfa2b724b8d54fcbc31e82543db52e61c5574bc2b4c243e9b
+  metadata.gz: 01e3cb1c4a6f9989e24beda9df68db5371f2080146b9b25b01a95af133f61e77
+  data.tar.gz: 0ad4b847828bbc507ee26cc30d68abf9df3899a2df582840a47d3096a5eab788
 SHA512:
-  metadata.gz: 6ea058ede3f2d836a3f86f0551538f4380575653660da686e9b81c6c5d0f8c025730d368f985374fe6e36141e4978088ccc7d673c6502885750d1d350ecf1b76
-  data.tar.gz: e7365a35018a899fecc62d73307d3c3b854524c257a596ad480345d8709676645fefb0b94087f84239e602f23728b93f678800a2860eaa8490a116a28670f60e
+  metadata.gz: 3ea4ac607e3341abfb5120abe57cd3614671b8c2659feddad45c621aac669300737864b6b4418e6966d3dbd53bd830862f622fa498a61cefe4096c8244bb882b
+  data.tar.gz: c5765b977e8798763cd16a9f3cf0cba8bf19c5fd9bb8804899191e8f5170db8fee001a3152538fc9e700df48461636ab8651d911bf416721841d7b33feef68c3

checksums.yaml.gz.sig

@@ -1,3 +1 @@
-r,�\k@H_?b
-w�"�p��
�LH{ -$��P����f|Խk&'����N7�ߞ�#.���6a�g��[�
-:X-kbu&��m)��7E�zA��8
+�֏c�T޻��}v�xn�4�%t]E���|�c:�=�?\Qy�*�g���),A;¤+g�#����M��xc�J�N�;P(�7�ܚP��0yx��S<M҄�k�pL��ި����FI��Ys���Ew�	wJ�1���pw�X[O�p[y�"�Z����y���ty�1;���[ڤ�߫�*�/�MOZ���\���ǃ���Wz��6R�s�w��r��ȁ�_��I�з��|U@�B8����{�:Q�

data/{History.txt → History.rdoc}

@@ -1,3 +1,15 @@
+=== 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:
+
+  * Remove page from parent subpages if being moved via fix_subpages.
+
 === 3.10.5 / 2022-01-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,12 +35,10 @@ 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
 

data/lib/zenweb/site.rb

@@ -255,6 +255,7 @@ module Zenweb
 
         next unless parent and parent != p and p.url =~ /html$/
 
+        p.parent.subpages.delete p if p.parent
         p.parent = parent
         parent.subpages << p
       end

data/lib/zenweb.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zenweb
 version: !ruby/object:Gem::Version
-  version: 3.10.5
+  version: 3.10.7
 platform: ruby
 authors:
 - Ryan Davis
@@ -10,9 +10,9 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDPjCCAiagAwIBAgIBBjANBgkqhkiG9w0BAQsFADBFMRMwEQYDVQQDDApyeWFu
+  MIIDPjCCAiagAwIBAgIBBzANBgkqhkiG9w0BAQsFADBFMRMwEQYDVQQDDApyeWFu
   ZC1ydWJ5MRkwFwYKCZImiZPyLGQBGRYJemVuc3BpZGVyMRMwEQYKCZImiZPyLGQB
-  GRYDY29tMB4XDTIxMTIyMzIzMTkwNFoXDTIyMTIyMzIzMTkwNFowRTETMBEGA1UE
+  GRYDY29tMB4XDTIzMDEwMTA3NTExN1oXDTI0MDEwMTA3NTExN1owRTETMBEGA1UE
   AwwKcnlhbmQtcnVieTEZMBcGCgmSJomT8ixkARkWCXplbnNwaWRlcjETMBEGCgmS
   JomT8ixkARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALda
   b9DCgK+627gPJkB6XfjZ1itoOQvpqH1EXScSaba9/S2VF22VYQbXU1xQXL/WzCkx
@@ -22,14 +22,14 @@ cert_chain:
   qhtV7HJxNKuPj/JFH0D2cswvzznE/a5FOYO68g+YCuFi5L8wZuuM8zzdwjrWHqSV
   gBEfoTEGr7Zii72cx+sCAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
   HQYDVR0OBBYEFEfFe9md/r/tj/Wmwpy+MI8d9k/hMA0GCSqGSIb3DQEBCwUAA4IB
-  AQCKB5jfsuSnKb+t/Wrh3UpdkmX7TrEsjVmERC0pPqzQ5GQJgmEXDD7oMgaKXaAq
-  x2m+KSZDrqk7c8uho5OX6YMqg4KdxehfSLqqTZGoeV78qwf/jpPQZKTf+W9gUSJh
-  zsWpo4K50MP+QtdSbKXZwjAafpQ8hK0MnnZ/aeCsW9ov5vdXpYbf3dpg6ADXRGE7
-  lQY2y1tJ5/chqu6h7dQmnm2ABUqx9O+JcN9hbCYoA5i/EeubUEtFIh2w3SpO6YfB
-  JFmxn4h9YO/pVdB962BdBNNDia0kgIjI3ENnkLq0dKpYU3+F3KhEuTksLO0L6X/V
-  YsuyUzsMz6GQA4khyaMgKNSD
+  AQAkg3y+PBnBAPWdxxITm5sPHqdWQgSyCpRA20o4LTuWr8BWhSXBkfQNa7cY6fOn
+  xyM34VPzBFbExv6XOGDfOMFBVaYTHuN9peC/5/umL7kLl+nflXzL2QA7K6LYj5Bg
+  sM574Onr0dZDM6Vn69bzQ7rBIFDfK/OhlPzqKZad4nsdcsVH8ODCiT+ATMIZyz5K
+  WCnNtqlyiWXI8tdTpahDgcUwfcN/oN7v4K8iU5IbLJX6HQ5DKgmKjfb6XyMth16k
+  ROfWo9Uyp8ba/j9eVG14KkYRaLydAY1MNQk2yd3R5CGfeOpD1kttxjoypoUJ2dOG
+  nsNBRuQJ1UfiCG97a6DNm+Fr
   -----END CERTIFICATE-----
-date: 2022-01-05 00:00:00.000000000 Z
+date: 2023-07-25 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.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.4'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -133,14 +161,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.23'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.23'
+        version: '4.0'
 description: |-
   Zenweb is a set of classes/tools for organizing and formating a
   website. It is website oriented rather than webpage oriented, unlike
@@ -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
@@ -255,7 +283,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Zenweb is a set of classes/tools for organizing and formating a website