zenweb 3.10.1 → 3.10.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 3737a3b87e86c85728272600f7ae0a1f8f55d564
-  data.tar.gz: d3bdb4f609b52e54d3754bf3eede3ca0f8fdf584
+SHA256:
+  metadata.gz: 21c85d185e152fb057384c1defe583ab0f535a5c705f34976976f5a55506dff7
+  data.tar.gz: e5091b07884222fdfa2b724b8d54fcbc31e82543db52e61c5574bc2b4c243e9b
 SHA512:
-  metadata.gz: 8e47e0cac3bb1f56c6ff9b049fc7e8f356a4ac7bc25d7848d7be8f6b34252ea9c3be128e1bc00ca830cac84ff974412a22fe6b752b5e00f29dbd0bdb7a193769
-  data.tar.gz: 8434b923ad69c434d5fccc2c0034588a30d75bafc04cb36a07e9a76691eb366ff64d9fc7e7655d317ae8c220bd4bd1f7537836448c41fef20c5216c6f42fbb79
+  metadata.gz: 6ea058ede3f2d836a3f86f0551538f4380575653660da686e9b81c6c5d0f8c025730d368f985374fe6e36141e4978088ccc7d673c6502885750d1d350ecf1b76
+  data.tar.gz: e7365a35018a899fecc62d73307d3c3b854524c257a596ad480345d8709676645fefb0b94087f84239e602f23728b93f678800a2860eaa8490a116a28670f60e

checksums.yaml.gz.sig

@@ -1,2 +1,3 @@
-qx�6��(��"Ub3�|��a�O����΄V����isd�o,7����, �p<:��X���8�;���/�N�E�W��f��	
�p�\冲��Mc]��2k�����g��24����ط�����+�Ӓ��Z+~kUڽ��3�l%��p�D����E:o��"����=�2p���5��{��+ѐ��_��Vv@��_�D���r ɺ�h$�J:�
-��"��/
+r,�\k@H_?b
+w�"�p��
�LH{ -$��P����f|Խk&'����N7�ߞ�#.���6a�g��[�
+:X-kbu&��m)��7E�zA��8

data/History.txt

@@ -1,3 +1,35 @@
+=== 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:
+
+  * Bumped rake dependency to < 15.
+
+* 1 bug fix:
+
+  * Fixed debug task to fail more gracefully when page not found. (kejadlen)
+
+=== 3.10.3 / 2019-09-24
+
+* 1 bug fix:
+
+  * Fixed an ERB deprecation warning in ruby 2.6+.
+
+=== 3.10.2 / 2018-03-16
+
+* 5 bug fixes:
+
+  * Argh! Fixed logic error in inherited config lookup.
+  * Fix subpages after time pruning in categories.
+  * Fixed Site#fix_subpages from duplicating pages. Now idempotent.
+  * Fixed double-loading warnings from plugins if you're testing against local.
+  * Fixed filtering of pre-dated pages. (thagomizer)
+
 === 3.10.1 / 2016-11-16
 
 * 1 bug fix:

data/Rakefile

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

data/lib/zenweb/config.rb

@@ -48,7 +48,7 @@ module Zenweb
     # Access value at +k+. The value can be inherited from the parent configs.
 
     def [] k
-      h[k.to_s] or parent[k]
+      h.key?(k.to_s) ? h[k.to_s] : parent[k]
     end
 
     def key? k
@@ -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/plugins/erb.rb

@@ -33,11 +33,14 @@ class Zenweb::Page
         gsub(/%\}/,  "%>").
         gsub(/\\([{}%])/, '\1')
 
-      @erb = ERB.new(content, nil, "-")
+      @erb = if RUBY_VERSION >= "2.6.0" then
+               ERB.new(content, trim_mode:"-")
+             else
+               ERB.new(content, nil, "-")
+             end
     end
 
     @erb.filename = source.inspect
     @erb.result binding
   end
 end # erb
-

data/lib/zenweb/site.rb

@@ -34,7 +34,11 @@ module Zenweb
     # Loads all files matching "zenweb/plugins/*.rb".
 
     def self.load_plugins
