zenweb 3.10.8 → 3.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 448821783e1068f92a0284e93d3072d8501cf21cc0ab94da3f6fc63d251de7d0
-  data.tar.gz: 314bda2c7bc1882f01e5c7b5ff37da023dc46bfd7e0b73de67e605f7260e20f0
+  metadata.gz: f8864678bb1d4420008d2289a77fcc9f14389c54c293ad1bebef6690e23d5b2e
+  data.tar.gz: 5ddaa8d510daccc1b189258c409c68f5418ec59424015c8373ee9ac4237eb5bf
 SHA512:
-  metadata.gz: d4753d177c0ab4b46a58e929f57e1d1c26fcda263c24aa7cc2d0b7875b2b13a2103903664af997a2c15b8903ce7d2d74dc9a13838947338c7ef4d5e45f4602de
-  data.tar.gz: 0d59fdbee4361cce03ef42aac407a39dd25ee2a4a025964de78ab50b5b68ef070d2a54c1b8ef95d0b03d0c07785606978f19367cbd8beeba3c046c17990c3c84
+  metadata.gz: 8a59ab5a91b985b16346bdf03d8f058ce6910aae7e6986c4cbaccdecbd4f23482a3f4628692f0d1ed0cda08d09306197ec98bc1afdfc3626ebfccf1cb82dc25b
+  data.tar.gz: 20ec7695d083ffe7f069349bc1f512e86d6a655e120935a90596b6a49ea84e289e069970b812c8b9c729c212c865d8742bf5a34c65cfa470179aa03d9640554c

data/History.rdoc

@@ -1,3 +1,18 @@
+=== 3.11.1 / 2024-08-22
+
+* 4 bug fixes:
+
+  * Deleted long dead (~2.0) code.
+  * Fixed 2.7 (only?!) frozen string literal bug.
+  * Modified 'rake run' task to regenerate more consistently.
+  * Removed ancient Enumerable#chunk implementation.
+
+=== 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:

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/config.rb

@@ -55,8 +55,7 @@ module Zenweb
       h.key?(k.to_s) or parent.key?(k)
     end
 
-    UTF_BOM = "\xEF\xBB\xBF"
-    UTF_BOM.force_encoding "binary" if File::RUBY19
+    UTF_BOM = "\xEF\xBB\xBF".b
 
     ##
     # Splits a file and returns the yaml header and body, as applicable.
@@ -75,7 +74,7 @@ module Zenweb
 
         yaml_file = File.extname(path) == ".yml"
 
-        body.force_encoding "utf-8" if File::RUBY19
+        body.force_encoding Encoding::UTF_8
       else
         body = path.content
       end

data/lib/zenweb/extensions.rb

@@ -10,24 +10,6 @@ def File.each_parent dir, file
 end
 
 module Enumerable
-  def chunk
-    bin, result, prev = [], [], Object.new
-
-    each do |o|
-      curr = yield o
-
-      if prev != curr then
-        bin = []
-        result << [curr, bin]
-        prev = curr
-      end
-
-      bin << o
-    end
-
-    result
-  end unless [].respond_to? :chunk
-
   def multi_group_by
     r = Hash.new { |h,k| h[k] = [] }
     each do |o|
@@ -54,20 +36,6 @@ class Array # :nodoc:
   end
 end
 
-class File # :nodoc:
-  RUBY19 = "<3".respond_to? :encoding # :nodoc:
-
-  class << self
-    alias :binread :read unless RUBY19
-  end
-end
-
-class String # :nodoc:
-  def valid_encoding? # :nodoc:
-    true
-  end unless File::RUBY19
-end
-
 class Time # :nodoc:
   ##
   # Format as YYYY-MM-DD

data/lib/zenweb/page.rb

@@ -311,8 +311,7 @@ module Zenweb
       end
       @layout
     rescue => e
-      e.message.concat " for page #{path.inspect}"
-      raise e
+      raise e.exception "%s for page %p" % [e.message, path]
     end
 
     ##
@@ -330,6 +329,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 +379,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/tasks.rake

@@ -3,7 +3,7 @@ require 'zenweb'
 task :default => :generate
 
 def website
-  return $website if defined?($website)
+  return $website if defined?($website) && $website
   $website = Zenweb::Site.new
   $website.scan
   $website.wire
@@ -153,19 +153,17 @@ task :run do
 
       warn "NOTE: No file found for #{url}" unless task
 
-      newer = task && task.needed?
+      if task then
+        if task.needed? then
+          unless system "#{Gem.ruby} -S rake -q clean generate" then
+            warn "WARNING: couldn't run 'rake clean generate' properly, exited: %p" % [$?]
+          end
+        end
 
