hamlit 2.8.7 → 2.8.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 1f85249809ae3c05e918d5fb69f544d908c1573aa0835ea9804df69e2f94d5b4
-  data.tar.gz: dded39056d8210c15156774fe4bb3a60e270bf62ae5f4b803cb058b0a0369810
+SHA1:
+  metadata.gz: ac088a81087622ffbbb0baf88ab84b628f148f24
+  data.tar.gz: 4241a33bb175b1664a69633c3105b59b8b01811c
 SHA512:
-  metadata.gz: ef3929f4707374a2c826005ca325cb23c6a2903ff8fc27efbe3eaed3dcc99d47b607e0c963c6cda5261761d7e0da69609602ca67365e4b631a228a496e722324
-  data.tar.gz: d4519892eeb2946af49181d2ddd9a56bdc3477718ae5c637d70e5b59da23d14420f7c9bca7256ef3e27613ef2012efb8e7f678bc1a1bba5b8ff4779633d72613
+  metadata.gz: cea3917a500701866aa5d1dcc2e05ef2df42d258f9adc38bfddf33a027e92a79db1a8eb5f7ad66f3067742ea0e00438bdfd1abf3a5fddc663803dff4e160d16c
+  data.tar.gz: 4dac10fbf405dea17e32761e4ab2345f4158e68cb3159867a1c0ccb2b736c29ddce27e0bdd2fdcada2cf926100f5a2288f5ebb75433adfde8af628c10b1f7ae7

data/CHANGELOG.md

@@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file. This
 project adheres to [Semantic Versioning](http://semver.org/). This change log is based upon
 [keep-a-changelog](https://github.com/olivierlacan/keep-a-changelog).
 
+## [2.8.8](https://github.com/k0kubun/hamlit/compare/v2.8.7...v2.8.8) - 2018-04-06
+
+### Fixed
+
+- Don't require Tilt dependencies if unregistered
+  [#121](https://github.com/k0kubun/hamlit/pull/121). *Thanks to @michaelglass*
+
 ## [2.8.7](https://github.com/k0kubun/hamlit/compare/v2.8.6...v2.8.7) - 2018-02-17
 
 ### Fixed

data/Gemfile

@@ -14,7 +14,6 @@ end
 
 gem 'benchmark-ips', '2.3.0'
 gem 'maxitest'
-gem 'minitest-line'
 gem 'pry-byebug'
 
 # To resolve circular require warning

data/lib/hamlit/filters/coffee.rb

@@ -3,7 +3,7 @@ module Hamlit
   class Filters
     class Coffee < TiltBase
       def compile(node)
-        require 'tilt/coffee' if explicit_require?
+        require 'tilt/coffee' if explicit_require?('coffee')
         temple = [:multi]
         temple << [:static, "<script>\n"]
         temple << compile_with_tilt(node, 'coffee', indent_width: 2)

data/lib/hamlit/filters/less.rb

@@ -8,7 +8,7 @@ module Hamlit
   class Filters
     class Less < TiltBase
       def compile(node)
-        require 'tilt/less' if explicit_require?
+        require 'tilt/less' if explicit_require?('less')
         temple = [:multi]
         temple << [:static, "<style>\n"]
         temple << compile_with_tilt(node, 'less', indent_width: 2)

data/lib/hamlit/filters/markdown.rb

@@ -2,7 +2,7 @@ module Hamlit
   class Filters
     class Markdown < TiltBase
       def compile(node)
-        require 'tilt/redcarpet' if explicit_require?
+        require 'tilt/redcarpet' if explicit_require?('markdown')
         compile_with_tilt(node, 'markdown')
       end
     end

data/lib/hamlit/filters/sass.rb

@@ -3,7 +3,7 @@ module Hamlit
   class Filters
     class Sass < TiltBase
       def compile(node)
-        require 'tilt/sass' if explicit_require?
+        require 'tilt/sass' if explicit_require?('sass')
         temple = [:multi]
         temple << [:static, "<style>\n"]
         temple << compile_with_tilt(node, 'sass', indent_width: 2)

data/lib/hamlit/filters/scss.rb

@@ -3,7 +3,7 @@ module Hamlit
   class Filters
     class Scss < TiltBase
       def compile(node)
-        require 'tilt/sass' if explicit_require?
+        require 'tilt/sass' if explicit_require?('scss')
         temple = [:multi]
         temple << [:static, "<style>\n"]
         temple << compile_with_tilt(node, 'scss', indent_width: 2)

data/lib/hamlit/filters/tilt_base.rb

@@ -10,8 +10,9 @@ module Hamlit
         text.gsub!(/^/, ' ' * indent_width)
       end
 
-      def explicit_require?
-        Gem::Version.new(Tilt::VERSION) >= Gem::Version.new('2.0.0')
+      def explicit_require?(needed_registration)
+        Gem::Version.new(Tilt::VERSION) >= Gem::Version.new('2.0.0') &&
+          !Tilt.registered?(needed_registration)
       end
 
       private

data/lib/hamlit/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Hamlit
-  VERSION = '2.8.7'
+  VERSION = '2.8.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hamlit
 version: !ruby/object:Gem::Version
-  version: 2.8.7
+  version: 2.8.8
 platform: ruby
 authors:
 - Takashi Kokubun
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-17 00:00:00.000000000 Z
+date: 2018-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: temple
@@ -368,7 +368,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.5
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: High Performance Haml Implementation