+      seen = {}
       Gem.find_files("zenweb/plugins/*.rb").each do |path|
+        file = File.basename path
+        next if seen[file]
+        seen[file] = true
         require path
       end
     end
@@ -67,6 +71,9 @@ module Zenweb
             end
           end
 
+          time_prune
+          fix_subpages
+
           pages.each do |url, page|
             dir = url.split(/\//).first
             next unless File.directory? dir and dir !~ /^_/
@@ -201,11 +208,15 @@ module Zenweb
       $website = self # HACK
       task(:virtual_pages).invoke
 
+      time_prune
+
+      fix_subpages
+    end
+
+    def time_prune
       t = Time.now
       @pages.reject! { |path, page| page.date && page.date > t } unless
         ENV["ALL"]
-
-      fix_subpages
     end
 
     def self.binary_files
@@ -250,7 +261,7 @@ module Zenweb
 
       @pages.values.each do |p|
         unless p.subpages.empty? then
-          sorted = p.subpages.sort_by(&:clean_url)
+          sorted = p.subpages.sort_by(&:clean_url).uniq
           p.subpages.replace sorted
         end
       end

data/lib/zenweb/tasks.rake

@@ -182,17 +182,20 @@ end
 
 website if ENV['DEBUG']
 
-desc "Debug the generation of a file. Takes a PATH arg."
-task :debug => ".site" do
+desc "Debug the generation of a file. Takes a F=path arg or defaults to index.html.erb."
+task :debug do
   site = website
 
   path = ENV['PAGE'] || ENV['F'] || ENV['FILE'] || "index.html.erb"
 
-  if path then
-    page = site.pages[path]
+  page = site.pages[path]
+
+  if page
     page.generate
 
     puts
     puts File.read page.url_path
+  else
+    fail "Could not find F=%p" % [path]
   end
 end

data/lib/zenweb.rb

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

data/test/test_zenweb_config.rb

@@ -51,7 +51,7 @@ class TestZenwebConfig < Minitest::Test
            '"layout" => "post"]',
            '"title" => "Example Page 1"]'].join ", "
 
-    assert_nil Rake.application.options.trace
+    refute Rake.application.options.trace
     Rake.application.options.trace = true
     assert_equal exp, config.inspect
   ensure

data/test/test_zenweb_plugins_erb.rb

@@ -54,7 +54,8 @@ class TestZenwebPageErb < Minitest::Test
       page.erb "this is {{ 1 + }} content", page
     end
 
-    assert_includes e.message, "concat(( 1 + ).to_s)"
+    # in 2.5 this changes from concat to <<, but the syntax error stays
+    assert_includes e.message, "(( 1 + ).to_s)"
     assert e.backtrace.grep('Page["blog/2012-01-02-page1.html.md"]:1')
   end
 end

data/test/test_zenweb_site.rb

@@ -50,6 +50,22 @@ class TestZenwebSite < Minitest::Test
     end
   end
 
+  def test_fix_subpages
+    top = setup_complex_website
+
+    site.fix_subpages
+    site.fix_subpages
+    # ...
+
+    sp  = site.pages
+    exp = [[sp["blog/index.html.md"],
+            [[sp["blog/2014-01-01-first.html.md"], []],
+             [sp["blog/2014-02-02-second.html.md"], []],
+             [sp["blog/2014-03-03-third.html.md"], []]]]]
+
+    assert_equal exp, top.all_subpages
+  end
+
   def test_config
     assert_equal "_config.yml", site.config.path
   end

metadata

@@ -1,18 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: zenweb
 version: !ruby/object:Gem::Version
-  version: 3.10.1
+  version: 3.10.5
 platform: ruby
 authors:
 - Ryan Davis
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDijCCAnKgAwIBAgIBATANBgkqhkiG9w0BAQUFADBFMRMwEQYDVQQDDApyeWFu
+  MIIDPjCCAiagAwIBAgIBBjANBgkqhkiG9w0BAQsFADBFMRMwEQYDVQQDDApyeWFu
   ZC1ydWJ5MRkwFwYKCZImiZPyLGQBGRYJemVuc3BpZGVyMRMwEQYKCZImiZPyLGQB
-  GRYDY29tMB4XDTE2MDkyNjAxNTczNVoXDTE3MDkyNjAxNTczNVowRTETMBEGA1UE
+  GRYDY29tMB4XDTIxMTIyMzIzMTkwNFoXDTIyMTIyMzIzMTkwNFowRTETMBEGA1UE
   AwwKcnlhbmQtcnVieTEZMBcGCgmSJomT8ixkARkWCXplbnNwaWRlcjETMBEGCgmS
   JomT8ixkARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALda
   b9DCgK+627gPJkB6XfjZ1itoOQvpqH1EXScSaba9/S2VF22VYQbXU1xQXL/WzCkx
@@ -20,122 +20,127 @@ cert_chain:
   oOvjtt5P8+GSK9zLzxQP0gVLS/D0FmoE44XuDr3iQkVS2ujU5zZL84mMNqNB1znh
   GiadM9GHRaDiaxuX0cIUBj19T01mVE2iymf9I6bEsiayK/n6QujtyCbTWsAS9Rqt
   qhtV7HJxNKuPj/JFH0D2cswvzznE/a5FOYO68g+YCuFi5L8wZuuM8zzdwjrWHqSV
-  gBEfoTEGr7Zii72cx+sCAwEAAaOBhDCBgTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIE
-  sDAdBgNVHQ4EFgQUR8V72Z3+v+2P9abCnL4wjx32T+EwIwYDVR0RBBwwGoEYcnlh
-  bmQtcnVieUB6ZW5zcGlkZXIuY29tMCMGA1UdEgQcMBqBGHJ5YW5kLXJ1YnlAemVu
-  c3BpZGVyLmNvbTANBgkqhkiG9w0BAQUFAAOCAQEAIGzgp0aZ2W9+v96ujmBcQHoC
-  buy0iU68MVj2VlxMyfr1KPZIh1OyhU4UO4zrkREcH8ML70v9cYHNvOd9oynRHnvC
-  l2tj/fD3YJ0AEkJxGrYwRWQmvMfC4bJ02bC1+rVOUIXXKp3+cUmiN4sTniof8VFo
-  bo/YYP4c7erpERa+9hrqygg6WQbJlk2YRlH3JXPFjmu869i2dcbR5ZLOAeEy+axH
-  E4oJcnPkJAr0rw504JGtlZtONZQblwmRJOIdXzolaE3NRGUzGVOUSptZppAKiavY
-  fO6tdKQc/5RfA8oQEkg8hrxA5PQSz4TOFJGLpFvIapEk6tMruQ0bHgkhr9auXg==
+  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
   -----END CERTIFICATE-----
-date: 2016-11-17 00:00:00.000000000 Z
+date: 2022-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.9'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '11'
+        version: '15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.9'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '11'
+        version: '15'
 - !ruby/object:Gem::Dependency
   name: makerakeworkwell
   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: less
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         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: 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
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.15'
+        version: '3.23'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.15'
+        version: '3.23'
 description: |-
   Zenweb is a set of classes/tools for organizing and formating a
   website. It is website oriented rather than webpage oriented, unlike
@@ -166,7 +171,7 @@ extra_rdoc_files:
 - example-site/blog/_tmp/not_yet.html.md
 - example-site/pages/nonblogpage.html.md
 files:
-- .autotest
+- ".autotest"
 - History.txt
 - Manifest.txt
 - README.txt
@@ -230,27 +235,28 @@ files:
 homepage: https://github.com/seattlerb/zenweb
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  homepage_uri: https://github.com/seattlerb/zenweb
+  bug_tracker_uri: https://github.com/seattlerb/zenweb/issues
+post_install_message:
 rdoc_options:
-- --main
+- "--main"
 - README.txt
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: Zenweb is a set of classes/tools for organizing and formating a website
 test_files: []