zenweb 3.9.0 → 3.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f182dd306078007adbb5ab6c1e53ad6a6d9ad389
-  data.tar.gz: 546e36b5723788433e99824c100e4344a9c3c4f8
+  metadata.gz: 5febe4a0a9de6f9ee3ec7abe552561e6c2d14775
+  data.tar.gz: b422b7ec60e68338d26de19062336a29bd7b9df9
 SHA512:
-  metadata.gz: 1a55442c3989e15e3cf236754bf4c609863be2e40da7c582b7f55ce4fb5202cbf2b5711e4e68abb03ac028bd68ebc36872364f77745cf18a879301438f8807d5
-  data.tar.gz: aaab074cb12006a26c8e5a9378c482b50815a3731b31738faafb4e692b54f32558baf709247b654cf864f3a7742463b67cf2538f06bd6e20bda01849f535f5af
+  metadata.gz: a20d9d354d7fb0874100f6ebcda980f8323d14a8e88ee6afc7a4979a9bf7732a5ff9e934b0c06d25b307870bf2048d55c10b539bf1ef6aaa20cb496d141d53f7
+  data.tar.gz: 4f02f19c9b4441553d8d33a8e8998ca725b4168f61021117fa3584df1a77c6128b319bcad10f25dcc940eabe6d385b22de59cfc27e1c8be56bc86345054476e4

data/History.txt

@@ -1,3 +1,19 @@
+=== 3.10.0 / 2016-10-09
+
+* 7 minor enhancements:
+
+  * Added Page#stylesheet.
+  * Added Zenweb::Config#key? and hooked into Page#method_missing for quieter checks.
+  * Improved Site#method_missing to use Config#key? to allow nil values w/o warnings.
+  * MonthlyPage and YearlyPage now put date in config as well.
+  * Now ignores subdirs/subfiles that start with underscore (not just top level).
+  * Page#[] uses Config#key? to be better about nil entries.
+  * Site#layout will now raise if passed unknown layout name.
+
+* 1 bug fix:
+
+  * Markdown sitemap now sorts w/ case folded.
+
 === 3.9.0 / 2015-12-21
 
 * 1 minor enhancement:

data/Manifest.txt

@@ -18,6 +18,8 @@ example-site/blog/2012-01-02-page1.html.md
 example-site/blog/2012-01-03-page2.html.md
 example-site/blog/2012-01-04-page3.html.md
 example-site/blog/_config.yml
+example-site/blog/_not_yet.html.md
+example-site/blog/_tmp/not_yet.html.md
 example-site/blog/index.html.erb
 example-site/config.ru
 example-site/css/colors.css.less

data/example-site/atom.xml.erb

@@ -5,7 +5,6 @@ author: John Doe
 email: john.doe@example.com
 feed_url: http://example.com/atom.xml
 rss_length: 15
-layout: nil
 ...
 <?xml version="1.0" encoding="utf-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom">

data/example-site/sitemap.xml.erb

@@ -1,5 +1,4 @@
 ---
-layout: nil
 ...
 <?xml version='1.0' encoding='UTF-8'?>
 <urlset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

data/lib/zenweb/config.rb

@@ -51,6 +51,10 @@ module Zenweb
       h[k.to_s] or parent[k]
     end
 
+    def key? k
+      h.key?(k.to_s) or parent.key?(k)
+    end
+
     UTF_BOM = "\xEF\xBB\xBF"
     UTF_BOM.force_encoding "binary" if File::RUBY19
 
@@ -129,6 +133,7 @@ module Zenweb
   # :stopdoc:
   Config::Null = Class.new Config do
     def [] k;                    end
+    def key? k;                  end
     def initialize;              end
     def inspect; "Config::Null"; end
     def wire;                    end

data/lib/zenweb/extensions.rb

@@ -48,7 +48,6 @@ class Array # :nodoc:
       when Array then
         x.deep_each(depth + 1, &b)
       else
-        # yield (depth-1)/2, x
         yield depth, x
       end
     end

data/lib/zenweb/page.rb

@@ -68,7 +68,8 @@ module Zenweb
     # Helper method to access the config value named +k+.
 
     def [] k
-      config[k] or warn("#{self.inspect} does not define #{k.inspect}")
+      warn("#{self.url} does not define #{k.inspect}") unless config.key?(k)
+      config[k]
     end
 
     ##
