hamlit 2.14.4-java → 2.15.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62e629fef1bc222ab631aee99292c64ab9c67d8c590991c44dfa43e673214548
-  data.tar.gz: f2aed6b260bec4896df12cfcea5aaa7a226efee73ea7a3df72a5018b8370f0a1
+  metadata.gz: 7ad29f71336e1e71fab1716562eb6e17dc21ab89536318f7be91e56991c42a76
+  data.tar.gz: 19592da7e2ab8cf613933dcd838ecea68c9b843cfd06d9ac67f31c6eec1a71a1
 SHA512:
-  metadata.gz: a6b0808eec0c088bffe3d3cb4073bdaf875544e76795084e51fad9dec48fcd672f208fb302495464e9d2b5d265f026622b14e51a7fe49fb5189a11dc4843f477
-  data.tar.gz: 6f0823f8141cbf3fc174c1b403d6c502c310fbe5dcaf40c421dda79424eb060532a194b41adbb021e9910d7f7a9b50dcd9acbcf8ed29e2162129e2fd8cbcea67
+  metadata.gz: 34de923109facf23d50039433576861f6ae669b4b37771be879bd9a11ae94f190456435256c20d3ff5ca3d47e5f97e31ecbcc4c9df3e16b53e635ae8a435e4c1
+  data.tar.gz: f0a89c63f0c777b1b236260d43d8e077c948dcddc477341abedd91d03f3d20d9a296a3c62de39548cc878739f65b57ccbe4196b9f6b52443e99b70c0fcb38841

data/.github/FUNDING.yml

@@ -0,0 +1 @@
+github: k0kubun

data/.github/workflows/bench.yml

@@ -0,0 +1,46 @@
+name: bench
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    types:
+      - opened
+      - synchronize
+      - reopened
+  schedule:
+    - cron: "00 15 * * *" # 7:00 PST (-8), 8:00 PDT (-7)
+jobs:
+  bench:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - slim: 1
+          - template: 'benchmark/boolean_attribute.haml,benchmark/class_attribute.haml,benchmark/id_attribute.haml,benchmark/data_attribute.haml,benchmark/common_attribute.haml'
+          - 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'
+          - template: 'benchmark/etc/attribute_builder.haml'
+          - template: 'benchmark/etc/static_analyzer.haml'
+          - template: 'benchmark/etc/string_interpolation.haml'
+          - template: 'test/haml/templates/standard.haml'
+            compile: 1
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.0
+      - uses: actions/cache@v2
+        with:
+          path: vendor/bundle
+          key: ${{ runner.os }}-${{ matrix.ruby }}-gems-${{ hashFiles('**/Gemfile.lock') }}
+          restore-keys: ${{ runner.os }}-gems-
+      - run: sudo apt-get update && sudo apt-get install -y nodejs libxslt-dev # nodejs for execjs, libxslt for TruffleRuby nokogiri
+      - name: bundle install
+        run: bundle config path vendor/bundle && bundle install -j$(nproc) --retry 3
+      - run: bundle exec rake bench
+        env:
+          SLIM_BENCH: ${{ matrix.slim }}
+          TEMPLATE: ${{ matrix.template }}
+          COMPILE: ${{ matrix.compile }}

data/CHANGELOG.md

