webgen 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a60ac4c86998c240ed99fd35a34d68d4c58a9ab
-  data.tar.gz: 36a48c6b290e92da90225f76b3dda06557fe57c9
+  metadata.gz: d93b547db495a7469b8a3b038da5ab6eae16c083
+  data.tar.gz: d634fdc3f669cde58f29346d2a769c1ecd1bdbf3
 SHA512:
-  metadata.gz: 54a4999cee44f7498f01c7e1131e8d64a17c0a8581cda6c4f79577541a436df7d2f9624a1ba79407fec581c923115ad01fca3037c1804c5f8c47e12fe4aeb9e5
-  data.tar.gz: fdcecf0497be5d33dc7514aab8775326132c8addfcc5d1fcf4c55e2742edcfff3007c789de6a63b37170a9bfac78bc9fd118920699a06bcd4048a2b73b83c7f0
+  metadata.gz: 8e82628dd6abefd5c7eee3266e77b0a435671486a0460e014c9ba46b6c7e29552cb9bdcbf152e1be3ee1dcc66501ec71a4c6a4434d311ab68bb785ff94ab0d81
+  data.tar.gz: 838e654ae206a8a79554ac6c71d46daa4719758518c60a5e117f4068c07777fc6d0e0f917974081ed07dfbdbef1325fab144ec2442467820fd708f7ffad63f2b

data/VERSION

@@ -1 +1 @@
-1.4.0
+1.4.1

data/data/webgen/passive_sources/default.metainfo

@@ -1,8 +1,4 @@
 --- paths
-/**/:
-  handler: directory
-  proxy_path: index.html
-
 /**/*.template:
   handler: template
   blocks: {defaults: {pipeline: [erb,tags,blocks,html_head]}}
@@ -45,3 +41,7 @@
   handler: copy
   pipeline: scss
   no_output: true
+
+/**/:
+  handler: directory
+  proxy_path: index.html

data/lib/webgen/blackboard.rb

@@ -22,9 +22,9 @@ module Webgen
     # unknown ID is specified, the listener is added as last entry in the listener array.
     def add_listener(msg_name, id = nil, position = {}, &block)
       position = if position[:before]
-                   (@listener[msg_name] || []).index {|id, obj| id == position[:before]}
+                   (@listener[msg_name] || []).index {|lid, obj| lid == position[:before]}
                  elsif position[:after]
-                   (pos = (@listener[msg_name] || []).index {|id, obj| id == position[:after]}) && pos + 1
+                   (pos = (@listener[msg_name] || []).index {|lid, obj| lid == position[:after]}) && pos + 1
                  end
       insert_listener_at_position(msg_name, id, position || -1, &block)
     end

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

@@ -285,7 +285,7 @@ option('tag.include_file.escape_html', true, &true_or_false)
 
 tag.register('Coderay', :mandatory => ['lang'])
 option('tag.coderay.lang', 'ruby')
-option('tag.coderay.process_body', true &true_or_false)
+option('tag.coderay.process_body', true, &true_or_false)
 option('tag.coderay.wrap', 'div') do |val|
   val = val.to_s.intern
   raise "The value has to be either div or span" unless val == :div || val == :span
@@ -313,7 +313,7 @@ option('tag.langbar.separator', ' | ')
 option('tag.langbar.mapping', {}, &is_hash)
 
 tag.register('BreadcrumbTrail')
-option('tag.breadcrumb_trail.omit_dir_index', false &true_or_false)
+option('tag.breadcrumb_trail.omit_dir_index', false, &true_or_false)
 option('tag.breadcrumb_trail.start_level', 0, &is_integer)
 option('tag.breadcrumb_trail.end_level', -1, &is_integer)
 option('tag.breadcrumb_trail.separator', ' / ', &is_string)

data/lib/webgen/content_processor/blocks.rb

@@ -55,15 +55,14 @@ module Webgen
           used_chain = (context[:chain].length > 1 ? context[:chain][1..-1] : context[:chain].dup)
         elsif options[:chain].kind_of?(Array)
           used_chain = options[:chain]
-          dest_node = context.dest_node
         else
           paths = options[:chain].split(';')
           used_chain = paths.collect do |path|
             context.ref_node.resolve(path.strip, context.dest_node.lang, true)
           end.compact
           return '' if used_chain.length != paths.length
-          dest_node = context.dest_node
         end
+        dest_node = context.dest_node
 
         if options[:node] == 'first'
           used_chain.shift while used_chain.length > 0 && !used_chain.first.blocks.has_key?(options[:name])

data/lib/webgen/content_processor/sass.rb

@@ -96,8 +96,8 @@ module Webgen
         def possible_filenames(path)
           dirname, basename = File.split(path)
           basename, ext = basename.scan(/^(.*?)(?:\.(sass|scss))?$/).first
