webgen 1.5.1 → 1.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6fbb6e93b9b2cbae04fb5c395d3c51684742e33a7ae84902a9bb0c8a37067b6
-  data.tar.gz: b7631a0e10684ba0d7898ee5ec3cb7a3dbd15f7b47116b220917efb19372a066
+  metadata.gz: c6697ca3880193603f4c4d88579cc87bafb3826646f1aa062c62c2db21ffe3af
+  data.tar.gz: 509d1c0b3868faef7805ac47c69216df4c855f7b98595a653f6ca523a66daefd
 SHA512:
-  metadata.gz: 24818e0987424cbf2aa8ddd3cca0c74428bcd82d10b56837c879750d4bcb08e9bc45486970fe5b8aa442c3249ca9c2a62f9428626d55ea0c78deb3f86784bf0a
-  data.tar.gz: 169fea7fc799e2575b99cd3b9c2b8f1080cb7546f7cf28c784b0663994b1640ad4d1c1d2788ae925525bcdffc43df56cdc7faa00327117111a53b13665fb6ee9
+  metadata.gz: 999375fd6b0fa4640bb7185e674e36d5f77a51f08e5bfe1d10f6acfb328de69526fe3fef7edf8f758d61a818dcdaffd52cfa9947cbfbe699879f8a5e82b288ae
+  data.tar.gz: fd21ea49579e6e89d790cc54110584de387d49633db1662dc7bbc394d5ca9c1579615a66ab42eabb52fa6dfed7769d5ee474cb66281dc1c9cb8a4337771dcdb7

data/README.md

@@ -5,6 +5,11 @@ files (which can be written in any markup language). It can generate
 dynamic content like menus on the fly and comes with many powerful
 extensions.
 
+Sponsors:
+
+* **GROSSWEBER** provides <a href="http://grossweber.com/b/kramdown" target="_blank">software
+  development consulting and training services</a>.
+
 
 ## Contact & Help
 

data/Rakefile

@@ -105,20 +105,20 @@ EOF
 
     #### Dependencies, requirements and files
 
-    s.required_ruby_version = '>= 2.0.0'
+    s.required_ruby_version = '>= 2.6.0'
 
     s.add_dependency('cmdparse', '~> 3.0', '>= 3.0.1')
     s.add_dependency('systemu', '~> 2.5')
