zenweb 3.3.1 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6bd20644944f1186966e3dff500be7f0e2e46d40
-  data.tar.gz: 55674396df72215b8f8fe41ff27f01835c694996
+  metadata.gz: 1f1ce6d301a838ed6be4b2bc6a0565a373955c87
+  data.tar.gz: 6e5283bf5788568ec6f6c13bcb74c07eed25f201
 SHA512:
-  metadata.gz: d9eff21dec0065095156fa6f5f10a816a39464211aa56694b8c756873b1f15a552c0d664e4f421382ce4a063c90fd58092036d71e93b0fc1f79896118bdcae70
-  data.tar.gz: 8b19d0c35bee6eb6fad00f22493aa2fce07ae32d2cb3fa79b6695a3f0d19fff136e8c5a98a989f9c680253ae960aeaea043f915f2d46d7d5dfb60179f301831e
+  metadata.gz: 3a4f65e5649314d122693b83e7e0a9ef78730501cebb524c2a622a680e573efb02c083588485df81a6176a625f98273eb95d3b3721396d9f11b1d0fb9757ac5b
+  data.tar.gz: 3d89f8b69e6b8df948a25d901334ec5da1db9ab25d03acfca70a4545648f7155f70f4a2aef4097c627e2abd45cb02e4719c69c242c89df05766094432914ae3b

data/History.txt

@@ -1,3 +1,12 @@
+=== 3.4.0 / 2014-03-24
+
+* 4 minor enhancements:
+
+  * Added FakePage to make synthesizing pages easier.
+  * Added task :virtual_pages and called during scan phase. Add virtual pages in your Rakefile!
+  * Markdown sitemap can now toggle it's subsection's dated titles.
+  * Modified config to be more resilient to non-file pages. Grabs content directly from page when passed one.
+
 === 3.3.1 / 2013-12-13
 
 * 1 bug fix:

data/lib/zenweb/config.rb

@@ -62,14 +62,19 @@ module Zenweb
     #   split("index.html.md") => [config, content]
 
     def self.split path
-      body = File.binread path
+      body, yaml_file = nil, false
+      if String === path and File.file? path
+        body = File.binread path
 
-      raise ArgumentError, "UTF BOM not supported: #{path}" if
-        body.start_with? UTF_BOM
+        raise ArgumentError, "UTF BOM not supported: #{path}" if
+          body.start_with? UTF_BOM
 
-      yaml_file = File.extname(path) == ".yml"
+        yaml_file = File.extname(path) == ".yml"
 
-      body.force_encoding "utf-8" if File::RUBY19
+        body.force_encoding "utf-8" if File::RUBY19
+      else
+        body = path.content
+      end
 
       if yaml_file then
         [body, nil]
@@ -83,7 +88,8 @@ module Zenweb
 
     def h # :nodoc:
       @h ||= begin
-               config, _ = self.class.split path
+               thing = File.file?(path) ? path : site.pages[path]
+               config, _ = self.class.split thing
                config && YAML.load(config) || {}
              end
     end

data/lib/zenweb/page.rb

@@ -77,7 +77,8 @@ module Zenweb
     def body
       # TODO: add a test for something with --- without a yaml header.
       @body ||= begin
-                  _, body = Zenweb::Config.split path
+                  thing = File.file?(path) ? path : self
+                  _, body = Zenweb::Config.split thing
                   body.strip
                 end
     end
@@ -432,4 +433,15 @@ module Zenweb
       end
     end
   end # class Page
+
+  ##
+  # A page not rooted in an actual file. This lets you synthesize
+  # pages directly in rake tasks. Initialize it with a destination
+  # path as normal, but then you must set the date and content
+  # yourself.
+
+  class FakePage < Page
+    attr_accessor :content
+    attr_accessor :date
+  end
 end

data/lib/zenweb/plugins/markdown.rb

@@ -49,17 +49,21 @@ class Zenweb::Page
     # whether the pages are ordered (dated) or not or a combination of
     # the two.
 
