jekyll-minibundle 1.5.1 → 1.6.0

data/test/unit/files_test.rb

@@ -0,0 +1,46 @@
+require 'support/test_case'
+require 'jekyll/minibundle/files'
+
+module Jekyll::Minibundle::Test
+  class FilesTest < TestCase
+    def test_read_last_with_non_existing_file_raises_exception
+      assert_raises(Errno::ENOENT) { Files.read_last('no-such-file', 4) }
+    end
+
+    def test_read_last_with_empty_file_returns_empty
+      Tempfile.open('test') do |file|
+        file.close
+
+        assert_equal '', Files.read_last(file.path, 4)
+      end
+    end
+
+    def test_read_last_with_file_bigger_than_max_size_returns_last_bytes
+      Tempfile.open('test') do |file|
+        file.write("1\n2\n3\n4")
+        file.close
+
+        assert_equal "\n3\n4", Files.read_last(file.path, 4)
+      end
+    end
+
+    def test_read_last_with_file_smaller_than_max_size_returns_all_contents
+      Tempfile.open('test') do |file|
+        file.write("1\n2")
+        file.close
+
+        assert_equal "1\n2", Files.read_last(file.path, 100)
+      end
+    end
+
+    def test_read_last_with_max_size_zero_or_negative_returns_empty
+      Tempfile.open('test') do |file|
+        file.write("1\n2")
+        file.close
+
+        assert_equal '', Files.read_last(file.path, 0)
+        assert_equal '', Files.read_last(file.path, -1)
+      end
+    end
+  end
+end

data/test/unit/hashes_test.rb

@@ -0,0 +1,41 @@
+require 'support/test_case'
+require 'jekyll/minibundle/hashes'
+
+module Jekyll::Minibundle::Test
+  class HashesTest < TestCase
+    def test_dig_returns_value_when_found
+      assert_equal 1, Hashes.dig({top: {middle: {leaf: 1}}}, :top, :middle, :leaf)
+      assert_equal 1, Hashes.dig({top: [{}, {leaf: 1}]}, :top, 1, :leaf)
+      assert_equal 1, Hashes.dig([{}, {middle: [{}, {leaf: 1}]}], 1, :middle, 1, :leaf)
+    end
+
+    def test_dig_returns_same_found_object
+      leaf_obj = {leaf: 1}
+      assert_same leaf_obj, Hashes.dig({top: {middle: leaf_obj}}, :top, :middle)
+    end
+
+    def test_dig_returns_nil_when_not_found
+      assert_nil Hashes.dig({}, :no_such)
+      assert_nil Hashes.dig([], 0)
+      assert_nil Hashes.dig({top: {}}, :top, :no_such_leaf)
+      assert_nil Hashes.dig({top: {leaf: 1}}, :top, :no_such_leaf)
+      assert_nil Hashes.dig({top: []}, :top, 0)
+      assert_nil Hashes.dig([{leaf: 1}], 0, :no_such)
+    end
+
+    def test_dig_returns_nil_for_nil
+      assert_nil Hashes.dig(nil, :no_such_key)
+      assert_nil Hashes.dig(nil, 0)
+    end
+
+    def test_pick_returns_hash_with_specified_keys
+      assert_equal({}, Hashes.pick(a: 1, 'b' => 2, 'c' => 3))
+      assert_equal({}, Hashes.pick({}))
+      assert_equal({a: 1, 'c' => 3}, Hashes.pick({a: 1, 'b' => 2, 'c' => 3}, :a, 'c'))
+    end
+
+    def test_pick_raises_exception_if_key_does_not_exist
+      assert_raises(KeyError) { Hashes.pick({}, :no_such) }
+    end
+  end
+end

data/test/unit/mini_bundle_block_test.rb

@@ -1,13 +1,68 @@
 require 'support/test_case'
+require 'support/fixture_config'
 require 'jekyll/minibundle/mini_bundle_block'
 
 module Jekyll::Minibundle::Test
   class MiniBundleBlockTest < TestCase
+    include FixtureConfig
+
     def test_raise_exception_if_no_type_argument
       err = assert_raises(ArgumentError) do
-        Liquid::Template.parse("{% minibundle %} {% endminibundle %}")
+        Liquid::Template.parse('{% minibundle %} {% endminibundle %}')
       end
       assert_equal "No asset type for minibundle block; pass value such as 'css' or 'js' as the argument", err.to_s
     end
+
+    [
+      {
+        description:        'nil_baseurl_results_in_asset_url_without_baseurl',
+        baseurl_config:     'baseurl:',
+        expected_asset_url: CSS_BUNDLE_DESTINATION_FINGERPRINT_PATH
+      },
+      {
+        description:        'empty_baseurl_results_in_asset_url_without_baseurl',
+        baseurl_config:     "baseurl: ''",
+        expected_asset_url: CSS_BUNDLE_DESTINATION_FINGERPRINT_PATH
+      },
+      {
+        description:        'slash_baseurl_results_in_asset_url_with_baseurl',
+        baseurl_config:     'baseurl: /',
+        expected_asset_url: "/#{CSS_BUNDLE_DESTINATION_FINGERPRINT_PATH}"
+      },
+      {
+        description:        'slash_root_baseurl_results_in_asset_url_with_baseurl',
+        baseurl_config:     'baseurl: /root',
+        expected_asset_url: "/root/#{CSS_BUNDLE_DESTINATION_FINGERPRINT_PATH}"
+      },
+      {
+        description:        'slash_root_slash_baseurl_results_in_asset_url_with_baseurl',
+        baseurl_config:     'baseurl: /root/',
+        expected_asset_url: "/root/#{CSS_BUNDLE_DESTINATION_FINGERPRINT_PATH}"
+      }
+    ].each do |spec|
+      define_method :"test_normalizing_baseurl_with_#{spec.fetch(:description)}" do
+        AssetFileRegistry.clear
+
+        template = Liquid::Template.parse(<<-END)
+{% minibundle css %}
+source_dir: _assets/styles
+destination_path: assets/site
+#{spec.fetch(:baseurl_config)}
+assets:
+  - reset
+  - common
+minifier_cmd: #{minifier_cmd_to_remove_comments}
+{% endminibundle %}
+        END
+
+        actual_output = nil
+        capture_io do
+          actual_output = template.render({}, registers: {site: new_fake_site(site_fixture_path)})
+        end
+        expected_output = %{<link rel="stylesheet" href="#{spec.fetch(:expected_asset_url)}">\n}
+
+        assert_equal expected_output, actual_output
+      end
+    end
   end
 end

data/test/unit/mini_stamp_tag_test.rb

@@ -8,24 +8,24 @@ module Jekyll::Minibundle::Test
 
     def test_raise_exception_if_no_asset_source_argument
       err = assert_raises(ArgumentError) do
-        Liquid::Template.parse("{% ministamp %}")
+        Liquid::Template.parse('{% ministamp %}')
       end
-      assert_equal "No asset source for ministamp tag; pass value such as '/_assets/site.css' as the first argument", err.to_s
+      assert_equal "No asset source for ministamp tag; pass value such as '_assets/site.css' as the first argument", err.to_s
     end
 
     def test_raise_exception_if_no_asset_destination_argument
       err = assert_raises(ArgumentError) do
-        Liquid::Template.parse("{% ministamp /_assets/site.css %}")
+        Liquid::Template.parse('{% ministamp /_assets/site.css %}')
       end
-      assert_equal "No asset destination for ministamp tag; pass value such as '/assets/site.css' as the second argument", err.to_s
+      assert_equal "No asset destination for ministamp tag; pass value such as 'assets/site.css' as the second argument", err.to_s
     end
 
     def test_ignore_rest_arguments
       AssetFileRegistry.clear
-      template = Liquid::Template.parse("{% ministamp #{STAMP_SOURCE_PATH} #{STAMP_DESTINATION_PATH} rest %}")
-      context = {}
-      options = {registers: {site: new_fake_site(site_fixture_path)}}
-      assert_equal STAMP_DESTINATION_FINGERPRINT_PATH, template.render(context, options)
+      output = Liquid::Template
+               .parse("{% ministamp #{STAMP_SOURCE_PATH} #{STAMP_DESTINATION_PATH} rest %}")
+               .render({}, registers: {site: new_fake_site(site_fixture_path)})
+      assert_equal STAMP_DESTINATION_FINGERPRINT_PATH, output
     end
   end
 end

data/test/unit/stamp_file_properties_test.rb

@@ -10,34 +10,53 @@ module Jekyll::Minibundle::Test
 
     def setup
       @results ||= with_fake_site do |site|
-        file = StampFile.new(site, STAMP_SOURCE_PATH, STAMP_DESTINATION_PATH, &stamp_basenamer)
+        file = StampFile.new(site, STAMP_SOURCE_PATH, STAMP_DESTINATION_PATH)
         get_send_results(file, STATIC_FILE_API_PROPERTIES)
       end
     end
 
-    def test_to_liquid
-      hash = @results.fetch(:to_liquid)
-      assert_equal "/#{STAMP_SOURCE_PATH}", hash['path']
-      refute_empty hash['modified_time']
-      assert_equal '.css', hash['extname']
+    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_extname
       assert_equal '.css', @results.fetch(:extname)
     end
 
-    def test_destination_rel_dir
-      assert_equal 'assets', @results.fetch(:destination_rel_dir)
+    def test_modified_time
+      assert_instance_of Time, @results.fetch(:modified_time)
     end
 
-    def test_write?
-      assert @results.fetch(:write?)
+    def test_mtime
+      mtime = @results.fetch(:modified_time)
+      assert_equal mtime.to_i, @results.fetch(:mtime)
     end
 
-    private
+    def test_placeholders
+      assert_equal({}, @results.fetch(:placeholders))
+    end
 
-    def stamp_basenamer
-      ->(base, ext, stamper) { "#{base}-#{stamper.call}#{ext}" }
+    def test_relative_path
+      assert_equal "/#{STAMP_SOURCE_PATH}", @results.fetch(:relative_path)
+    end
+
+    def test_to_liquid
+      hash = @results.fetch(:to_liquid)
+      assert_equal "/#{STAMP_SOURCE_PATH}", hash['path']
+      assert_instance_of Time, hash['modified_time']
+      assert_equal '.css', hash['extname']
+    end
+
+    def test_type
+      assert_nil @results.fetch(:type)
+    end
+
+    def test_write?
+      assert @results.fetch(:write?)
     end
   end
 end

data/test/unit/stamp_file_writing_test.rb

@@ -77,11 +77,7 @@ module Jekyll::Minibundle::Test
     private
 
     def new_stamp_file(site)
-      StampFile.new(site, STAMP_SOURCE_PATH, STAMP_DESTINATION_PATH, &stamp_basenamer)
-    end
-
-    def stamp_basenamer
-      ->(base, ext, stamper) { "#{base}-#{stamper.call}#{ext}" }
+      StampFile.new(site, STAMP_SOURCE_PATH, STAMP_DESTINATION_PATH)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-minibundle
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.6.0
 platform: ruby
 authors:
 - Tuomas Kareinen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-29 00:00:00.000000000 Z
+date: 2016-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '5.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '5.8'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.3'
+        version: '11.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.3'
+        version: '11.1'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.38.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.38.0
 description: |
   A straightforward asset bundling plugin for Jekyll, utilizing external
   minification tool of your choice. It provides asset concatenation for
