webgen 1.4.1 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d93b547db495a7469b8a3b038da5ab6eae16c083
-  data.tar.gz: d634fdc3f669cde58f29346d2a769c1ecd1bdbf3
+SHA256:
+  metadata.gz: c7503141411c417cebfe4ce07f0c73743cb0d3d8f1106df4c44c10c002b36e21
+  data.tar.gz: 27b7f63d682a006ad8d29708541abe0ad2684d83660d548ae4c133c025ae4137
 SHA512:
-  metadata.gz: 8e82628dd6abefd5c7eee3266e77b0a435671486a0460e014c9ba46b6c7e29552cb9bdcbf152e1be3ee1dcc66501ec71a4c6a4434d311ab68bb785ff94ab0d81
-  data.tar.gz: 838e654ae206a8a79554ac6c71d46daa4719758518c60a5e117f4068c07777fc6d0e0f917974081ed07dfbdbef1325fab144ec2442467820fd708f7ffad63f2b
+  metadata.gz: d48ff1a6abfd6fa03cb13da0fe4f65997049f93bdd4112cadbe877971e93cf6ad46a205db7ccc9bbc3cb3a5e978772f391a936e030804273dcfbcc9f60b51755
+  data.tar.gz: 8ddcc6251a2004df145341c3185d7d629f42c828ce3bc93dc5a85ef6e952f6baa46fcddc6ab586eebb44e8322bfe443d9b721115ded0c3a765557bbb7f7677c3

data/Rakefile

@@ -123,6 +123,7 @@ EOF
     s.add_development_dependency('erubis', '~> 2.6')
     s.add_development_dependency('rdiscount', '~> 1.3')
     s.add_development_dependency('archive-tar-minitar', '~> 0.5')
+    s.add_development_dependency('cssminify', '~> 1.0')
 
     s.files = PKG_FILES.to_a
     s.require_path = 'lib'

data/VERSION

@@ -1 +1 @@
-1.4.1
+1.5.0

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

@@ -22,6 +22,9 @@ extensions:
   content_processor.builder:
     author: *author
     summary: Allows one to programatically create valid XHTML/XML documents
+  content_processor.cssminify:
+    author: *author
+    summary: Compresses CSS files
   content_processor.erb:
     author: *author
     summary: Allows one to use ERB (embedded Ruby) in the content

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

@@ -63,6 +63,7 @@ require 'webgen/content_processor'
 website.ext.content_processor = content_processor = Webgen::ContentProcessor.new
 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)
 

data/lib/webgen/content_processor/css_minify.rb

@@ -0,0 +1,21 @@
+# -*- encoding: utf-8 -*-
+
+require 'webgen/content_processor'
+webgen_require 'cssminify'
+
+module Webgen
+  class ContentProcessor
+
+    # Minifies CSS files.
+    module CSSMinify
+
+      # Process the content of +context+ with CSSMinify (a CSS minifier).
+      def self.call(context)
+        context.content = ::CSSminify.compress(context.content)
+        context
+      end
+
+    end
+
+  end
+end

data/lib/webgen/path_handler/base.rb

@@ -161,7 +161,7 @@ module Webgen
       # exists, the language part is forced to be in the destination path and the resulting
       # destination path is returned.
       def dest_path(parent, path)
-        path.meta_info['dest_path'] ||= '<parent><basename>(-<version>)(.<lang>)<ext>'
+        path.meta_info['dest_path'] ||= '<parent><basename>(-<version>)(-<modified_at>)(.<lang>)<ext>'
         dpath = construct_dest_path(parent, path, false)
         if (node = node_exists?(path, dpath)) && node.lang != path.meta_info['lang']
           dpath = construct_dest_path(parent, path, true)
@@ -216,6 +216,8 @@ module Webgen
               use_lang_part ? path.meta_info['lang'] : ''
             when "<version>"
               use_version_part ? path.meta_info['version'] : ''
+            when "<modified_at>"
+              path.meta_info['modified_at_in_dest_path'] ? path.meta_info['modified_at'].strftime('%Y%m%d%H%M%S') : ''
             when /<(year|month|day)>/
               ctime = path.meta_info['created_at']
               if !ctime.kind_of?(Time)

data/lib/webgen/version.rb

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

data/test/webgen/content_processor/test_css_minify.rb

@@ -0,0 +1,18 @@
+# -*- encoding: utf-8 -*-
+
+require 'webgen/test_helper'
+require 'webgen/content_processor/css_minify'
+
+class TestContentProcessorCSSMinify < Minitest::Test
+
+  include Webgen::TestHelper
+
+  def test_static_call
+    setup_context
+    cp = Webgen::ContentProcessor::CSSMinify
+
+    @context.content = "a   \n{    border: 1px   solid   #000000\n}"
+    assert_equal("a{border:1px solid #000}", cp.call(@context).content)
+  end
+
+end

data/test/webgen/path_handler/test_base.rb

@@ -60,7 +60,7 @@ class TestPathHandlerBase < Minitest::Test
       assert_equal(expected, @obj.dest_path(parent, Webgen::Path.new(path, mi)))
     end
 
-    mi = {'dest_path' => '<parent><basename>(-<version>)(.<lang>)<ext>'}
+    mi = {'dest_path' => '<parent><basename>(-<version>)(-<modified_at>)(.<lang>)<ext>'}
 
     config['path_handler.lang_code_in_dest_path'] = true
     check_dest_path.call('/path.html', mi, '/path.html')
@@ -128,6 +128,10 @@ class TestPathHandlerBase < Minitest::Test
     check_dest_path.call('/path.html', {'dest_path' => "webgen:this is not changed"},
                          'this is not changed')
 
+    check_dest_path.call('/path.css', mi.merge('modified_at_in_dest_path' => true,
+                                               'modified_at' => Time.parse('2018-05-06 08:30:05')),
+                         '/path-20180506083005.css')
+
     assert_raises(Webgen::NodeCreationError) do
       check_dest_path.call('/path.html', {'dest_path' => "<hallo>"}, 'unused')
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webgen
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.0
 platform: ruby
 authors:
 - Thomas Leitner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-26 00:00:00.000000000 Z
+date: 2018-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cmdparse
@@ -240,6 +240,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
+- !ruby/object:Gem::Dependency
+  name: cssminify
+  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'
 description: |
   webgen is used to generate static websites from templates and content
   files (which can be written in a markup language). It can generate
@@ -303,6 +317,7 @@ files:
 - lib/webgen/content_processor.rb
 - lib/webgen/content_processor/blocks.rb
 - lib/webgen/content_processor/builder.rb
+- lib/webgen/content_processor/css_minify.rb
 - lib/webgen/content_processor/erb.rb
 - lib/webgen/content_processor/erubis.rb
 - lib/webgen/content_processor/fragments.rb
@@ -392,6 +407,7 @@ files:
 - test/webgen/cli/test_logger.rb
 - test/webgen/content_processor/test_blocks.rb
 - test/webgen/content_processor/test_builder.rb
+- test/webgen/content_processor/test_css_minify.rb
 - test/webgen/content_processor/test_erb.rb
 - test/webgen/content_processor/test_erubis.rb
 - test/webgen/content_processor/test_fragments.rb
@@ -501,7 +517,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: webgen is a fast, powerful, and extensible static website generator.