-    s.add_dependency('kramdown', '~> 1.3')
+    s.add_dependency('kramdown', '~> 2.3')
     s.add_development_dependency('rake', '>= 0.8.3')
     s.add_development_dependency('minitest', '~> 5.0')
     s.add_development_dependency('diff-lcs', '~> 1.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('haml', '~> 5.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('rdoc', '~> 6.0')
     s.add_development_dependency('coderay', '~> 1.0')
     s.add_development_dependency('erubis', '~> 2.6')
     s.add_development_dependency('rdiscount', '~> 1.3')
@@ -128,11 +128,9 @@ EOF
     s.files = PKG_FILES.to_a
     s.require_path = 'lib'
     s.executables = ['webgen']
-    s.default_executable = 'webgen'
 
     #### Documentation
 
-    s.has_rdoc = true
     s.rdoc_options = ['--line-numbers', '--main', 'API.rdoc']
     s.extra_rdoc_files = ['API.rdoc']
 

data/THANKS

@@ -17,3 +17,4 @@ Thanks for donations to:
 * Mateusz Szczap
 * Michael Franzl
 * Roger Pack
+* Damien Robert

data/VERSION

@@ -1 +1 @@
-1.5.1
+1.7.2

data/data/webgen/passive_sources/templates/sitemap.template

@@ -5,7 +5,7 @@
 context.node.sitemap_entries.each do |item|
 %>
   <url>
-    <loc><%= URI.escape(item.url) %></loc>
+    <loc><%= ERB::Util.url_encode(item.url) %></loc>
     <lastmod><%= item['modified_at'].iso8601 %></lastmod>
     <changefreq><%= item['change_freq'] || context.node['default_change_freq'] %></changefreq>
     <% if priority = item['priority'] || context.node['default_priority'] %>

data/data/webgen/passive_sources/templates/tikz.template

@@ -1,7 +1,6 @@
 --- name:content pipeline:erb
 \nonstopmode
-\documentclass{standalone}
-\usepackage{tikz}
+\documentclass[tikz]{standalone}
 
 <% if context['content_processor.tikz.libraries'] %>
 \usetikzlibrary{<%= context['content_processor.tikz.libraries'].join(',') %>}

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

@@ -404,6 +404,20 @@ options:
         \tikz \draw (0,0) -- (0,2) -- (2,2);
         {tikz}
 
+  content_processor.tikz.engine:
+    summary: |
+      Specifies which LaTeX engine should be used. Default is pdflatex, but you may want to use
+      xelatex or lualatex if needed.
+    syntax: |
+      `pdflatex` or `lualatex` or `xelatex`
+    example:
+      config: |
+        content_processor.tikz.engine: lualatex
+      tag: |
+        {tikz:: {path: tikz.png, content_processor.tikz.engine: xelatex}}
+        \tikz \draw (0,0) -- (0,2) -- (2,2);
+        {tikz}
+
   content_processor.xmllint.options:
     summary: |
       Options passed to the `xmllint` command.

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

@@ -65,7 +65,7 @@ content_processor.register('Blocks')
 content_processor.register('Builder')
 content_processor.register('CSSMinify', :name => 'cssminify')
 content_processor.register('Erb')
-option('content_processor.erb.trim_mode', '', &is_string)
+option('content_processor.erb.trim_mode', nil, &is_string)
 
 content_processor.register('Erubis')
 option('content_processor.erubis.use_pi', false, &true_or_false)
@@ -112,6 +112,7 @@ option('content_processor.tikz.resolution', '72 72',) do |val|
 end
 option('content_processor.tikz.transparent', false, &true_or_false)
 option('content_processor.tikz.template', '/templates/tikz.template', &is_string)
+option('content_processor.tikz.engine', 'pdflatex', &is_string)
 
 content_processor.register('Xmllint')
 option('content_processor.xmllint.options', "--catalogs --noout --valid", &is_string)

data/lib/webgen/content_processor/erb.rb

@@ -13,7 +13,11 @@ module Webgen
 
       # Process the Ruby statements embedded in the content of +context+.
       def self.call(context)
-        erb = ERB.new(context.content, nil, context.website.config['content_processor.erb.trim_mode'])
+        erb = if RUBY_VERSION < '2.6'
+                ERB.new(context.content, nil, context.website.config['content_processor.erb.trim_mode'] || '')
+              else
+                ERB.new(context.content, trim_mode: context.website.config['content_processor.erb.trim_mode'])
+              end
         erb.filename = context.ref_node.alcn
         context.content = erb.result(binding)
         context

data/lib/webgen/content_processor/html_head.rb

@@ -73,6 +73,9 @@ module Webgen
         ((context.persistent[:cp_html_head] || {})[:meta] || {}).merge(context.content_node['meta'] || {}).each do |name, content|
           result += "\n<meta name=\"#{ERB::Util.h(name)}\" content=\"#{ERB::Util.h(content)}\" />"
         end
+        ((context.persistent[:cp_html_head] || {})[:meta_property] || {}).merge(context.content_node['meta_property'] || {}).each do |property, content|
+          result += "\n<meta property=\"#{ERB::Util.h(property)}\" content=\"#{ERB::Util.h(content)}\" />"
+        end
         result
       end
 

data/lib/webgen/content_processor/tikz.rb

@@ -7,7 +7,6 @@ require 'webgen/content_processor'
 require 'webgen/utils/external_command'
 
 Webgen::Utils::ExternalCommand.ensure_available!('pdflatex', '-v')
-Webgen::Utils::ExternalCommand.ensure_available!('pdfcrop', '--version')
 Webgen::Utils::ExternalCommand.ensure_available!('gs', '-v')
 Webgen::Utils::ExternalCommand.ensure_available!('convert', '-version')
 Webgen::Utils::ExternalCommand.ensure_available!('identify', '-version')
@@ -31,7 +30,7 @@ module Webgen
       def self.prepare_options(context)
         %w[content_processor.tikz.resolution content_processor.tikz.transparent
            content_processor.tikz.libraries content_processor.tikz.opts
-           content_processor.tikz.template].each do |opt|
+           content_processor.tikz.template content_processor.tikz.engine].each do |opt|
           context[opt] = context.content_node[opt] || context.website.config[opt]
         end
         context['data'] = context.content
