haml 6.0.3-java → 6.0.4-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 196f2dd507a61ecf4a14268a46d390e3f48e38f1c9ceaa1aaa6a037d43084451
-  data.tar.gz: 7068d203e0d6204b8738a24ef871b54bb3b8ce531b04587d88dacabd2364ed31
+  metadata.gz: ba55e6f006bab380b4df0dd739bc02d627ad2e51eb85006d7199b898a0bcdd6e
+  data.tar.gz: b4ae94e51d1ec420fb121b96484d3cad1c036945e95ba86b6c06dd68acd46b64
 SHA512:
-  metadata.gz: 0b5de12ac87b362b9c9cf601311a8dd61e7bb5d36d6747f8d2de70a43994f91ca4bc0fd0624dd1f10099ea8f941f6f4d01af8d52301792d6c0664dccfb56b6b7
-  data.tar.gz: e3bb884257de118bb129dbcb49ce309921afbeb6a0a730bae9fa419c2a6b04fb67c0214d0548e6f394171a9366da04acae7be5aaee524e66349d9b5c3dae835e
+  metadata.gz: 5702731267ea12d0cd29ae1c33081b4d25fecd01e125c898db6d9625cbbede9fb0e893f477e8bc094361616f8eefd265bd62c7df14bb34a93e7dbeda43a342c5
+  data.tar.gz: 06534b31a100540d9746f185a4cd73f827fa75a35c420f3cdb584ab3a0df8ee9649cbbad374dc4835c847d580ba56c9d66073e34e350f8e4f4eec9cd7c62ca65

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Haml Changelog
 
