webgen 1.7.2 → 1.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6697ca3880193603f4c4d88579cc87bafb3826646f1aa062c62c2db21ffe3af
-  data.tar.gz: 509d1c0b3868faef7805ac47c69216df4c855f7b98595a653f6ca523a66daefd
+  metadata.gz: abf6f162be63a2724a21ba9d446637813047ce78d9b8ecd7677bdd994d0cb0f4
+  data.tar.gz: 41767d022e9e0370ad086954fa26682b45cf11760b8f437ea49f6ede05d9a66c
 SHA512:
-  metadata.gz: 999375fd6b0fa4640bb7185e674e36d5f77a51f08e5bfe1d10f6acfb328de69526fe3fef7edf8f758d61a818dcdaffd52cfa9947cbfbe699879f8a5e82b288ae
-  data.tar.gz: fd21ea49579e6e89d790cc54110584de387d49633db1662dc7bbc394d5ca9c1579615a66ab42eabb52fa6dfed7769d5ee474cb66281dc1c9cb8a4337771dcdb7
+  metadata.gz: 5986a587fe071fbc943afe55c2e95b3e63f303d702aabf6fb0d647dea437ca573969eb4d8bcd11b6e56094589064f50107d3945b5429f329349573d1ce17fd72
+  data.tar.gz: de5270884ef504f193eddd0c92dda36b21cdfd9f469c58e9e93c0f50c380bddf907c8dc5e6c14b62d6437e7acf4b4678c62fc853c1e4280ad199850cf31ef6b3

data/Rakefile

@@ -107,6 +107,7 @@ EOF
 
     s.required_ruby_version = '>= 2.6.0'
 
+    s.add_dependency('psych', '~> 5.1')
     s.add_dependency('cmdparse', '~> 3.0', '>= 3.0.1')
     s.add_dependency('systemu', '~> 2.5')
     s.add_dependency('kramdown', '~> 2.3')

data/VERSION

@@ -1 +1 @@
-1.7.2
+1.7.3

data/lib/webgen/bundle_loader.rb

@@ -1,8 +1,8 @@
 # -*- encoding: utf-8 -*-
 
 require 'rbconfig'
-require 'yaml'
 require 'webgen/error'
+require 'webgen/utils'
 
 module Webgen
 
@@ -59,7 +59,7 @@ module Webgen
           if info_file.nil?
             @infos[:bundles][bundle] = {}
           else
-            infos = YAML.load(File.read(info_file))
+            infos = Utils.yaml_load(File.read(info_file))
             [:extensions, :options].each do |type|
               if data = infos.delete(type.to_s)
                 data.each do |name, hash|
@@ -134,7 +134,7 @@ module Webgen
 
         info_file = File.join(File.dirname(file), 'info.yaml')
         next unless File.file?(info_file)
-        next unless (begin YAML.load(File.read(info_file))['autoload']; rescue Exception; false end)
+        next unless (begin Utils.yaml_load(File.read(info_file))['autoload']; rescue Exception; false end)
 
         load(bundle_name)
       end

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

@@ -1,6 +1,7 @@
 # -*- encoding: utf-8 -*-
 
 require 'webgen/cli/utils'
+require 'webgen/utils'
 
 module Webgen
   module CLI
@@ -32,7 +33,7 @@ DESC
         populate_hash = lambda do |file|
           bundle_name = File.basename(File.dirname(file))
           info_file = File.join(File.dirname(file), 'info.yaml')
-          bundles[bundle_name] ||= (File.file?(info_file) ? YAML.load(File.read(info_file)) : {})
+          bundles[bundle_name] ||= (File.file?(info_file) ? Utils.yaml_load(File.read(info_file)) : {})
           bundles[bundle_name][:state] ||= :available
           bundles[bundle_name]
         end

data/lib/webgen/cli.rb

@@ -10,6 +10,7 @@ require 'webgen/cli/commands/generate'
 require 'webgen/cli/commands/show'
 require 'webgen/cli/commands/create'
 require 'webgen/cli/commands/install'
+require 'webgen/utils'
 
 module Webgen
 
@@ -129,7 +130,7 @@ module Webgen
           opts.on("-o", "--option CONFIG_OPTION", String, "Specify a simple configuration option (key=value)") do |v|
             k, v = v.split('=')
             begin
-              @config_options[k.to_s] = YAML.load(v.to_s)
+              @config_options[k.to_s] = Utils.yaml_load(v.to_s)
             rescue YAML::SyntaxError
               raise ConfigurationOptionError.new("Couldn't parse value for '#{k}': #{$!}")
             end

data/lib/webgen/configuration.rb

@@ -2,6 +2,7 @@
 
 require 'yaml'
 require 'webgen/error'
+require 'webgen/utils'
 
 module Webgen
 
@@ -171,7 +172,7 @@ module Webgen
     def load_from_file(filename)
       data = if String === filename || filename.respond_to?(:read)
                begin
