zenweb 3.11.0 → 3.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84df6337b405ae77d3a2ed5fb1c6aa940ce2ad08ba6dd904a9b3cde365a47623
-  data.tar.gz: bc471952a820c258e6704dc1e73039c16978edf51b7016ee12db27514e9eeb2e
+  metadata.gz: d5d65b2aa52df8d273f1d9495c817afaec7e29c5628106c28feced37ea7cf988
+  data.tar.gz: c8f3ce1cd5a8528ee6d8302a0173c2b3673870378458c0a0dba4b26ad5eb280b
 SHA512:
-  metadata.gz: '08fbb2f23c3ebb0ca4323a5a79d0604f84d61f5904c3c758e2c3ef2e5956fc2044cf1eec66b3a3a93b18b914e12fa47247b4bcc7e3a6498750c7201b9d5fa8b7'
-  data.tar.gz: 26452812d1d9459a0413ca40b8fa9a394372b7c4f2cdcacc6ce7cef7b85bb8a69b4c78e3e7def7e9356ed6f1af2ac584434d9da4465b8b8c861e8c1ea729229d
+  metadata.gz: 6170ff66ec3020cd0ec7f268f05a220e799601b8ba1899b0ab15ce769eab9b3ce98ff9ca89ad400109324908444d93e31eb47b116cae01f815f6fdb5d58b8acc
+  data.tar.gz: a4dd4c2f449052627667eb862fce8f34f7a74f5d3b2b537cacdfd8b03b0d90d086133bab7d5cd1205c01a460da50636a0878ee0413399eb1a55a24ee011d13c9

data/History.rdoc

@@ -1,3 +1,24 @@
+=== 3.12.0 / 2026-01-29
+
+* 2 minor enhancements:
+
+  * Added Binary subclass of Page: copies file and preserves dates.
+  * Disabled Page#binary and friends.
+
+* 2 bug fixes:
+
+  * Added ability to specify change_frequency in config to force a page's value.
+  * Fixed disqus urls to use https.
+
+=== 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:

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

@@ -31,11 +31,13 @@ module Zenweb
 
     attr_accessor :parent
 
-    ##
-    # Is this file a binary file? Defaults to true if config passed to Page.new.
-
-    attr_accessor :binary
+    # :stopdoc:
+    def binary = warn "Page#binary is deprecated. Use Zenweb::Binary instead."
+    def binary= o
+      warn "Page#binary= is deprecated. Use Zenweb::Binary instead."
+    end
     alias binary? binary
+    # :startdoc:
 
     ##
     # Returns a regexp that will match file extensions for all known
@@ -98,11 +100,7 @@ module Zenweb
       @body ||= begin
                   thing = File.file?(path) ? path : self
                   _, body = Zenweb::Config.split thing
-                  if self.binary? then
-                    body
-                  else
-                    body.strip
-                  end
+                  body.strip
                 end
     end
 
@@ -193,6 +191,8 @@ module Zenweb
     end
 
     def change_frequency
+      return config["change_frequency"] if config["change_frequency"]
+
       days_old = (Time.now - self.date).to_i / 86400
 
       case days_old
@@ -271,11 +271,7 @@ module Zenweb
       content = self.render
 
       open url_path, "w" do |f|
-        if binary? then
-          f.print content
-        else
-          f.puts content
-        end
+        f.puts content
       end
     end
 
@@ -311,8 +307,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
 
     ##
@@ -505,6 +500,29 @@ module Zenweb
     attr_accessor :date
   end
 
+  ##
+  # A file representing a binary. This file is not rendered in any
+  # way, and doesn't have the usual dependencies because its content
+  # would not be modified to changes in config or the like.
+
+  class Binary < Page
+    def generate
+      warn "Copying #{url_path}"
+      cp path, url_path, preserve:true, verbose: Rake.application.options.trace
+      # touch url_path, mtime: date, verbose: Rake.application.options.trace
+    end
+
+    def wire
+      file self.path
+      directory url_dir
+      file url_path => url_dir
+      file url_path => path do
+        self.generate
+      end
+      task :site => url_path
+    end
+  end
+
   ##
   # Generates a virtual page with an index of all tags on the given pages.
   # You must subclass and provide a content method.

data/lib/zenweb/plugins/disqus.rb

@@ -5,7 +5,7 @@ class Zenweb::Page
 
   def disqus shortname
     '<div id="disqus_thread"></div>' +
