webgen 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 752984a6bcdf000d963941ddd4c32f9703361a5d
-  data.tar.gz: 6ec75a97844417d5bfcce8c6b9fcf9efae0a6b0e
+  metadata.gz: 2a1b98190c63a1f48d1d1dccd972540408c621f0
+  data.tar.gz: 5b512539e92608915846a6ed88c42f4aca49fcf1
 SHA512:
-  metadata.gz: 3810ef988115522a56d71c49bd24697c598e1d10640427de278f033f10ccd25a7b2571675d947f66f9aa310c2be53dfeec64fe31d691f4e6eb631b32a331d937
-  data.tar.gz: 69051fc7a5f18bb19dc1bc3573dea799ecd3c0283819dc9be7d9ac2948b4ab545854d448aa90a6af4381dcd6472a9f3c2846de70b89d6ef27cf12a06fb48b7fc
+  metadata.gz: a588782682753d0dab0ef0870202c1900c31de91968eedf05b3697d822614ca6a37ed5b689d6461f23d709cfd39c6ab065955499d73f650ef4b8b7ac596637c4
+  data.tar.gz: bb345850ff9514ef556e17f5b49e10a096451196419e0b351d1f36db462c0b4f505f591e913f7c2636a8073ded7c9cad07c93d13ac47ed58ad07dfc4e7e81c0b

data/VERSION

@@ -1 +1 @@
-1.2.0
+1.2.1

data/lib/webgen/content_processor/erubis.rb

@@ -9,16 +9,27 @@ module Webgen
     # Processes embedded Ruby statements with the +erubis+ library.
     module Erubis
 
+      class CompatibleEruby < ::Erubis::Eruby #:nodoc:
+        include ::Erubis::ErboutEnhancer
+        include ::Erubis::PercentLineEnhancer
+      end
+
+      class CompatiblePIEruby < ::Erubis::PI::Eruby #:nodoc:
+        include ::Erubis::ErboutEnhancer
+        include ::Erubis::PercentLineEnhancer
+      end
+
       # Including Erubis because of problem with resolving Erubis::XmlHelper et al
       include ::Erubis
+      extend ::Erubis::XmlHelper
 
       # Process the Ruby statements embedded in the content of +context+.
       def self.call(context)
         options = context.website.config['content_processor.erubis.options']
         erubis = if context.website.config['content_processor.erubis.use_pi']
-                   ::Erubis::PI::Eruby.new(context.content, options)
+                   CompatiblePIEruby.new(context.content, options)
                  else
-                   ::Erubis::Eruby.new(context.content, options)
+                   CompatibleEruby.new(context.content, options)
                  end
         erubis.filename = context.ref_node.alcn
         context.content = erubis.result(binding)

data/lib/webgen/content_processor/kramdown.rb

@@ -33,10 +33,25 @@ module Webgen
 
       end
 
+      class ::Kramdown::Parser::WebgenKramdown < ::Kramdown::Parser::Kramdown #:nodoc:
+
+        LINK_DEFS_CACHE = {}
+
+        # Caching already normalized link definitions because this is potentially an O(n*m)
+        # operation where n...number of link definitions, m...number of invocations.
+        def update_link_definitions(link_defs)
+          link_defs.each do |k, v|
+            @link_defs[LINK_DEFS_CACHE[k] ||= normalize_link_id(k)] = v
+          end
+        end
+
+      end
+
       # Convert the content in +context+ to HTML.
       def self.call(context)
         options = context.website.config['content_processor.kramdown.options'].dup
         options[:link_defs] = context.website.ext.link_definitions.merge(options[:link_defs] || {})
+        options[:input] = 'WebgenKramdown'
         doc = ::Kramdown::Document.new(context.content, options)
         context.content = CustomHtmlConverter.new(doc.root, doc.options, context).convert(doc.root)
         context.content.encode!(doc.root.options[:encoding])

data/lib/webgen/context.rb

@@ -73,7 +73,7 @@ module Webgen
     def initialize(website, options = {}, persistent = {})
       @website = website
       (website.ext.context_modules || []).each {|m| self.extend(m)}
-      @options = {:content => ''}.merge(options)
+      @options = {:content => '', :chain => []}.merge(options)
       @persistent = persistent
     end
 

data/lib/webgen/context/nodes.rb

@@ -16,7 +16,7 @@ module Webgen
       #
       # The returned node should be used as source node for calculating relative paths to other nodes.
       def dest_node
-        @options[:dest_node] || self.content_node
+        @options[:dest_node] || content_node
       end
 
       # Return the reference node, ie. the node which provided the original content for this context
