hamlit 2.9.4-java → 2.12.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c44c5a360e172c2bcc8383952fd5c8b03fb287c818b0b0d5394862f0b55b659
-  data.tar.gz: 95d39c6eb8060801ddeb0f8ae61ada9d3755b4ac0750725c468d70ddf29aa5c4
+  metadata.gz: 9730ad24ae51f479f990d08aaa054adc41541e02f058889d085c437b7fce3772
+  data.tar.gz: 96956fc4d9e69332956936769d0843548d769179f31c2499706befc566dab02b
 SHA512:
-  metadata.gz: a530cade0a6cf8110c4f4f213094ee4712559744cd5eeb8c0c5a81daf5c696bc3f147f91cfc07260304ce4b2c00203cb59fa0fdb1fd7d7bd2a4130a9e06f39cd
-  data.tar.gz: f5b1f560f7bffec014ff5e2217ec5a5502743c09352f362c3de551ae390baf775a342e9395a892dcac7bda969acda68230fcb6f64aac46c107e9ab860dbeaf1d
+  metadata.gz: 7d12567ab91773b31fbb8431362c821261b5ad47e678f75465df51e52a48bb101da829dd9e93b7aea75925a77b179f09f92ab08c0c0042b46478f0497bed7c6e
+  data.tar.gz: fa594a116affab20ea90313253bc5308a9e0d47a369b07d4b971e97728ac8fcbb6bbaa4ee1509ffede4b9f546e47d1abd6810d0c545377357748805416bfd34f

data/.gitignore

@@ -11,6 +11,7 @@
 .ruby-version
 *.bundle
 *.so
+*.su
 *.o
 *.a
 *.swp

data/.travis.yml

@@ -9,11 +9,13 @@ matrix:
   include:
     - rvm: 2.3.8
       env: TASK=test
-    - rvm: 2.4.5
+    - rvm: 2.4.9
       env: TASK=test
-    - rvm: 2.5.3
+    - rvm: 2.5.7
       env: TASK=test
-    - rvm: 2.6.0
+    - rvm: 2.6.5
+      env: TASK=test
+    - rvm: 2.7.0
       env: TASK=test
     - rvm: ruby-head
       env: TASK=test
@@ -21,19 +23,19 @@ matrix:
       env: TASK=test
     - rvm: truffleruby
       env: TASK=test
-    - rvm: 2.6.0
+    - rvm: 2.7.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.6.0
+    - rvm: 2.7.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.6.0
+    - rvm: 2.7.0
       env: TASK=bench SLIM_BENCH=1
-    - rvm: 2.6.0
+    - rvm: 2.7.0
       env: TASK=bench TEMPLATE=benchmark/etc/attribute_builder.haml
-    - rvm: 2.6.0
+    - rvm: 2.7.0
       env: TASK=bench TEMPLATE=benchmark/etc/static_analyzer.haml
-    - rvm: 2.6.0
+    - rvm: 2.7.0
       env: TASK=bench TEMPLATE=benchmark/etc/string_interpolation.haml
-    - rvm: 2.6.0
+    - rvm: 2.7.0
       env: TASK=bench TEMPLATE=test/haml/templates/standard.haml COMPILE=1
   allow_failures:
     - rvm: ruby-head

data/CHANGELOG.md