+## 6.0.4
+
+Released on October 2, 2022
+([diff](https://github.com/haml/haml/compare/v6.0.3...v6.0.4)).
+
+* Fix a parse failure of `%` in attributes [#1096](https://github.com/haml/haml/issues/1096)
+* Add another fallback from C to Ruby for Wasm.
+
 ## 6.0.3
 
 Released on September 28, 2022
@@ -34,8 +42,15 @@ Released on September 21, 2022
   * The `haml` CLI interface was also replaced.
   * The interface of `Haml::Engine` is changed. `Haml::Template` is most likely what you need now.
   * Most Haml helpers are removed.
-     * On Rails, only `find_and_reserve`, `preserve`, `surround`, `precede`, `succeed`, and `capture_haml` are left.
-     * On Tilt, only `preserve` is left.
+     * Rails:
+         * Kept: `find_and_reserve`, `preserve`, `surround`, `precede`, `succeed`, `capture_haml`
+         * Removed: `block_is_haml?`, `flatten`, `haml_concat`, `haml_indent`, `haml_tag`, `haml_tag_if`, `html_attrs`,
+           `html_escape`, `init_haml_helpers`, `is_haml?`, `list_of`, `non_haml`, `tab_down`, `tab_up`, `with_tabs`
+     * Tilt:
+         * Kept: `preserve`
+         * Removed: `block_is_haml?`, `capture_haml`, `escape_once`, `find_and_preserve`, `flatten`, `haml_concat`,
+           `haml_indent`, `haml_tag`, `haml_tag_if`, `html_attrs`, `html_escape`, `init_haml_helpers`, `is_haml?`,
+           `list_of`, `non_haml`, `precede`, `succeed`, `surround`, `tab_down`, `tab_up`, `with_tabs`
   * Only the attributes in [`Haml::AttributeBuilder::BOOLEAN_ATTRIBUTES`](lib/haml/attribute_builder.rb)
     are handled as boolean attributes.
   * Some legacy Rails integration is removed.

data/Rakefile

@@ -35,72 +35,14 @@ end
 
 Dir['benchmark/*.rake'].each { |b| import(b) }
 
-namespace :haml do
-  Rake::TestTask.new do |t|
-    t.libs << 'lib' << 'test'
-    files = Dir['test/haml/*_test.rb']
-    files << 'test/haml/haml-spec/*_test.rb'
-    t.ruby_opts = %w[-rtest_helper]
-    t.test_files = files
-    t.verbose = true
-  end
-end
-
-namespace :hamlit do
-  Rake::TestTask.new do |t|
-    t.libs << 'lib' << 'test'
-    t.ruby_opts = %w[-rtest_helper]
-    t.test_files = Dir['test/hamlit/**/*_test.rb']
-    t.verbose = true
-  end
-end
-
-namespace :test do
-  Rake::TestTask.new(:all) do |t|
-    t.libs << 'lib' << 'test'
-    files = Dir['test/hamlit/**/*_test.rb']
-    files += Dir['test/haml/*_test.rb']
-    files << 'test/haml/haml-spec/*_test.rb'
-    t.ruby_opts = %w[-rtest_helper]
-    t.test_files = files
-    t.verbose = true
-  end
-
-  Rake::TestTask.new(:spec) do |t|
-    t.libs << 'lib' << 'test'
-    t.ruby_opts = %w[-rtest_helper]
-    t.test_files = %w[test/haml/haml-spec/ugly_test.rb test/haml/haml-spec/pretty_test.rb]
-    t.verbose = true
-  end
-
-  Rake::TestTask.new(:engine) do |t|
-    t.libs << 'lib' << 'test'
-    t.ruby_opts = %w[-rtest_helper]
-    t.test_files = %w[test/haml/engine_test.rb]
-    t.verbose = true
-  end
-
-  Rake::TestTask.new(:filters) do |t|
-    t.libs << 'lib' << 'test'
-    t.ruby_opts = %w[-rtest_helper]
-    t.test_files = %w[test/haml/filters_test.rb]
-    t.verbose = true
-  end
-
-  Rake::TestTask.new(:helper) do |t|
-    t.libs << 'lib' << 'test'
-    t.ruby_opts = %w[-rtest_helper]
-    t.test_files = %w[test/haml/helper_test.rb]
-    t.verbose = true
-  end
-
-  Rake::TestTask.new(:template) do |t|
-    t.libs << 'lib' << 'test'
-    t.ruby_opts = %w[-rtest_helper]
-    t.test_files = %w[test/haml/template_test.rb]
-    t.verbose = true
-  end
+Rake::TestTask.new do |t|
+  t.libs << 'lib' << 'test'
+  files = Dir['test/haml/**/*_test.rb']
+  t.ruby_opts = %w[-rtest_helper]
+  t.test_files = files
+  t.verbose = true
 end
+task test: :compile
 
 desc 'bench task for CI'
 task bench: :compile do
@@ -137,5 +79,4 @@ task(:doc => 'doc:sass') {sh "yard"}
 desc "Generate documentation incrementally"
 task(:redoc) {sh "yard -c"}
 
-task default: %w[compile hamlit:test]
-task test: %w[compile test:all]
+task default: %w[compile test]

data/lib/haml/engine.rb

@@ -3,6 +3,7 @@ require 'temple'
 require 'haml/parser'
 require 'haml/compiler'
 require 'haml/html'
+require 'haml/string_splitter'
 require 'haml/escapable'
 require 'haml/force_escapable'
 require 'haml/dynamic_merger'
@@ -27,7 +28,7 @@ module Haml
     use Parser
     use Compiler
     use HTML
-    filter :StringSplitter
+    use StringSplitter
     filter :StaticAnalyzer
     use Escapable
     use ForceEscapable

data/lib/haml/string_splitter.rb

@@ -1,19 +1,139 @@
 # frozen_string_literal: true
-require 'ripper'
-require 'haml/ruby_expression'
+begin
+  require 'ripper'
+rescue LoadError
+end
 
 module Haml
-  module StringSplitter
-    # `code` param must be valid string literal
-    def self.compile(code)
-      unless Ripper.respond_to?(:lex) # truffleruby doesn't have Ripper.lex
-        return [[:dynamic, code]]
+  # Compile [:dynamic, "foo#{bar}"] to [:multi, [:static, 'foo'], [:dynamic, 'bar']]
+  class StringSplitter < Temple::Filter
+    if defined?(Ripper) && RUBY_VERSION >= "2.0.0" && Ripper.respond_to?(:lex)
+      class << self
+        # `code` param must be valid string literal
+        def compile(code)
+          [].tap do |exps|
+            tokens = Ripper.lex(code.strip)
+            tokens.pop while tokens.last && [:on_comment, :on_sp].include?(tokens.last[1])
+
+            if tokens.size < 2
+              raise(Haml::InternalError, "Expected token size >= 2 but got: #{tokens.size}")
+            end
+            compile_tokens!(exps, tokens)
+          end
+        end
+
+        private
+
+        def strip_quotes!(tokens)
+          _, type, beg_str = tokens.shift
+          if type != :on_tstring_beg
+            raise(Haml::InternalError, "Expected :on_tstring_beg but got: #{type}")
+          end
+
+          _, type, end_str = tokens.pop
+          if type != :on_tstring_end
+            raise(Haml::InternalError, "Expected :on_tstring_end but got: #{type}")
+          end
+
+          [beg_str, end_str]
+        end
+
+        def compile_tokens!(exps, tokens)
+          beg_str, end_str = strip_quotes!(tokens)
+
+          until tokens.empty?
+            _, type, str = tokens.shift
+
+            case type
+            when :on_tstring_content
+              beg_str, end_str = escape_quotes(beg_str, end_str)
+              exps << [:static, eval("#{beg_str}#{str}#{end_str}").to_s]
+            when :on_embexpr_beg
+              embedded = shift_balanced_embexpr(tokens)
+              exps << [:dynamic, embedded] unless embedded.empty?
+            end
+          end
+        end
+
+        # Some quotes are split-unsafe. Replace such quotes with null characters.
+        def escape_quotes(beg_str, end_str)
+          case [beg_str[-1], end_str]
+          when ['(', ')'], ['[', ']'], ['{', '}']
+            [beg_str.sub(/.\z/) { "\0" }, "\0"]
+          else
+            [beg_str, end_str]
+          end
+        end
+
+        def shift_balanced_embexpr(tokens)
+          String.new.tap do |embedded|
+            embexpr_open = 1
+
+            until tokens.empty?
+              _, type, str = tokens.shift
+              case type
+              when :on_embexpr_beg
+                embexpr_open += 1
+              when :on_embexpr_end
+                embexpr_open -= 1
+                break if embexpr_open == 0
+              end
+
+              embedded << str
+            end
+          end
+        end
       end
 
-      begin
-        Temple::Filters::StringSplitter.compile(code)
-      rescue Temple::FilterError => e
-        raise Haml::InternalError.new(e.message)
+      def on_dynamic(code)
+        return [:dynamic, code] unless string_literal?(code)
+        return [:dynamic, code] if code.include?("\n")
+
+        temple = [:multi]
+        StringSplitter.compile(code).each do |type, content|
+          case type
+          when :static
+            temple << [:static, content]
+          when :dynamic
+            temple << on_dynamic(content)
+          end
+        end
+        temple
+      end
+
+      private
+
+      def string_literal?(code)
+        return false if SyntaxChecker.syntax_error?(code)
+
+        type, instructions = Ripper.sexp(code)
+        return false if type != :program
+        return false if instructions.size > 1
+
+        type, _ = instructions.first
+        type == :string_literal
+      end
+
+      class SyntaxChecker < Ripper
+        class ParseError < StandardError; end
+
+        def self.syntax_error?(code)
+          self.new(code).parse
+          false
+        rescue ParseError
+          true
+        end
+
+        private
+
+        def on_parse_error(*)
+          raise ParseError
+        end
+      end
+    else
+      # Do nothing if ripper is unavailable
+      def call(ast)
+        ast
       end
     end
   end

data/lib/haml/util.rb

@@ -14,16 +14,15 @@ module Haml
   module Util
     extend self
 
-    # Java extension is not implemented for JRuby yet.
-    # TruffleRuby does not implement `rb_ary_sort_bang`, etc.
-    if /java/ === RUBY_PLATFORM || RUBY_ENGINE == 'truffleruby'
+    begin
+      require 'haml/haml' # Haml::Util.escape_html
+    rescue LoadError
+      # For JRuby and Wasm, fallback to Ruby implementation when C extension is not available.
       require 'cgi/escape'
 
       def self.escape_html(html)
         CGI.escapeHTML(html.to_s)
       end
-    else
-      require 'haml/haml' # Haml::Util.escape_html
     end
 
     # TODO: Remove unescape_interpolation's workaround and get rid of `respond_to?`.

data/lib/haml/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Haml
-  VERSION = '6.0.3'
+  VERSION = '6.0.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haml
 version: !ruby/object:Gem::Version
-  version: 6.0.3
+  version: 6.0.4
 platform: java
 authors:
 - Natalie Weizenbaum
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-28 00:00:00.000000000 Z
+date: 2022-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement