hamlit 2.9.1 → 2.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: bc45e545339c68fa4be81ef0dade7e48023f2529
-  data.tar.gz: c78dad0eb8daeceed3aaca230a3587dd39207a02
+SHA256:
+  metadata.gz: ff5c08623e133d33678ed09abfa8aeb752ff6fe48a203d6d22000430335e0ced
+  data.tar.gz: caa9eb9872690fc5ae45432c5c8487be7fafe51f2e65f484e6f9602f5afdf4d2
 SHA512:
-  metadata.gz: 9f2ae53cc63fc0c3a081d776dc156b5e6fa0138d598b4981030ea98117ef14633bc2c04c5e1d94aca8a7f610ba59d8990a920c87a57c8c11ee5052ffc67a2300
-  data.tar.gz: 51ddf158f1e3fefa9d3e338ea4b72a65065d7c46b3be992685e605950ac1cfceef21f1487b4f87a55c9ed8f0e2affb37a80d5413ced67e8b61db827c8459b734
+  metadata.gz: 0d1241f1a8d1fea6d4528649047d5830197b84e3c2bc01c17f8dd07d59f9cc02023b9c28140817f8aeee92ea26bd67ca3bbf864fa3ffeaff83f271d365b87a23
+  data.tar.gz: 97fcaa8d8b03f6fc84c27927c9a1b73f871211b3d109b32258786a897d54ccb5f3b68c2e42c7e2175dda04073f1dc2aaecb3d3479df34806a5119b035b773968

data/.travis.yml

@@ -7,31 +7,33 @@ script:
   - "RUBYOPT='-w' bundle exec rake $TASK"
 matrix:
   include:
-    - rvm: 2.1.10
+    - rvm: 2.3.8
       env: TASK=test
-    - rvm: 2.2.6
+    - rvm: 2.4.5
       env: TASK=test
-    - rvm: 2.3.3
+    - rvm: 2.5.3
       env: TASK=test
-    - rvm: 2.4.0
+    - rvm: 2.6.0
       env: TASK=test
     - rvm: ruby-head
       env: TASK=test
-    - rvm: jruby-9.1.9.0
+    - rvm: jruby-9.2.8.0
       env: TASK=test
-    - rvm: 2.4.0
+    - rvm: truffleruby
+      env: TASK=test
+    - rvm: 2.6.0
       env: TASK=bench TEMPLATE=benchmark/boolean_attribute.haml,benchmark/class_attribute.haml,benchmark/id_attribute.haml,benchmark/data_attribute.haml,benchmark/common_attribute.haml
-    - rvm: 2.4.0
+    - rvm: 2.6.0
       env: TASK=bench TEMPLATE=benchmark/dynamic_attributes/boolean_attribute.haml,benchmark/dynamic_attributes/class_attribute.haml,benchmark/dynamic_attributes/id_attribute.haml,benchmark/dynamic_attributes/data_attribute.haml,benchmark/dynamic_attributes/common_attribute.haml
-    - rvm: 2.4.0
+    - rvm: 2.6.0
       env: TASK=bench SLIM_BENCH=1
-    - rvm: 2.4.0
+    - rvm: 2.6.0
       env: TASK=bench TEMPLATE=benchmark/etc/attribute_builder.haml
-    - rvm: 2.4.0
+    - rvm: 2.6.0
       env: TASK=bench TEMPLATE=benchmark/etc/static_analyzer.haml
-    - rvm: 2.4.0
+    - rvm: 2.6.0
       env: TASK=bench TEMPLATE=benchmark/etc/string_interpolation.haml
-    - rvm: 2.4.0
+    - rvm: 2.6.0
       env: TASK=bench TEMPLATE=test/haml/templates/standard.haml COMPILE=1
   allow_failures:
     - rvm: ruby-head

data/CHANGELOG.md