@@ -4,6 +4,33 @@ 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.15.1](https://github.com/k0kubun/hamlit/compare/v2.15.0...v2.15.1) - 2021-07-23
+
+### Fixed
+
+- Remove `benchmark` from the gem package to reduce its size [#186](https://github.com/k0kubun/hamlit/issues/186)
+  *Thanks to @pocke*
+
+## [2.15.0](https://github.com/k0kubun/hamlit/compare/v2.14.6...v2.15.0) - 2021-04-12
+
+### Added
+
+- Always use Hamlit when both haml.gem and hamlit.gem are installed in Rails
+  *Thanks to @igor-drozdov*
+
+## [2.14.6](https://github.com/k0kubun/hamlit/compare/v2.14.5...v2.14.6) - 2021-03-23
+
+### Fixed
+
+- Optimize v2.14.5's implementation a little
+
+## [2.14.5](https://github.com/k0kubun/hamlit/compare/v2.14.4...v2.14.5) - 2021-03-23
+
+### Added
+
+- Support `config.action_view.annotate_rendered_view_with_filenames = true` of Rails 6.1
+  *Thanks to @kirin121*
+
 ## [2.14.4](https://github.com/k0kubun/hamlit/compare/v2.14.3...v2.14.4) - 2021-02-01
 
 ### Fixed

data/hamlit.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'https://github.com/k0kubun/hamlit'
   spec.license       = 'MIT'
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features|sample)/}) }
+  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features|sample|benchmark)/}) }
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']

data/lib/hamlit/ambles.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+module Hamlit
+  class Ambles < Temple::Filter
+    define_options :preamble, :postamble
+
+    def initialize(*)
+      super
+      @preamble = options[:preamble]
+      @postamble = options[:postamble]
+    end
+
+    def call(ast)
+      ret = [:multi]
+      ret << [:static, @preamble] if @preamble
+      ret << ast
+      ret << [:static, @postamble] if @postamble
+      ret
+    end
+  end
+end

data/lib/hamlit/engine.rb

@@ -6,6 +6,7 @@ require 'hamlit/html'
 require 'hamlit/escapable'
 require 'hamlit/force_escapable'
 require 'hamlit/dynamic_merger'
+require 'hamlit/ambles'
 
 module Hamlit
   class Engine < Temple::Engine
@@ -30,6 +31,7 @@ module Hamlit
     use Escapable
     use ForceEscapable
     filter :ControlFlow
+    use Ambles
     filter :MultiFlattener
     filter :StaticMerger
     use DynamicMerger

data/lib/hamlit/rails_template.rb

@@ -33,6 +33,11 @@ module Hamlit
         options = options.merge(format: :xhtml)
       end
 
+      if ActionView::Base.try(:annotate_rendered_view_with_filenames) && template.format == :html
+        options[:preamble] = "<!-- BEGIN #{template.short_identifier} -->\n"
+        options[:postamble] = "<!-- END #{template.short_identifier} -->\n"
+      end
+
       Engine.new(options).call(source)
     end
 

data/lib/hamlit/railtie.rb

@@ -4,6 +4,11 @@ require 'rails'
 module Hamlit
   class Railtie < ::Rails::Railtie
     initializer :hamlit, before: :load_config_initializers do |app|
+      # Load haml/plugin first to override if available
+      begin
+        require 'haml/plugin'
+      rescue LoadError
+      end
       require 'hamlit/rails_template'
     end
   end

data/lib/hamlit/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hamlit
 version: !ruby/object:Gem::Version
-  version: 2.14.4
+  version: 2.15.1
 platform: java
 authors:
 - Takashi Kokubun
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-02-01 00:00:00.000000000 Z
+date: 2021-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -256,6 +256,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/FUNDING.yml"
+- ".github/workflows/bench.yml"
 - ".github/workflows/test.yml"
 - ".gitignore"
 - CHANGELOG.md
@@ -264,40 +266,6 @@ files:
 - README.md
 - REFERENCE.md
 - Rakefile
