synvert-core 1.22.0 → 1.22.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90f6acc3b15b0d25a8df1320393862f574dffbfc1743fd5bbb03f7323d994ae1
-  data.tar.gz: 7fa5d3c80ed1c86fc8c67abc2add07e374681c3bb54bc53e590195ffb51c3fb2
+  metadata.gz: 125adb6c7e7a82a3b03fa233fa0d43f9beabd1c46eb620323297689e7f47826f
+  data.tar.gz: 96118a021ba37a5723bc284b75163f7e897dc23b57d9bcc62c8203f0de9c6dbb
 SHA512:
-  metadata.gz: 755e6b198dc2ce1c652ea6bced3f9ee002599e6ab51dee5ea1a9dd8d103b0aafa86fa495808db548a675e0a6bf0356533687f7cd652e73dd519bec9e50cb55dd
-  data.tar.gz: f2364e3359310b864a813d6132e9475ea4f19f95219e849bcbd33cdfe362f849c5a11ddc9220ca6b7689058ca795e70be75a63043fc9498224d336f2fd10a567
+  metadata.gz: 7b1bd83e3d44bd056afb750005d27e3f03627f203c3d426ca7a1aca67343edb3184e46e32333532cbc0d953fd6ec56ed07985194cf6e7bf6cc3deeed20e7a91f
+  data.tar.gz: 70cd42406792039a01298a47fbd53451de86f66d955da83174d7ee81ae271c89e8a7e98c9a317c097eddf7cac837afa15206fdfdf6b499c623b6fb721fbe2f9f

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 # CHANGELOG
 
+##  1.22.2 (2023-03-31)
+
+* Do not replace white space characters in erb engine
+* Check erb source in `ReplaceErbStmtWithExprAction`
+* Update `node_mutation` to 1.13.1
+
+## 1.22.1 (2023-03-31)
+
+* Fix indent when `insert_after` or `insert_before` to a child node
+* Update `node_mutation` to 1.13.0
+
 ## 1.22.0 (2023-03-24)
 
 * Add `and_comma` option to `insert`, `insert_before`, `insert_after` api

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    synvert-core (1.22.0)
+    synvert-core (1.22.2)
       activesupport (< 7.0.0)
-      node_mutation (>= 1.12.1)
+      node_mutation (>= 1.13.1)
       node_query (>= 1.12.0)
       parallel
       parser
@@ -22,7 +22,6 @@ GEM
     coderay (1.1.3)
     concurrent-ruby (1.2.2)
     diff-lcs (1.5.0)
-    erubis (2.7.0)
     fakefs (2.4.0)
     ffi (1.15.5)
     formatador (1.1.0)
@@ -49,8 +48,7 @@ GEM
     method_source (1.0.0)
     minitest (5.18.0)
     nenv (0.3.0)
-    node_mutation (1.12.1)
-      erubis
+    node_mutation (1.13.1)
     node_query (1.12.0)
     notiffany (0.1.3)
       nenv (~> 0.1)

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

@@ -9,9 +9,15 @@ module Synvert::Core
         # @param source [String] erb code.
         # @return [String] encoded ruby code.
         def encode(source)
-          source.gsub(/%>.*?<%=?/m) { |str| ' ' * str.size }
-                .sub(/^.*?<%=?/m) { |str| ' ' * str.size }
-                .sub(/%>.*?$/m) { |str| ' ' * str.size }
+          source.gsub(/%>.*?<%=?/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) }
+        end
+
+        private
+
+        def replace_all_code_but_white_space_characters(source)
+          source.gsub(/\S/, ' ')
         end
       end
     end

data/lib/synvert/core/rewriter/action/replace_erb_stmt_with_expr_action.rb

@@ -8,8 +8,9 @@ module Synvert::Core
     # Initialize a ReplaceErbStmtWithExprAction.
     #
     # @param node [Synvert::Core::Rewriter::Node]
-    def initialize(node)
+    def initialize(node, erb_source)
       super(node, nil)
+      @erb_source = erb_source
     end
 
     # The new erb expr code.
@@ -23,7 +24,12 @@ module Synvert::Core
 
     # Calculate the begin the end positions.
     def calculate_position
-      @start = NodeMutation.adapter.get_start(@node) - 1
+      @start = NodeMutation.adapter.get_start(@node)
+      loop do
+        @start -= 1
+        break if @erb_source[@start] == '%'
+      end
+      @start += 1
       @end = @start
     end
   end

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

@@ -268,7 +268,7 @@ module Synvert::Core
     # @param to [String] where to insert, if it is nil, will insert to current node.
     # @param and_comma [Boolean] insert extra comma.
     def insert_after(code, to: nil, and_comma: false)
-      column = ' ' * NodeMutation.adapter.get_start_loc(@current_node).column
+      column = ' ' * NodeMutation.adapter.get_start_loc(@current_node, to).column
       @current_mutation.insert(@current_node, "\n#{column}#{code}", at: 'end', to: to, and_comma: and_comma)
     end
 
@@ -285,7 +285,7 @@ module Synvert::Core
     # @param to [String] where to insert, if it is nil, will insert to current node.
     # @param and_comma [Boolean] insert extra comma.
     def insert_before(code, to: nil, and_comma: false)
-      column = ' ' * NodeMutation.adapter.get_start_loc(@current_node).column
+      column = ' ' * NodeMutation.adapter.get_start_loc(@current_node, to).column
       @current_mutation.insert(@current_node, "#{code}\n#{column}", at: 'beginning', to: to, and_comma: and_comma)
     end
 