@@ -279,9 +280,9 @@ module Zenweb
     end
 
     ##
-    # Render a named file from +_includes+.
-    #
-    # category: XXX
+    # Render a named file from +_includes+. You must pass in the
+    # current page. This can make its configuration available
+    # accessing it via page.
 
     def include name, page
       incl = Page.new(site, File.join("_includes", name))
@@ -303,8 +304,6 @@ module Zenweb
 
     ##
     # Return a layout Page named in the config key +layout+.
-    #
-    # TODO: expand
 
     def layout
       unless defined? @layout then
@@ -338,7 +337,11 @@ module Zenweb
       when /=|^render_|^to_a(?:ry)?$/ then # to_a/ry for 1.9 only. :(
         super
       else
-        self[msg]
+        if config.key? msg
+          config[msg]
+        else
+          config.send msg, *args
+        end
       end
     end
 
@@ -363,6 +366,13 @@ module Zenweb
       file(url_path).needed?
     end
 
+    ##
+    # Stupid helper method to make declaring stylesheets cleaner
+
+    def stylesheet name
+      %(<link rel="stylesheet" type="text/css" href="/css/#{name}.css">)
+    end
+
     ##
     # Render a Page instance based on its filetypes. For example,
     # index.html.md.erb will essentially call:
@@ -620,6 +630,7 @@ module Zenweb
     def initialize site, path, pages, year, month
       super site, path, pages
       self.date = Time.local(year, month)
+      config.h['date'] = self.date
     end
   end
 
@@ -640,6 +651,7 @@ module Zenweb
     def initialize site, path, pages, year
       super site, path, pages
       self.date = Time.local(year)
+      config.h['date'] = self.date
     end
   end
 end

data/lib/zenweb/plugins/markdown.rb

@@ -57,7 +57,7 @@ class Zenweb::Page
 
         dated, normal = a.map(&:last).reject(&:no_index?).partition(&:dated?)
 