@@ -24,14 +24,14 @@ module Webgen
       #
       # The returned node should be used, for example, for resolving relative paths.
       def ref_node
-        @options[:chain] && @options[:chain].first
+        @options[:chain][0]
       end
 
       # Return the node that is ultimately rendered.
       #
       # This node should be used, for example, for retrieving meta information.
       def content_node
-        @options[:chain] && @options[:chain].last
+        @options[:chain][-1]
       end
       alias :node :content_node
 

data/lib/webgen/node.rb

@@ -174,6 +174,7 @@ module Webgen
 
       # resolve any '.' and '..' paths in the target url
       if other_url.path =~ /\/\.\.?\// && other_url.scheme == 'webgen'
+        other_url = other_url.dup
         other_url.path = Pathname.new(other_url.path).cleanpath.to_s
       end
       route = my_url.route_to(other_url).to_s
@@ -188,7 +189,7 @@ module Webgen
     #
     # If the +lang+ parameter is not used, it defaults to the language of the current node.
     def proxy_node(lang = @lang)
-      self['proxy_path'] && resolve(self['proxy_path'], lang, true) || self
+      @meta_info['proxy_path'] && resolve(@meta_info['proxy_path'], lang, true) || self
     end
 
     # Return a HTML link from this node to the given node.
@@ -207,7 +208,7 @@ module Webgen
       attr = (rnode['link_attrs'].kind_of?(Hash) ? rnode['link_attrs'] : {}).merge(attr)
       link_text = attr.delete('link_text') || (rnode != node && rnode['routed_title']) || node['title']
 
-      attr['href'] = self.route_to(node, lang)
+      attr['href'] = route_to(node, lang)
       attr['hreflang'] = rnode.lang.to_s if rnode.lang
       attrs = attr.collect {|name,value| "#{name.to_s}=\"#{value}\"" }.sort.unshift('').join(' ')
       "<a#{attrs}>#{link_text}</a>"

data/lib/webgen/node_finder.rb

@@ -287,7 +287,7 @@ module Webgen
         nodes.unshift(node)
         node = node.parent
       end
-      result.nodes = nodes
+      result.nodes = nodes & result.nodes
     end
 
     def filter_descendants(result, ref_node, enabled)
@@ -295,8 +295,7 @@ module Webgen
       result.ref_node_used = true
 
       result.nodes.keep_if do |n|
-        n = n.parent while n != n.tree.dummy_root && n != ref_node
-        n == ref_node
+        n.alcn.start_with?(ref_node.alcn)
       end
     end
 
@@ -307,9 +306,9 @@ module Webgen
       if value == true
         result.nodes.keep_if {|n| n.parent == ref_node.parent}
       else
-        value = [value].flatten.map {|i| (i = i.to_i) < 0 ? ref_node.level + 1 + i : i}
+        lower, upper = *[value].flatten.map {|i| (i = i.to_i) < 0 ? ref_node.level + 1 + i : i}
         result.nodes.keep_if do |n|
-          n.level >= value.first && n.level <= value.last && (n.parent.is_ancestor_of?(ref_node) || n.is_root?)
+          n.level >= lower && n.level <= upper && (n.parent.is_ancestor_of?(ref_node) || n.is_root?)
         end
       end
     end

data/lib/webgen/path.rb

@@ -38,31 +38,40 @@ module Webgen
     # not escaped. This is needed so that paths with fragments work correctly.
     URL_UNSAFE_PATTERN = Regexp.new("[^#{URI::PATTERN::UNRESERVED}#{URI::PATTERN::RESERVED}#]") # :nodoc:
 
-    # Base URI prepended to all internal URLs.
-    WEBGEN_BASE_URI = URI.parse('webgen://webgen.localhost/') # :nodoc:
+    # Hash that caches generated URLs
+    URL_CACHE = {} # :nodoc:
 
-    # Construct an internal URL for the given +path+ which can be an acn/alcn/absolute path.
+    # Construct an internal URL for the given +path+.
     #
-    # If the parameter +make_absolute+ is +true+, then a relative URL will be made absolute by
-    # prepending the special URL 'webgen://webgen.localhost/'.
+    # If the parameter +make_absolute+ is +true+, then the path will be made absolute by prepending
+    # the special URL 'webgen://lh'
     def self.url(path, make_absolute = true)