-                 YAML::load(String === filename ? File.read(filename) : filename.read) || {}
+                 Utils.yaml_load(String === filename ? File.read(filename) : filename.read) || {}
                rescue RuntimeError, ArgumentError, SyntaxError, YAML::SyntaxError => e
                  raise Error, "Problem parsing configuration data (it needs to contain a YAML hash): #{e.message}", e.backtrace
                end

data/lib/webgen/node.rb

@@ -94,7 +94,10 @@ module Webgen
 
       @level = -1
       @tree = @parent
-      (@level += 1; @tree = @tree.parent) while @tree.kind_of?(Webgen::Node)
+      while @tree.kind_of?(Webgen::Node)
+        @level += 1
+        @tree = @tree.parent
+      end
 
       @tree.register_node(self)
       @parent.children << self unless @parent == @tree

data/lib/webgen/page.rb

@@ -2,6 +2,7 @@
 
 require 'yaml'
 require 'webgen/error'
+require 'webgen/utils'
 
 module Webgen
 
@@ -49,7 +50,7 @@ module Webgen
           {}
         else
           begin
-            meta_info = YAML::load(mi_data.to_s)
+            meta_info = Utils.yaml_load(mi_data.to_s)
             unless meta_info.kind_of?(Hash)
               raise FormatError, "Invalid structure of meta information block: expected YAML hash but found #{meta_info.class}"
             end
@@ -78,7 +79,7 @@ module Webgen
           else
             md = RE_BLOCKS_START_COMPLEX.match(options.to_s)
             raise(FormatError, "Found invalid blocks starting line for block #{index}: #{options}") if content =~ /\A---/ || md.nil?
-            options = Hash[*md[1].to_s.scan(/(\w+):([^\s]*)/).map {|k,v| [k, (v == '' ? nil : YAML::load(v))]}.flatten]
+            options = Hash[*md[1].to_s.scan(/(\w+):([^\s]*)/).map {|k,v| [k, (v == '' ? nil : Utils.yaml_load(v))]}.flatten]
           end
 
           name = options.delete('name') || (index == 1 ? 'content' : 'block' + (index).to_s)

data/lib/webgen/path_handler/api.rb

@@ -226,7 +226,7 @@ module Webgen
       # 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")