@@ -66,29 +65,35 @@ module Webgen
       def self.compile(context, cwd, tex_file, basename, ext)
         render_res, output_res = context['content_processor.tikz.resolution'].split(' ')
 
+        engine = context['content_processor.tikz.engine']
         File.write(tex_file, context.content)
-        execute("pdflatex -shell-escape -interaction=nonstopmode -halt-on-error #{basename}.tex", cwd, context) do |_status, stdout, stderr|
+        execute("#{engine} -shell-escape -interaction=nonstopmode -halt-on-error #{basename}.tex", cwd, context) do |_status, stdout, stderr|
           errors = (stdout+stderr).scan(/^!(.*\n.*)/).join("\n")
-          raise Webgen::RenderError.new("Error while parsing TikZ picture commands with PDFLaTeX: #{errors}",
+          raise Webgen::RenderError.new("Error while parsing TikZ picture commands with #{engine}: #{errors}",
                                         'content_processor.tikz', context.dest_node, context.ref_node)
         end
 
-        execute("pdfcrop #{basename}.pdf #{basename}.pdf", cwd, context)
-
         if context['content_processor.tikz.transparent'] && ext =~ /\.png/i
           cmd = "gs -dSAFER -dBATCH -dNOPAUSE -r#{render_res} -sDEVICE=pngalpha -dGraphicsAlphaBits=4 " +
             "-dTextAlphaBits=4 -sOutputFile=#{basename}#{ext} #{basename}.pdf"
+        elsif ext =~ /\.svg/i
+          # some installations of ghostscript (`gs`) also have a svg output device, but pdf2svg
+          # is a safer bet.
+          cmd = "pdf2svg #{basename}.pdf #{basename}.svg"
         else
           cmd = "convert -density #{render_res} #{basename}.pdf #{basename}#{ext}"
         end
         execute(cmd, cwd, context)
 
-        if render_res != output_res
-          _status, stdout, _stderr = execute("identify #{basename}#{ext}", cwd, context)
-          width, height = stdout.scan(/\s\d+x\d+\s/).first.strip.split('x').collect do |s|
-            s.to_f * output_res.to_f / render_res.to_f
+        # resizing doesn't really make sense on a vector graphic.
+        unless ext =~ /\.svg/i
+          if render_res != output_res
+            _status, stdout, _stderr = execute("identify #{basename}#{ext}", cwd, context)
+            width, height = stdout.scan(/\s\d+x\d+\s/).first.strip.split('x').collect do |s|
+              s.to_f * output_res.to_f / render_res.to_f
+            end
+            execute("convert -resize #{width}x#{height} #{basename}#{ext} #{basename}#{ext}", cwd, context)
           end
-          execute("convert -resize #{width}x#{height} #{basename}#{ext} #{basename}#{ext}", cwd, context)
         end
       end
       private_class_method :compile

data/lib/webgen/context/html_head.rb

@@ -23,6 +23,13 @@ module Webgen
           (cp_hash[:meta] ||= {})[name] = content
         end
 
+        # Set the meta tag to the provided value, using +property+ instead of +name+.
+        #
+        # Note that some meta information keys may not be specified multiple times!
+        def meta_property(name, content)
+          (cp_hash[:meta_property] ||= {})[name] = content
+        end
+
         # Add a link to the given file in the HTML head section.
         #
         # The type can either be :css for CSS files or :js for javascript files. The path to the

data/lib/webgen/languages.rb

@@ -84,9 +84,10 @@ module Webgen
         @@languages = {}
         started = nil
         data = File.readlines(__FILE__).each do |l|
-          next if !started && (started = (l == '__END__'))
+          next unless (started ||= (l == "aar||aa|Afar|afar\n"))
           data = l.chomp.split('|').collect {|f| f.empty? ? nil : f}
           lang = Language.new(data[0..2], data[3])
+          @@languages[lang] = lang
           @@languages[lang.code2chars] ||= lang unless lang.code2chars.nil?
           @@languages[lang.code3chars] ||= lang unless lang.code3chars.nil?
           @@languages[lang.code3chars_alternative] ||= lang unless lang.code3chars_alternative.nil?

data/lib/webgen/path_handler/api.rb

@@ -47,8 +47,9 @@ module Webgen
           klass_node = create_page_node_for_class(path, dir_node, klass, output_flag_file)
           api.class_nodes[klass.full_name] = klass_node
           klass_node.node_info[:api] = api
-          klass.each_method {|method| create_fragment_node_for_method(path, klass_node, method)}
-          klass.each_attribute {|attr| create_fragment_node_for_method(path, klass_node, attr)}
+          create_fragment_nodes_for_constants(path, klass_node, klass)
+          create_fragment_nodes_for_attributes(path, klass_node, klass)
+          create_fragment_nodes_for_methods(path, klass_node, klass)
         end
 
         rdoc.store.all_files.sort.each do |file|
@@ -91,7 +92,6 @@ module Webgen
         rdoc.options = rdoc_options(options)
         rdoc.store = rdoc_store(rdoc.options, cache_dir)
 
-        rdoc.exclude = rdoc.options.exclude
         rdoc.last_modified.replace(rdoc.setup_output_dir(cache_dir, false))
 
         if !(rdoc.parse_files(rdoc.options.files)).empty?
@@ -179,13 +179,76 @@ module Webgen
       end
       protected :create_page_node_for_class
 
+      # Creates fragment nodes for constants under the "Constants" fragment.
+      def create_fragment_nodes_for_constants(api_path, klass_node, klass)
+        return if klass.constants.none? {|const| const.display? }
+        constants_url = "#{klass_node.alcn}#Constants"
+        path = Webgen::Path.new(constants_url,
+                                {'handler' => 'copy', 'modified_at' => api_path['modified_at'],
+                                 'pipeline' => [], 'no_output' => true, 'title' => "Constants"})
+        const_node = @website.ext.path_handler.create_secondary_nodes(path).first
+        klass.constants.sort_by(&:name).each do |const|
+          create_fragment_node_for_constant(api_path, const_node, const)
+        end
+      end
+      protected :create_fragment_nodes_for_constants
+
+      # Create a fragment node for the given constant.
+      #
+      # A link definition entry for the method is also created.
+      def create_fragment_node_for_constant(api_path, parent_node, constant)
+        constant_url = "#{parent_node.alcn.sub(/#.*$/, '')}##{constant.name}"
+        path = Webgen::Path.new(constant_url,
+                                {'handler' => 'copy', 'modified_at' => api_path['modified_at'],
+                                 'parent_alcn' => parent_node.alcn,
+                                 'pipeline' => [], 'no_output' => true, 'title' => constant.name})
+        @website.ext.path_handler.create_secondary_nodes(path)
+        add_link_definition(api_path, constant.full_name, constant_url, constant.full_name)
+      end
+      protected :create_fragment_node_for_constant
+
+      # Creates fragment nodes for attributes under the "Attributes" fragment.
+      def create_fragment_nodes_for_attributes(api_path, parent_node, klass)
+        return if klass.attributes.none? {|attr| attr.display? }
+        attributes_url = "#{parent_node.alcn}#Attributes"
+        path = Webgen::Path.new(attributes_url,
+                                {'handler' => 'copy', 'modified_at' => api_path['modified_at'],
+                                  'parent_alcn' => parent_node.alcn,
+                                 'pipeline' => [], 'no_output' => true, 'title' => "Attributes"})
+        attr_node = @website.ext.path_handler.create_secondary_nodes(path).first
+        klass.attributes.sort_by(&:name).each do |attribute|
+          create_fragment_node_for_method(api_path, attr_node, attribute)
+        end
+      end
+      protected :create_fragment_nodes_for_attributes
+
+      # Creates fragment nodes for methods under the "Class Methods" or "Instance Methods"
+      # fragments.
+      def create_fragment_nodes_for_methods(api_path, klass_node, klass)
+        ["Class", "Instance"].each do |type|
+          method_list = klass.send("#{type.downcase}_method_list")
+          next if method_list.empty?
+          meth_url = "#{klass_node.alcn}##{type}-Methods"
+          path = Webgen::Path.new(meth_url,
+                                  {'handler' => 'copy', 'modified_at' => api_path['modified_at'],
+                                    'pipeline' => [], 'no_output' => true,
+                                    'title' => "#{type} Methods"})
+          meth_node = @website.ext.path_handler.create_secondary_nodes(path).first
+          method_list.sort_by(&:name).each do |method|
+            create_fragment_node_for_method(api_path, meth_node, method)
+          end
+        end
+      end
+      protected :create_fragment_nodes_for_attributes
+
       # Create a fragment node for the given method.
       #
       # A link definition entry for the method is also created.
-      def create_fragment_node_for_method(api_path, klass_node, method)
-        method_url = "#{klass_node.alcn}##{method.aref}"
+      def create_fragment_node_for_method(api_path, parent_node, method)
+        method_url = "#{parent_node.alcn.sub(/#.*$/, '')}##{method.aref}"
         path = Webgen::Path.new(method_url,
                                 {'handler' => 'copy', 'modified_at' => api_path['modified_at'],
+                                  'parent_alcn' => parent_node.alcn,
                                   'pipeline' => [], 'no_output' => true, 'title' => method.name})
         @website.ext.path_handler.create_secondary_nodes(path)
         add_link_definition(api_path, method.full_name, method_url, method.full_name)

data/lib/webgen/source/tar_archive.rb

@@ -37,8 +37,8 @@ module Webgen
       # Return all paths in the tar archive available at #uri.
       def paths
         if !defined?(@paths)
-          stream = open(@uri)
-          stream = Zlib::GzipReader.new(stream) if @uri =~ /(\.tar\.gz|\.tgz)$/
+          stream = (RUBY_VERSION < '2.5' ? open(@uri) : URI.open(@uri))
+          stream = Zlib::GzipReader.new(stream) if @uri.to_s =~ /(\.tar\.gz|\.tgz)$/
           Archive::Tar::Minitar::Input.open(stream) do |input|
             @paths = input.collect do |entry|
               path = entry.full_name

data/lib/webgen/tag.rb

@@ -97,6 +97,7 @@ module Webgen
 
     def initialize(website) # :nodoc:
       super()
+      @parser = nil
       website.blackboard.add_listener(:website_initialized, 'tag') do
         @parser = Webgen::Utils::TagParser.new(website.config['tag.prefix'])
       end

data/lib/webgen/version.rb

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

data/lib/webgen/website.rb

@@ -4,6 +4,7 @@
 require 'stringio'
 require 'fileutils'
 require 'ostruct'
+require 'date'
 
 # Requirements for Website
 require 'webgen/core_ext'

data/test/webgen/content_processor/test_builder.rb

@@ -13,13 +13,13 @@ class TestBuilder < Minitest::Test
     cp = Webgen::ContentProcessor::Builder
 
     @context.content = "xml.div(:path => context.node.alcn) { xml.strong('test'); " +
-      "context.website; context; context.ref_node; context.dest_node }"
+      "context.website; context.ref_node; context.dest_node }"
     assert_equal("<div path=\"/test\">\n  <strong>test</strong>\n</div>\n", cp.call(@context).content)
 
-    @context.content = "xml.div do \n5+5\n+=+6\nend"
-    assert_error_on_line(SyntaxError, 3) { cp.call(@context) }
+    @context.content = "xml.div do \n=+6\nend"
+    assert_error_on_line(SyntaxError, 2) { cp.call(@context) }
 
-    @context.content = "xml.div do \n5+5\nunknown\n++6\nend"
+    @context.content = "xml.div do \nx=5+5\nunknown\n+6\nend"
     assert_error_on_line(NameError, 3) { cp.call(@context) }
   end
 

data/test/webgen/content_processor/test_haml.rb

@@ -12,7 +12,7 @@ class TestHaml < Minitest::Test
     cp = Webgen::ContentProcessor::Haml
 
     @context.content = "#content\n  %h1 Hallo\n  = [context.node.alcn, context.ref_node.alcn, context.dest_node.alcn].join"
-    assert_equal("<div id='content'>\n  <h1>Hallo</h1>\n  /test/test/test\n</div>\n", cp.call(@context).content)
+    assert_equal("<div id='content'>\n<h1>Hallo</h1>\n/test/test/test\n</div>\n", cp.call(@context).content)
 
     @context.content = "#cont\n    % = + unknown"
     assert_error_on_line(Webgen::RenderError, 2) { cp.call(@context) }

data/test/webgen/content_processor/test_html_head.rb

@@ -24,13 +24,15 @@ class TestHtmlHead < Minitest::Test
 
   def test_tags_from_context_data
     @node.meta_info['meta'] = {'other' => 'me'}
+    @node.meta_info['meta_property'] = {'otherprop' => 'me'}
     context = Webgen::Context.new(@website, :chain => [@node])
     context.persistent[:cp_html_head] = {
       :js_file => ['hallo.js', 'hallo2.js', 'hallo.js'],
       :js_inline => ["somescript", "anotherscript"],
       :css_file => ['hallo.css', 'hallo2.css', 'hallo.css'],
       :css_inline => ["somestyle", "anotherstyle"],
-      :meta => {:lucky => 'me<"'}
+      :meta => {:lucky => 'me<"'},
+      :meta_property => {:unlucky => 'me'},
     }
     assert_equal("\n<script type=\"text/javascript\" src=\"hallo.js\"></script>" +
                  "\n<script type=\"text/javascript\" src=\"hallo2.js\"></script>" +
@@ -41,10 +43,15 @@ class TestHtmlHead < Minitest::Test
                  "\n<style type=\"text/css\">/*<![CDATA[/*/\nsomestyle\n/*]]>*/</style>" +
                  "\n<style type=\"text/css\">/*<![CDATA[/*/\nanotherstyle\n/*]]>*/</style>" +
                  "\n<meta name=\"lucky\" content=\"me&lt;&quot;\" />" +
-                 "\n<meta name=\"other\" content=\"me\" />", @obj.tags_from_context_data(context))
+                 "\n<meta name=\"other\" content=\"me\" />" +
+                 "\n<meta property=\"unlucky\" content=\"me\" />" +
+                 "\n<meta property=\"otherprop\" content=\"me\" />",
+                 @obj.tags_from_context_data(context))
 
     context.persistent[:cp_html_head] = nil