-      if newer then
-        system "rake clean generate"
-      end
-
-      if task && newer then
-        @@site = nil
+        @@site = $website = nil
         Rake.application = Rake::Application.new # reset
       end
 
-      task.clear_timestamp if task && target_path =~ /(html|css|js)$/
-
       super
     end
   end

data/lib/zenweb.rb

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

data/test/test_zenweb_page.rb

@@ -366,8 +366,8 @@ class TestZenwebPage < Minitest::Test
     e = assert_raises NoMethodError do
       assert_nil page.render_wtf
     end
-    err = "undefined method `render_wtf' for Page"
-    assert_includes e.message, err
+
+    assert_match(/undefined method `render_wtf' for.*?Zenweb::Page/,  e.message)
   end
 
   def test_layout_nil_string
@@ -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
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zenweb
 version: !ruby/object:Gem::Version
-  version: 3.10.8
+  version: 3.11.1
 platform: ruby
 authors:
 - Ryan Davis
@@ -10,9 +10,9 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDPjCCAiagAwIBAgIBBzANBgkqhkiG9w0BAQsFADBFMRMwEQYDVQQDDApyeWFu
+  MIIDPjCCAiagAwIBAgIBCDANBgkqhkiG9w0BAQsFADBFMRMwEQYDVQQDDApyeWFu
   ZC1ydWJ5MRkwFwYKCZImiZPyLGQBGRYJemVuc3BpZGVyMRMwEQYKCZImiZPyLGQB
-  GRYDY29tMB4XDTIzMDEwMTA3NTExN1oXDTI0MDEwMTA3NTExN1owRTETMBEGA1UE
+  GRYDY29tMB4XDTI0MDEwMjIxMjEyM1oXDTI1MDEwMTIxMjEyM1owRTETMBEGA1UE
   AwwKcnlhbmQtcnVieTEZMBcGCgmSJomT8ixkARkWCXplbnNwaWRlcjETMBEGCgmS
   JomT8ixkARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALda
   b9DCgK+627gPJkB6XfjZ1itoOQvpqH1EXScSaba9/S2VF22VYQbXU1xQXL/WzCkx
@@ -22,14 +22,14 @@ cert_chain:
   qhtV7HJxNKuPj/JFH0D2cswvzznE/a5FOYO68g+YCuFi5L8wZuuM8zzdwjrWHqSV
   gBEfoTEGr7Zii72cx+sCAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
   HQYDVR0OBBYEFEfFe9md/r/tj/Wmwpy+MI8d9k/hMA0GCSqGSIb3DQEBCwUAA4IB
-  AQAkg3y+PBnBAPWdxxITm5sPHqdWQgSyCpRA20o4LTuWr8BWhSXBkfQNa7cY6fOn
-  xyM34VPzBFbExv6XOGDfOMFBVaYTHuN9peC/5/umL7kLl+nflXzL2QA7K6LYj5Bg
-  sM574Onr0dZDM6Vn69bzQ7rBIFDfK/OhlPzqKZad4nsdcsVH8ODCiT+ATMIZyz5K
-  WCnNtqlyiWXI8tdTpahDgcUwfcN/oN7v4K8iU5IbLJX6HQ5DKgmKjfb6XyMth16k
-  ROfWo9Uyp8ba/j9eVG14KkYRaLydAY1MNQk2yd3R5CGfeOpD1kttxjoypoUJ2dOG
-  nsNBRuQJ1UfiCG97a6DNm+Fr
+  AQCygvpmncmkiSs9r/Kceo4bBPDszhTv6iBi4LwMReqnFrpNLMOWJw7xi8x+3eL2
+  XS09ZPNOt2zm70KmFouBMgOysnDY4k2dE8uF6B8JbZOO8QfalW+CoNBliefOTcn2
+  bg5IOP7UoGM5lC174/cbDJrJnRG9bzig5FAP0mvsgA8zgTRXQzIUAZEo92D5K7p4
+  B4/O998ho6BSOgYBI9Yk1ttdCtti6Y+8N9+fZESsjtWMykA+WXWeGUScHqiU+gH8
+  S7043fq9EbQdBr2AXdj92+CDwuTfHI6/Hj5FVBDULufrJaan4xUgL70Hvc6pTTeW
+  deKfBjgVAq7EYHu1AczzlUly
   -----END CERTIFICATE-----
-date: 2023-08-30 00:00:00.000000000 Z
+date: 2024-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -161,14 +161,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.2'
 description: |-
   Zenweb is a set of classes/tools for organizing and formating a
   website. It is website oriented rather than webpage oriented, unlike
@@ -283,7 +283,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.15
 signing_key:
 specification_version: 4
 summary: Zenweb is a set of classes/tools for organizing and formating a website