+          method_list = type == 'Class' ? klass.class_method_list : klass.instance_methods
           next if method_list.empty?
           meth_url = "#{klass_node.alcn}##{type}-Methods"
           path = Webgen::Path.new(meth_url,

data/lib/webgen/path_handler/meta_info.rb

@@ -5,6 +5,7 @@ require 'set'
 require 'yaml'
 require 'webgen/path_handler/base'
 require 'webgen/path_handler/page_utils'
+require 'webgen/utils'
 
 module Webgen
   class PathHandler
@@ -44,7 +45,7 @@ module Webgen
       # Add the data from the given page block to the hash.
       def add_data(path, content, block_name)
         entries = []
-        if content && (data = YAML::load(content))
+        if content && (data = Utils.yaml_load(content))
           data.each do |(*keys), value|
             value = Marshal.dump(value)
             keys.each {|key| entries << [Webgen::Path.append(path.parent_path, key), value]}

data/lib/webgen/path_handler/virtual.rb

@@ -4,6 +4,7 @@ require 'yaml'
 require 'webgen/path'
 require 'webgen/path_handler/base'
 require 'webgen/path_handler/page_utils'
+require 'webgen/utils'
 
 module Webgen
   class PathHandler
@@ -65,7 +66,7 @@ module Webgen
       def read_entries(blocks)
         blocks.each do |name, content|
           begin
-            data = YAML::load(content)
+            data = Utils.yaml_load(content)
           rescue RuntimeError, ArgumentError, SyntaxError, YAML::SyntaxError => e
             raise RuntimeError, "Problem parsing block '#{name}' (it needs to contain a YAML hash): #{e.message}", e.backtrace
           end

data/lib/webgen/utils/tag_parser.rb

@@ -3,6 +3,7 @@
 require 'yaml'
 require 'strscan'
 require 'webgen/error'
+require 'webgen/utils'
 
 module Webgen
   module Utils
@@ -113,7 +114,7 @@ module Webgen
 
       # Parse the parameter string and return the result.
       def parse_params(param_string, tag)
-        YAML::load("--- #{param_string}")
+        Utils.yaml_load("--- #{param_string}")
       rescue ArgumentError, SyntaxError, YAML::SyntaxError => e
         raise Error.new("Could not parse parameter string '#{param_string}' for tag '#{tag}': #{e.message}")
       end

data/lib/webgen/utils.rb

@@ -2,6 +2,7 @@
 
 require 'rbconfig'
 require 'webgen/core_ext'
+require 'yaml'
 
 module Webgen
 
@@ -34,6 +35,11 @@ module Webgen
       str
     end
 
+    # Load the YAML string.
+    def self.yaml_load(str)
+      YAML.load(str, aliases: true, permitted_classes: [Symbol, Time])
+    end
+
   end
 
 end

data/lib/webgen/version.rb

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

data/test/webgen/item_tracker/test_file.rb

@@ -7,7 +7,7 @@ require 'webgen/item_tracker/file'
 class TestItemTrackerFile < Minitest::Test
 
   def setup
-    @website = MiniTest::Mock.new
+    @website = Minitest::Mock.new
     @obj = Webgen::ItemTracker::File.new(@website)
   end
 

data/test/webgen/item_tracker/test_nodes.rb

@@ -37,7 +37,7 @@ class TestItemTrackerNodes < Minitest::Test
 
   def test_item_changed?
     setup_default_nodes(@website.tree)
-    @website.ext.item_tracker = MiniTest::Mock.new
+    @website.ext.item_tracker = Minitest::Mock.new
     2.times do
       @website.ext.item_tracker.expect(:item_changed?, false, [:node_meta_info, @website.tree['/file.en.html']])
       @website.ext.item_tracker.expect(:item_changed?, false, [:node_meta_info, @website.tree['/file.de.html']])

data/test/webgen/source/test_stacked.rb

@@ -18,10 +18,10 @@ class TestSourceStacked < Minitest::Test
   end
 
   def test_paths
-    path1 = MiniTest::Mock.new
+    path1 = Minitest::Mock.new
     path1.expect(:mount_at, 'path1', ['/'])
     path1.expect(:hash, 'path1'.hash)
-    path2 = MiniTest::Mock.new
+    path2 = Minitest::Mock.new
     path2.expect(:mount_at, 'path2', ['/hallo/'])
     path2.expect(:hash, 'path2'.hash)
 

data/test/webgen/tag/test_tikz.rb

@@ -10,7 +10,7 @@ class TestTagTikz < Minitest::Test
     require 'webgen/tag/tikz' rescue skip($!.message)
 
     setup_context
-    @website.ext.path_handler = MiniTest::Mock.new
+    @website.ext.path_handler = Minitest::Mock.new
 
     root = Webgen::Node.new(@website.tree.dummy_root, '/', '/')
     node = Webgen::Node.new(root, 'file.page', '/file.html')

data/test/webgen/test_context.rb

@@ -62,7 +62,7 @@ class TestContext < Minitest::Test
 
   def test_tags_methods
     context = Webgen::Context.new(@website)
-    tag = MiniTest::Mock.new
+    tag = Minitest::Mock.new
     tag.expect(:call, 'value', ['mytag', {'opt' => 'val'}, 'body', context])
     @website.ext.tag = tag
 

data/test/webgen/test_destination.rb

@@ -12,7 +12,7 @@ end
 class TestDestination < Minitest::Test
 
   def setup
-    @website = MiniTest::Mock.new
+    @website = Minitest::Mock.new
     @dest = Webgen::Destination.new(@website)
   end
 

data/test/webgen/test_error.rb

@@ -26,7 +26,7 @@ class TestError < Minitest::Test
 
   def test_class_error_line
     begin
-      eval("5 =")
+      eval("5 =", binding, "(eval)", 1)
     rescue SyntaxError => e
       assert_equal(1, Webgen::Error.error_line(e))
     end
@@ -40,7 +40,7 @@ class TestError < Minitest::Test
 
   def test_class_error_file
     begin
-      eval("5 =")
+      eval("5 =", binding, "(eval)")
     rescue SyntaxError => e
       assert_equal('(eval)', Webgen::Error.error_file(e))
     end
@@ -79,7 +79,7 @@ class TestRenderError < Minitest::Test
     assert_match(/Error at location in <\/error:~5> while rendering <\/path>/, e.message)
 
     begin
-      eval("5 =")
+      eval("5 =", binding, "(eval)", 1)
     rescue SyntaxError
       e = Webgen::RenderError.new($!, 'location', '/path', '/error')
       assert_equal("/error", e.error_path)

data/test/webgen/test_node.rb

@@ -111,7 +111,7 @@ class TestNode < Minitest::Test
     assert_equal(tree['/dir2/index.en.html'], tree['/dir2/'].proxy_node('en'))
     assert_equal(tree['/dir2/index.en.html'], tree['/dir2/'].proxy_node('en'))
 
-    @website.ext.item_tracker = MiniTest::Mock.new
+    @website.ext.item_tracker = Minitest::Mock.new
     @website.ext.item_tracker.expect(:add, nil, [:a, :b, :c, :d])
     tree['/dir/subfile.html'].meta_info['proxy_path'] = 'holla'
     assert_equal(tree['/dir/subfile.html'], tree['/dir/subfile.html'].proxy_node('pt'))

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: webgen
 version: !ruby/object:Gem::Version
-  version: 1.7.2
+  version: 1.7.3
 platform: ruby
 authors:
 - Thomas Leitner
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-07 00:00:00.000000000 Z
+date: 2024-01-01 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: psych
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: cmdparse
   requirement: !ruby/object:Gem::Requirement
@@ -516,8 +530,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
-signing_key: 
+rubygems_version: 3.5.3
+signing_key:
 specification_version: 4
 summary: webgen is a fast, powerful, and extensible static website generator.
 test_files: []
+...