zenweb 3.10.1 → 3.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 3737a3b87e86c85728272600f7ae0a1f8f55d564
-  data.tar.gz: d3bdb4f609b52e54d3754bf3eede3ca0f8fdf584
+SHA256:
+  metadata.gz: 1b4fad66a102c7e624056d1908d4e6087034dfc5755e84f68b8968d403957c9a
+  data.tar.gz: b49e8241c32670e45738f217ea1a9cb151a54e5456217f9c6c54d16d2f05467a
 SHA512:
-  metadata.gz: 8e47e0cac3bb1f56c6ff9b049fc7e8f356a4ac7bc25d7848d7be8f6b34252ea9c3be128e1bc00ca830cac84ff974412a22fe6b752b5e00f29dbd0bdb7a193769
-  data.tar.gz: 8434b923ad69c434d5fccc2c0034588a30d75bafc04cb36a07e9a76691eb366ff64d9fc7e7655d317ae8c220bd4bd1f7537836448c41fef20c5216c6f42fbb79
+  metadata.gz: 4d1ac7338660b7cb5f31d496c9124912c03c00227290a3c1e9f91e3329fb388b150496051e8ce863870f5f2777dabd551d3a2dcf0355a51f4de23714ce2ff2a0
+  data.tar.gz: 329aa8c3907a69543bf46895b514f6c0245b38734c671549bc9b50eac1768b1f8ceb00c0e0cd5702fc725dd2ccc9ab43f1bad2d78e7b439f9ddef25b53494b9c

checksums.yaml.gz.sig

@@ -1,2 +1,5 @@
-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:�
-��"��/
+���X�ڣ�b�9)C�Bs��[�	}tp�U�d�u�ا8�D��X�~��t	�CAsEt$��R�?�H��^J~Rr����#g��Yh�%����R����"�w7�B�6:�M�	�ch�Yy�wQ�,'H��Ŧhx��V�w�;!6��nhJw�C�+594K�ޚ�'��NE<ߧ��k��\�
+������nj��=�兺�6x�
+�0�߯;A��\X�Q�Q�P���)����	"�/�Cu&���n�W��ي
+�
+ɮE

data/History.txt

@@ -1,3 +1,13 @@
+=== 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/lib/zenweb.rb

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

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

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/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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zenweb
 version: !ruby/object:Gem::Version
-  version: 3.10.1
+  version: 3.10.2
 platform: ruby
 authors:
 - Ryan Davis
@@ -10,9 +10,9 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDijCCAnKgAwIBAgIBATANBgkqhkiG9w0BAQUFADBFMRMwEQYDVQQDDApyeWFu
+  MIIDPjCCAiagAwIBAgIBAjANBgkqhkiG9w0BAQUFADBFMRMwEQYDVQQDDApyeWFu
   ZC1ydWJ5MRkwFwYKCZImiZPyLGQBGRYJemVuc3BpZGVyMRMwEQYKCZImiZPyLGQB
-  GRYDY29tMB4XDTE2MDkyNjAxNTczNVoXDTE3MDkyNjAxNTczNVowRTETMBEGA1UE
+  GRYDY29tMB4XDTE3MTEyMTIxMTExMFoXDTE4MTEyMTIxMTExMFowRTETMBEGA1UE
   AwwKcnlhbmQtcnVieTEZMBcGCgmSJomT8ixkARkWCXplbnNwaWRlcjETMBEGCgmS
   JomT8ixkARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALda
   b9DCgK+627gPJkB6XfjZ1itoOQvpqH1EXScSaba9/S2VF22VYQbXU1xQXL/WzCkx
@@ -20,122 +20,121 @@ 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/hMA0GCSqGSIb3DQEBBQUAA4IB
+  AQAfAXSQpsW7YSxd1csRtA/M4Zt0AMXFMd76GJ8Lgtg8G0+VFbdChRyDuDb0kPlW
+  h9QQX/YABfCW8vxmssbMGrP+VGBAn7BbdTcfTlgCWrvMX1uL5aRL74nA4urKXqdW
+  a0nP70K4958P3GffBdtE3KGkU5xstFnXGajxuBRnL66E15KU0BNehVxdG258bdPu
+  EKN6MqBPftFiev3tuwqDV11r2GquDpniYcT+Mi8/PgeAgVT/afBeVgbB3KaZeTRR
+  AhXhF6Wi2GTMezlj5jlI5XV7WsJUSwTp/YiVvcmT74ZaCRvexm6EnNhkrvJJ1Xeu
+  V+HB+LYYhXWitInO/eXxDrFB
   -----END CERTIFICATE-----
-date: 2016-11-17 00:00:00.000000000 Z
+date: 2018-03-16 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'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.9'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '11'
 - !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'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.15'
+        version: '3.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.15'
+        version: '3.16'
 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 +165,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
@@ -233,23 +232,23 @@ licenses:
 metadata: {}
 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
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Zenweb is a set of classes/tools for organizing and formating a website