webgen 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8014eb18c4f772caae6df97d2a0887e4a1618672
-  data.tar.gz: 8ed2ef00768fd1696394485f1785564428308a5d
+  metadata.gz: 752984a6bcdf000d963941ddd4c32f9703361a5d
+  data.tar.gz: 6ec75a97844417d5bfcce8c6b9fcf9efae0a6b0e
 SHA512:
-  metadata.gz: b346a18e36607dd4262de8f5245e2d19f143433d2b3ddf2d4769216b88a18b35db8ee22728cb9a93e82d1045cbfe85595e1923d522f8d644ec9887442565292f
-  data.tar.gz: 2ebbd16b45b3a20337e53321520e05f7ed7054cbf2463538bf6d9a45e1d27269f7929f5e71edb1044ccb71d92fa37f55a90add30887e3c6fd28c58cb8f64e7cd
+  metadata.gz: 3810ef988115522a56d71c49bd24697c598e1d10640427de278f033f10ccd25a7b2571675d947f66f9aa310c2be53dfeec64fe31d691f4e6eb631b32a331d937
+  data.tar.gz: 69051fc7a5f18bb19dc1bc3573dea799ecd3c0283819dc9be7d9ac2948b4ab545854d448aa90a6af4381dcd6472a9f3c2846de70b89d6ef27cf12a06fb48b7fc

data/Rakefile

@@ -112,23 +112,23 @@ EOF
 
     s.required_ruby_version = '>= 1.9.3'
 
-    s.add_dependency('cmdparse', '>= 2.0.5')
-    s.add_dependency('systemu', '>= 2.5.0')
-    s.add_dependency('kramdown', '~> 1.0')
+    s.add_dependency('cmdparse', '~> 2.0', '>= 2.0.5')
+    s.add_dependency('systemu', '~> 2.5')
+    s.add_dependency('kramdown', '~> 1.3')
     s.add_development_dependency('rake', '>= 0.8.3')
-    s.add_development_dependency('minitest', '>= 5.0.0')
-    s.add_development_dependency('diff-lcs', '>= 1.1.0')
-    s.add_development_dependency('rubyforge', '>= 2.0.2')
-    s.add_development_dependency('maruku', '>= 0.6.0')
-    s.add_development_dependency('RedCloth', '>= 4.1.9')
-    s.add_development_dependency('haml', '>= 3.1.0')
-    s.add_development_dependency('sass', '>= 3.2.0')
-    s.add_development_dependency('builder', '>= 2.1.0')
-    s.add_development_dependency('rdoc', '>= 4.0')
-    s.add_development_dependency('coderay', '>= 1.0.0')
-    s.add_development_dependency('erubis', '>= 2.6.5')
-    s.add_development_dependency('rdiscount', '>= 1.3.5')
-    s.add_development_dependency('archive-tar-minitar', '>= 0.5.2')
+    s.add_development_dependency('minitest', '~> 5.0')
+    s.add_development_dependency('diff-lcs', '~> 1.0')
+    s.add_development_dependency('rubyforge', '~> 2.0')
+    s.add_development_dependency('maruku', '~> 0.7')
+    s.add_development_dependency('RedCloth', '~> 4.1')
+    s.add_development_dependency('haml', '~> 4.0')
+    s.add_development_dependency('sass', '~> 3.2')
+    s.add_development_dependency('builder', '~> 2.1')
+    s.add_development_dependency('rdoc', '~> 4.0')
+    s.add_development_dependency('coderay', '~> 1.0')
+    s.add_development_dependency('erubis', '~> 2.6')
+    s.add_development_dependency('rdiscount', '~> 1.3')
+    s.add_development_dependency('archive-tar-minitar', '~> 0.5')
 
     s.files = PKG_FILES.to_a
     s.require_path = 'lib'

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.2.0

data/lib/webgen/bundle/built-in/info.yaml

@@ -706,6 +706,15 @@ options:
       tag: |
         {date: {format: '%Y-%m-%d'}}
 
+  tag.date.mi:
+    summary: |
+      The name of the meta information key (a date/time) which should be formatted.
+    syntax: |
+      `KEY` where `KEY` is the name of a meta information key
+    example:
+      tag: |
+        {date: {mi: modified_at, format: '%Y-%m-%d'}}
+
   tag.execute_command.command:
     summary: |
       The command that should be executed.
@@ -948,6 +957,16 @@ options:
       tag: |
         {menu: {options: {mi: {menu: true}}, template: /other.template}}
 