-          (ext.nil? ? %w{sass scss} : [ext]).map do |ext|
-            [["#{dirname}/_#{basename}.#{ext}", ext.to_sym], ["#{dirname}/#{basename}.#{ext}", ext.to_sym]]
+          (ext.nil? ? %w{sass scss} : [ext]).map do |iext|
+            [["#{dirname}/_#{basename}.#{iext}", iext.to_sym], ["#{dirname}/#{basename}.#{iext}", iext.to_sym]]
           end.flatten(1)
         end
 

data/lib/webgen/content_processor/tikz.rb

@@ -67,7 +67,7 @@ module Webgen
         render_res, output_res = context['content_processor.tikz.resolution'].split(' ')
 
         File.write(tex_file, context.content)
-        execute("pdflatex -shell-escape -interaction=nonstopmode -halt-on-error #{basename}.tex", cwd, context) do |status, stdout, stderr|
+        execute("pdflatex -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}",
                                         'content_processor.tikz', context.dest_node, context.ref_node)
@@ -84,7 +84,7 @@ module Webgen
         execute(cmd, cwd, context)
 
         if render_res != output_res
-          status, stdout, stderr = execute("identify #{basename}#{ext}", cwd, context)
+          _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

data/lib/webgen/content_processor/xmllint.rb

@@ -14,7 +14,7 @@ module Webgen
         Webgen::Utils::ExternalCommand.ensure_available!('xmllint', '--version')
 
         cmd = "xmllint #{context.website.config['content_processor.xmllint.options']} -"
-        status, stdout, stderr = systemu(cmd, 'stdin' => context.content)
+        status, _stdout, stderr = systemu(cmd, 'stdin' => context.content)
         if status.exitstatus != 0
           stderr.scan(/^-:(\d+):(.*?\n)(.*?\n)/).each do |line, error_msg, line_context|
             context.website.logger.warn do

data/lib/webgen/destination/file_system.rb

@@ -21,7 +21,7 @@ module Webgen
 
       # Return +true+ if the given path exists.
       def exists?(path)
-        File.exists?(File.join(@root, path))
+        File.exist?(File.join(@root, path))
       end
 
       # Delete the given +path+

data/lib/webgen/rake_task.rb

@@ -139,10 +139,10 @@ module Webgen
         website.execute_task(:generate_website)
       end
 
-      task :clobber => paste('clobber_', @name)
+      task :clobber => "clobber_#{@name}".intern
 
       desc "Remove webgen products"
-      task paste('clobber_', @name) do
+      task "clobber_#{@name}".intern do
         require 'webgen/website'
         require 'webgen/cli'
         website = Webgen::Website.new(@directory, Webgen::CLI::Logger.new($stdout), &@config_block)

data/lib/webgen/source/file_system.rb

@@ -28,7 +28,7 @@ module Webgen
       # Return all paths under the root path which match the glob.
       def paths
         @paths ||= Dir.glob(File.join(@root, @glob), File::FNM_DOTMATCH|File::FNM_CASEFOLD).collect do |f|
