synvert-core 1.24.0 → 1.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b80b28538674cde89c7dc0098b53d736abb355874d4736654b48234c38c76e2b
-  data.tar.gz: 463e9b2616f07146ce551e904912dc2cbfb71e010ffa11eda8ff134c0ea1a5b3
+  metadata.gz: 69a5a31926536922320b7184cae70096bba437729c6c4dbe6c0bb2ab98d56e43
+  data.tar.gz: afeed86dae83348eccb85859dcc907250ff1e5361d69b7a71839cb88c1fc3e79
 SHA512:
-  metadata.gz: 2f25773c6887fe6b676dc1abd92df89b82dddab81e26841d3e1b566b1ab4f84666f7fde4563e864508814b49f7a54313014a88e412946b908e58976641a1223f
-  data.tar.gz: 13cadd41c39b742837a0b562626b1de9355e63f52f953133139f60c47f6341001f2442bca9276078bfdadea909ef5068db688444ed8e55ceaf9fc2511e7321d4
+  metadata.gz: 50d06d1c664c06fac3e7bc163226c3e98305bd26d802919ce73003ad4e8d5e1cf441d2559b32aeada9266d48cb7d3365ef2d39fa37a934bd2e0fe2ad489693ee
+  data.tar.gz: 34915fcbb4252d66c9b25318b96e1f4bf6f4a8881f8d85229bc7f6f5cbf80ff50aed3f774cddcbab10495ef865daff0c6d40fd6608382e9e97d7a42b16ca6fc3

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## 1.25.0 (2023-04-17)
+
+* Update `wrap` dsl
+* Update `node_mutation` to 1.15.1
+* Fix `erb` encoded source
+
 ## 1.24.0 (2023-04-16)
 
 * Add `Slim` engine

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    synvert-core (1.24.0)
+    synvert-core (1.25.0)
       activesupport (< 7.0.0)
-      node_mutation (>= 1.14.0)
+      node_mutation (>= 1.15.1)
       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.14.0)
+    node_mutation (1.15.1)
     node_query (1.12.1)
     notiffany (0.1.3)
       nenv (~> 0.1)

data/README.md