+  tag.menu.tracking_style:
+    summary: |
+      Specifies which kind of information should be tracked by the 'nodes' item tracker
+    syntax: |
+      `STYLE` where `STYLE` is 'meta_info' (if only changed meta information should be tracked) or
+      'content' (if the content should be tracked)
+    example:
+      tag: |
+        {menu: {options: {in_menu: true, sort: sort_info}, tracking_style: content}}
+
   tag.meta_info.escape_html:
     summary: |
       Specifies whether special HTML characters in the meta information value should be escaped.
@@ -1057,7 +1076,7 @@ options:
   website.link_to_current_page:
     summary:
       Specifies whether generated links to the current page should be used. If `false`, then a
-      `<span>` element is used instead of a `<href>` element.
+      `<span>` element is used instead of an `<a>` element.
     syntax: |
       `true` or `false`.
     example:

data/lib/webgen/bundle/built-in/init.rb

@@ -259,6 +259,7 @@ option('tag.prefix', '', &is_string)
 
 tag.register('Date')
 option('tag.date.format', '%Y-%m-%d %H:%M:%S', &is_string)
+option('tag.date.mi', nil, &is_string)
 
 tag.register('MetaInfo', :names => ['meta_info', :default])
 option('tag.meta_info.escape_html', true, &true_or_false)
@@ -330,7 +331,9 @@ option('tag.menu.item_level_class', 'webgen-menu-level')
 option('tag.menu.item_submenu_class', 'webgen-menu-submenu')
 option('tag.menu.item_submenu_inhierarchy_class', 'webgen-menu-submenu-inhierarchy')
 option('tag.menu.item_selected_class', 'webgen-menu-item-selected')
-
+option('tag.menu.tracking_style', 'meta_info') do |val|
+  val.to_s.intern
+end
 
 ########################################################################
 # Everything related to the task extension

data/lib/webgen/cli.rb

@@ -91,7 +91,7 @@ module Webgen
 
       # Create a new CommandParser class.
       def initialize
-        super(true, true, false)
+        super(false, true, false)
         @directory = nil
         @verbose = false
         @do_search = false

data/lib/webgen/cli/commands/generate.rb

@@ -39,14 +39,14 @@ EOF
         abort = false
         old_paths = []
         dirs = "{" << commandparser.website.config['sources'].map do |mp, type, *args|
-          type == :file_system ? File.join(args[0], args[1] || '**/*') : nil
+          type == :file_system ? File.join(commandparser.website.directory, args[0], args[1] || '**/*') : nil
         end.compact.join(',') << "}"
 
         Signal.trap('INT') {abort = true}
 
         while !abort
           paths = Dir[dirs].sort
-          if old_paths != paths || paths.any? {|p| File.mtime(p) > time}
+          if old_paths != paths || paths.any? {|p| File.file?(p) && File.mtime(p) > time}
             begin
               commandparser.website(true).execute_task(:generate_website)
             rescue Webgen::Error => e

data/lib/webgen/path_handler/feed.rb

@@ -70,8 +70,8 @@ module Webgen
         end
 
         path.ext = path['version']
-        path['dest_path'] = '<parent><basename>(.<lang>)<ext>'
-        path['cn'] = '<basename><ext>'
+        path['dest_path'] ||= '<parent><basename>(.<lang>)<ext>'
+        path['cn'] ||= '<basename><ext>'
         path['node_class'] = Node.to_s
         create_node(path) do |node|
           set_blocks(node, blocks)

data/lib/webgen/tag/date.rb

@@ -9,7 +9,21 @@ module Webgen
 
       # Return the current date formatted as specified.
       def self.call(tag, body, context)
-        Time.now.strftime(context[:config]['tag.date.format'])
+        key = context[:config]['tag.date.mi']
+        val = context.content_node[key]
+
+        if val && val.respond_to?(:strftime)
+          time = val
+        elsif val
+          raise Webgen::RenderError.new("Value of meta information key '#{key}' not a valid date/time",
+                                        "tag.date", context.dest_node, context.ref_node)
+        elsif key
+          raise Webgen::RenderError.new("No meta information key '#{key}' found",
+                                        "tag.date", context.dest_node, context.ref_node)
+        else
+          time = Time.now
+        end
+        time.strftime(context[:config]['tag.date.format'])
       end
 
     end

data/lib/webgen/tag/menu.rb