@@ -4,8 +4,30 @@ 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.9.4](https://github.com/k0kubun/hamlit/compare/v2.9.3...v2.9.4) - 2019-09-08
+
+### Added
+
+- Experimental support of truffleruby [#145](https://github.com/k0kubun/hamlit/issues/145).
+
+## [2.9.3](https://github.com/k0kubun/hamlit/compare/v2.9.2...v2.9.3) - 2019-04-09
+
+### Fixed
+
+- Fix deprecation warning on Rails 6 [#138](https://github.com/k0kubun/hamlit/issues/138).
+  *Thanks to @r7kamura*
+
+## [2.9.2](https://github.com/k0kubun/hamlit/compare/v2.9.1...v2.9.2) - 2018-11-30
+
+### Fixed
+
+- Fix possible `autoload` failure of dependency [#131](https://github.com/k0kubun/hamlit/issues/131).
+  *Thanks to @wimrijnders*
+
 ## [2.9.1](https://github.com/k0kubun/hamlit/compare/v2.9.0...v2.9.1) - 2018-11-01
 
+### Added
+
 - Start supporting JRuby [#100](https://github.com/k0kubun/hamlit/issues/100).
 
 ## [2.9.0](https://github.com/k0kubun/hamlit/compare/v2.8.10...v2.9.0) - 2018-10-16

data/Gemfile

@@ -19,10 +19,12 @@ if /java/ === RUBY_PLATFORM # JRuby
   gem 'pandoc-ruby'
 else
   gem 'pry-byebug'
-  gem 'redcarpet', github: 'vmg/redcarpet' # To resolve circular require warning
+  gem 'redcarpet'
 
-  if RUBY_PLATFORM !~ /mswin|mingw/
-    gem 'faml'
+  if RUBY_PLATFORM !~ /mswin|mingw/ && RUBY_ENGINE != 'truffleruby'
+    if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.7.0') # Travis cannot compile ruby.h with C++
+      gem 'faml'
+    end
     gem 'stackprof'
   end
 end

data/README.md

@@ -141,6 +141,10 @@ Please report an issue with following information:
 - Hamlit version
 - Rails/Sinatra version
 
+### Coding styles
+
+Please follow the existing coding styles and do not send patches including cosmetic changes.
+
 ## License
 
 Copyright (c) 2015 Takashi Kokubun

data/REFERENCE.md

@@ -99,6 +99,9 @@ Hamlit does not remove non-boolean attributes and render `<a foo=''></a>`
 (`foo` is not removed). This design allows us to reduce string concatenation and
 is the only difference between Faml and Hamlit.
 
+You may be also interested in
+[hamlit/hamlit-boolean\_attributes](https://github.com/hamlit/hamlit-boolean_attributes).
+
 ## 5 Types of Attributes
 
 Haml has 3 types of attributes: id, class and others.
@@ -181,7 +184,10 @@ defer reversed ismap seamless muted required autofocus novalidate formnovalidate
 itemscope allowfullscreen default inert sortable truespeed typemustmatch
 ```
 
-"data-\*" is also regarded as boolean.
+If you want to customize the list of boolean attributes, you can use
+[hamlit/hamlit-boolean\_attributes](https://github.com/hamlit/hamlit-boolean_attributes).
+
+"aria-\*" and "data-\*" are also regarded as boolean.
 
 ### other attributes
 No hyphenation and boolean support. `false` is rendered as "false" (like Rails helpers).

data/ext/hamlit/hamlit.c

@@ -1,5 +1,6 @@
 #include <ruby.h>
 #include <ruby/encoding.h>
+#ifndef TRUFFLERUBY
 #include "hescape.h"
 #include "string.h"
 
@@ -551,3 +552,4 @@ Init_hamlit(void)
   rb_const_set(mAttributeBuilder, id_space,      rb_obj_freeze(rb_str_new_cstr(" ")));
   rb_const_set(mAttributeBuilder, id_underscore, rb_obj_freeze(rb_str_new_cstr("_")));
 }
+#endif

data/hamlit.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   if /java/ === RUBY_PLATFORM
-    # spec.platform = 'java'
+    spec.platform = 'java'
   else
     spec.extensions = ['ext/hamlit/extconf.rb']
     spec.required_ruby_version = '>= 2.1.0'
@@ -33,11 +33,11 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'coffee-script'
   spec.add_development_dependency 'erubi'
-  spec.add_development_dependency 'haml'
+  spec.add_development_dependency 'haml', '>= 5'
   spec.add_development_dependency 'less'
   spec.add_development_dependency 'minitest-reporters', '~> 1.1'
   spec.add_development_dependency 'rails', '>= 4.0.0'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rake-compiler'
   spec.add_development_dependency 'sass'
   spec.add_development_dependency 'slim'

data/lib/hamlit/attribute_builder.rb

@@ -9,7 +9,9 @@ module Hamlit::AttributeBuilder
                        itemscope allowfullscreen default inert sortable
                        truespeed typemustmatch download].freeze
 
-  if /java/ === RUBY_PLATFORM # JRuby
+  # Java extension is not implemented for JRuby yet.
+  # TruffleRuby does not implement `rb_ary_sort_bang`, etc.
+  if /java/ === RUBY_PLATFORM || RUBY_ENGINE == 'truffleruby'
     class << self
       def build(escape_attrs, quote, format, object_ref, *hashes)
         hashes << Hamlit::ObjectRef.parse(object_ref) if object_ref

data/lib/hamlit/attribute_compiler.rb

@@ -14,7 +14,9 @@ module Hamlit
 
     def compile(node)
       hashes = []
-      return runtime_compile(node) if node.value[:object_ref] != :nil
+      if node.value[:object_ref] != :nil || !Ripper.respond_to?(:lex) # No Ripper.lex in truffleruby
+        return runtime_compile(node)
+      end
       node.value[:attributes_hashes].each do |attribute_str|
         hash = AttributeParser.parse(attribute_str)
         return runtime_compile(node) unless hash

data/lib/hamlit/compiler/script_compiler.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+require 'temple/static_analyzer'
 require 'hamlit/ruby_expression'
 require 'hamlit/string_splitter'
 
@@ -10,6 +11,10 @@ module Hamlit
       end
 
       def compile(node, &block)
+        unless Ripper.respond_to?(:lex) # No Ripper.lex in truffleruby
+          return dynamic_compile(node, &block)
+        end
+
         no_children = node.children.empty?
         case
         when no_children && node.value[:escape_interpolation]

data/lib/hamlit/compiler/tag_compiler.rb

@@ -28,8 +28,10 @@ module Hamlit
           nil
         when node.value[:parse]
           return compile_interpolated_plain(node) if node.value[:escape_interpolation]
-          return delegate_optimization(node) if RubyExpression.string_literal?(node.value[:value])
-          return delegate_optimization(node) if Temple::StaticAnalyzer.static?(node.value[:value])
+          if Ripper.respond_to?(:lex) # No Ripper.lex in truffleruby
+            return delegate_optimization(node) if RubyExpression.string_literal?(node.value[:value])
+            return delegate_optimization(node) if Temple::StaticAnalyzer.static?(node.value[:value])
+          end
 
           var = @identity.generate
           [:multi,
@@ -53,6 +55,10 @@ module Hamlit
 
       # We should handle interpolation here to escape only interpolated values.
       def compile_interpolated_plain(node)
+        unless Ripper.respond_to?(:lex) # No Ripper.lex in truffleruby
+          return [:multi, [:escape, node.value[:escape_interpolation], [:dynamic, "%Q[#{node.value[:value]}]"]], [:newline]]
+        end
+
         temple = [:multi]
         StringSplitter.compile(node.value[:value]).each do |type, value|
           case type

data/lib/hamlit/engine.rb

@@ -25,8 +25,10 @@ module Hamlit
     use Parser
     use Compiler
     use HTML
-    use StringSplitter
-    filter :StaticAnalyzer
+    if Ripper.respond_to?(:lex) # No Ripper.lex in truffleruby
+      use StringSplitter
+      filter :StaticAnalyzer
+    end
     use Escapable
     use ForceEscapable
     filter :ControlFlow

data/lib/hamlit/filters/plain.rb

@@ -5,6 +5,9 @@ module Hamlit
   class Filters
     class Plain < Base
       def compile(node)
+        unless Ripper.respond_to?(:lex)
+          raise NotImplementedError.new('This platform does not have Ripper.lex required for :plain filter')
+        end
         text = node.value[:text]
         text = text.rstrip unless ::Hamlit::HamlUtil.contains_interpolation?(text) # for compatibility
         [:multi, *compile_plain(text)]

data/lib/hamlit/rails_template.rb

@@ -23,7 +23,8 @@ module Hamlit
       end
     end
 
-    def call(template)
+    def call(template, source = nil)
+      source ||= template.source
       options = RailsTemplate.options
 
       # https://github.com/haml/haml/blob/4.0.7/lib/haml/template/plugin.rb#L19-L20
@@ -32,7 +33,7 @@ module Hamlit
         options = options.merge(format: :xhtml)
       end
 
-      Engine.new(options).call(template.source)
+      Engine.new(options).call(source)
     end
 
     def supports_streaming?

data/lib/hamlit/utils.rb

@@ -1,7 +1,9 @@
 # frozen_string_literal: true
 module Hamlit
   module Utils
-    if /java/ === RUBY_PLATFORM # JRuby
+    # Java extension is not implemented for JRuby yet.
+    # TruffleRuby does not implement `rb_ary_sort_bang`, etc.
+    if /java/ === RUBY_PLATFORM || RUBY_ENGINE == 'truffleruby'
       require 'cgi/escape'
 
       def self.escape_html(html)

data/lib/hamlit/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hamlit
 version: !ruby/object:Gem::Version
-  version: 2.9.1
+  version: 2.9.4
 platform: ruby
 authors:
 - Takashi Kokubun
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-01 00:00:00.000000000 Z
+date: 2019-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: temple
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: less
   requirement: !ruby/object:Gem::Requirement
@@ -154,16 +154,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
@@ -311,6 +311,7 @@ files:
 - lib/hamlit/filters/text_base.rb
 - lib/hamlit/filters/tilt_base.rb
 - lib/hamlit/force_escapable.rb
+- lib/hamlit/hamlit.su
 - lib/hamlit/helpers.rb
 - lib/hamlit/html.rb
 - lib/hamlit/identity.rb
@@ -353,8 +354,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: High Performance Haml Implementation