-    assert_equal("\n<meta name=\"other\" content=\"me\" />", @obj.tags_from_context_data(context))
+    assert_equal("\n<meta name=\"other\" content=\"me\" />" +
+                 "\n<meta property=\"otherprop\" content=\"me\" />",
+                 @obj.tags_from_context_data(context))
 
   end
 

data/test/webgen/content_processor/test_ruby.rb

@@ -14,10 +14,10 @@ class TestContentProcessorRuby < Minitest::Test
     @context.content = "context.content = context.dest_node.alcn"
     assert_equal(@context.dest_node.alcn, cp.call(@context).content)
 
-    @context.content = "5+5\n+=+6\n"
+    @context.content = "x = 5+5\n+=+6\n"
     assert_error_on_line(SyntaxError, 2) { cp.call(@context) }
 
-    @context.content = "5+5\nunknown\n++6"
+    @context.content = "x = 5+5\nunknown\n++6"
     assert_error_on_line(NameError, 2) { cp.call(@context) }
   end
 

data/test/webgen/content_processor/test_sass.rb

@@ -14,7 +14,7 @@ class TestSass < Minitest::Test
     @website.config['content_processor.sass.options'] = {}
     cp = Webgen::ContentProcessor::Sass
 
-    @context.content = "#main\n  :background-color #000"
+    @context.content = "#main\n  background-color: #000"
     result = "#main {\n  background-color: #000; }\n"
     assert_equal(result, cp.call(@context).content)
 