@@ -15,7 +15,8 @@ module Webgen
 
         context[:nodes] = context.website.ext.node_finder.find(options, context.content_node)
         context.website.ext.item_tracker.add(context.dest_node, :nodes, :node_finder_option_set,
-                                             {:opts => options, :ref_alcn => context.content_node.alcn}, :meta_info)
+                                             {:opts => options, :ref_alcn => context.content_node.alcn},
+                                             context[:config]['tag.menu.tracking_style'])
 
         if context[:nodes].empty?
           ''

data/lib/webgen/version.rb

@@ -3,6 +3,6 @@
 module Webgen
 
   # The version of webgen.
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 
 end

data/test/webgen/path_handler/test_feed.rb

@@ -62,6 +62,11 @@ EOF
       path = Webgen::Path.new('/test_feed_2') { StringIO.new("---\nunknow: yes") }
       @feed.create_nodes(path, 'unused')
     end
+
+    @path['version'] = 'atom'
+    @path['cn'] = 'atom.xml'
+    atom_node = @feed.create_nodes(@path.dup, @path_blocks)
+    assert_equal('atom.xml', atom_node.cn)
   end
 
   def test_content

data/test/webgen/tag/test_date.rb

@@ -10,9 +10,14 @@ class TestTagDate < Minitest::Test
 
   def test_call
     context = setup_context
+    time = Time.now
     context[:config] = {'tag.date.format' => '%Y%m%d'}
+    context[:chain] = [Webgen::Node.new(@website.tree.dummy_root, '/', '/', 'created_at' => time)]
 
     assert_equal(Time.now.strftime("%Y%m%d"), Webgen::Tag::Date.call('date', '', context))
+
+    context[:config]['tag.date.mi'] = 'created_at'
+    assert_equal(time.strftime("%Y%m%d"), Webgen::Tag::Date.call('date', '', context))
   end
 
 end

metadata

@@ -1,253 +1,259 @@
 --- !ruby/object:Gem::Specification
 name: webgen
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Thomas Leitner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-09 00:00:00.000000000 Z
+date: 2013-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cmdparse
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.5
 - !ruby/object:Gem::Dependency
   name: systemu
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: '2.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: kramdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.3
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: diff-lcs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rubyforge
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: maruku
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '0.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: RedCloth
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.9
+        version: '4.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.9
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '2.1'
 - !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: coderay
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: erubis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.5
+        version: '2.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.5
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: rdiscount
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.5
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.5
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: archive-tar-minitar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: '0.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: '0.5'
 description: |
   webgen is used to generate static websites from templates and content
   files (which can be written in a markup language). It can generate
@@ -260,17 +266,17 @@ extensions: []
 extra_rdoc_files:
 - API.rdoc
 files:
-- Rakefile
-- setup.rb
-- VERSION
+- API.rdoc
 - AUTHORS
-- THANKS
 - COPYING
 - GPL
-- API.rdoc
 - README.md
+- Rakefile
+- THANKS
+- VERSION
 - bin/webgen
 - data/webgen/basic_website_template/ext/init.rb
+- data/webgen/basic_website_template/src/.gitignore
 - data/webgen/basic_website_template/webgen.config
 - data/webgen/bundle_template_files/README.md.erb
 - data/webgen/bundle_template_files/Rakefile.erb
@@ -286,7 +292,6 @@ files:
 - data/webgen/passive_sources/templates/sitemap.template
 - data/webgen/passive_sources/templates/tag.template
 - data/webgen/passive_sources/templates/tikz.template
-- data/webgen/basic_website_template/src/.gitignore
 - lib/webgen/blackboard.rb
 - lib/webgen/bundle/built-in-show-changes/info.yaml
 - lib/webgen/bundle/built-in-show-changes/init.rb
@@ -396,6 +401,7 @@ files:
 - lib/webgen/version.rb
 - lib/webgen/website.rb
 - man/man1/webgen.1
+- setup.rb
 - test/test_documentation.rb
 - test/webgen/cli/test_logger.rb
 - test/webgen/content_processor/test_blocks.rb
@@ -493,24 +499,24 @@ post_install_message: |2+
   Have fun!
 
 rdoc_options:
-- --line-numbers
-- --main
+- "--line-numbers"
+- "--main"
 - API.rdoc
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: webgen
-rubygems_version: 2.0.3
+rubygems_version: 2.2.0.rc.1
 signing_key: 
 specification_version: 4
 summary: webgen is a fast, powerful, and extensible static website generator.