-        normal = normal.sort_by(&:url).map { |p| page_sitemap_url p, level }
+        normal = normal.sort_by { |p| p.url.downcase }.map { |p| page_sitemap_url p, level }
 
         dated = dated_map(dated) { |month, ps2|
           x = date_sorted_map(ps2) { |p|

data/lib/zenweb/site.rb

@@ -119,7 +119,7 @@ module Zenweb
     # Returns a layout named +name+.
 
     def layout name
-      @layouts[name]
+      name and (@layouts[name] or raise "unknown layout #{name.inspect}")
     end
 
     ##
@@ -133,8 +133,9 @@ module Zenweb
     ##
     # Proxy object for the config. Returns a config item at +msg+.
 
-    def method_missing msg, *args
-      config[msg.to_s] || warn("#{self.inspect} does not define #{msg}")
+    def method_missing msg, *_args
+      k = msg.to_s
+      config.key?(k) ? config[k] : warn("#{self.inspect} does not define #{k}")
     end
 
     ##
@@ -173,6 +174,7 @@ module Zenweb
       top = Dir["*"] - excludes
       files = top.select { |path| File.file? path }
       files += Dir["{#{top.join(",")}}/**/*"].reject { |f| not File.file? f }
+      files.reject! { |f| f.include? "/_" }
 
       renderers_re = Page.renderers_re
 

data/lib/zenweb.rb

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

data/test/helper.rb

@@ -44,6 +44,22 @@ class Minitest::Test
 
     site.fix_subpages
   end
+
+  def setup_complex_website
+    self.site = Zenweb::Site.new
+
+    pages = %w[
+      index.html.md
+      blog/index.html.md
+      blog/2014-01-01-first.html.md
+      blog/2014-02-02-second.html.md
+      blog/2014-03-03-third.html.md
+    ]
+
+    build_fake_site(*pages)
+
+    site.pages["index.html.md"]
+  end
 end
 
 class Zenweb::Page

data/test/test_zenweb_config.rb

@@ -58,6 +58,14 @@ class TestZenwebConfig < Minitest::Test
     Rake.application.options.trace = nil
   end
 
+  def test_key_eh
+    assert config.key? "title"
+
+    assert_silent do
+      refute config.key? "woot"
+    end
+  end
+
   def test_parent
     assert_equal site.configs["blog/_config.yml"], config.parent
   end

data/test/test_zenweb_page.rb

@@ -30,22 +30,6 @@ class TestZenwebPage < Minitest::Test
     return p1, p2
   end
 
-  def setup_complex_website
-    self.site = Zenweb::Site.new
-
-    pages = %w[
-      index.html.md
-      blog/index.html.md
-      blog/2014-01-01-first.html.md
-      blog/2014-02-02-second.html.md
-      blog/2014-03-03-third.html.md
-    ]
-
-    build_fake_site(*pages)
-
-    site.pages["index.html.md"]
-  end
-
   def setup_complex_website2 skip_monthly = false
     self.site = Zenweb::Site.new
 
@@ -335,11 +319,21 @@ class TestZenwebPage < Minitest::Test
     assert_equal page.config["title"], page["title"]
   end
 
+  def test_index_missing
+    exp = "/blog/2012/01/02/page1.html does not define \"missing\"\n"
+
+    assert_output "", exp do
+      assert_nil page["missing"]
+    end
+  end
+
   def test_inspect
     assert_equal 'Page["blog/2012-01-02-page1.html.md"]', page.inspect
   end
 
   def test_layout
+    site.scan # to load layouts
+
     assert_equal site.layout("post"), page.layout
   end
 
@@ -351,20 +345,21 @@ class TestZenwebPage < Minitest::Test
     assert_equal exp, page.link_html("blah")
   end
 
-  def test_method_missing
-    assert_equal page["title"], page.method_missing("title")
-  end
-
   def test_meta
     exp = '<meta name="title" content="Example Page 1">'
     assert_equal exp, page.meta("title")
   end
 
+  def test_method_missing
+    assert_equal page["title"], page.method_missing("title")
+  end
+
   def test_method_missing_odd
-    err = "Page[\"blog/2012-01-02-page1.html.md\"] does not define \"wtf\"\n"
-    assert_output "", err do
+    e = assert_raises NoMethodError do
       assert_nil page.method_missing("wtf")
     end
+
+    assert_includes e.message, "undefined method `wtf'"
   end
 
   def test_method_missing_render
@@ -406,6 +401,7 @@ class TestZenwebPage < Minitest::Test
   end
 
   def test_render
+    page.instance_variable_set :@layout, nil # keep it skinny
     assert_equal "<p>Not really much here to see.</p>\n", page.render
   end
 
@@ -434,6 +430,11 @@ class TestZenwebPage < Minitest::Test
     assert_equal site, page.site
   end
 
+  def test_stylesheet
+    exp = %(<link rel="stylesheet" type="text/css" href="/css/woot.css">)
+    assert_equal exp, page.stylesheet("woot")
+  end
+
   def test_subpages
     site.scan
 
@@ -542,3 +543,43 @@ class TestZenwebPage < Minitest::Test
     end
   end
 end
+
+class TestGenerated < Minitest::Test
+  include ChdirTest("example-site")
+
+  class MonthlyTest < Zenweb::MonthlyPage
+    def content
+      "woot"
+    end
+  end
+
+  class YearlyTest < Zenweb::YearlyPage
+    def content
+      "woot"
+    end
+  end
+
+  attr_accessor :site
+
+  def assert_date klass, *args
+    setup_complex_website
+
+    path = "blog/2014/01/index.html"
+    pages = []
+    monthly = klass.new(site, path, pages, *args)
+
+    exp_date = Time.local 2014, 1
+
+    assert_equal exp_date, monthly.date
+    assert_equal exp_date, monthly["date"]
+
+  end
+
+  def test_monthly_date
+    assert_date MonthlyTest, 2014, 1
+  end
+
+  def test_yearly_date
+    assert_date YearlyTest, 2014
+  end
+end

data/test/test_zenweb_plugins_markdown.rb

@@ -29,7 +29,7 @@ class TestUgh < MarkdownTest
   def test_coderay_ruby
     assert_markdown_code("ruby",
                          "def x\n  42\nend",
-                         '<div class="highlighter-coderay"><table class="CodeRay"><tr>',
+                         '<div class="language-ruby highlighter-coderay"><table class="CodeRay"><tr>',
                          '<span class="keyword">def</span>')
   end
 
@@ -121,6 +121,23 @@ class TestZenwebPageMarkdown < MarkdownTest
     assert_equal exp, act
   end
 
+  def test_sitemap_folded_sorting
+    build_fake_site %w[
+                     a/index.html.md
+                     a/ZenWeb.html.md
+                     a/autotest.html.md
+                    ]
+
+    page = site.pages["a/index.html.md"]
+    act  = page.sitemap
+    exp  = <<-END.cleanup
+    * [Title for a/autotest.html.md](/a/autotest.html)
+    * [Title for a/ZenWeb.html.md](/a/ZenWeb.html)
+    END
+
+    assert_equal exp, act
+  end
+
   def test_sitemap_multidir
     build_fake_site %w[a/index.html.md
                        a/b/index.html.md

data/test/test_zenweb_site.rb

@@ -122,6 +122,22 @@ class TestZenwebSite < Minitest::Test
     assert_equal "Example Website", site.header
   end
 
+  def test_method_missing_missing
+    exp = "Site[0 pages, 1 configs] does not define missing\n"
+
+    assert_output "", exp do
+      assert_nil site.missing
+    end
+  end
+
+  def test_method_missing_nil
+    site.config.h["nil_key"] = nil
+
+    assert_silent do
+      assert_nil site.nil_key
+    end
+  end
+
   def test_pages
     site.scan
 
@@ -188,6 +204,33 @@ class TestZenwebSite < Minitest::Test
     refute_empty site.layouts
   end
 
+  def test_scan_excludes_underscores
+    site.scan
+
+    exp = %w[
+           about/index.html.md
+           atom.xml.erb
+           blog/2012-01-02-page1.html.md
+           blog/2012-01-03-page2.html.md
+           blog/2012-01-04-page3.html.md
+           blog/index.html.erb
+           css/colors.css.less
+           css/styles.css
+           css/syntax.css
+           img/bg.png
+           index.html.erb
+           js/jquery.js
+           js/site.js
+           pages/index.html.erb
+           pages/nonblogpage.html.md
+           projects/index.html.erb
+           projects/zenweb.html.erb
+           sitemap.xml.erb
+          ]
+
+    assert_equal exp, site.pages.keys.sort
+  end
+
   def test_wire
     Rake.application = Rake::Application.new
     site.scan

data.tar.gz.sig

@@ -1 +1,2 @@
-��fN6m�#��:J�q��Sz��<{hp�	)�%�0魳�n�sz!9L������Ki�*]�yqn�S����-wU��%�����7�F�O�����$��S�?TZ|u�~kF���BT�J���N���e���HN�Vi����X��'�/���4m�ꪮ��Y�0g�[)Bu�_J����O�k0f��@E)����6�o\j��d��jl���`@��*�-�Úll�i�Vܘp�������$��w$
+�[T��ku�M��I��j����9*pgp3�����6��
+I;T[�W@c耜�y�ˁ݀�)�g�cQ�ǿ����pl�w�"򙈠ۓ���v�j

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zenweb
 version: !ruby/object:Gem::Version
-  version: 3.9.0
+  version: 3.10.0
 platform: ruby
 authors:
 - Ryan Davis
@@ -10,9 +10,9 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDPjCCAiagAwIBAgIBAzANBgkqhkiG9w0BAQUFADBFMRMwEQYDVQQDDApyeWFu
+  MIIDijCCAnKgAwIBAgIBATANBgkqhkiG9w0BAQUFADBFMRMwEQYDVQQDDApyeWFu
   ZC1ydWJ5MRkwFwYKCZImiZPyLGQBGRYJemVuc3BpZGVyMRMwEQYKCZImiZPyLGQB
-  GRYDY29tMB4XDTE1MDkxOTIwNTEyMloXDTE2MDkxODIwNTEyMlowRTETMBEGA1UE
+  GRYDY29tMB4XDTE2MDkyNjAxNTczNVoXDTE3MDkyNjAxNTczNVowRTETMBEGA1UE
   AwwKcnlhbmQtcnVieTEZMBcGCgmSJomT8ixkARkWCXplbnNwaWRlcjETMBEGCgmS
   JomT8ixkARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALda
   b9DCgK+627gPJkB6XfjZ1itoOQvpqH1EXScSaba9/S2VF22VYQbXU1xQXL/WzCkx
@@ -20,16 +20,17 @@ cert_chain:
   oOvjtt5P8+GSK9zLzxQP0gVLS/D0FmoE44XuDr3iQkVS2ujU5zZL84mMNqNB1znh
   GiadM9GHRaDiaxuX0cIUBj19T01mVE2iymf9I6bEsiayK/n6QujtyCbTWsAS9Rqt
   qhtV7HJxNKuPj/JFH0D2cswvzznE/a5FOYO68g+YCuFi5L8wZuuM8zzdwjrWHqSV
-  gBEfoTEGr7Zii72cx+sCAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
-  HQYDVR0OBBYEFEfFe9md/r/tj/Wmwpy+MI8d9k/hMA0GCSqGSIb3DQEBBQUAA4IB
-  AQB+Hx8xUgrpZa4P8H8gR8zme5kISwQrG80MbpqJV6/G3/ZicRFhN5sjwu0uHGue
-  bd9Cymf6oIRwHVarJux2M32T6bL07Hmi07w2QaPc3MnMKB/D46SRZ2JSSGPFRBTc
-  SilobMRoGs/7B15uGFUEnNrCB/ltMqhwwSx1r++UQPfeySHEV9uqu03E5Vb7J37O
-  2Er6PLXHRiYsIycD1LkMi6YnixdITRHmrqJYE2rsjaIfpIehiusVAPHkNf7qbpHq
-  qx3h45R1CAsObX0SQDIT+rRbQrtKz1GHIZTOFYvEJjUY1XmRTZupD3CJ8Q7sDqSy
-  NLq5jm1fq6Y9Uolu3RJbmycf
+  gBEfoTEGr7Zii72cx+sCAwEAAaOBhDCBgTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIE
+  sDAdBgNVHQ4EFgQUR8V72Z3+v+2P9abCnL4wjx32T+EwIwYDVR0RBBwwGoEYcnlh
+  bmQtcnVieUB6ZW5zcGlkZXIuY29tMCMGA1UdEgQcMBqBGHJ5YW5kLXJ1YnlAemVu
+  c3BpZGVyLmNvbTANBgkqhkiG9w0BAQUFAAOCAQEAIGzgp0aZ2W9+v96ujmBcQHoC
+  buy0iU68MVj2VlxMyfr1KPZIh1OyhU4UO4zrkREcH8ML70v9cYHNvOd9oynRHnvC
+  l2tj/fD3YJ0AEkJxGrYwRWQmvMfC4bJ02bC1+rVOUIXXKp3+cUmiN4sTniof8VFo
+  bo/YYP4c7erpERa+9hrqygg6WQbJlk2YRlH3JXPFjmu869i2dcbR5ZLOAeEy+axH
+  E4oJcnPkJAr0rw504JGtlZtONZQblwmRJOIdXzolaE3NRGUzGVOUSptZppAKiavY
+  fO6tdKQc/5RfA8oQEkg8hrxA5PQSz4TOFJGLpFvIapEk6tMruQ0bHgkhr9auXg==
   -----END CERTIFICATE-----
-date: 2015-12-21 00:00:00.000000000 Z
+date: 2016-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -107,20 +108,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.4'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '5.8'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '5.8'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -141,14 +128,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.14'
+        version: '3.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.14'
+        version: '3.15'
 description: |-
   Zenweb is a set of classes/tools for organizing and formating a
   website. It is website oriented rather than webpage oriented, unlike
@@ -175,6 +162,8 @@ extra_rdoc_files:
 - example-site/blog/2012-01-02-page1.html.md
 - example-site/blog/2012-01-03-page2.html.md
 - example-site/blog/2012-01-04-page3.html.md
+- example-site/blog/_not_yet.html.md
+- example-site/blog/_tmp/not_yet.html.md
 - example-site/pages/nonblogpage.html.md
 files:
 - .autotest
@@ -197,6 +186,8 @@ files:
 - example-site/blog/2012-01-03-page2.html.md
 - example-site/blog/2012-01-04-page3.html.md
 - example-site/blog/_config.yml
+- example-site/blog/_not_yet.html.md
+- example-site/blog/_tmp/not_yet.html.md
 - example-site/blog/index.html.erb
 - example-site/config.ru
 - example-site/css/colors.css.less