@@ -94,6 +108,8 @@ files:
 - lib/jekyll/minibundle/development_file.rb
 - lib/jekyll/minibundle/development_file_collection.rb
 - lib/jekyll/minibundle/environment.rb
+- lib/jekyll/minibundle/files.rb
+- lib/jekyll/minibundle/hashes.rb
 - lib/jekyll/minibundle/mini_bundle_block.rb
 - lib/jekyll/minibundle/mini_stamp_tag.rb
 - lib/jekyll/minibundle/stamp_file.rb
@@ -110,10 +126,13 @@ files:
 - test/fixture/site/about.html
 - test/fixture/site/assets/site.css
 - test/fixture/site/index.html
+- test/integration/known_caveats_test.rb
 - test/integration/minibundle_development_mode_test.rb
 - test/integration/minibundle_production_mode_test.rb
-- test/integration/ministamp_test.rb
+- test/integration/ministamp_development_mode_test.rb
+- test/integration/ministamp_production_mode_test.rb
 - 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/test_case.rb
@@ -123,9 +142,9 @@ files:
 - 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_collection_writing_test.rb
 - test/unit/environment_test.rb
-- test/unit/jekyll_payload_test.rb
+- test/unit/files_test.rb
+- test/unit/hashes_test.rb
 - test/unit/jekyll_static_file_api_test.rb
 - test/unit/mini_bundle_block_test.rb
 - test/unit/mini_stamp_tag_test.rb
@@ -148,7 +167,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -156,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.2
 signing_key: 
 specification_version: 4
 summary: A minimalistic asset bundling plugin for Jekyll
@@ -173,10 +192,13 @@ test_files:
 - test/fixture/site/about.html
 - test/fixture/site/assets/site.css
 - test/fixture/site/index.html
+- test/integration/known_caveats_test.rb
 - test/integration/minibundle_development_mode_test.rb
 - test/integration/minibundle_production_mode_test.rb
-- test/integration/ministamp_test.rb
+- test/integration/ministamp_development_mode_test.rb
+- test/integration/ministamp_production_mode_test.rb
 - 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/test_case.rb
@@ -186,9 +208,9 @@ test_files:
 - 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_collection_writing_test.rb
 - test/unit/environment_test.rb
-- test/unit/jekyll_payload_test.rb
+- test/unit/files_test.rb
+- test/unit/hashes_test.rb
 - test/unit/jekyll_static_file_api_test.rb
 - test/unit/mini_bundle_block_test.rb
 - test/unit/mini_stamp_tag_test.rb

data/test/unit/development_file_collection_writing_test.rb

@@ -1,43 +0,0 @@
-require 'support/test_case'
-require 'support/fixture_config'
-require 'jekyll/minibundle/development_file'
-
-module Jekyll::Minibundle::Test
-  class DevelopmentFileCollectionWritingTest < TestCase
-    include FixtureConfig
-
-    def test_calling_write_before_destination_path_for_markup_writes_destination
-      with_fake_site do |site|
-        dev_files = DevelopmentFileCollection.new(site, bundle_config)
-
-        assert first_file_of(dev_files).write('_site')
-
-        destination_file = destination_path(JS_BUNDLE_DESTINATION_PATH, 'dependency.js')
-
-        assert File.exist?(destination_file)
-
-        org_mtime = mtime_of(destination_file)
-        dev_files.destination_path_for_markup
-
-        refute first_file_of(dev_files).write('_site')
-        assert_equal org_mtime, mtime_of(destination_file)
-      end
-    end
-
-    private
-
-    def bundle_config
-      {
-       'type'             => :js,
-       'source_dir'       => JS_BUNDLE_SOURCE_DIR,
-       'assets'           => %w{dependency app},
-       'destination_path' => JS_BUNDLE_DESTINATION_PATH,
-       'attributes'       => {}
-      }
-    end
-
-    def first_file_of(dev_files)
-      dev_files.instance_variable_get(:@files).first
-    end
-  end
-end