zenweb 3.10.4 → 3.10.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0848e8626822877b57388849ea4cf48c98204ed207d8fb7d0f86a9b12c1e9be1'
-  data.tar.gz: cb36baeb00a0364c4dfe8c0148c66dfe843e5a5bd4dbffced1c23b5b0f99a032
+  metadata.gz: 68ee34c1081020cb2d941c8274ab68d94134e50fc7b67330335d8e030d1f3177
+  data.tar.gz: e22b30eee01734adf91e2b8bdd5ba5ffbe4d962447c35089ccee3d7920f3289b
 SHA512:
-  metadata.gz: 31e178d64cc6498b1d898906a62d007d58414f9a5598ec1df1f45a53172febd36fd2c9a9d639993c781f5de4a36b6bc842c0ba3eb446c4d7c6e98d920f9d137e
-  data.tar.gz: 31599fca9893e3da3f99a424a831d60004fdb084ae49c252c311733b05274c91365a5c07d4ec9c5d5d91b3261916315ff7fc656a49f8c24f2f950ac43bc2c493
+  metadata.gz: 574f8c47d35ab0070a6f64509b21a525c68789d2cb9b28c1fe4bcb735c0ce187afbd835711e896fbaddb1dc07b480e22dc32d7a658b94541390d9548fbba4c62
+  data.tar.gz: f5620b48cb0ff5c203d32b8902740d1a936fe46c8cf6a8946a0cfaf4e63cbf7fdf7f03e51e094ac5696b877846ca8a40c85bc1df79975ba2fae0d2d20f0c1c30

data/History.txt

@@ -1,3 +1,15 @@
+=== 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:
+
+  * ruby 3.1: Fixed YAML.load issue with loading Time instances.
+
 === 3.10.4 / 2019-12-14
 
 * 1 minor enhancement:

data/lib/zenweb/config.rb

@@ -94,13 +94,23 @@ module Zenweb
       @h ||= begin
                thing = File.file?(path) ? path : site.pages[path]
                config, _ = self.class.split thing
-               config && YAML.load(config) || {}
+               maybe_load_yaml(config) || {}
              end
     rescue => e
       warn "#{self.path}: #{e}"
       raise
     end
 
+    def maybe_load_yaml config
+      if config then
+        if YAML.respond_to? :safe_load_file then
+          YAML.safe_load config, permitted_classes: [Time]
+        else
+          YAML.load config
+        end
+      end
+    end
+
     def inspect # :nodoc:
       if Rake.application.options.trace then
         hash = h.sort.map { |k,v| "#{k.inspect} => #{v.inspect}" }.join ", "

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.4"
+  VERSION = "3.10.6"
 end
 
 require "zenweb/site"

metadata

@@ -1,18 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: zenweb
 version: !ruby/object:Gem::Version
-  version: 3.10.4
+  version: 3.10.6
 platform: ruby
 authors:
 - Ryan Davis
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDPjCCAiagAwIBAgIBBDANBgkqhkiG9w0BAQsFADBFMRMwEQYDVQQDDApyeWFu
+  MIIDPjCCAiagAwIBAgIBBzANBgkqhkiG9w0BAQsFADBFMRMwEQYDVQQDDApyeWFu
   ZC1ydWJ5MRkwFwYKCZImiZPyLGQBGRYJemVuc3BpZGVyMRMwEQYKCZImiZPyLGQB
-  GRYDY29tMB4XDTE5MTIxMzAwMDIwNFoXDTIwMTIxMjAwMDIwNFowRTETMBEGA1UE
+  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
-  AQCkkcHqAa6IKLYGl93rn78J3L+LnqyxaA059n4IGMHWN5bv9KBQnIjOrpLadtYZ
-  vhWkunWDKdfVapBEq5+T4HzqnsEXC3aCv6JEKJY6Zw7iSzl0M8hozuzRr+w46wvT
-  fV2yTN6QTVxqbMsJJyjosks4ZdQYov2zdvQpt1HsLi+Qmckmg8SPZsd+T8uiiBCf
-  b+1ORSM5eEfBQenPXy83LZcoQz8i6zVB4aAfTGGdhxjoMGUEmSZ6xpkOzmnGa9QK
-  m5x9IDiApM+vCELNwDXXGNFEnQBBK+wAe4Pek8o1V1TTOxL1kGPewVOitX1p3xoN
-  h7iEjga8iM1LbZUfiISZ+WrB
+  AQAkg3y+PBnBAPWdxxITm5sPHqdWQgSyCpRA20o4LTuWr8BWhSXBkfQNa7cY6fOn
+  xyM34VPzBFbExv6XOGDfOMFBVaYTHuN9peC/5/umL7kLl+nflXzL2QA7K6LYj5Bg
+  sM574Onr0dZDM6Vn69bzQ7rBIFDfK/OhlPzqKZad4nsdcsVH8ODCiT+ATMIZyz5K
+  WCnNtqlyiWXI8tdTpahDgcUwfcN/oN7v4K8iU5IbLJX6HQ5DKgmKjfb6XyMth16k
+  ROfWo9Uyp8ba/j9eVG14KkYRaLydAY1MNQk2yd3R5CGfeOpD1kttxjoypoUJ2dOG
+  nsNBRuQJ1UfiCG97a6DNm+Fr
   -----END CERTIFICATE-----
-date: 2019-12-14 00:00:00.000000000 Z
+date: 2023-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -133,14 +133,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.20'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.20'
+        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
@@ -238,7 +238,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/seattlerb/zenweb
   bug_tracker_uri: https://github.com/seattlerb/zenweb/issues
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--main"
 - README.txt
@@ -255,8 +255,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.4.10
+signing_key:
 specification_version: 4
 summary: Zenweb is a set of classes/tools for organizing and formating a website
 test_files: []