-          next unless File.exists?(f) && f !~ /\/\.\.$/ # handle invalid links
+          next unless File.exist?(f) && f !~ /\/\.\.$/ # handle invalid links
           temp = Pathname.new(f.sub(/^#{Regexp.escape(@root)}\/?/, '/')).cleanpath.to_s
           temp += '/' if File.directory?(f) && temp[-1] != ?/
           Path.new(temp, 'modified_at' => File.mtime(f)) {|mode| File.open(f, mode)}

data/lib/webgen/tag/include_file.rb

@@ -11,10 +11,10 @@ module Webgen
 
       # Include the specified file verbatim in the output, optionally escaping special HTML characters
       # and/or processing tags in it.
-      def self.call(tag, body, context)
+      def self.call(tag, _body, context)
         filename = context[:config]['tag.include_file.filename']
         filename = File.join(context.website.directory, filename) unless filename =~ /^(\/|\w:)/
-        if !File.exists?(filename)
+        if !File.exist?(filename)
           raise Webgen::RenderError.new("File '#{filename}' cannot be included because it does not exist",
                                         "tag.#{tag}", context.dest_node, context.ref_node)
         end

data/lib/webgen/task/create_website.rb

@@ -55,7 +55,7 @@ module Webgen
       #
       # Returns +true+ if the website has been created.
       def self.call(website, template = nil)
-        if File.exists?(website.directory)
+        if File.exist?(website.directory)
           raise Error.new("Directory <#{website.directory}> does already exist!")
         end
         if template && !website.ext.task.data(:create_website)[:templates].has_key?(template)
@@ -64,18 +64,18 @@ module Webgen
 
         begin
           Dir.mktmpdir do |tmpdir|
-            ws = Webgen::Website.new(tmpdir) do |ws|
-              ws.config['sources'] = [['/', :file_system, File.join(Webgen::Utils.data_dir, 'basic_website_template')]]
+            ws = Webgen::Website.new(tmpdir) do |iws|
+              iws.config['sources'] = [['/', :file_system, File.join(Webgen::Utils.data_dir, 'basic_website_template')]]
               if template
-                ws.config['sources'].unshift(['/', :file_system, website.ext.task.data(:create_website)[:templates][template]])
+                iws.config['sources'].unshift(['/', :file_system, website.ext.task.data(:create_website)[:templates][template]])
               end
-              ws.config['destination'] = [:file_system, File.expand_path(website.directory)]
-              ws.ext.path_handler.registered_extensions.each do |name, data|
+              iws.config['destination'] = [:file_system, File.expand_path(website.directory)]
+              iws.ext.path_handler.registered_extensions.each do |_name, data|
                 data.patterns = []
               end
-              ws.ext.path_handler.registered_extensions[:copy].patterns = ['**/*', '**/']
-              ws.logger.level = ::Logger::INFO
-              ws.logger.formatter = Proc.new do |severity, timestamp, progname, msg|
+              iws.ext.path_handler.registered_extensions[:copy].patterns = ['**/*', '**/']
+              iws.logger.level = ::Logger::INFO
+              iws.logger.formatter = Proc.new do |_severity, _timestamp, _progname, msg|
                 website.logger.vinfo(msg) if msg =~ /\[create\]/
               end
             end

data/lib/webgen/utils.rb

@@ -13,7 +13,7 @@ module Webgen
       unless defined?(@@data_dir)
         require 'rbconfig'
         @@data_dir = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'data', 'webgen'))
-        @@data_dir = File.expand_path(File.join(RbConfig::CONFIG["datadir"], "webgen")) if !File.exists?(@@data_dir)
+        @@data_dir = File.expand_path(File.join(RbConfig::CONFIG["datadir"], "webgen")) if !File.exist?(@@data_dir)
         raise "Could not find webgen data directory! This is a bug, report it please!" unless File.directory?(@@data_dir)
       end
       @@data_dir

data/lib/webgen/vendor/rainpress.rb

@@ -72,7 +72,7 @@ class Rainpress
   #
   # We take care of Windows(\r\n), Unix(\n) and Mac(\r) newlines.
 	def remove_newlines!
-		@style.gsub! /\n|\r/, ''
+		@style.gsub!(/\n|\r/, '')
 	end
 
 	# Remove unneeded spaces
@@ -81,9 +81,9 @@ class Rainpress
   # 2. Remove spaces around ;:{},
   # 3. Remove tabs
   def remove_spaces!
-    @style.gsub! /\s*(\s|;|:|\}|\{|,)\s*/, '\1'
-    @style.gsub! "\t", ''
-	end
+    @style.gsub!(/\s*(\s|;|:|\}|\{|,)\s*/, '\1')
+    @style.gsub!("\t", '')
+  end
 
 	# Replace color values with their shorter equivalent
 	#
@@ -94,9 +94,9 @@ class Rainpress
  	#    * black -> #000
 	# 4. Replace #-values with their shorter name
 	#    * #f00 -> red
-	def shorten_colors!
+  def shorten_colors!
 	  # rgb(50,101,152) to #326598
-    @style.gsub! /rgb\s*\(\s*([0-9,\s]+)\s*\)/ do |match|
+    @style.gsub!(/rgb\s*\(\s*([0-9,\s]+)\s*\)/) do |match|
       out = '#'
       $1.split(',').each do |num|
         out += '0' if num.to_i < 16
@@ -105,7 +105,7 @@ class Rainpress
       out
     end
     # Convert #AABBCC to #ABC, keep if preceed by a '='