data/test/webgen/content_processor/test_tags.rb

@@ -37,6 +37,7 @@ class TestContentProcessorTags < Minitest::Test
       assert_nil(params)
       assert_equal('', body)
       assert_equal(@context, local_context)
+      ''
     end
     cp.call(@context)
   end

data/test/webgen/content_processor/test_tikz.rb

@@ -19,13 +19,13 @@ class TestContentProcessorTikz < Minitest::Test
 
     @context.node.define_singleton_method(:[]) {|_ignored| nil}
 
-    call('\tikz \draw (0,0) -- (0,1);', 'test.png', [], '', '72 72', false)
-    Timeout.timeout(0.2) { call('\tikz \draw (0,0) -- (0,1);', 'test.png', [], '', '72 72', false) } # test cache
+    call('\tikz \draw (0,0) -- (1,1);', 'test.png', [], '', '72 72', false)
+    Timeout.timeout(0.2) { call('\tikz \draw (0,0) -- (1,1);', 'test.png', [], '', '72 72', false) } # test cache
     refute_nil(@context.content)
 
     assert_raises(Webgen::RenderError) { call('\tikz \asdfasdfasf', 'test.png', [], '', '72 72', false) }
 
-    call('\tikz \draw (0,0) -- (0,1);', '/images/test.gif', ['arrows'], '->', '72 72', true)
+    call('\tikz \draw (0,0) -- (1,1);', '/images/test.gif', ['arrows'], '->', '72 72', true)
     refute_nil(@context.content)
   end
 