-      url = URI.parse(URI::DEFAULT_PARSER.escape(path, URL_UNSAFE_PATTERN))
-      url = WEBGEN_BASE_URI + url unless url.absolute? || !make_absolute
-      url
+      URL_CACHE[[path, make_absolute]] ||= begin
+                                             if absolute?(path) || !make_absolute
+                                               URI.parse(URI::DEFAULT_PARSER.escape(path, URL_UNSAFE_PATTERN))
+                                             else
+                                               URI.parse(URI::DEFAULT_PARSER.escape("webgen://lh#{path[0] != ?/ ? '/' : ''}#{path}",
+                                                                                    URL_UNSAFE_PATTERN))
+                                             end
+                                           end.freeze
+    end
+
+    # Return +true+ if the given URI is an absolute one, i.e. if it include a scheme.
+    def self.absolute?(uri)
+      uri =~ /\A[\w+.-]+:/
     end
 
     # Append the +path+ to the +base+ path.
     #
-    # The +base+ parameter has to be an acn/alcn/absolute path. If it represents a directory, it
-    # needs to have a trailing slash! The +path+ parameter doesn't need to be absolute and may
-    # contain path patterns.
+    # * The +base+ parameter has to be an acn/alcn/absolute path (i.e. starting with a slash).
+    # * If +base+ represents a directory, it needs to have a trailing slash!
+    # * The +path+ parameter doesn't need to be absolute and may contain path patterns.
     def self.append(base, path)
-      raise(ArgumentError, 'base needs to start with a slash (i.e. be an absolute path)') unless base[0] == ?/
-      url = url(base) + url(path, false)
-      (url.path << (url.fragment.nil? ? '' : "##{url.fragment}")).encode!(path.encoding)
+      result = url(base) + url(path, false)
+      (result.fragment.nil? ? result.path : "#{result.path}##{result.fragment}").encode!(path.encoding)
     end
 
-    # Return +true+ if the given path string matches the given path pattern.
+    # Return +true+ if the given path string matches the given non-empty path pattern.
     #
     # If a fragment path (i.e. one which has a hash character somewhere) should be matched, the
     # pattern needs to have a hash character as well.
@@ -70,8 +79,9 @@ module Webgen
     # For information on which patterns are supported, have a look at the API documentation of
     # File.fnmatch.
     def self.matches_pattern?(path, pattern, options = File::FNM_DOTMATCH|File::FNM_CASEFOLD|File::FNM_PATHNAME)
-      pattern += '/' if path =~ /\/$/ && pattern !~ /\/$|^$/
-      (path.to_s.include?('#') ? pattern.include?('#') : true) && File.fnmatch(pattern, path, options)
+      path = path.to_s
+      pattern += '/' if path[-1] == ?/ && pattern[-1] != ?/
+      (path.include?('#') ? pattern.include?('#') : true) && File.fnmatch(pattern, path, options)
     end
 
     # Construct a localized canonical name from a given canonical name and a language.
@@ -79,7 +89,7 @@ module Webgen
       if lang.nil?
         cn
       else
-        cn.split('.').insert((cn =~ /^\./ ? 2 : 1), lang.to_s).join('.')
+        cn.split('.').insert((cn.start_with?('.') ? 2 : 1), lang.to_s).join('.')
       end
     end
 
@@ -185,7 +195,7 @@ module Webgen
     #
     # Triggers analyzation of the path if invoked.
     def acn
-      if @path =~ /#/
+      if @path.include?('#')
         self.class.new(parent_path).acn << cn
       else
         parent_path + cn
@@ -196,7 +206,7 @@ module Webgen
     #
     # Triggers analyzation of the path if invoked.
     def alcn
-      if @path =~ /#/
+      if @path.include?('#')
         self.class.new(parent_path).alcn << lcn
       else
         parent_path + lcn
@@ -287,9 +297,9 @@ module Webgen
 
     # Analyse the path and extract the needed information.
     def analyse
-      if @path =~ /#/
+      if @path.include?('#')
         analyse_fragment
-      elsif @path =~ /\/$/
+      elsif @path[-1] == ?/
         analyse_directory
       else
         analyse_file
@@ -297,7 +307,7 @@ module Webgen
       @meta_info['title'] ||= @basename.tr('_-', ' ').capitalize
       @ext ||= ''
       raise "The basename of a path may not be empty: #{@path}" if @basename.empty? || @basename == '#'
-      raise "The parent path must start with a slash: #{@path}" if @path !~ /^\//
+      raise "The parent path must start with a slash: #{@path}" if @path[0] != ?/
     end
 
     # Analyse the path assuming it is a directory.