-- benchmark/boolean_attribute.haml
-- benchmark/class_attribute.haml
-- benchmark/common_attribute.haml
-- benchmark/data_attribute.haml
-- benchmark/dynamic_attributes/boolean_attribute.haml
-- benchmark/dynamic_attributes/class_attribute.haml
-- benchmark/dynamic_attributes/common_attribute.haml
-- benchmark/dynamic_attributes/data_attribute.haml
-- benchmark/dynamic_attributes/id_attribute.haml
-- benchmark/dynamic_boolean_attribute.haml
-- benchmark/dynamic_merger/benchmark.rb
-- benchmark/dynamic_merger/hello.haml
-- benchmark/dynamic_merger/hello.string
-- benchmark/etc/attribute_builder.haml
-- benchmark/etc/real_sample.haml
-- benchmark/etc/real_sample.rb
-- benchmark/etc/static_analyzer.haml
-- benchmark/etc/string_interpolation.haml
-- benchmark/etc/tags.haml
-- benchmark/etc/tags_loop.haml
-- benchmark/ext/build_data.rb
-- benchmark/ext/build_id.rb
-- benchmark/graph/graph.key
-- benchmark/graph/graph.png
-- benchmark/id_attribute.haml
-- benchmark/plain.haml
-- benchmark/script.haml
-- benchmark/slim/LICENSE
-- benchmark/slim/context.rb
-- benchmark/slim/run-benchmarks.rb
-- benchmark/slim/view.erb
-- benchmark/slim/view.haml
-- benchmark/slim/view.slim
-- benchmark/utils/benchmark_ips_extension.rb
 - bin/bench
 - bin/console
 - bin/ruby
@@ -312,6 +280,7 @@ files:
 - ext/hamlit/hescape.h
 - hamlit.gemspec
 - lib/hamlit.rb
+- lib/hamlit/ambles.rb
 - lib/hamlit/attribute_builder.rb
 - lib/hamlit/attribute_compiler.rb
 - lib/hamlit/attribute_parser.rb
@@ -390,8 +359,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.7.9
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: High Performance Haml Implementation

data/benchmark/boolean_attribute.haml

@@ -1,6 +0,0 @@
-%input{ disabled: false }
-%input{ disabled: true }
-- disabled = false
-%input{ disabled: disabled }
-- disabled = true
-%input{ disabled: disabled }

data/benchmark/class_attribute.haml

@@ -1,5 +0,0 @@
-.book{ class: 'content active' }
-.book(class='content active')
-
-- klass = %w[content active]
-.book{ class: klass }

data/benchmark/common_attribute.haml

@@ -1,3 +0,0 @@
-%a{ href: '&"\'<>' }
-- href = '&"\'<>'
-%a{ href: href }

data/benchmark/data_attribute.haml

@@ -1,4 +0,0 @@
-%div{ data: { disabled: false } }
-%div{ data: { disabled: true } }
-- hash = { 'user' => { id: 1234, name: 'k0kubun' }, book_id: 5432 }
-%div{ data: hash } data

data/benchmark/dynamic_attributes/boolean_attribute.haml

@@ -1,4 +0,0 @@
-- hash = { disabled: false }
-%input{ hash }
-- hash = { disabled: true }
-%input{ hash }

data/benchmark/dynamic_attributes/class_attribute.haml

@@ -1,4 +0,0 @@
-- hash = { class: %w[content active] }
-.book{ hash }
-- arr = %w[foo bar]
-.book(class=arr){ hash }

data/benchmark/dynamic_attributes/common_attribute.haml

@@ -1,2 +0,0 @@
-- hash = { href: '&"\'<>' }
-%a{ hash }

data/benchmark/dynamic_attributes/data_attribute.haml

@@ -1,2 +0,0 @@
-- hash = { data: { 'user' => { id: 1234, name: 'k0kubun' }, book_id: 5432 } }
-%div{ hash } data

data/benchmark/dynamic_attributes/id_attribute.haml

@@ -1,2 +0,0 @@
-- hash = { id: %w[content active] }
-#book{ hash }

data/benchmark/dynamic_boolean_attribute.haml

@@ -1,4 +0,0 @@
-- disabled = false
-%input{ disabled: disabled }
-- disabled = true
-%input{ disabled: disabled }

data/benchmark/dynamic_merger/benchmark.rb

@@ -1,25 +0,0 @@
-# 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

@@ -1,50 +0,0 @@
-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

@@ -1,50 +0,0 @@
-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 }