@@ -39,12 +39,13 @@ class TestContentProcessorTikz < Minitest::Test
                                    'content_processor.tikz.transparent' => trans,
                                    'content_processor.tikz.libraries' => libs,
                                    'content_processor.tikz.opts' => opts,
-                                   'content_processor.tikz.template' => '/template')
+                                   'content_processor.tikz.template' => '/template',
+                                   'content_processor.tikz.engine' => 'pdflatex')
     Webgen::ContentProcessor::Tikz.call(@context)
   end
 
   def teardown
-    FileUtils.rm_rf(@website.directory) if @website
+    #FileUtils.rm_rf(@website.directory) if @website
   end
 
 end

data/test/webgen/item_tracker/test_node_meta_info.rb

@@ -8,7 +8,8 @@ class TestNodeMetaInfo < Minitest::Test
   def setup
     @website = Object.new
     @node = node = Object.new
-    @node.define_singleton_method(:meta_info) { {'key' => 'value'} }
+    @meta_info_data = meta_info_data = {'key' => 'value'}
+    @node.define_singleton_method(:meta_info) { meta_info_data }
     @website.define_singleton_method(:tree) { {'alcn' => node} }
     @obj = Webgen::ItemTracker::NodeMetaInfo.new(@website)
   end
@@ -25,11 +26,10 @@ class TestNodeMetaInfo < Minitest::Test
     assert_equal('value', @obj.item_data('alcn', 'key'))
     refute_same(@node.meta_info['key'], @obj.item_data('alcn', 'key'))
 
