jekyll-minibundle 2.1.2 → 2.2.0

data/test/unit/stamp_file_properties_test.rb

@@ -1,48 +1,54 @@
 require 'support/test_case'
 require 'support/fixture_config'
-require 'support/static_file_api_config'
+require 'support/static_file_config'
 require 'jekyll/minibundle/stamp_file'
 
 module Jekyll::Minibundle::Test
   class StampFilePropertiesTest < TestCase
     include FixtureConfig
-    include StaticFileAPIConfig
+    include StaticFileConfig
 
     def setup
-      @@results ||= with_fake_site do |site|
-        file = StampFile.new(site, STAMP_SOURCE_PATH, STAMP_DESTINATION_PATH)
-        file.destination_path_for_markup
-        get_send_results(file, STATIC_FILE_API_PROPERTIES)
+      @@results ||= with_stamp_file do |file|
+        get_send_results(file, STATIC_FILE_PROPERTIES)
       end
     end
 
+    def test_basename
+      assert_equal("screen-#{STAMP_FINGERPRINT}", @@results.fetch(:basename))
+    end
+
+    def test_data
+      assert_equal({}, @@results.fetch(:data))
+    end
+
     def test_defaults
       assert_equal({}, @@results.fetch(:defaults))
     end
 
     def test_destination_rel_dir
-      assert_equal 'assets', @@results.fetch(:destination_rel_dir)
-    end
-
-    def test_name
-      assert_equal "screen-#{STAMP_FINGERPRINT}.css", @@results.fetch(:name)
+      assert_equal('/assets', @@results.fetch(:destination_rel_dir))
     end
 
     def test_extname
-      assert_equal '.css', @@results.fetch(:extname)
+      assert_equal('.css', @@results.fetch(:extname))
     end
 
     def test_modified_time
-      assert_instance_of Time, @@results.fetch(:modified_time)
+      assert_instance_of(Time, @@results.fetch(:modified_time))
     end
 
     def test_mtime
       mtime = @@results.fetch(:modified_time)
-      assert_equal mtime.to_i, @@results.fetch(:mtime)
+      assert_equal(mtime.to_i, @@results.fetch(:mtime))
+    end
+
+    def test_name
+      assert_equal("screen-#{STAMP_FINGERPRINT}.css", @@results.fetch(:name))
     end
 
     def test_path
