synvert-core 1.26.1 → 1.26.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76425d306537f25b4323935112165ad6bbc02714793e39d7287ee97b884f2284
-  data.tar.gz: 276cb3ec3ee5685b3233b51105ac1de4233927f3e7bcd89bac01e5d761aa5869
+  metadata.gz: 33af6c56062d411c6a6b22460889e1416975ce685fe1d8e8e86c73583ea8c3c3
+  data.tar.gz: fc14712ad5a4a95f4c97cfd7cf41dbd51973b43c9a24be9086baf321a626a92e
 SHA512:
-  metadata.gz: d0e36b19d07fb73b93898b48833e5419e1f5e258da0c9660cf8584efdb142e6d4495a9a47105884ba558b6f2a2070c83eebfe54aee22f64d5eb4cfd3a3c712e8
-  data.tar.gz: 6058cc41e9ac61a497d1ddb0f8cb642a48797d67ace1a0e7d513fbae1cce9a7fa50d4a35162caf3e396e0630f5ac394bd63d0a75a83f0a1012a7ef9d8b4a18fc
+  metadata.gz: ee2aee51d031543fade41cf86d36d8f3704fac0d1bebaf8d146400a73d277352318216b40c4b2bd819e6cd3dbb865ed8dbac05c6e53800a6e7e993460e0d1b73
+  data.tar.gz: 2ea5ae0070defc84ed1e2a157af58c3beab37c04cdc4b18b3528a5339a69aa8a4a02f53515a0fc14381e996bf7374497dc376c408dc305de1552f0db35cf503f

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # CHANGELOG
 
+## 1.28.3 (2023-05-13)
+
+* Fix haml and slim engine to support attribute and ruby evalidation in the same line
+* Fix ruby block in multi lins in haml and slim
+
+## 1.26.2 (2023-05-10)
+
+* Update `node_mutation` to 1.16.0
+
 ## 1.26.1 (2023-05-06)
 
 * Compact test results

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    synvert-core (1.26.1)
+    synvert-core (1.26.3)
       activesupport (< 7.0.0)
-      node_mutation (>= 1.15.3)
+      node_mutation (>= 1.16.0)
       node_query (>= 1.12.1)
       parallel
       parser
@@ -48,7 +48,7 @@ GEM
     method_source (1.0.0)
     minitest (5.18.0)
     nenv (0.3.0)
-    node_mutation (1.15.3)
+    node_mutation (1.16.0)
     node_query (1.12.1)
     notiffany (0.1.3)
       nenv (~> 0.1)

data/lib/synvert/core/engine/elegant.rb

@@ -69,6 +69,9 @@ module Synvert::Core
 
         while rest.rstrip.end_with?(',')
           rest = scanner.scan(/.*?(\z|\n)/)
+          if IF_KEYWORDS.include?(keyword) || rest =~ DO_BLOCK_REGEX
+            leading_spaces_counts << leading_spaces_count
+          end
           new_code << rest
         end
       end
@@ -85,6 +88,9 @@ module Synvert::Core
 
         while rest.rstrip.end_with?(',')
           rest = scanner.scan(/.*?(\z|\n)/)
+          if rest =~ DO_BLOCK_REGEX
+            leading_spaces_counts << leading_spaces_count
+          end
           new_code << rest
         end
       end

data/lib/synvert/core/engine/haml.rb

@@ -28,7 +28,7 @@ module Synvert::Core
               new_code << (WHITESPACE * scanner.matched.size)
               scan_matching_wrapper(scanner, new_code, '{', '}')
               if scanner.scan('=')
-                new_code << WHITESPACE
+                new_code << ';'
                 scan_ruby_expression(scanner, new_code, leading_spaces_counts, leading_spaces_count)
               else
                 scan_ruby_interpolation_and_plain_text(scanner, new_code, leading_spaces_counts, leading_spaces_count)

data/lib/synvert/core/engine/slim.rb

@@ -33,7 +33,7 @@ module Synvert::Core
               end
               scan_attributes_between_whitespace(scanner, new_code)
               if scanner.scan(/ ?==?/) # it matches ruby expression "  span= current_user.login"
-                new_code << (WHITESPACE * scanner.matched.size)
+                new_code << (WHITESPACE * (scanner.matched.size - 1)) + ';'
                 scan_ruby_expression(scanner, new_code, leading_spaces_counts, leading_spaces_count)
               else
                 scan_ruby_interpolation_and_plain_text(scanner, new_code, leading_spaces_counts, leading_spaces_count)

data/lib/synvert/core/version.rb

@@ -2,6 +2,6 @@
 
 module Synvert
   module Core
-    VERSION = '1.26.1'
+    VERSION = '1.26.3'
   end
 end

data/spec/synvert/core/engine/haml_spec.rb

@@ -98,6 +98,14 @@ module Synvert::Core
         expect(encoded_source).to be_include '{:href=>"/posts", :data => {:author_id => 123, :category => 7}}'
       end
 
+      it 'encodes attributes with ruby evaluation' do
+        source = <<~EOS
+          %a{:href=>"/posts", :data => {:author_id => 123, :category => 7}}= current_user.name
+        EOS
+        encoded_source = Engine::Haml.encode(source)
+        expect(encoded_source).to be_include '{:href=>"/posts", :data => {:author_id => 123, :category => 7}}; current_user.name'
+      end
+
       it 'encodes class and ID' do
         source = <<~EOS
           %div#things
@@ -194,6 +202,17 @@ module Synvert::Core
         expect(encoded_source).not_to be_include 'See, I can count!'
       end
 
+      it 'encodes ruby block in multi lines' do
+        source = <<~EOS
+          = form_for(:document, builder: BootstrapForm,
+            html: {id: 'new_document_form', class: 'form-vertical'}) do |f|
+        EOS
+        encoded_source = Engine::Haml.encode(source)
+        expect(encoded_source).to be_include 'form_for'
+        expect(encoded_source).to be_include 'do |f|'
+        expect(encoded_source).to be_include 'end'
+      end
+
       it 'encodes ruby interpolation' do
         source = 'Look at #{h word} lack of backslash: \#{foo}'
         encoded_source = Engine::Haml.encode(source)

data/spec/synvert/core/engine/slim_spec.rb

@@ -131,8 +131,8 @@ module Synvert::Core
             h2[id="tagline" class="small tagline"] = page_tagline
         EOS
         encoded_source = Engine::Slim.encode(source)
-        expect(encoded_source).to be_include 'page_logo'
-        expect(encoded_source).to be_include 'page_tagline'
+        expect(encoded_source).to be_include '; page_logo'
+        expect(encoded_source).to be_include '; page_tagline'
         expect(encoded_source).not_to be_include 'h1'
         expect(encoded_source).not_to be_include 'h2'
         expect(encoded_source).not_to be_include 'id'

data/synvert-core-ruby.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "activesupport", "< 7.0.0"
   spec.add_runtime_dependency "node_query", ">= 1.12.1"
-  spec.add_runtime_dependency "node_mutation", ">= 1.15.3"
+  spec.add_runtime_dependency "node_mutation", ">= 1.16.0"
   spec.add_runtime_dependency "parser"
   spec.add_runtime_dependency "parser_node_ext", ">= 1.0.0"
   spec.add_runtime_dependency "parallel"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: synvert-core
 version: !ruby/object:Gem::Version
-  version: 1.26.1
+  version: 1.26.3
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-06 00:00:00.000000000 Z
+date: 2023-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.15.3
+        version: 1.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.15.3
+        version: 1.16.0
 - !ruby/object:Gem::Dependency
   name: parser
   requirement: !ruby/object:Gem::Requirement