@@ -327,7 +337,7 @@ module Webgen
     # Analyse the path assuming it is a fragment.
     def analyse_fragment
       @parent_path, @basename =  @path.scan(/^(.*?)(#.*?)$/).first
-      raise "The parent path of a fragment path must be a file path and not a directory path: #{@path}" if @parent_path =~ /\/$/
+      raise "The parent path of a fragment path must be a file path and not a directory path: #{@path}" if @parent_path[-1] == ?/
       raise "A fragment path must only contain one hash character: #{path}" if @path.count("#") > 1
     end
 

data/lib/webgen/path_handler.rb

@@ -214,6 +214,12 @@ module Webgen
       @instances[handler.intern] ||= extension(handler).new(@website)
     end
 
+    # Return the name of the give path handler instance.
+    def name_of_instance(instance)
+      @instances.rassoc(instance)[0] || 'unknown'
+    end
+    private :name_of_instance
+
 
     # Populate the website tree with nodes.
     #
@@ -277,10 +283,10 @@ module Webgen
             @website.blackboard.dispatch_msg(:after_node_written, node, content)
           rescue Webgen::Error => e
             e.path = node.alcn if e.path.to_s.empty?
-            e.location = "path_handler.#{node.node_info[:path_handler]}" unless e.location
+            e.location = "path_handler.#{name_of_instance(node.node_info[:path_handler])}" unless e.location
             raise
           rescue Exception => e
-            raise Webgen::RenderError.new(e, "path_handler.#{node.node_info[:path_handler]}", node)
+            raise Webgen::RenderError.new(e, "path_handler.#{name_of_instance(node.node_info[:path_handler])}", node)
           end
         end
         @website.blackboard.dispatch_msg(:after_all_nodes_written)

data/lib/webgen/path_handler/virtual.rb

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 
-require 'uri'
 require 'yaml'
+require 'webgen/path'
 require 'webgen/path_handler/base'
 require 'webgen/path_handler/page_utils'
 
@@ -31,7 +31,7 @@ module Webgen
             parent_path = create_directories(File.dirname(key), 'modified_at' => meta_info['modified_at'])
 
             dest_path = meta_info.delete('dest_path') || key
-            dest_path = if URI::parse(dest_path).absolute?
+            dest_path = if Webgen::Path.absolute?(dest_path)
                           dest_path
                         elsif dest_path =~ /^\//
                           "webgen:#{dest_path}"

data/lib/webgen/tag/relocatable.rb

@@ -19,7 +19,7 @@ module Webgen
         path = context[:config]['tag.relocatable.path']
         result = ''
         begin
-          result = (Webgen::Path.url(path, false).absolute? ? path : resolve_path(path, context))
+          result = (Webgen::Path.absolute?(path) ? path : resolve_path(path, context))
         rescue URI::InvalidURIError => e
           context.website.logger.warn do
             ["Could not parse path '#{path}' for tag.relocatable in <#{context.ref_node}>",

data/lib/webgen/version.rb

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

data/test/webgen/content_processor/test_erubis.rb

@@ -12,7 +12,7 @@ class TestErubis < Minitest::Test
     @website.config.merge!('content_processor.erubis.options' => {}, 'content_processor.erubis.use_pi' => false)
     cp = Webgen::ContentProcessor::Erubis
 
-    @context.content = "<%= context[:doit] %>6\n<%= context.ref_node.alcn %>\n<%= context.node.alcn %>\n<%= context.dest_node.alcn %><% context.website %>"
+    @context.content = "<%= context[:doit] %>6\n<%= h(context.ref_node.alcn) %>\n<%= context.node.alcn %>\n<%= context.dest_node.alcn %><% context.website %>"
     assert_equal("hallo6\n/test\n/test\n/test", cp.call(@context).content)
 
     @context.content = "\n<%= 5* %>"

data/test/webgen/test_node_finder.rb

@@ -133,6 +133,8 @@ class TestNodeFinder < Minitest::Test
     # test filter: ancestors
     check.call(%w[/ /dir/ /dir/dir/ /dir/dir/file.html],
                @nf.find({:ancestors => true, :flatten => true}, tree['/dir/dir/file.html']))
+    check.call(%w[/dir/dir/],
+               @nf.find({:absolute_levels => 2, :ancestors => true, :flatten => true}, tree['/dir/dir/file.html']))
     check.call(%w[/ /dir/ /dir/dir/],
                @nf.find({:ancestors => true, :flatten => true}, tree['/dir/dir/']))
 

data/test/webgen/test_path.rb

@@ -8,12 +8,12 @@ require 'tmpdir'
 class TestPath < Minitest::Test
 
   def test_class_url
-    assert_equal("webgen://webgen.localhost/hallo", Webgen::Path.url("hallo").to_s)
-    assert_equal("webgen://webgen.localhost/hallo%20du", Webgen::Path.url("hallo du").to_s)
-    assert_equal("webgen://webgen.localhost/hall%C3%B6chen", Webgen::Path.url("hallöchen").to_s)
-    assert_equal("webgen://webgen.localhost/hallo#du", Webgen::Path.url("hallo#du").to_s)
+    assert_equal("webgen://lh/hallo", Webgen::Path.url("hallo").to_s)
+    assert_equal("webgen://lh/hallo%20du", Webgen::Path.url("hallo du").to_s)
+    assert_equal("webgen://lh/hall%C3%B6chen", Webgen::Path.url("hallöchen").to_s)
+    assert_equal("webgen://lh/hallo#du", Webgen::Path.url("hallo#du").to_s)
 
-    assert_equal("webgen://webgen.localhost/test", Webgen::Path.url("/test").to_s)
+    assert_equal("webgen://lh/test", Webgen::Path.url("/test").to_s)
     assert_equal("http://example.com/test", Webgen::Path.url("http://example.com/test").to_s)
 
     assert_equal("test", Webgen::Path.url("test", false).to_s)
@@ -21,8 +21,6 @@ class TestPath < Minitest::Test
   end
 
   def test_class_append
-    assert_raises(ArgumentError) { Webgen::Path.append('test', 'test') }
-    assert_raises(ArgumentError) { Webgen::Path.append('test/', 'test') }
     assert_equal('/', Webgen::Path.append('/', '/'))
     assert_equal('/dir', Webgen::Path.append('/other', '/dir'))
     assert_equal('/dir/', Webgen::Path.append('/other', '/dir/'))
@@ -56,7 +54,6 @@ class TestPath < Minitest::Test
 
     path = '/'
     assert(Webgen::Path.matches_pattern?(path, '/'))
-    assert(!Webgen::Path.matches_pattern?(path, ''))
 
     path = ''
     assert(!Webgen::Path.matches_pattern?(path, '/'))

metadata

@@ -1,257 +1,257 @@
 --- !ruby/object:Gem::Specification
 name: webgen
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Thomas Leitner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-30 00:00:00.000000000 Z
+date: 2014-02-16 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'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.5'
 - !ruby/object:Gem::Dependency
   name: kramdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         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'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
   name: diff-lcs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rubyforge
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: maruku
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.7'
 - !ruby/object:Gem::Dependency
   name: RedCloth
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.1'
 - !ruby/object:Gem::Dependency
   name: haml
   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: sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         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'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: erubis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.6'
 - !ruby/object:Gem::Dependency
   name: rdiscount
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: archive-tar-minitar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.5'
 description: |
@@ -266,17 +266,17 @@ extensions: []
 extra_rdoc_files:
 - API.rdoc
 files:
-- API.rdoc
+- Rakefile
+- setup.rb
+- VERSION
 - 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
@@ -292,6 +292,7 @@ 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
@@ -401,7 +402,6 @@ 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
@@ -412,7 +412,6 @@ files:
 - test/webgen/content_processor/test_haml.rb
 - test/webgen/content_processor/test_html_head.rb
 - test/webgen/content_processor/test_kramdown.rb
-- test/webgen/content_processor/test_maruku.rb
 - test/webgen/content_processor/test_r_discount.rb
 - test/webgen/content_processor/test_r_doc.rb
 - test/webgen/content_processor/test_rainpress.rb
@@ -499,24 +498,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.2.0.rc.1
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: webgen is a fast, powerful, and extensible static website generator.

data/test/webgen/content_processor/test_maruku.rb

@@ -1,30 +0,0 @@
-# -*- encoding: utf-8 -*-
-
-require 'webgen/test_helper'
-
-class TestMaruku < Minitest::Test
-
-  include Webgen::TestHelper
-
-  def setup
-    require 'webgen/content_processor/maruku' rescue skip('Library maruku not installed')
-    setup_context
-    @cp = Webgen::ContentProcessor::Maruku
-  end
-
-  def test_static_call
-    @context.content = '# header'
-    assert_equal('<h1 id=\'header\'>header</h1>', @cp.call(@context).content)
-
-    @context.content = "# head*d* {#das .dsaf "
-    assert_raises(MaRuKu::Exception) { @cp.call(@context) }
-  end
-
-  def test_static_call_fix_for_invalid_id
-    @context.content = '# `test`'
-    assert_equal('<h1 id=\'id1\'><code>test</code></h1>', @cp.call(@context).content)
-    @context.content = '# `test`'
-    assert_equal('<h1 id=\'id1\'><code>test</code></h1>', @cp.call(@context).content)
-  end
-
-end