-    @style.gsub! /([^\"'=\s])(\s*)#([\da-f])\3([\da-f])\4([\da-f])\5/i, '\1#\3\4\5'
+    @style.gsub!(/([^\"'=\s])(\s*)#([\da-f])\3([\da-f])\4([\da-f])\5/i, '\1#\3\4\5')
 
     # At the moment we assume that colours only appear before ';' or '}' and
     # after a ':', if there could be an occurence of a color before or after
@@ -114,55 +114,55 @@ class Rainpress
 
     # shorten several names to numbers
     ## shorten white -> #fff
-    @style.gsub! /:\s*white\s*(;|\})/, ':#fff\1'
+    @style.gsub!(/:\s*white\s*(;|\})/, ':#fff\1')
 
     ## shorten black -> #000
-    @style.gsub! /:\s*black\s*(;|\})/, ':#000\1'
+    @style.gsub!(/:\s*black\s*(;|\})/, ':#000\1')
 
     # shotern several numbers to names
     ## shorten #f00 or #ff0000 -> red
-    @style.gsub! /:\s*#f{1,2}0{2,4}(;|\})/i, ':red\1'
+    @style.gsub!(/:\s*#f{1,2}0{2,4}(;|\})/i, ':red\1')
   end
 
   # Do miscellaneous compression methods on the style.
   def do_misc!
     # Replace 0(pt,px,em,%) with 0 but only when preceded by : or a white-space
-    @style.gsub! /([\s:]+)(0)(px|em|%|in|cm|mm|pc|pt|ex)/i, '\1\2'
+    @style.gsub!(/([\s:]+)(0)(px|em|%|in|cm|mm|pc|pt|ex)/i, '\1\2')
 
     # Replace :0 0 0 0(;|}) with :0(;|})
-    @style.gsub! /:0 0 0 0(;|\})/, ':0\1'
+    @style.gsub!(/:0 0 0 0(;|\})/, ':0\1')
 
     # Replace :0 0 0(;|}) with :0(;|})
-    @style.gsub! /:0 0 0(;|\})/, ':0\1'
+    @style.gsub!(/:0 0 0(;|\})/, ':0\1')
 
     # Replace :0 0(;|}) with :0(;|})
-    @style.gsub! /:0 0(;|\})/, ':0\1'
+    @style.gsub!(/:0 0(;|\})/, ':0\1')
 
     # Replace background-position:0; with background-position:0 0;
-    @style.gsub! 'background-position:0;', 'background-position:0 0;'
+    @style.gsub!('background-position:0;', 'background-position:0 0;')
 
     # Replace 0.6 to .6, but only when preceded by : or a white-space
-    @style.gsub! /[:\s]0+\.(\d+)/ do |match|
-      match.sub '0', '' # only first '0' !!
+    @style.gsub!(/[:\s]0+\.(\d+)/) do |match|
+      match.sub('0', '') # only first '0' !!
     end
 
     # Replace multiple ';' with a single ';'
-    @style.gsub! /[;]+/, ';'
+    @style.gsub!(/[;]+/, ';')
 
     # Replace ;} with }
-    @style.gsub! ';}', '}'
+    @style.gsub!(';}', '}')
 
     # Replace font-weight:normal; with 400
-    @style.gsub! /font-weight[\s]*:[\s]*normal[\s]*(;|\})/i,'font-weight:400\1'
-    @style.gsub! /font[\s]*:[\s]*normal[\s;\}]*/ do |match|
-      match.sub 'normal', '400'
+    @style.gsub!(/font-weight[\s]*:[\s]*normal[\s]*(;|\})/i,'font-weight:400\1')
+    @style.gsub!(/font[\s]*:[\s]*normal[\s;\}]*/) do |match|
+      match.sub('normal', '400')
     end
 
     # Replace font-weight:bold; with 700
-    @style.gsub! /font-weight[\s]*:[\s]*bold[\s]*(;|\})/,'font-weight:700\1'
-    @style.gsub! /font[\s]*:[\s]*bold[\s;\}]*/ do |match|
-      match.sub 'bold', '700'
+    @style.gsub!(/font-weight[\s]*:[\s]*bold[\s]*(;|\})/,'font-weight:700\1')
+    @style.gsub!(/font[\s]*:[\s]*bold[\s;\}]*/) do |match|
+      match.sub('bold', '700')
     end
   end
 
-end
+end

data/lib/webgen/version.rb

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

data/test/test_documentation.rb

@@ -11,8 +11,6 @@ class TestExtensionDocumentation < Minitest::Test
   def test_all_extensions_documented
     ws = Webgen::Website.new(File.join(Dir.tmpdir, '/abcdefgh'))
     documentation = ws.ext.bundle_infos.extensions.dup
-    author = "Thomas Leitner <t_leitner@gmx.at>"
-    docu_keys = Set.new(documentation.keys)
     ext_keys = Set.new(ws.ext.instance_eval { @table.keys })
 
     check_docu = lambda do |key|
@@ -47,7 +45,6 @@ class TestExtensionDocumentation < Minitest::Test
   def test_all_config_options_documented
     ws = Webgen::Website.new(File.join(Dir.tmpdir, '/abcdefgh'))
     documentation = ws.ext.bundle_infos.options.dup
-    docu_keys = Set.new(documentation.keys)
 
     check_docu = lambda do |key|
       data = documentation.delete(key.to_s)

data/test/webgen/cli/test_logger.rb

@@ -13,7 +13,7 @@ class TestLogger < Minitest::Test
   def test_log_output
     original = Webgen::CLI::Utils.use_colors
     Webgen::CLI::Utils.use_colors = false