-      assert_match(%r{/#{STAMP_SOURCE_PATH}\z}, @@results.fetch(:path))
+      assert_match(%r{\A/.+/#{STAMP_SOURCE_PATH}\z}, @@results.fetch(:path))
     end
 
     def test_placeholders
@@ -50,24 +56,41 @@ module Jekyll::Minibundle::Test
     end
 
     def test_relative_path
-      assert_equal "/#{STAMP_SOURCE_PATH}", @@results.fetch(:relative_path)
+      assert_equal("/#{STAMP_SOURCE_PATH}", @@results.fetch(:relative_path))
     end
 
     def test_to_liquid
-      hash = @@results.fetch(:to_liquid)
-      assert_equal "screen-#{STAMP_FINGERPRINT}", hash.fetch('basename')
-      assert_equal "screen-#{STAMP_FINGERPRINT}.css", hash.fetch('name')
-      assert_equal '.css', hash.fetch('extname')
-      assert_instance_of Time, hash.fetch('modified_time')
-      assert_equal "/#{STAMP_SOURCE_PATH}", hash.fetch('path')
+      with_stamp_file do |file|
+        drop = file.to_liquid
+        assert_equal("screen-#{STAMP_FINGERPRINT}.css", drop.name)
+        assert_equal('.css', drop.extname)
+        assert_equal("screen-#{STAMP_FINGERPRINT}", drop.basename)
+        assert_instance_of(Time, drop.modified_time)
+        assert_equal("/#{STAMP_SOURCE_PATH}", drop.path)
+        assert_nil(drop.collection)
+      end
     end
 
     def test_type
-      assert_nil @@results.fetch(:type)
+      assert_nil(@@results.fetch(:type))
+    end
+
+    def test_url
+      assert_equal(STAMP_DESTINATION_FINGERPRINT_PATH, @@results.fetch(:url))
     end
 
     def test_write?
-      assert @@results.fetch(:write?)
+      assert(@@results.fetch(:write?))
+    end
+
+    private
+
+    def with_stamp_file(&block)
+      with_fake_site do |site|
+        file = StampFile.new(site, STAMP_SOURCE_PATH, STAMP_DESTINATION_PATH)
+        file.destination_path_for_markup
+        block.call(file)
+      end
     end
   end
 end

data/test/unit/stamp_file_writing_test.rb

@@ -6,6 +6,15 @@ module Jekyll::Minibundle::Test
   class StampFileWritingTest < TestCase
     include FixtureConfig
 
+    def test_raise_error_if_source_file_does_not_exist
+      err = assert_raises(ArgumentError) do
+        with_fake_site do |site|
+          StampFile.new(site, '_tmp', STAMP_DESTINATION_PATH)
+        end
+      end
+      assert_match(%r{\AStamp source file does not exist: .+/_tmp\z}, err.to_s)
+    end
+
     def test_calling_destination_path_for_markup_determines_fingerprint_and_destination_write
       with_fake_site do |site|
         stamp_file = make_stamp_file(site)
@@ -17,13 +26,13 @@ module Jekyll::Minibundle::Test
 
         org_markup_path = stamp_file.destination_path_for_markup
 
-        assert write_file(stamp_file)
+        assert(write_file(stamp_file))
 
         org_mtime = file_mtime_of(old_destination)
 
         last_markup_path = stamp_file.destination_path_for_markup
 
-        assert_equal org_markup_path, last_markup_path
+        assert_equal(org_markup_path, last_markup_path)
 
         # change content, but don't call destination_path_for_markup yet
 
@@ -31,11 +40,11 @@ module Jekyll::Minibundle::Test
 
         # preserve content's fingerprint
 
-        refute write_file(stamp_file)
+        refute(write_file(stamp_file))
 
-        assert_equal org_markup_path, last_markup_path
-        assert_equal org_mtime, file_mtime_of(old_destination)
-        assert_equal File.read(site_fixture_path(STAMP_SOURCE_PATH)), File.read(old_destination)
+        assert_equal(org_markup_path, last_markup_path)
+        assert_equal(org_mtime, file_mtime_of(old_destination))
+        assert_equal(File.read(site_fixture_path(STAMP_SOURCE_PATH)), File.read(old_destination))
 
         # see content's fingerprint to update after calling
         # destination_path_for_markup
@@ -44,12 +53,12 @@ module Jekyll::Minibundle::Test
 
         refute_equal org_markup_path, last_markup_path
 
-        assert write_file(stamp_file)
+        assert(write_file(stamp_file))
 
         new_destination = destination_path('assets/screen-0f5dbd1e527a2bee267e85007b08d2a5.css')
 
-        assert_operator file_mtime_of(new_destination), :>, org_mtime
-        assert_equal File.read(source), File.read(new_destination)
+        assert_operator(file_mtime_of(new_destination), :>, org_mtime)
+        assert_equal(File.read(source), File.read(new_destination))
       end
     end
 
@@ -61,17 +70,17 @@ module Jekyll::Minibundle::Test
         org_markup = stamp_file.destination_path_for_markup
         stamp_file.destination_path_for_markup
 
-        assert write_file(stamp_file)
+        assert(write_file(stamp_file))
 
         org_mtime = file_mtime_of(destination)
         ensure_file_mtime_changes { FileUtils.touch(source) }
         last_markup = stamp_file.destination_path_for_markup
         stamp_file.destination_path_for_markup
 
-        assert write_file(stamp_file)
-        assert_equal org_markup, last_markup
-        assert_operator file_mtime_of(destination), :>, org_mtime
-        assert_equal File.read(source), File.read(destination)
+        assert(write_file(stamp_file))
+        assert_equal(org_markup, last_markup)
+        assert_operator(file_mtime_of(destination), :>, org_mtime)
+        assert_equal(File.read(source), File.read(destination))
       end
     end
 
@@ -79,13 +88,13 @@ module Jekyll::Minibundle::Test
       with_fake_site do |site|
         stamp_file = make_stamp_file(site)
 
-        refute write_file(stamp_file)
-        assert_empty Dir[destination_path('assets/*.css')]
+        refute(write_file(stamp_file))
+        assert_empty(Dir[destination_path('assets/*.css')])
 
         stamp_file.destination_path_for_markup
 
-        assert write_file(stamp_file)
-        assert File.exist?(destination_path(STAMP_DESTINATION_FINGERPRINT_PATH))
+        assert(write_file(stamp_file))
+        assert(File.file?(destination_path(STAMP_DESTINATION_FINGERPRINT_PATH)))
       end
     end
 
@@ -93,16 +102,16 @@ module Jekyll::Minibundle::Test
       with_fake_site do |site|
         stamp_file = make_stamp_file(site)
 
-        refute stamp_file.modified?
-        refute write_file(stamp_file)
+        refute(stamp_file.modified?)
+        refute(write_file(stamp_file))
 
         stamp_file.destination_path_for_markup
 
-        assert stamp_file.modified?
-        assert write_file(stamp_file)
+        assert(stamp_file.modified?)
+        assert(write_file(stamp_file))
 
-        refute stamp_file.modified?
-        refute write_file(stamp_file)
+        refute(stamp_file.modified?)
+        refute(write_file(stamp_file))
       end
     end
 

data/test/unit/variable_template_test.rb

@@ -0,0 +1,121 @@
+# coding: utf-8
+
+require 'support/test_case'
+require 'jekyll/minibundle/variable_template'
+
+module Jekyll::Minibundle::Test
+  class VariableTemplateTest < TestCase
+    VARIABLES = {
+      'var1' => 41,
+      'var2' => '42',
+      'var3' => 43
+    }.freeze
+
+    def test_render_single_variable
+      assert_equal('41', render('{{var1}}', VARIABLES))
+      assert_equal('abc 41 zz', render('abc {{var1}} zz', VARIABLES))
+    end
+
+    def test_render_many_variables
+      assert_equal('414243', render('{{var1}}{{var2}}{{var3}}', VARIABLES))
+      assert_equal('abc 41 42efg43hij', render('abc {{var1}} {{var2}}efg{{var3}}hij', VARIABLES))
+    end
+
+    def test_render_single_variable_many_times
+      assert_equal('4141', render('{{var1}}{{var1}}', VARIABLES))
+    end
+
+    def test_strip_whitespace_around_variable_name
+      assert_equal('41 42', render("{{ var1\t}} {{ \n var2\n}}", VARIABLES))
+    end
+
+    def test_render_empty_string_for_nil_variable
+      assert_equal('', render('{{nosuch}}', VARIABLES))
+    end
+
+    def test_variable_name_can_be_anything_but_closing_tag
+      assert_equal('42', render('{{ foo {{ 3… } bar }}', 'foo {{ 3… } bar' => 42))
+    end
+
+    def test_return_template_without_variables_as_is
+      assert_equal('', render('', VARIABLES))
+      assert_equal('abc', render('abc', VARIABLES))
+    end
+
+    def test_raise_error_if_nil_template
+      err = assert_raises(ArgumentError) { VariableTemplate.compile(nil) }
+      assert_equal('Nil template', err.to_s)
+    end
+
+    def test_raise_error_if_unclosed_open_tag
+      err = assert_raises(VariableTemplate::SyntaxError) { VariableTemplate.compile('beg{{var}end') }
+      expected = <<-END
+Missing closing tag ("}}") for variable opening tag ("{{") at position 5 in template (position highlighted with "@"):
+beg{{@var}end
+      END
+      assert_equal(expected, err.to_s)
+    end
+
+    def test_application_to_same_compiled_template_many_times
+      template = VariableTemplate.compile('the answer is {{var}}, obviously')
+      assert_equal('the answer is 42, obviously', template.render('var' => 42))
+      assert_equal('the answer is 21, obviously', template.render('var' => 21))
+    end
+
+    def test_nonascii_template_and_variables
+      variables = {
+        '…first'   => 'after first…',
+        'yötön yö' => 'yö'
+      }
+      actual = render('begin… {{ …first }} middle {{yötön yö}} …end', variables)
+      expected = 'begin… after first… middle yö …end'
+      assert_equal(expected, actual)
+    end
+
+    def test_escapes_with_backslash
+      assert_equal('\\', render('\\\\', VARIABLES))
+      assert_equal('{', render('\\{', VARIABLES))
+      assert_equal('}', render('\\}', VARIABLES))
+      assert_equal('\\a', render('\\a', VARIABLES))
+      assert_equal('{{var1}}', render('\{{var1}}', VARIABLES))
+      assert_equal('{{var1}}', render('{\{var1}}', VARIABLES))
+      assert_equal('{{var1}}', render('\{{var1\}}', VARIABLES))
+      assert_equal('{{var1}}', render('\{{var1}\}', VARIABLES))
+      assert_equal('bar', render('{{foo\\}}', 'foo\\' => 'bar'))
+    end
+
+    def test_generator_escapes_text_token
+      assert_equal('#{}', render('#{}', {}))
+      assert_equal('"hey"', render('"hey"', {}))
+      assert_equal("'hey'", render("'hey'", {}))
+    end
+
+    def test_generator_escapes_variable_token
+      assert_equal('42', render('{{ \\ }}', '\\' => 42))
+      assert_equal('42', render("{{ ' }}", "'" => 42))
+      assert_equal('42', render('{{ " }}', '"' => 42))
+      assert_equal('42', render('{{ #{} }}', '#{}' => 42))
+      assert_equal("beg'42'end", render("beg'{{ 'var' }}'end", "'var'" => 42))
+    end
+
+    def test_complex_template
+      variables = {
+        'integer'    => 42,
+        'string'     => 'a rather long string',
+        'sneaky… \\' => 'clever…'
+      }
+
+      template = 'begin "ä\\{\\ö\\\\{{integer}}middle \{{trap}} and {{ string }} also {{ sneaky… \\}} end'
+      expected = 'begin "ä{\\ö\\42middle {{trap}} and a rather long string also clever… end'
+      actual = render(template, variables)
+
+      assert_equal(expected, actual)
+    end
+
+    private
+
+    def render(template, values)
+      VariableTemplate.compile(template).render(values)
+    end
+  end
+end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-minibundle
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.2.0
 platform: ruby
 authors:
 - Tuomas Kareinen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-28 00:00:00.000000000 Z
+date: 2017-03-10 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: benchmark-ips
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: jekyll
   requirement: !ruby/object:Gem::Requirement
@@ -112,6 +126,7 @@ files:
 - jekyll-minibundle.gemspec
 - lib/jekyll/minibundle.rb
 - lib/jekyll/minibundle/asset_bundle.rb
+- lib/jekyll/minibundle/asset_file_drop.rb
 - lib/jekyll/minibundle/asset_file_properties.rb
 - lib/jekyll/minibundle/asset_file_registry.rb
 - lib/jekyll/minibundle/asset_stamp.rb
@@ -127,6 +142,8 @@ files:
 - lib/jekyll/minibundle/mini_bundle_block.rb
 - lib/jekyll/minibundle/mini_stamp_tag.rb
 - lib/jekyll/minibundle/stamp_file.rb
+- lib/jekyll/minibundle/variable_template.rb
+- lib/jekyll/minibundle/variable_template_registry.rb
 - lib/jekyll/minibundle/version.rb
 - test/fixture/site/_assets/scripts/app.js
 - test/fixture/site/_assets/scripts/dependency.js
@@ -147,14 +164,15 @@ files:
 - test/integration/static_files_as_asset_sources_test.rb
 - test/support/assertions.rb
 - test/support/fixture_config.rb
-- test/support/static_file_api_config.rb
+- test/support/static_file_config.rb
 - test/support/test_case.rb
 - test/unit/asset_bundle_test.rb
+- test/unit/asset_file_drop_test.rb
 - test/unit/asset_file_registry_test.rb
 - test/unit/asset_tag_markup_test.rb
 - test/unit/bundle_file_properties_test.rb
 - test/unit/bundle_file_writing_test.rb
-- test/unit/development_file_collection_properties_test.rb
+- test/unit/development_file_properties_test.rb
 - test/unit/development_file_writing_test.rb
 - test/unit/environment_test.rb
 - test/unit/files_test.rb
@@ -164,6 +182,7 @@ files:
 - test/unit/mini_stamp_tag_test.rb
 - test/unit/stamp_file_properties_test.rb
 - test/unit/stamp_file_writing_test.rb
+- test/unit/variable_template_test.rb
 homepage: https://github.com/tkareine/jekyll-minibundle
 licenses:
 - MIT
@@ -213,14 +232,15 @@ test_files:
 - test/integration/static_files_as_asset_sources_test.rb
 - test/support/assertions.rb
 - test/support/fixture_config.rb
-- test/support/static_file_api_config.rb
+- test/support/static_file_config.rb
 - test/support/test_case.rb
 - test/unit/asset_bundle_test.rb
+- test/unit/asset_file_drop_test.rb
 - test/unit/asset_file_registry_test.rb
 - test/unit/asset_tag_markup_test.rb
 - test/unit/bundle_file_properties_test.rb
 - test/unit/bundle_file_writing_test.rb
-- test/unit/development_file_collection_properties_test.rb
+- test/unit/development_file_properties_test.rb
 - test/unit/development_file_writing_test.rb
 - test/unit/environment_test.rb
 - test/unit/files_test.rb
@@ -230,3 +250,4 @@ test_files:
 - test/unit/mini_stamp_tag_test.rb
 - test/unit/stamp_file_properties_test.rb
 - test/unit/stamp_file_writing_test.rb
+- test/unit/variable_template_test.rb