-      run_js_script("http://#{shortname}.disqus.com/embed.js")
+      run_js_script("https://#{shortname}.disqus.com/embed.js")
   end
 
   ##
@@ -13,6 +13,6 @@ class Zenweb::Page
   # disqus comment counts.
 
   def disqus_counts shortname
-    run_js_script "http://#{shortname}.disqus.com/count.js"
+    run_js_script "https://#{shortname}.disqus.com/count.js"
   end
 end

data/lib/zenweb/site.rb

@@ -197,7 +197,7 @@ module Zenweb
         when /\.yml$/ then
           @configs[path] = Config.new self, path
         when /\.(?:#{self.class.binary_files.join("|")})$/ then
-          @pages[path] = Page.new self, path, self.config
+          @pages[path] = Binary.new self, path, self.config
         when /\.(?:#{self.class.text_files.join("|")})$/, renderers_re then
           @pages[path] = Page.new self, path
         else

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

data/test/test_zenweb_page.rb

@@ -147,16 +147,18 @@ class TestZenwebPage < Minitest::Test
     assert_equal exp, top.sitemap(:title_dated)
   end
 
-  def test_binary
-    page = Zenweb::Page.new site, "blah"
-    refute_predicate page, :binary?
+  def test_body
+    assert_equal "Not really much here to see.", page.body
+  end
 
-    page = Zenweb::Page.new site, "blah", site.config
-    assert_predicate page, :binary?
+  def test_change_frequency
+    assert_equal "yearly", page.change_frequency
   end
 
-  def test_body
-    assert_equal "Not really much here to see.", page.body
+  def test_change_frequency__config
+    page.config.h["change_frequency"] = "daily"
+
+    assert_equal "daily", page.change_frequency
   end
 
   def test_breadcrumbs
@@ -256,18 +258,12 @@ class TestZenwebPage < Minitest::Test
   end
 
   def test_generate_binary
-    page = Zenweb::Page.new site, "blah", site.config
+    page = Zenweb::Binary.new site, "blah", site.config
+    def page.cp(...) = puts "copy!" # just shows it got called
+    def page.date    = Time.now
 
-    def page.render
-      "woot"
-    end
-
-    def page.open path, mode
-      yield $stdout
-    end
-
-    out = "woot"
-    err = "Rendering .site/blah\n"
+    out = "copy!\n"
+    err = "Copying .site/blah\n"
 
     assert_output out, err do
       page.generate
@@ -359,15 +355,15 @@ class TestZenwebPage < Minitest::Test
       assert_nil page.method_missing("wtf")
     end
 
-    assert_includes e.message, "undefined method `wtf'"
+    assert_match(/undefined method .wtf'/, e.message)
   end
 
   def test_method_missing_render
     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

data/test/test_zenweb_plugins_disqus.rb

@@ -23,7 +23,7 @@ class TestZenwebPageDisqus < Minitest::Test
           var s   = document.createElement('script');
           s.type  = 'text/javascript';
           s.async = true;
-          s.src   = 'http://myshortname.disqus.com/#{name}.js';
+          s.src   = 'https://myshortname.disqus.com/#{name}.js';
           (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(s);
         })();
       </script>

data/test/test_zenweb_plugins_erb.rb

@@ -49,13 +49,17 @@ class TestZenwebPageErb < Minitest::Test
     assert e.backtrace.grep('Page["blog/2012-01-02-page1.html.md"]:1')
   end
 
+  def prism? # yuck! but prism is injecting ansi codes everywhere!
+    RubyVM::InstructionSequence.compile("").to_a[4][:parser] == :prism
+  end
+
   def test_erb_syntax_error
     e = assert_raises SyntaxError do
       page.erb "this is {{ 1 + }} content", page
     end
 
     # in 2.5 this changes from concat to <<, but the syntax error stays
-    assert_includes e.message, "(( 1 + ).to_s)"
+    assert_includes e.message, "(( 1 + ).to_s)" unless prism?
     assert e.backtrace.grep('Page["blog/2012-01-02-page1.html.md"]:1')
   end
 end

data/test/test_zenweb_site.rb

@@ -166,9 +166,9 @@ class TestZenwebSite < Minitest::Test
 
     assert_equal exp, site.pages.keys.sort
 
-    exp = [Zenweb::Page]
+    exp = [Zenweb::Binary, Zenweb::Page]
 
-    assert_equal exp, site.pages.values.map(&:class).uniq
+    assert_equal exp, site.pages.values.map(&:class).uniq.sort_by(&:name)
   end
 
   def test_pages_by_date
@@ -278,7 +278,7 @@ class TestZenwebSite < Minitest::Test
       assert_task "css/colors.css.less",              %w[_config.yml]
       assert_task "css/styles.css",                   %w[_config.yml]
       assert_task "css/syntax.css",                   %w[_config.yml]
-      assert_task "img/bg.png",                       %w[_config.yml]
+      assert_task "img/bg.png"
       assert_task "js/jquery.js",                     %w[_config.yml]
       assert_task "js/site.js",                       %w[_config.yml]
       assert_task "sitemap.xml.erb",                  %w[_config.yml]

metadata

@@ -1,18 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: zenweb
 version: !ruby/object:Gem::Version
-  version: 3.11.0
+  version: 3.12.0
 platform: ruby
 authors:
 - Ryan Davis
-autorequire:
 bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDPjCCAiagAwIBAgIBBzANBgkqhkiG9w0BAQsFADBFMRMwEQYDVQQDDApyeWFu
+  MIIDPjCCAiagAwIBAgIBCjANBgkqhkiG9w0BAQsFADBFMRMwEQYDVQQDDApyeWFu
   ZC1ydWJ5MRkwFwYKCZImiZPyLGQBGRYJemVuc3BpZGVyMRMwEQYKCZImiZPyLGQB
-  GRYDY29tMB4XDTIzMDEwMTA3NTExN1oXDTI0MDEwMTA3NTExN1owRTETMBEGA1UE
+  GRYDY29tMB4XDTI2MDEwNzAxMDkxNFoXDTI3MDEwNzAxMDkxNFowRTETMBEGA1UE
   AwwKcnlhbmQtcnVieTEZMBcGCgmSJomT8ixkARkWCXplbnNwaWRlcjETMBEGCgmS
   JomT8ixkARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALda
   b9DCgK+627gPJkB6XfjZ1itoOQvpqH1EXScSaba9/S2VF22VYQbXU1xQXL/WzCkx
@@ -22,14 +21,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
+  AQA/X8/PKTTc/IkYQEUL6XWtfK8fAfbuLJzmLcz6f2ZWrtBvPsYvqRuwI1bWUtil
+  2ibJEfIuSIHX6BsUTX18+hlaIussf6EWq/YkE7e2BKmgQE42vSOZMce0kCEAPbx0
+  rQtqonfWTHQ8UbQ7GqCL3gDQ0QDD2B+HUlb4uaCZ2icxqa/eOtxMvHC2tj+h0xKY
+  xL84ipM5kr0bHGf9/MRZJWcw51urueNycBXu1Xh+pEN8qBmYsFRR4SIODLClybAO
+  6cbm2PyPQgKNiqE4H+IQrDVHd9bJs1XgLElk3qoaJBWXc/5fy0J1imYb25UqmiHG
+  snGe1hrppvBRdcyEzvhfIPjI
   -----END CERTIFICATE-----
-date: 2023-09-29 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -141,35 +140,35 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
-description: |-
+        version: '4.6'
+description: |
   Zenweb is a set of classes/tools for organizing and formating a
   website. It is website oriented rather than webpage oriented, unlike
   most rendering tools. It is content oriented, rather than style
@@ -183,6 +182,8 @@ description: |-
   Zenweb uses rake to handle dependencies. As a result, scanning a
   website and regenerating incrementally is not just possible, it is
   blazingly fast.
+
+  ==== To Install:
 email:
 - ryand-ruby@zenspider.com
 executables: []
@@ -266,7 +267,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/seattlerb/zenweb
   bug_tracker_uri: https://github.com/seattlerb/zenweb/issues
-post_install_message:
+  documentation_uri: http://docs.seattlerb.org/zenweb
 rdoc_options:
 - "--main"
 - README.rdoc
@@ -283,8 +284,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
-signing_key:
+rubygems_version: 3.7.2
 specification_version: 4
 summary: Zenweb is a set of classes/tools for organizing and formating a website
 test_files: []

metadata.gz.sig

@@ -1,3 +1 @@
-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���
-�\�)
+v