-    out, err = capture_io do
+    out, _err = capture_io do
       l = Webgen::CLI::Logger.new
       l.level = ::Logger::DEBUG
       l.info { "information" }

data/test/webgen/content_processor/test_html_head.rb

@@ -17,7 +17,7 @@ class TestHtmlHead < Minitest::Test
   def test_call
     context = Webgen::Context.new(@website, :chain => [@node])
     context.content = "</head>"
-    de_node = Webgen::Node.new(@root, 'test', 'test.de', {'lang' => 'de'})
+    Webgen::Node.new(@root, 'test', 'test.de', {'lang' => 'de'})
     assert_equal("\n<link type=\"text/html\" rel=\"alternate\" hreflang=\"de\" href=\"test.de\" /></head>",
                  @obj.call(context).content)
   end

data/test/webgen/content_processor/test_kramdown.rb

@@ -11,7 +11,7 @@ class TestContentProcessorKramdown < Minitest::Test
     setup_context
     cp = Webgen::ContentProcessor::Kramdown
     root = Webgen::Node.new(@website.tree.dummy_root, '/', '/')
-    hello = Webgen::Node.new(root, 'hello.html', '/hello.en.html')
+    Webgen::Node.new(root, 'hello.html', '/hello.en.html')
     @website.config['content_processor.kramdown.options'] = {:auto_ids => true}
     @website.config['content_processor.kramdown.handle_links'] = true
     @website.config['content_processor.kramdown.ignore_unknown_fragments'] = false

data/test/webgen/content_processor/test_ruby.rb

@@ -3,7 +3,7 @@
 require 'webgen/test_helper'
 require 'webgen/content_processor/ruby'
 
-class TestBuilder < Minitest::Test
+class TestContentProcessorRuby < Minitest::Test
 
   include Webgen::TestHelper
 

data/test/webgen/content_processor/test_sass.rb

@@ -15,7 +15,7 @@ class TestSass < Minitest::Test
     cp = Webgen::ContentProcessor::Sass
 
     @context.content = "#main\n  :background-color #000"
-    result = "#main {\n  background-color: black; }\n"
+    result = "#main {\n  background-color: #000; }\n"
     assert_equal(result, cp.call(@context).content)
 
     @context.content = "#cont\n = 5"
@@ -33,7 +33,7 @@ class TestSass < Minitest::Test
     partial2 = Webgen::Node.new(dirdir, '_other.scss', '/dir/dir/_other.scss')
     partial2.node_info[:path] = Webgen::Path.new('test') { StringIO.new('#id { color:white; }') }
     dir2 = Webgen::Node.new(root, 'dir2/', '/dir2/')
-    file = Webgen::Node.new(dir2, 'file.test', '/dir2/file.test')
+    Webgen::Node.new(dir2, 'file.test', '/dir2/file.test')
 
     @context[:chain] = [sass]
     @context.content = "@import 'unknown'"

data/test/webgen/content_processor/test_tags.rb

@@ -34,7 +34,7 @@ class TestContentProcessorTags < Minitest::Test
 
     stag.set_block do |tag, params, body, local_context|
       assert_equal('test', tag)
-      assert_equal(nil, params)
+      assert_nil(params)
       assert_equal('', body)
       assert_equal(@context, local_context)
     end

data/test/webgen/content_processor/test_tikz.rb

@@ -15,9 +15,9 @@ class TestContentProcessorTikz < Minitest::Test
     @website.ext.content_processor.register('Blocks')
     @website.ext.content_processor.register('Erb')
     template_data = File.read(File.join(Webgen::Utils.data_dir, 'passive_sources', 'templates', 'tikz.template'))
-    node = RenderNode.new(template_data, @website.tree.dummy_root, '/template', '/template')
+    RenderNode.new(template_data, @website.tree.dummy_root, '/template', '/template')
 
-    @context.node.define_singleton_method(:[]) {|ignored| nil}
+    @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
@@ -31,6 +31,9 @@ class TestContentProcessorTikz < Minitest::Test
 
   def call(content, path, libs, opts, res, trans)
     @context.content = content