@@ -300,7 +300,9 @@ module Synvert::Core
     #     replace_erb_stmt_with_expr
     #   end
     def replace_erb_stmt_with_expr
-      action = Rewriter::ReplaceErbStmtWithExprAction.new(@current_node)
+      absolute_file_path = File.join(Configuration.root_path, @file_path)
+      erb_source = read_source(absolute_file_path)
+      action = Rewriter::ReplaceErbStmtWithExprAction.new(@current_node, erb_source)
       add_action(action)
     end
 

data/lib/synvert/core/version.rb

@@ -2,6 +2,6 @@
 
 module Synvert
   module Core
-    VERSION = '1.22.0'
+    VERSION = '1.22.2'
   end
 end

data/lib/synvert/core.rb

@@ -8,7 +8,6 @@ require 'parser_node_ext'
 require_relative './core/node_ext'
 require 'active_support'
 require 'active_support/core_ext'
-require 'erubis'
 require 'node_query'
 require 'node_mutation'
 

data/spec/synvert/core/rewriter/action/replace_erb_stmt_with_expr_action_spec.rb

@@ -4,12 +4,33 @@ require 'spec_helper'
 
 module Synvert::Core
   RSpec.describe Rewriter::ReplaceErbStmtWithExprAction do
-    context 'replace with single line' do
+    context 'replace with whitespace' do
       subject {
-        source = "<% form_for post do |f| %>\n<% end %>"
-        source = Engine::Erb.encode(source)
+        erb_source = "<% form_for post do |f| %>\n<% end %>"
+        source = Engine::Erb.encode(erb_source)
         node = Parser::CurrentRuby.parse(source).children.first
-        described_class.new(node).process
+        described_class.new(node, erb_source).process
+      }
+
+      it 'gets start' do
+        expect(subject.start).to eq '<%'.length
+      end
+
+      it 'gets end' do
+        expect(subject.end).to eq '<%'.length
+      end
+
+      it 'gets new_code' do
+        expect(subject.new_code).to eq '='
+      end
+    end
+
+    context 'replace without whitespace' do
+      subject {
+        erb_source = "<%form_for post do |f|%>\n<%end%>"
+        source = Engine::Erb.encode(erb_source)
+        node = Parser::CurrentRuby.parse(source).children.first
+        described_class.new(node, erb_source).process
       }
 
       it 'gets start' do

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

@@ -155,10 +155,10 @@ module Synvert::Core
         instance.current_node,
         "\n  Foobar",
         at: 'end',
-        to: nil,
+        to: 'caller',
         and_comma: false
       )
-      instance.insert_after 'Foobar'
+      instance.insert_after 'Foobar', to: 'caller'
     end
 
     it 'parses insert_before' do
@@ -169,18 +169,23 @@ module Synvert::Core
         instance.current_node,
         "Foobar\n  ",
         at: 'beginning',
-        to: nil,
+        to: 'caller',
         and_comma: false
       )
-      instance.insert_before 'Foobar'
+      instance.insert_before 'Foobar', to: 'caller'
     end
 
     it 'parses replace_erb_stmt_with_expr' do
       instance.instance_variable_set(:@current_mutation, double)
       instance.current_node = double
       action = double
+      erb_source = '<% form_for @post do |f| %><% end %>'
+      allow(File).to receive(:read).and_return(erb_source)
       expect(instance.instance_variable_get(:@current_mutation)).to receive(:actions).and_return([])
-      expect(Rewriter::ReplaceErbStmtWithExprAction).to receive(:new).with(instance.current_node).and_return(action)
+      expect(Rewriter::ReplaceErbStmtWithExprAction).to receive(:new).with(
+        instance.current_node,
+        erb_source
+      ).and_return(action)
       expect(action).to receive(:process)
       instance.replace_erb_stmt_with_expr
     end
@@ -356,7 +361,7 @@ module Synvert::Core
           <%= form_for @post do |f| %>
           <% end %>
         EOS
-        expect(File).to receive(:read).with('./app/views/posts/_form.html.erb', encoding: 'UTF-8').and_return(input)
+        allow(File).to receive(:read).with('./app/views/posts/_form.html.erb', encoding: 'UTF-8').and_return(input)
         expect(File).to receive(:write).with('./app/views/posts/_form.html.erb', output)
         instance.process
       end
@@ -419,7 +424,7 @@ module Synvert::Core
           <% form_for @post do |f| %>
           <% end %>
         EOS
-        expect(File).to receive(:read).with('./app/views/posts/_form.html.erb', encoding: 'UTF-8').and_return(input)
+        allow(File).to receive(:read).with('./app/views/posts/_form.html.erb', encoding: 'UTF-8').and_return(input)
         result = instance.test
         expect(result.file_path).to eq 'app/views/posts/_form.html.erb'
         expect(result.actions).to eq [NodeMutation::Struct::Action.new(2, 2, '=')]

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.0"
-  spec.add_runtime_dependency "node_mutation", ">= 1.12.1"
+  spec.add_runtime_dependency "node_mutation", ">= 1.13.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.22.0
+  version: 1.22.2
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-24 00:00:00.000000000 Z
+date: 2023-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.12.1
+        version: 1.13.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.12.1
+        version: 1.13.1
 - !ruby/object:Gem::Dependency
   name: parser
   requirement: !ruby/object:Gem::Requirement