@@ -4,6 +4,51 @@ 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.12.0](https://github.com/k0kubun/hamlit/compare/v2.11.1...v2.12.0) - 2020-09-30
+
+### Changed
+
+- Class names are no longer ordered alphabetically
+  *Thanks to @aliismayilov*
+  - This is compatible with [Haml 5.2](https://github.com/haml/haml/blob/v5.2.0/CHANGELOG.md#52)
+
+## [2.11.1](https://github.com/k0kubun/hamlit/compare/v2.11.0...v2.11.1) - 2020-08-25
+
+### Fixed
+
+- Fix a line number on an error after filters like preserve, plain, and ruby.
+  *Thanks to @rgisiger*
+
+## [2.11.0](https://github.com/k0kubun/hamlit/compare/v2.10.1...v2.11.0) - 2019-12-12
+
+### Added
+
+- Support Haml's _revealed_ conditional comment feature on `/![if !IE]` [#153](https://github.com/k0kubun/hamlit/issues/153).
+  *Thanks to @esb*
+
+## [2.10.1](https://github.com/k0kubun/hamlit/compare/v2.10.0...v2.10.1) - 2019-11-28
+
+### Added
+
+- Register `Hamlit::Template` to Tilt as :hamlit as well, in addition to :haml
+
+## [2.10.0](https://github.com/k0kubun/hamlit/compare/v2.9.5...v2.10.0) - 2019-09-15
+
+### Added
+
+- Optimize template rendering by string interpolation [#146](https://github.com/k0kubun/hamlit/issues/146)
+  - Exploiting pre-allocation of string interpolation introduced in Ruby 2.5 [ruby/ruby#1626](https://github.com/ruby/ruby/pull/1626)
+
+### Changed
+
+- Require temple.gem >= 0.8.2
+
+## [2.9.5](https://github.com/k0kubun/hamlit/compare/v2.9.4...v2.9.5) - 2019-09-08
+
+### Added
+
+- Supported `:plain` filter in truffleruby
+
 ## [2.9.4](https://github.com/k0kubun/hamlit/compare/v2.9.3...v2.9.4) - 2019-09-08
 
 ### Added

data/Gemfile

@@ -8,23 +8,17 @@ end
 # Specify your gem's dependencies in hamlit.gemspec
 gemspec
 
-if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.2.2')
-  gem 'rack', '< 2'
-end
-
 gem 'benchmark-ips', '2.3.0'
 gem 'maxitest'
+gem 'pry'
 
 if /java/ === RUBY_PLATFORM # JRuby
   gem 'pandoc-ruby'
 else
-  gem 'pry-byebug'
   gem 'redcarpet'
 
   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 'faml'
     gem 'stackprof'
   end
 end

data/REFERENCE.md

@@ -57,6 +57,7 @@ for full features in original implementation.
   - [x] :plain
   - [x] :preserve
   - [x] :ruby
+     - `haml_io` API is not supported. Use [hamlit-haml\_io.gem](https://github.com/hamlit/hamlit-haml_io) if you need.
   - [x] :sass
   - [x] :scss
   - [ ] :textile
@@ -121,10 +122,10 @@ and merging multiple ids results in concatenation by "\_".
 %div{ id: false }
 
 # Output
-<div id='foo_bar'></span>
-<div id='foo_bar'></span>
-<div id='foo_bar'></span>
-<div id=''></span>
+<div id='foo_bar'></div>
+<div id='foo_bar'></div>
+<div id='foo_bar'></div>
+<div id=''></div>
 ```
 
 ### class attribute
@@ -224,6 +225,14 @@ Hamlit::RailsTemplate.set_options attr_quote: '"'
 set :haml, { attr_quote: '"' }
 ```
 
+## Ruby module
+
+`Hamlit::Template` is a module registered to `Tilt`. You can use it like:
+
+```rb
+Hamlit::Template.new { "%strong Yay for HAML!" }.render
+```
+
 ## Creating a custom filter
 
 Currently it doesn't have filter registering interface compatible with Haml.

data/benchmark/dynamic_merger/benchmark.rb

@@ -0,0 +1,25 @@
+# Original: https://github.com/amatsuda/string_template/blob/master/benchmark.rb
+require 'benchmark_driver'
+
+Benchmark.driver(repeat_count: 8) do |x|
+  x.prelude %{
+    require 'rails'
+    require 'action_view'
+    require 'string_template'
+    StringTemplate::Railtie.run_initializers
+    require 'hamlit'
+    Hamlit::Railtie.run_initializers
+    Hamlit::RailsTemplate.set_options(escape_html: false, generator: Temple::Generators::ArrayBuffer)
+    require 'action_view/base'
+
+    (view = Class.new(ActionView::Base).new(ActionView::LookupContext.new(''))).instance_variable_set(:@world, 'world!')
+
+    # compile template
+    hello = 'benchmark/dynamic_merger/hello'
+    view.render(template: hello, handlers: 'string')
+    view.render(template: hello, handlers: 'haml')
+  }
+  x.report 'string', %{ view.render(template: hello, handlers: 'string') }
+  x.report 'hamlit', %{ view.render(template: hello, handlers: 'haml') }
+  x.loop_count 100_000
+end

data/benchmark/dynamic_merger/hello.haml

@@ -0,0 +1,50 @@
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }

data/benchmark/dynamic_merger/hello.string

@@ -0,0 +1,50 @@
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }
+hello, #{ @world }

data/bin/bench

@@ -25,7 +25,7 @@ class Bench < Thor
     haml = File.read(file)
 
     Benchmark.ips do |x|
-      x.report("haml v#{Haml::VERSION}") { Haml::Engine.new(haml, escape_html: true, escape_attrs: true, ugly: true).precompiled }
+      x.report("haml v#{Haml::VERSION}") { Haml::Engine.new(haml, escape_html: true, escape_attrs: true).precompiled }
       x.report("faml v#{Faml::VERSION}") { Faml::Engine.new.call(haml) }
       x.report("hamlit v#{Hamlit::VERSION}") { Hamlit::Engine.new.call(haml) }
       x.compare!
@@ -43,7 +43,7 @@ class Bench < Thor
       object.instance_eval(File.read(ruby_file))
     end
 
-    Haml::Engine.new(haml, escape_html: true, escape_attrs: true, ugly: true).def_method(object, :haml)
+    Haml::Engine.new(haml, escape_html: true, escape_attrs: true).def_method(object, :haml)
     object.instance_eval "def faml; #{Faml::Engine.new.call(haml)}; end"
     object.instance_eval "def hamlit; #{Hamlit::Engine.new.call(haml)}; end"
 
@@ -59,7 +59,7 @@ class Bench < Thor
   def code(file)
     haml = File.read(file)
     puts "#{?= * 49}\n Haml Source: #{file}\n#{?= * 49}"
-    puts Haml::Engine.new(haml, escape_html: true, escape_attrs: true, ugly: true).precompiled
+    puts Haml::Engine.new(haml, escape_html: true, escape_attrs: true).precompiled
     puts "\n#{?= * 49}\n Faml Source: #{file}\n#{?= * 49}"
     puts Faml::Engine.new.call(haml)
     puts "\n#{?= * 49}\n Hamlit Source: #{file}\n#{?= * 49}"

data/ext/hamlit/hamlit.c

@@ -152,7 +152,6 @@ hamlit_build_multi_class(VALUE escape_attrs, VALUE values)
     }
   }
 
-  rb_ary_sort_bang(buf);
   rb_funcall(buf, id_uniq_bang, 0);
 
   return escape_attribute(escape_attrs, rb_ary_join(buf, str_space()));

data/hamlit.gemspec

@@ -26,10 +26,11 @@ Gem::Specification.new do |spec|
     spec.required_ruby_version = '>= 2.1.0'
   end
 
-  spec.add_dependency 'temple', '>= 0.8.0'
+  spec.add_dependency 'temple', '>= 0.8.2'
   spec.add_dependency 'thor'
   spec.add_dependency 'tilt'
 
+  spec.add_development_dependency 'benchmark_driver'
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'coffee-script'
   spec.add_development_dependency 'erubi'
@@ -41,5 +42,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake-compiler'
   spec.add_development_dependency 'sass'
   spec.add_development_dependency 'slim'
+  spec.add_development_dependency 'string_template'
   spec.add_development_dependency 'unindent'
 end

data/lib/hamlit/attribute_builder.rb

@@ -47,7 +47,7 @@ module Hamlit::AttributeBuilder
           when value.is_a?(String)
             # noop
           when value.is_a?(Array)
-            value = value.flatten.select { |v| v }.map(&:to_s).sort.uniq.join(' ')
+            value = value.flatten.select { |v| v }.map(&:to_s).uniq.join(' ')
           when value
             value = value.to_s
           else
@@ -67,7 +67,7 @@ module Hamlit::AttributeBuilder
             classes << value.to_s
           end
         end
-        escape_html(escape_attrs, classes.map(&:to_s).sort.uniq.join(' '))
+        escape_html(escape_attrs, classes.map(&:to_s).uniq.join(' '))
       end
 
       def build_data(escape_attrs, quote, *hashes)

data/lib/hamlit/attribute_compiler.rb

@@ -17,7 +17,7 @@ module Hamlit
       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|
+      [node.value[:dynamic_attributes].new, node.value[:dynamic_attributes].old].compact.each do |attribute_str|
         hash = AttributeParser.parse(attribute_str)
         return runtime_compile(node) unless hash
         hashes << hash
@@ -28,11 +28,11 @@ module Hamlit
     private
 
     def runtime_compile(node)
-      attrs = node.value[:attributes_hashes]
+      attrs = []
       attrs.unshift(node.value[:attributes].inspect) if node.value[:attributes] != {}
 
       args = [@escape_attrs.inspect, "#{@quote.inspect}.freeze", @format.inspect].push(node.value[:object_ref]) + attrs
-      [:html, :attrs, [:dynamic, "::Hamlit::AttributeBuilder.build(#{args.join(', ')})"]]
+      [:html, :attrs, [:dynamic, "::Hamlit::AttributeBuilder.build(#{args.join(', ')}, #{node.value[:dynamic_attributes].to_literal})"]]
     end
 
     def static_compile(static_hash, dynamic_hashes)

data/lib/hamlit/compiler/children_compiler.rb

@@ -1,4 +1,6 @@
 # frozen_string_literal: true
+require 'hamlit/temple_line_counter'
+
 module Hamlit
   class Compiler
     class ChildrenCompiler
@@ -14,7 +16,7 @@ module Hamlit
         node.children.each do |n|
           rstrip_whitespace!(temple) if nuke_prev_whitespace?(n)
           insert_newlines!(temple, n)
-          temple << yield(n)
+          temple << moving_lineno(n) { block.call(n) }
           temple << :whitespace if insert_whitespace?(n)
         end
         rstrip_whitespace!(temple) if nuke_inner_whitespace?(node)
@@ -27,19 +29,31 @@ module Hamlit
         (node.line - @lineno).times do
           temple << [:newline]
         end
+
         @lineno = node.line
+      end
 
+      def moving_lineno(node, &block)
+        # before: As they may have children, we need to increment lineno before compilation.
         case node.type
         when :script, :silent_script
           @lineno += 1
-        when :filter
-          @lineno += (node.value[:text] || '').split("\n").size
         when :tag
-          node.value[:attributes_hashes].each do |attribute_hash|
+          [node.value[:dynamic_attributes].new, node.value[:dynamic_attributes].old].compact.each do |attribute_hash|
             @lineno += attribute_hash.count("\n")
           end
           @lineno += 1 if node.children.empty? && node.value[:parse]
         end
+
+        temple = block.call # compile
+
+        # after: filter may not have children, and for some dynamic filters we can't predict the number of lines.
+        case node.type
+        when :filter
+          @lineno += TempleLineCounter.count_lines(temple)
+        end
+
+        temple
       end
 
       def confirm_whitespace(temple)