-    def sitemap
+    def sitemap title_dated = true
       self.all_subpages.deep_each.chunk { |n, p| n }.map { |depth, a|
         level = (depth-1)/2
+        level = 0 if level < 0
+
         dated, normal = a.map(&:last).partition(&:dated?)
 
         normal = normal.sort_by(&:url).map { |p| page_sitemap_url p, level }
 
         dated = dated_map(dated) { |month, ps2|
-          date_sorted_map(ps2) { |p|
+          x = date_sorted_map(ps2) { |p|
             page_sitemap_url p, level + 1
-          }.unshift "#{"  " * level}* #{month}:"
+          }
+          x.unshift "#{"  " * level}* #{month}:" if title_dated
+          x
         }
 
         normal + dated

data/lib/zenweb/site.rb

@@ -180,6 +180,9 @@ module Zenweb
         end
       end
 
+      $website = self # HACK
+      task(:virtual_pages).invoke
+
       t = Time.now
       @pages.reject! { |path, page| page.date && page.date > t } unless
         ENV["ALL"]

data/lib/zenweb.rb

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

data/test/test_zenweb_config.rb

@@ -83,6 +83,7 @@ class TestZenwebConfig < Minitest::Test
 
     assert_tasks do
       assert_task "_config.yml"
+      assert_task "virtual_pages", nil, Rake::Task
       assert_task "blog/_config.yml", %w[_config.yml]
       assert_task config.path, %w[blog/_config.yml]
     end

data/test/test_zenweb_page.rb

@@ -22,7 +22,7 @@ class TestZenwebPage < Minitest::Test
     Rake.application = Rake::Application.new
     site.scan
 
-    assert_empty Rake.application.tasks
+    assert_empty Rake.application.tasks.map(&:name) - ["virtual_pages"]
 
     p1 = site.pages["blog/2012-01-02-page1.html.md"]
     p2 = site.pages["blog/2012-01-03-page2.html.md"]
@@ -81,6 +81,7 @@ class TestZenwebPage < Minitest::Test
     p1.depends_on p2
 
     assert_tasks do
+      assert_task "virtual_pages", nil, Rake::Task
       assert_task p1.url_path, [p2.url_path]
     end
   end
@@ -92,6 +93,7 @@ class TestZenwebPage < Minitest::Test
 
     # TODO: double check that this should be p1.path and not p1.url_path
     assert_tasks do
+      assert_task "virtual_pages", nil, Rake::Task
       assert_task p1.path, ["somethingelse"]
     end
   end
@@ -358,6 +360,8 @@ class TestZenwebPage < Minitest::Test
     page.wire
 
     assert_tasks do
+      assert_task "virtual_pages", nil, Rake::Task
+
       # dirs
       assert_task ".site"
       assert_task ".site/blog"

data/test/test_zenweb_site.rb

@@ -194,6 +194,8 @@ class TestZenwebSite < Minitest::Test
     site.wire
 
     assert_tasks do
+      assert_task "virtual_pages", nil, Rake::Task
+
       assert_task ".site"
       assert_task ".site/about"
       assert_task ".site/blog"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zenweb
 version: !ruby/object:Gem::Version
-  version: 3.3.1
+  version: 3.4.0
 platform: ruby
 authors:
 - Ryan Davis
@@ -29,7 +29,7 @@ cert_chain:
   Y4evBVezr3SjXz08vPqRO5YRdO3zfeMT8gBjRqZjWJGMZ2lD4XNfrs7eky74CyZw
   xx3n58i0lQkBE1EpKE0lFu/y
   -----END CERTIFICATE-----
-date: 2013-12-14 00:00:00.000000000 Z
+date: 2014-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -113,14 +113,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '5.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '5.3'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -141,14 +141,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.9'
 description: |-
   Zenweb is a set of classes/tools for organizing and formating a
   website. It is website oriented rather than webpage oriented, unlike
@@ -178,6 +178,7 @@ extra_rdoc_files:
 - example-site/pages/nonblogpage.html.md
 files:
 - .autotest
+- .gemtest
 - History.txt
 - Manifest.txt
 - README.txt
@@ -236,7 +237,6 @@ files:
 - test/test_zenweb_plugins_less.rb
 - test/test_zenweb_plugins_markdown.rb
 - test/test_zenweb_site.rb
-- .gemtest
 homepage: https://github.com/seattlerb/zenweb
 licenses:
 - MIT
@@ -259,7 +259,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: zenweb
-rubygems_version: 2.1.10
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Zenweb is a set of classes/tools for organizing and formating a website