webgen 1.7.0 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c2b90d29a4e3ddf583052496505ee5e903beac7a460c2b9fb19180540fe8e59
-  data.tar.gz: '06109f7ce0df6dce4095287907be396c816fcaf8f3c26767420f41af80a00965'
+  metadata.gz: 1754f53e6bf21861fe5ede0bdc46d9ec59b5e38a0f011037b19a218f3b1ba642
+  data.tar.gz: 766b0d8e4ba1b5ad86d9ad7655e9c92cac3ba43dbeff2747c8a83cbec6f1cd33
 SHA512:
-  metadata.gz: e4bc1e38d4cb27cbaeeda92b0775f65a44c8c4a048b4da6c661f8b502a9fe031b5d8476e62a9811f383be1c8dd152a3b59ed31e7466d116d02acf984d39c8184
-  data.tar.gz: '08e4498259a4e83f7623729082637f9ef7a8f78912d07808e65a62aa498cf672149c71a368bf909a80e62d45432ac844f9ae710a754304d451133e6431da8e02'
+  metadata.gz: 2a05b2c6b2ea95ce22c58d57d6145e92fbdec870f27f750fc847fa372c96b9bf2ea751d6cacabe8bf344e3a1cdf08a8ea2d78b28966d864cd666b3ad378e0162
+  data.tar.gz: c3724710f6745d87dd92531f8b2f6a06a82be518af9057b46c9b4d62e94cbc9831c24b8b670c3525168dd2e999f67c37807e3c600d0737d93d1db2f547a68d3d

data/Rakefile

@@ -109,16 +109,16 @@ EOF
 
     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.7.0
+1.7.1

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/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)

data/lib/webgen/content_processor/erb.rb

@@ -13,7 +13,7 @@ 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 = ERB.new(context.content, trim_mode: context.website.config['content_processor.erb.trim_mode'])
         erb.filename = context.ref_node.alcn
         context.content = erb.result(binding)
         context

data/lib/webgen/path_handler/api.rb

@@ -92,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?

data/lib/webgen/source/tar_archive.rb

@@ -38,7 +38,7 @@ module Webgen
       def paths
         if !defined?(@paths)
           stream = open(@uri)
-          stream = Zlib::GzipReader.new(stream) if @uri =~ /(\.tar\.gz|\.tgz)$/
+          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.7.0'
+  VERSION = '1.7.1'
 
 end

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_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/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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webgen
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.1
 platform: ruby
 authors:
 - Thomas Leitner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-21 00:00:00.000000000 Z
+date: 2020-07-21 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
@@ -516,8 +516,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: webgen is a fast, powerful, and extensible static website generator.