+    if @context.dest_node.singleton_class.method_defined?(:dest_path)
+      @context.dest_node.singleton_class.send(:remove_method, :dest_path)
+    end
     @context.dest_node.define_singleton_method(:dest_path) {path}
     @context.website.config.update('content_processor.tikz.resolution' => res,
                                    'content_processor.tikz.transparent' => trans,

data/test/webgen/path_handler/test_api.rb

@@ -15,7 +15,7 @@ class TestPathHandlerApi < Minitest::Test
 
     @api = Webgen::PathHandler::Api.new(@website)
 
-    root = Webgen::Node.new(@website.tree.dummy_root, '/', '/')
+    Webgen::Node.new(@website.tree.dummy_root, '/', '/')
 
     @page_file = File.dirname(__FILE__) + "/../../../API.rdoc"
     @path = Webgen::Path.new('/test.api', 'dest_path' => '<parent><basename><ext>',

data/test/webgen/path_handler/test_base.rb

@@ -100,7 +100,7 @@ class TestPathHandlerBase < Minitest::Test
 
     check_dest_path.call('/', mi, '/', @website.tree.dummy_root)
 
-    index_en = Webgen::Node.new(node, 'index.page', '/index.html', {'lang' => 'en'})
+    Webgen::Node.new(node, 'index.page', '/index.html', {'lang' => 'en'})
     check_dest_path.call('/index.en.html', mi, '/index.html')
     check_dest_path.call('/index.en.html', {'dest_path' => "<parent>hallo.html"}, '/hallo.html')
     check_dest_path.call('/other.de.html', {'dest_path' => "<parent>index(.<lang>)<ext>"}, '/index.de.html')
@@ -144,7 +144,7 @@ class TestPathHandlerBase < Minitest::Test
     assert_equal(false, @obj.node_exists?(Webgen::Path.new('/somename.en.html', {'no_output' => true}),
                                           '/somename.html'))
     assert_equal(frag_de, @obj.node_exists?(Webgen::Path.new('/somename.de.html#othertest'), '/somename.html#no'))
-    assert_equal(nil, @obj.node_exists?(Webgen::Path.new('/unknown'), '/unknown'))
+    assert_nil(@obj.node_exists?(Webgen::Path.new('/unknown'), '/unknown'))
   end
 
   def test_base_node_methods

data/test/webgen/path_handler/test_copy.rb

@@ -27,7 +27,7 @@ class TestPathHandlerCopy < Minitest::Test
     check_node = lambda do |src_path, mi, dest_path, pipeline|
       node = @copy.create_nodes(Webgen::Path.new(src_path, {'dest_path' => '<parent><basename><ext>'}.merge(mi)))
       refute_nil(node)
-      assert_equal(pipeline, node.meta_info['pipeline'])
+      assert(pipeline == node.meta_info['pipeline'])
       assert_equal(dest_path, node.dest_path)
     end
 

data/test/webgen/path_handler/test_template.rb

@@ -11,7 +11,7 @@ class TestPathHandlerTemplate < Minitest::Test
 
   def test_create_nodes
     setup_website
-    root = Webgen::Node.new(@website.tree.dummy_root, '/', '/')
+    Webgen::Node.new(@website.tree.dummy_root, '/', '/')
     @template = Webgen::PathHandler::Template.new(@website)
 
     path = Webgen::Path.new('/default.template', 'dest_path' => '<parent><basename><ext>') { StringIO.new('test') }

data/test/webgen/path_handler/test_virtual.rb

@@ -76,7 +76,7 @@ EOF
   def test_create_node
     @time = Time.now
     path = Webgen::Path.new('/virtual', 'dest_path' => '<parent><basename>(.<lang>)<ext>', 'modified_at' => @time)
-    nodes = @virtual.create_nodes(path, Webgen::Page.from_data(CONTENT).blocks)
+    @virtual.create_nodes(path, Webgen::Page.from_data(CONTENT).blocks)
 
     node_de = @root.tree['/path.de.html']
     node_en = @root.tree['/directory/path.en.html']

data/test/webgen/tag/test_breadcrumb_trail.rb

@@ -22,7 +22,7 @@ class TestTagBreadcrumbTrail < Minitest::Test
                                   {'lang' => 'en', 'routed_title' => 'Dir11', 'title' => 'Index'})
     file11_en = Webgen::Node.new(dir11, 'file111.html', '/dir1/dir11/file111.html',
                                  {'lang' => 'en', 'title' => 'File111'})
-    index_en = Webgen::Node.new(root, 'index.html', '/index.html', {'lang' => 'en'})
+    Webgen::Node.new(root, 'index.html', '/index.html', {'lang' => 'en'})
     setup_tag_template(root)
 
     context[:chain] = [file11_en]

data/test/webgen/tag/test_langbar.rb

@@ -17,7 +17,7 @@ class TestTagLangbar < Minitest::Test
 
     root = Webgen::Node.new(@website.tree.dummy_root, '/', '/')
     node = Webgen::Node.new(root, 'file.html', '/file.html', {'lang' => 'en'})
-    de_node = Webgen::Node.new(root, 'file.html', '/file.de.html', {'lang' => 'de'})
+    Webgen::Node.new(root, 'file.html', '/file.de.html', {'lang' => 'de'})
     other = Webgen::Node.new(root, 'other.html', '/other.html', {'lang' => 'en'})
     setup_tag_template(root)
 

data/test/webgen/test_cache.rb

@@ -37,11 +37,11 @@ class TestCache < Minitest::Test
     @cache.volatile[:key] = :value
     assert_equal(:value, @cache.volatile[:key])
     dump_and_restore
-    assert_equal(nil, @cache.volatile[:key])
+    assert_nil(@cache.volatile[:key])
 
     @cache.volatile[:key] = :value
     @cache.reset_volatile_cache
-    assert_equal(nil, @cache.volatile[:key])
+    assert_nil(@cache.volatile[:key])
   end
 
 end

data/test/webgen/test_cli.rb

@@ -17,7 +17,7 @@ class TestCLICommandParser < Minitest::Test
 
   def test_initialize
     assert_equal(Logger::INFO, @cli.log_level)
-    assert_equal(nil, @cli.directory)
+    assert_nil(@cli.directory)
   end
 
   def test_website
@@ -27,7 +27,7 @@ class TestCLICommandParser < Minitest::Test
 
   def test_parse
     @cli.website.ext.cli.add_command(SampleCommand.new)
-    out, err = capture_io do
+    out, _err = capture_io do
       begin
         @cli.parse(['help'])
         assert_equal(Dir.pwd, @cli.directory)

data/test/webgen/test_destination.rb

@@ -42,7 +42,7 @@ class TestDestination < Minitest::Test
 
     @website.expect(:config, {'destination' => 'unknown'})
     @dest.instance_eval { instance } # nothing should be raised
-    @website.verify
+    #@website.verify
   end
 
 end

data/test/webgen/test_node.rb

@@ -18,7 +18,7 @@ class TestNode < Minitest::Test
       assert_equal(cn, node.cn)
       assert_equal(lcn, node.lcn)
       assert_equal(alcn, node.alcn)
-      assert_equal(lang, node.lang)
+      assert(lang == node.lang)
       assert_kind_of(Webgen::Language, node.lang) if node.lang
       assert_equal(mi, node.meta_info)
       assert_equal({}, node.node_info)

data/test/webgen/test_path.rb

@@ -70,13 +70,13 @@ class TestPath < Minitest::Test
       assert_kind_of(String, o.path)
       assert_equal(ppath, o.parent_path)
       assert_equal(bn, o.basename)
-      assert_equal(lang, o.meta_info['lang'])
+      assert(lang == o.meta_info['lang'])
       assert_equal(ext, o.ext)
       assert_equal(cn, o.cn)
       assert_equal(lcn, o.lcn)
       assert_equal(acn, o.acn)
       assert_equal(alcn, o.alcn)
-      assert_equal(oi, o.meta_info['sort_info'])
+      assert(oi == o.meta_info['sort_info'])
       assert_equal(title, o.meta_info['title'])
     end
 

data/test/webgen/test_tree.rb

@@ -13,7 +13,7 @@ class TestTree < Minitest::Test
   end
 
   def test_initialize
-    refute_equal(nil, @tree.dummy_root)
+    refute_nil(@tree.dummy_root)
     assert_equal('', @tree.dummy_root.alcn)
   end
 
@@ -29,8 +29,8 @@ class TestTree < Minitest::Test
     assert_equal(@tree['/file.de.html'], @tree.translate_node(@tree['/file.en.html'], 'de'))
     assert_equal(@tree['/file.en.html'], @tree.translate_node(@tree['/file.en.html'], 'en'))
     assert_equal(@tree['/file.en.html'], @tree.translate_node(@tree['/file.de.html'], 'en'))
-    assert_equal(nil, @tree.translate_node(@tree['/file.de.html'], 'fr'))
-    assert_equal(nil, @tree.translate_node(@tree['/file.en.html'], nil))
+    assert_nil(@tree.translate_node(@tree['/file.de.html'], 'fr'))
+    assert_nil(@tree.translate_node(@tree['/file.en.html'], nil))
 
     assert_equal(@tree['/other.en.html'], @tree.translate_node(@tree['/other.html'], 'en'))
     assert_equal(@tree['/other.html'], @tree.translate_node(@tree['/other.html'], 'de'))
@@ -38,7 +38,7 @@ class TestTree < Minitest::Test
     assert_equal(@tree['/other.html'], @tree.translate_node(@tree['/other.en.html'], nil))
     assert_equal(@tree['/other.html'], @tree.translate_node(@tree['/other.en.html'], 'de'))
 
-    assert_equal(nil, @tree.translate_node(@tree['/file.en.html#frag'], nil))
+    assert_nil(@tree.translate_node(@tree['/file.en.html#frag'], nil))
     assert_equal(@tree['/file.en.html#frag'], @tree.translate_node(@tree['/file.en.html#frag'], 'en'))
     assert_equal(@tree['/file.de.html#frag'], @tree.translate_node(@tree['/file.en.html#frag'], 'de'))
   end
@@ -54,29 +54,29 @@ class TestTree < Minitest::Test
     setup_default_nodes(@tree)
 
     [@tree['/'], @tree['/file.de.html'], @tree['/file.en.html'], @tree['/other.html']].each do |n|
-      assert_equal(nil, n.resolve('file.html', nil))
+      assert_nil(n.resolve('file.html', nil))
       assert_equal(@tree['/file.en.html'], n.resolve('file.html', 'en'))
       assert_equal(@tree['/file.de.html'], n.resolve('file.html', 'de'))
-      assert_equal(nil, n.resolve('file.html', 'fr'))
+      assert_nil(n.resolve('file.html', 'fr'))
       assert_equal(@tree['/file.en.html'], n.resolve('file.en.html', nil))
       assert_equal(@tree['/file.en.html'], n.resolve('file.en.html', 'en'))
       assert_equal(@tree['/file.en.html'], n.resolve('file.en.html', 'de'))
-      assert_equal(nil, n.resolve('somename.fr.html', 'de'))
+      assert_nil(n.resolve('somename.fr.html', 'de'))
 
       assert_equal(@tree['/other.html'], n.resolve('other.html', nil))
       assert_equal(@tree['/other.html'], n.resolve('other.html', 'fr'))
       assert_equal(@tree['/other.en.html'], n.resolve('other.html', 'en'))
       assert_equal(@tree['/other.en.html'], n.resolve('other.en.html', nil))
       assert_equal(@tree['/other.en.html'], n.resolve('other.en.html', 'de'))
-      assert_equal(nil, n.resolve('other.fr.html', nil))
-      assert_equal(nil, n.resolve('other.fr.html', 'en'))
+      assert_nil(n.resolve('other.fr.html', nil))
+      assert_nil(n.resolve('other.fr.html', 'en'))
     end
 
     assert_equal(@tree['/file.en.html#frag'], @tree['/file.en.html'].resolve('#frag', 'de'))
     assert_equal(@tree['/file.en.html#frag'], @tree['/file.en.html'].resolve('#frag', nil))
     assert_equal(@tree['/file.en.html#nested'], @tree['/file.en.html'].resolve('#nested', nil))
 
-    assert_equal(nil, @tree.resolve_node('/file.html#frag', nil))
+    assert_nil(@tree.resolve_node('/file.html#frag', nil))
     assert_equal(@tree['/file.en.html#frag'], @tree.resolve_node('/file.html#frag', 'en'))
     assert_equal(@tree['/file.de.html#frag'], @tree.resolve_node('/file.html#frag', 'de'))
     assert_equal(@tree['/file.en.html#frag'], @tree.resolve_node('/file.en.html#frag', nil))
@@ -91,9 +91,9 @@ class TestTree < Minitest::Test
 
     nrcalls = 0
     @website.blackboard.add_listener(:node_resolution_failed) { nrcalls += 1 }
-    assert_equal(nil, @tree['/'].resolve('other.fr.html', nil, false))
+    assert_nil(@tree['/'].resolve('other.fr.html', nil, false))
     assert_equal(0, nrcalls)
-    assert_equal(nil, @tree['/'].resolve('other.fr.html', nil, true))
+    assert_nil(@tree['/'].resolve('other.fr.html', nil, true))
     assert_equal(1, nrcalls)
   end
 
@@ -116,7 +116,7 @@ class TestTree < Minitest::Test
 
     root = Webgen::Node.new(@tree.dummy_root, '/', '/')
     file = Webgen::Node.new(root, 'testfile', 'testfile')
-    dir = Webgen::Node.new(root, 'testdir/', 'testdir')
+    Webgen::Node.new(root, 'testdir/', 'testdir')
     virtual_root = Webgen::Node.new(root, 'vroot', '/', 'no_output' => true)
 
     @tree.delete_node(@tree.dummy_root)

data/test/webgen/utils/test_tag_parser.rb

@@ -65,7 +65,7 @@ class TestTagParser < Minitest::Test
     i = 0
     check_proc = proc do |tag, params, body|
       assert_equal(data[i][0], tag, 'error on tag with content: ' + content)
-      assert_equal(data[i][1], params, 'error on params with content: ' + content)
+      assert(data[i][1] == params, 'error on params with content: ' + content)
       assert_equal(data[i][2], body, 'error on body with content: ' + content)
       i += 1
       'test' + i.to_s

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webgen
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Thomas Leitner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-14 00:00:00.000000000 Z
+date: 2017-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cmdparse
@@ -501,7 +501,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: webgen is a fast, powerful, and extensible static website generator.