@@ -94,7 +94,7 @@ Actions:
 * [replace](https://xinminlabs.github.io/synvert-core-ruby/Synvert/Core/Rewriter/Instance.html#replace-instance_method) - replace the code of specified child nodes
 * [delete](https://xinminlabs.github.io/synvert-core-ruby/Synvert/Core/Rewriter/Instance.html#delete-instance_method) - delete the code in specified child nodes
 * [remove](https://xinminlabs.github.io/synvert-core-ruby/Synvert/Core/Rewriter/Instance.html#remove-instance_method) - remove the whole code of current node
-* [wrap](https://xinminlabs.github.io/synvert-core-ruby/Synvert/Core/Rewriter/Instance.html#wrap-instance_method) - wrap the current node with code
+* [wrap](https://xinminlabs.github.io/synvert-core-ruby/Synvert/Core/Rewriter/Instance.html#wrap-instance_method) - wrap the current node with prefix and suffix code
 * [replace_with](https://xinminlabs.github.io/synvert-core-ruby/Synvert/Core/Rewriter/Instance.html#replace_with-instance_method) - replace the whole code of current node
 * [warn](https://xinminlabs.github.io/synvert-core-ruby/Synvert/Core/Rewriter/Instance.html#warn-instance_method) - warn message
 * [replace_erb_stmt_with_expr](https://xinminlabs.github.io/synvert-core-ruby/Synvert/Core/Rewriter/Instance.html#replace_erb_stmt_with_expr-instance_method) - replace erb stmt code to expr code

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

@@ -94,14 +94,14 @@ module Synvert::Core
           new_code << END_LINE
         end
         while scanner.scan(/(.*?)(\\*)#\{/) # it matches interpolation "  #{current_user.login}"
-          new_code << WHITESPACE * scanner.matched.size
+          new_code << (WHITESPACE * scanner.matched.size)
           unless scanner.matched[-3] == '\\'
             count = 1
             while scanner.scan(/.*?([\{\}])/)
               if scanner.matched[-1] == '}'
                 count -= 1
                 if count == 0
-                  new_code << scanner.matched[0..-2] + ';'
+                  new_code << (scanner.matched[0..-2] + ';')
                   break
                 else
                   new_code << scanner.matched
@@ -114,12 +114,12 @@ module Synvert::Core
           end
         end
         if scanner.scan(/.*?\z/)
-          new_code << WHITESPACE * scanner.matched.size
+          new_code << (WHITESPACE * scanner.matched.size)
         end
         if scanner.scan(/.*?\n/)
-          new_code << WHITESPACE * (scanner.matched.size - 1) + "\n"
+          new_code << ((WHITESPACE * (scanner.matched.size - 1)) + "\n")
         end
       end
     end
   end
-end
+end

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

@@ -9,9 +9,9 @@ module Synvert::Core
         # @param source [String] erb code.
         # @return [String] encoded ruby code.
         def encode(source)
-          source.gsub(/%>.*?<%=?/m) { |str| replace_all_code_but_white_space_characters(str) }
+          source.gsub(/%>.*?<%=?/m) { |str| ';' + replace_all_code_but_white_space_characters(str[1..-1]) }
                 .sub(/^.*?<%=?/m) { |str| replace_all_code_but_white_space_characters(str) }
-                .sub(/%>.*?$/m) { |str| replace_all_code_but_white_space_characters(str) }
+                .sub(/%>.*?$/m) { |str| ';' + replace_all_code_but_white_space_characters(str[1..-1]) }
         end
 
         # Generate an empty proc.

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

@@ -25,7 +25,7 @@ module Synvert::Core
               new_code << WHITESPACE
               scan_ruby_expression(scanner, new_code, leading_spaces_counts, leading_spaces_count)
             elsif scanner.scan(/[%#\.][a-zA-Z0-9\-_%#\.]+/) # it matches element, id and class "  %span.user"
-              new_code << WHITESPACE * scanner.matched.size
+              new_code << (WHITESPACE * scanner.matched.size)
               scan_matching_wrapper(scanner, new_code, '{', '}')
               if scanner.scan('=')
                 new_code << WHITESPACE

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

@@ -6,11 +6,7 @@ module Synvert::Core
       class << self
         include Elegant
 
-        ATTRIBUTES_PAIR = {
-          '{' => '}',
-          '[' => ']',
-          '(' => ')'
-        }
+        ATTRIBUTES_PAIR = { '{' => '}', '[' => ']', '(' => ')' }
 
         # Encode haml string, leave only ruby code, replace other haml code with whitespace.
         # And insert `end\n` for each if, unless, begin, case to make it a valid ruby code.
@@ -28,16 +24,16 @@ module Synvert::Core
               new_code << WHITESPACE
               scan_ruby_statement(scanner, new_code, leading_spaces_counts, leading_spaces_count)
             elsif scanner.scan(/==?/) # it matches ruby expression "  = current_user.login"
-              new_code << WHITESPACE * scanner.matched.size
+              new_code << (WHITESPACE * scanner.matched.size)
               scan_ruby_expression(scanner, new_code, leading_spaces_counts, leading_spaces_count)
             elsif scanner.scan(/[a-z#\.][a-zA-Z0-9\-_%#\.]*/) # it matches element, id and class "  span.user"
-              new_code << WHITESPACE * scanner.matched.size
+              new_code << (WHITESPACE * scanner.matched.size)
               ATTRIBUTES_PAIR.each do |start, ending| # it matches attributes in brackets "  span[ class='user' ]"
                 scan_matching_wrapper(scanner, new_code, start, ending)
               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)
                 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)
@@ -64,7 +60,7 @@ module Synvert::Core
             while scanner.scan(/.*?[#{Regexp.quote(start)}#{Regexp.quote(ending)}]/m)
               matched = scanner.matched.gsub(/(\A| ).*?=/) { |key| WHITESPACE * key.size }
               if scanner.matched[-1] == ending
-                new_code << matched[0..-2] + ';'
+                new_code << (matched[0..-2] + ';')
                 count -= 1
                 break if count == 0
               else
@@ -77,7 +73,7 @@ module Synvert::Core
 
         def scan_attributes_between_whitespace(scanner, new_code)
           while scanner.scan(/ ?[\w\-_]+==?/) # it matches attributes split by space "  span class='user'"
-            new_code << WHITESPACE * scanner.matched.size
+            new_code << (WHITESPACE * scanner.matched.size)
             stack = []
             while scanner.scan(/(.*?['"\(\)\[\]\{\}]|.+?\b)/)
               matched = scanner.matched
@@ -86,7 +82,7 @@ module Synvert::Core
                 stack << matched[-1]
               elsif [')', ']', '}'].include?(matched[-1])
                 stack.pop
-              elsif %w['  "].include?(matched[-1])
+              elsif %w[' "].include?(matched[-1])
                 stack.last == matched[-1] ? stack.pop : stack << matched[-1]
               end
               break if stack.empty?

data/lib/synvert/core/rewriter/instance.rb

@@ -362,7 +362,7 @@ module Synvert::Core
       @current_mutation.delete(@current_node, *selectors, and_comma: and_comma)
     end
 
-    # It wraps current node with code.
+    # It wraps current node with prefix and suffix code.
     # @example
     #   # class Foobar
     #   # end
@@ -372,11 +372,13 @@ module Synvert::Core
     #   #   end
     #   # end
     #   within_node type: 'class' do
-    #     wrap with: 'module Synvert'
+    #     wrap with: 'module Synvert', and: 'end', newline: true
     #   end
-    # @param with [String] code need to be wrapped with.
-    def wrap(with:)
-      @current_mutation.wrap(@current_node, with: with)
+    # @param prefix [String] prefix code need to be wrapped with.
+    # @param suffix [String] suffix code need to be wrapped with.
+    # @param newline [Boolean] if wrap code in newline, default is false
+    def wrap(prefix:, suffix:, newline: false)
+      @current_mutation.wrap(@current_node, prefix: prefix, suffix: suffix, newline: newline)
     end
 
     # No operation.

data/lib/synvert/core/version.rb

@@ -2,6 +2,6 @@
 
 module Synvert
   module Core
-    VERSION = '1.24.0'
+    VERSION = '1.25.0'
   end
 end

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

@@ -20,6 +20,8 @@ module Synvert::Core
           bar = 'foo'
         %>
 
+        <%= user.first_name %> <%= user.last_name %>
+
         <% if User.current &&
               User.current.admin %>
           <%= rounded_content("page") do %>
@@ -40,6 +42,8 @@ module Synvert::Core
       expect(encoded_source).to be_include 'post = Post.find(:first)'
       expect(encoded_source).to be_include "link_to_function 'test', \"confirm('test');\""
       expect(encoded_source).to be_include 'end'
+      expect(encoded_source).to be_include 'user.first_name ;'
+      expect(encoded_source).to be_include 'user.last_name ;'
       expect(encoded_source).not_to be_include 'style'
       expect(encoded_source).not_to be_include 'div'
     end

data/spec/synvert/core/rewriter/instance_spec.rb

@@ -233,14 +233,16 @@ module Synvert::Core
       instance.delete :dot, :message, and_comma: true
     end
 
-    it 'parses wrap with' do
+    it 'parses wrap' do
       instance.instance_variable_set(:@current_mutation, double)
       instance.current_node = double
       expect(instance.instance_variable_get(:@current_mutation)).to receive(:wrap).with(
         instance.current_node,
-        with: 'module Foobar'
+        prefix: 'module Foobar',
+        suffix: 'end',
+        newline: true
       )
-      instance.wrap with: 'module Foobar'
+      instance.wrap prefix: 'module Foobar', suffix: 'end', newline: true
     end
 
     it 'parses noop' do

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.14.0"
+  spec.add_runtime_dependency "node_mutation", ">= 1.15.1"
   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.24.0
+  version: 1.25.0
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-16 00:00:00.000000000 Z
+date: 2023-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.14.0
+        version: 1.15.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.14.0
+        version: 1.15.1
 - !ruby/object:Gem::Dependency
   name: parser
   requirement: !ruby/object:Gem::Requirement