webgen 0.5.10 → 0.5.11

data/test/test_source_tararchive.rb

@@ -19,6 +19,9 @@ class TestSourceTarArchive < Test::Unit::TestCase
       stream.add_file('/other.page', :mtime => (Time.now - 4).to_i, :mode => 0100644) do |os, opts|
         os.write('This is other content!')
       end
+      stream.add_file('hallo.page', :mtime => (Time.now - 4).to_i, :mode => 0100644) do |os, opts|
+        os.write('This is the hallo.page!')
+      end
       sio.rewind
       sio
     end
@@ -42,9 +45,10 @@ class TestSourceTarArchive < Test::Unit::TestCase
 
   def test_paths
     source = Webgen::Source::TarArchive.new(@stream)
-    assert_equal(3, source.paths.length)
+    assert_equal(4, source.paths.length)
     assert(source.paths.include?(Webgen::Path.new('/test/')))
     assert(source.paths.include?(Webgen::Path.new('/test/hallo.page')))
+    assert(source.paths.include?(Webgen::Path.new('/hallo.page')))
     assert_equal('This is the contents!', source.paths.find {|p| p.path == '/test/hallo.page'}.io.data)
 
     source = Webgen::Source::TarArchive.new(@stream, '/test/*')

data/test/test_sourcehandler_feed.rb

@@ -27,8 +27,10 @@ EOF
       :root => root = Webgen::Node.new(@website.tree.dummy_root, '/', '/', {'index_path' => 'index.html'}),
       :file1_en => Webgen::Node.new(root, '/file1.en.html', 'file1.html', {'lang' => 'en', 'in_menu' => true, 'modified_at' => Time.now}),
       :index_en => Webgen::Node.new(root, '/index.en.html', 'index.html', {'lang' => 'en', 'modified_at' => Time.now - 1, 'author' => 'test'}),
+      :file2_en => Webgen::Node.new(root, '/file2.en.html', 'file2.html', {'lang' => 'en', 'modified_at' => Time.now - 2}),
     }
     @nodes[:index_en].node_info[:page] = Webgen::Page.from_data("--- name:content\nMyContent\n--- name:abstract\nRealContent")
+    @nodes[:file2_en].node_info[:page] = Webgen::Page.from_data("--- name:content\nCContent\n--- name:abstract\nAContent")
     @obj = Webgen::SourceHandler::Feed.new
     @path = path_with_meta_info('/test.feed', {}, @obj.class.name) {StringIO.new(FEED_CONTENT)}
   end
@@ -58,8 +60,8 @@ EOF
 
   def test_feed_entries
     atom_node, rss_node = @obj.create_node(@path)
-    assert_equal([@nodes[:index_en]], atom_node.feed_entries)
-    assert_equal([@nodes[:index_en]], rss_node.feed_entries)
+    assert_equal([@nodes[:index_en], @nodes[:file2_en]], atom_node.feed_entries)
+    assert_equal([@nodes[:index_en], @nodes[:file2_en]], rss_node.feed_entries)
   end
 
   def test_node_changed
@@ -75,6 +77,7 @@ EOF
     atom_node.unflag(:dirty)
     @nodes[:file1_en].unflag(:dirty)
     @nodes[:index_en].unflag(:dirty)
+    @nodes[:file2_en].unflag(:dirty)
     @website.tree['/templates/atom_feed.template'].unflag(:dirty)
     assert(!atom_node.changed?)
 

data/test/test_sourcehandler_virtual.rb

@@ -29,6 +29,10 @@ class TestSourceHandlerVirtual < Test::Unit::TestCase
 - other.html:
     url: directory/path.en.html
     title: Nothing
+
+- /dirnew/dirnew/dirnew/:
+    url: /
+    title: root
 EOF
 
   def setup
@@ -52,6 +56,7 @@ EOF
     assert_not_nil(path_de)
     assert_not_nil(dir)
     assert_not_nil(path_en)
+    assert_not_nil(@root.tree['/dirnew/dirnew/dirnew/'])
 
     assert_equal('new title', path_en['title'])
     assert_equal(@time, path_en['modified_at'])

data/test/test_tag_langbar.rb

@@ -26,11 +26,10 @@ class TestTagLangbar < Test::Unit::TestCase
     nodes = create_default_nodes
 
     de_link = '<a href="index.de.html">de</a>'
-    en_link = '<span>en</span>'
+    en_link = '<span class="webgen-langbar-current-lang">en</span>'
     check_results(nodes[:index_en], "#{de_link} | #{en_link}", de_link, "#{de_link} | #{en_link}", de_link)
 
