zenweb 3.4.0 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f1ce6d301a838ed6be4b2bc6a0565a373955c87
-  data.tar.gz: 6e5283bf5788568ec6f6c13bcb74c07eed25f201
+  metadata.gz: bd4e60e046e26c4c52060e136115c18c9a67dd39
+  data.tar.gz: a07920ba086b1627aab87550053f6b2d7a0d9ade
 SHA512:
-  metadata.gz: 3a4f65e5649314d122693b83e7e0a9ef78730501cebb524c2a622a680e573efb02c083588485df81a6176a625f98273eb95d3b3721396d9f11b1d0fb9757ac5b
-  data.tar.gz: 3d89f8b69e6b8df948a25d901334ec5da1db9ab25d03acfca70a4545648f7155f70f4a2aef4097c627e2abd45cb02e4719c69c242c89df05766094432914ae3b
+  metadata.gz: 40dfbb58356ae34e309c0a9d90fa8a23afdc7eb1b6e9e940b49e32ebc70ae8baae92943cd9859bdfdc77f4e7d8d1996883ce1e7ca3c41dead9746bb180579dce
+  data.tar.gz: 64a2699353dc48793df8ff6c354522a613cd5cfdb78ea205bc2bc59ca23da5ee95fda738ed5a2289d34846985268b8564efbfc916848eced9a7565d941f96091

data/.autotest

@@ -1,13 +1,16 @@
 # -*- ruby -*-
 
-require 'autotest/restart'
-require 'autotest/isolate'
-require 'autotest/rcov' if ENV['RCOV']
+require "rbconfig"
+version = RbConfig::CONFIG["ruby_version"]
+
+# require "autotest/restart"
+# require "autotest/isolate"
+# require "autotest/rcov" if ENV["RCOV"]
 
 Autotest.add_hook :initialize do |at|
-  at.testlib = "minitest/autorun"
+  at.add_exception(/isolate/)
 
-  at.add_exception /isolate/
+  ENV["GEM_PATH"] = "tmp/isolate/ruby-#{version}"
 
   at.extra_class_map["Zenweb::Site"]   = "lib/zenweb/site.rb"
   at.extra_class_map["Zenweb::Page"]   = "lib/zenweb/page.rb"

data/History.txt

@@ -1,3 +1,11 @@
+=== 3.5.0 / 2014-06-17
+
+* 3 minor enhancements:
+
+  * Added Page#no_index?
+  * Markdown's sitemap excludes any #no_index? page.
+  * Page#all_subpages excludes #no_index? pages.
+
 === 3.4.0 / 2014-03-24
 
 * 4 minor enhancements:

data/lib/zenweb/page.rb

@@ -68,7 +68,7 @@ module Zenweb
     # All pages below this page, recursively.
 
     def all_subpages
-      subpages.map { |p| [p, p.all_subpages] }
+      subpages.reject(&:no_index?).map { |p| [p, p.all_subpages] }
     end
 
     ##
@@ -315,6 +315,10 @@ module Zenweb
       end
     end
 
+    def no_index?
+      config["no_index"]
+    end
+
     ##
     # Render this page as a whole. This includes rendering the page's
     # content into a layout if one has been specified via config.

data/lib/zenweb/plugins/markdown.rb

@@ -54,7 +54,7 @@ class Zenweb::Page
         level = (depth-1)/2
         level = 0 if level < 0
 
-        dated, normal = a.map(&:last).partition(&:dated?)
+        dated, normal = a.map(&:last).reject(&:no_index?).partition(&:dated?)
 
         normal = normal.sort_by(&:url).map { |p| page_sitemap_url p, level }
 

data/lib/zenweb.rb

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

data/test/test_zenweb_plugins_markdown.rb

@@ -140,6 +140,26 @@ class TestZenwebPageMarkdown < MarkdownTest
     assert_equal exp, act
   end
 
+  def test_sitemap_multidir_excluded
+    build_fake_site %w[a/index.html.md
+                       a/b/index.html.md
+                       a/b/p1.html
+                       a/b/p2.html
+                       a/b/p3.html]
+
+    site.pages["a/b/p1.html"].config.h["no_index"] = true
+
+    page = site.pages["a/index.html.md"]
+    act = page.sitemap
+    exp = <<-END.cleanup
+    * [Title for a/b/index.html.md](/a/b/)
+      * [Title for a/b/p2.html](/a/b/p2.html)
+      * [Title for a/b/p3.html](/a/b/p3.html)
+    END
+
+    assert_equal exp, act
+  end
+
   def test_sitemap_subdir
     build_fake_site %w[a/index.html
                        a/b/index.html.md

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zenweb
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 3.5.0
 platform: ruby
 authors:
 - Ryan Davis
@@ -29,7 +29,7 @@ cert_chain:
   Y4evBVezr3SjXz08vPqRO5YRdO3zfeMT8gBjRqZjWJGMZ2lD4XNfrs7eky74CyZw
   xx3n58i0lQkBE1EpKE0lFu/y
   -----END CERTIFICATE-----
-date: 2014-03-25 00:00:00.000000000 Z
+date: 2014-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -141,14 +141,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '3.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '3.12'
 description: |-
   Zenweb is a set of classes/tools for organizing and formating a
   website. It is website oriented rather than webpage oriented, unlike
@@ -258,7 +258,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: zenweb
+rubyforge_project: 
 rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4