-    @node.define_singleton_method(:meta_info) { {'key' => 'value', 'modified_at' => 5} }
+    @meta_info_data['modified_at'] = 5
     assert_equal({'key' => 'value'}, @obj.item_data('alcn'))
-    @node.define_singleton_method(:meta_info) do
-      {'key' => 'value', 'modified_at' => 5, 'modified_at_in_dest_path' => true}
-    end
+    @meta_info_data['modified_at_in_dest_path'] = true
+
     assert_equal({'key' => 'value', 'modified_at' => 5, 'modified_at_in_dest_path' => true},
                  @obj.item_data('alcn'))
   end

data/test/webgen/path_handler/test_api.rb

@@ -5,6 +5,18 @@ require 'webgen/path_handler/api'
 
 class TestPathHandlerApi < Minitest::Test
 
+  # Some Constant
+  TEST_CONST = 42
+
+  # Other Constant
+  OTHER_CONST = 43
+
+  def self.test_meth; end
+  def self.other_meth; end
+
+  attr_reader :test_attr
+  attr_reader :other_attr
+
   class SampleTestSubclass
   end
 
@@ -44,9 +56,31 @@ class TestPathHandlerApi < Minitest::Test
     assert(@website.tree["#{test_alcn}#method-i-setup"])
     assert_equal(["#{test_alcn}#method-i-setup", 'TestPathHandlerApi#setup'],
                  @website.ext.link_definitions['my_api:TestPathHandlerApi#setup'])