-    link = '<span>en</span>'
-    check_results(nodes[:file_en], link, '', '', '')
+    check_results(nodes[:file_en], en_link, '', '', '')
 
     @obj.set_params('tag.langbar.show_single_lang' => true, 'tag.langbar.show_own_lang' => true, 'tag.langbar.separator' => ' --- ')
     assert_equal(["#{de_link} --- #{en_link}", false],

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: webgen
 version: !ruby/object:Gem::Version 
-  version: 0.5.10
+  version: 0.5.11
 platform: ruby
 authors: 
 - Thomas Leitner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-10 00:00:00 +02:00
+date: 2010-02-15 00:00:00 +01:00
 default_executable: webgen
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -23,24 +23,24 @@ dependencies:
         version: 2.0.2
     version: 
 - !ruby/object:Gem::Dependency 
-  name: maruku
+  name: kramdown
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.5.9
+        version: 0.5.0
     version: 
 - !ruby/object:Gem::Dependency 
-  name: facets
-  type: :runtime
+  name: maruku
+  type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.4.5
+        version: 0.6.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -90,7 +90,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.0
+        version: 2.0.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: RedCloth
@@ -110,7 +110,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.0.9
+        version: 2.2.7
     version: 
 - !ruby/object:Gem::Dependency 
   name: builder
@@ -130,7 +130,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.4.2
+        version: 2.4.3
     version: 
 - !ruby/object:Gem::Dependency 
   name: coderay
@@ -150,7 +150,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.6.2
+        version: 2.6.5
     version: 
 - !ruby/object:Gem::Dependency 
   name: rdiscount
@@ -160,7 +160,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.9
+        version: 1.3.5
     version: 
 - !ruby/object:Gem::Dependency 
   name: archive-tar-minitar
@@ -312,6 +312,8 @@ files:
 - doc/contentprocessor/fragments.page
 - doc/contentprocessor/haml.page
 - doc/contentprocessor/head.page
+- doc/contentprocessor/kramdown.page
+- doc/contentprocessor/less.page
 - doc/contentprocessor/maruku.page
 - doc/contentprocessor/rdiscount.page
 - doc/contentprocessor/rdoc.page
@@ -376,6 +378,9 @@ files:
 - lib/webgen/contentprocessor/fragments.rb
 - lib/webgen/contentprocessor/haml.rb
 - lib/webgen/contentprocessor/head.rb
+- lib/webgen/contentprocessor/kramdown/html.rb
+- lib/webgen/contentprocessor/kramdown.rb
+- lib/webgen/contentprocessor/less.rb
 - lib/webgen/contentprocessor/maruku.rb
 - lib/webgen/contentprocessor/rdiscount.rb
 - lib/webgen/contentprocessor/rdoc.rb
@@ -391,7 +396,6 @@ files:
 - lib/webgen/context.rb
 - lib/webgen/coreext.rb
 - lib/webgen/default_config.rb
-- lib/webgen/deprecated.rb
 - lib/webgen/error.rb
 - lib/webgen/languages.rb
 - lib/webgen/loggable.rb
@@ -465,6 +469,8 @@ files:
 - test/test_contentprocessor_fragments.rb
 - test/test_contentprocessor_haml.rb
 - test/test_contentprocessor_head.rb
+- test/test_contentprocessor_kramdown.rb
+- test/test_contentprocessor_less.rb
 - test/test_contentprocessor_maruku.rb
 - test/test_contentprocessor_rdiscount.rb
 - test/test_contentprocessor_rdoc.rb
@@ -553,7 +559,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: webgen
-rubygems_version: 1.3.2
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: webgen is a fast, powerful, and extensible static website generator.

data/lib/webgen/deprecated.rb

@@ -1,87 +0,0 @@
-module Webgen
-
-  class Node
-
-    def flagged(key)
-      warn("Deprecation warning (~ #{caller.first}): this method will be removed in one of the next releases - use Node#flagged? instead!")
-      flagged?(key)
-    end
-
-    def absolute_cn
-      warn("Deprecation warning (~ #{caller.first}): this method will be removed in one of the next releases - use Node#acn instead!")
-      acn
-    end
-
-    def absolute_lcn
-      warn("Deprecation warning (~ #{caller.first}): this method will be removed in one of the next releases - use Node#alcn instead!")
-      alcn
-    end
-
-  end
-
-  class Path
-
-    def cnbase
-      warn("Deprecation warning (~ #{caller.first}): this method will be removed in one of the next releases - use Path#basename instead!")
-      @basename
-    end
-
-    def cnbase=(value)
-      warn("Deprecation warning (~ #{caller.first}): this method will be removed in one of the next releases - use Path#basename= instead!")
-      basename = value
-    end
-
-  end
-
-  def self.const_missing(const)
-    if const.to_s == 'Block'
-      warn("Deprecation warning (~ #{caller.first}): Webgen::Block name will be removed in one of the next releases - use Webgen::Page::Block instead!")
-      Webgen::Page::Block
-    elsif const.to_s == "WebgenPageFormatError"
-      warn("Deprecation warning (~ #{caller.first}): Webgen::WebgenPageFormatError name will be removed in one of the next releases - use Webgen::Page::FormatError instead!")
-      Webgen::Page::FormatError
-    else
-      super
-    end
-  end
-
-  module ContentProcessor
-
-    def self.const_missing(const)
-      if const.to_s == 'Context'
-        warn("Deprecation warning (~ #{caller.first}): Webgen::ContentProcessor::Context is now named Webgen::Context! This alias will be removed in one of the next releases.")
-        Webgen::Context
-      else
-        super
-      end
-    end
-
-    module Deprecated
-
-      def deprecate(old, new, obj)
-        klass = Class.new
-        klass.instance_methods.select {|m| m.to_s !~ /^(__|instance_eval|object_id)/}.each {|m| klass.__send__(:undef_method, m)}
-        result = klass.new
-        result.instance_eval { @old, @new, @obj = old, new, obj }
-        def result.inspect; end
-        def result.method_missing(sym, *args, &block)
-          Kernel::warn("Deprecation warning (~ #{caller.first}): The alias '#{@old}' will be removed in one of the next releases - use '#{@new}' instead!")
-          @obj.send(sym, *args, &block)
-        end
-        result
-      end
-
-    end
-
-  end
-
-  module Common
-
-    def self.absolute_path(path, base)
-      warn("Deprecation warning (~ #{caller.first}): this method will be removed in one of the next releases - use Webgen::Path.make_absolute(base, path) instead!")
-      Path.make_absolute(base, path)
-    end
-
-  end
-
-end