+    assert(@website.tree["#{test_alcn}#method-c-test_meth"])
+    assert_equal(["#{test_alcn}#method-c-test_meth", 'TestPathHandlerApi::test_meth'],
+                 @website.ext.link_definitions['my_api:TestPathHandlerApi::test_meth'])
+    assert(@website.tree["#{test_alcn}#attribute-i-test_attr"])
+    assert_equal(["#{test_alcn}#attribute-i-test_attr", 'TestPathHandlerApi#test_attr'],
+                 @website.ext.link_definitions['my_api:TestPathHandlerApi#test_attr'])
+    assert(@website.tree["#{test_alcn}#TEST_CONST"])
+    assert_equal(["#{test_alcn}#TEST_CONST", 'TestPathHandlerApi::TEST_CONST'],
+                 @website.ext.link_definitions['my_api:TestPathHandlerApi::TEST_CONST'])
     assert(@website.tree['/my_dir/API_rdoc.en.html'])
     assert(@website.tree['/my_dir/TestPathHandlerApi/SampleTestSubclass.en.html'])
 
+    collector = lambda do |node|
+      node.children.empty? ? node.lcn : [node.lcn, node.children.map(&collector)]
+    end
+    result = @website.tree[test_alcn].children.map(&collector)
+
+    assert_equal([["#Constants", ["#OTHER_CONST", "#TEST_CONST"]],
+                  ["#Attributes", ["#attribute-i-other_attr", "#attribute-i-test_attr"]],
+                  ["#Class-Methods", ["#method-c-other_meth", "#method-c-test_meth"]],
+                  ["#Instance-Methods", ["#method-i-assert_common_tests_for_create_nodes",
+                  "#method-i-setup", "#method-i-setup_for_create_nodes", "#method-i-teardown",
+                  "#method-i-test_create_nodes", "#method-i-test_create_nodes_hierarchical",
+                  "#method-i-test_rdoc_options", "#method-i-test_rdoc_store"]]], result)
+
     cache_dir = @website.tmpdir(File.join('path_handler.api', 'my_api'))
     assert(File.directory?(cache_dir))
   end

data/test/webgen/test_context.rb

@@ -74,10 +74,12 @@ class TestContext < Minitest::Test
     @context.html_head.inline_fragment(:css, "content")
     @context.html_head.inline_fragment(:js, "content")
     @context.html_head.meta('name', 'content')
+    @context.html_head.meta_property('property', 'content')
 
     assert_equal(['content'], @context.persistent[:cp_html_head][:css_inline])
     assert_equal(['content'], @context.persistent[:cp_html_head][:js_inline])
     assert_equal({'name' => 'content'}, @context.persistent[:cp_html_head][:meta])
+    assert_equal({'property' => 'content'}, @context.persistent[:cp_html_head][:meta_property])
   end
 
 end

data/test/webgen/test_languages.rb

@@ -7,6 +7,7 @@ class TestLanguages < Minitest::Test
 
   def test_get_language
     assert_nil(Webgen::LanguageManager.language_for_code(nil))
+    assert_nil(Webgen::LanguageManager.language_for_code('__END__'))
 
     lang1 = Webgen::LanguageManager.language_for_code('ger')
     lang2 = Webgen::LanguageManager.language_for_code('deu')

data/test/webgen/test_tag.rb

@@ -111,6 +111,7 @@ class TestTag < Minitest::Test
       assert_equal('test', tag)
       assert_equal({'param' => 'value'}, params)
       assert_equal('', body)
+      ''
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webgen
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.7.2
 platform: ruby
 authors:
 - Thomas Leitner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-06 00:00:00.000000000 Z
+date: 2021-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cmdparse
@@ -50,14 +50,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -134,14 +134,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
@@ -176,14 +176,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '6.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: coderay
   requirement: !ruby/object:Gem::Requirement
@@ -509,15 +509,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: webgen is a fast, powerful, and extensible static website generator.