synvert-core 1.25.0 → 1.26.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69a5a31926536922320b7184cae70096bba437729c6c4dbe6c0bb2ab98d56e43
-  data.tar.gz: afeed86dae83348eccb85859dcc907250ff1e5361d69b7a71839cb88c1fc3e79
+  metadata.gz: 76425d306537f25b4323935112165ad6bbc02714793e39d7287ee97b884f2284
+  data.tar.gz: 276cb3ec3ee5685b3233b51105ac1de4233927f3e7bcd89bac01e5d761aa5869
 SHA512:
-  metadata.gz: 50d06d1c664c06fac3e7bc163226c3e98305bd26d802919ce73003ad4e8d5e1cf441d2559b32aeada9266d48cb7d3365ef2d39fa37a934bd2e0fe2ad489693ee
-  data.tar.gz: 34915fcbb4252d66c9b25318b96e1f4bf6f4a8881f8d85229bc7f6f5cbf80ff50aed3f774cddcbab10495ef865daff0c6d40fd6608382e9e97d7a42b16ca6fc3
+  metadata.gz: d0e36b19d07fb73b93898b48833e5419e1f5e258da0c9660cf8584efdb142e6d4495a9a47105884ba558b6f2a2070c83eebfe54aee22f64d5eb4cfd3a3c712e8
+  data.tar.gz: 6058cc41e9ac61a497d1ddb0f8cb642a48797d67ace1a0e7d513fbae1cce9a7fa50d4a35162caf3e396e0630f5ac394bd63d0a75a83f0a1012a7ef9d8b4a18fc

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # CHANGELOG
 
+## 1.26.1 (2023-05-06)
+
+* Compact test results
+* Fix erb regex
+
+## 1.26.0 (2023-04-18)
+
+* `add_file` and `remove_file` work for test
+* Add `indent` dsl
+* Add `type` to Action
+* Update `node_mutation` to 1.15.3
+
 ## 1.25.0 (2023-04-17)
 
 * Update `wrap` dsl

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    synvert-core (1.25.0)
+    synvert-core (1.26.1)
       activesupport (< 7.0.0)
-      node_mutation (>= 1.15.1)
+      node_mutation (>= 1.15.3)
       node_query (>= 1.12.1)
       parallel
       parser
@@ -39,7 +39,7 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    i18n (1.12.0)
+    i18n (1.13.0)
       concurrent-ruby (~> 1.0)
     listen (3.7.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
@@ -48,13 +48,13 @@ GEM
     method_source (1.0.0)
     minitest (5.18.0)
     nenv (0.3.0)
-    node_mutation (1.15.1)
+    node_mutation (1.15.3)
     node_query (1.12.1)
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    parallel (1.22.1)
-    parser (3.2.2.0)
+    parallel (1.23.0)
+    parser (3.2.2.1)
       ast (~> 2.4.1)
     parser_node_ext (1.0.0)
       parser
@@ -82,7 +82,7 @@ GEM
     thor (1.2.1)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    zeitwerk (2.6.7)
+    zeitwerk (2.6.8)
 
 PLATFORMS
   ruby

data/README.md

@@ -88,6 +88,7 @@ Actions:
 
 * [append](https://xinminlabs.github.io/synvert-core-ruby/Synvert/Core/Rewriter/Instance.html#append-instance_method) - append the code to the bottom of current node body
 * [prepend](https://xinminlabs.github.io/synvert-core-ruby/Synvert/Core/Rewriter/Instance.html#prepend-instance_method) - prepend the code to the bottom of current node body
+* [indent](https://xinminlabs.github.io/synvert-core-ruby/Synvert/Core/Rewriter/Instance.html#indent-instance_method) - indent code
 * [insert](https://xinminlabs.github.io/synvert-core-ruby/Synvert/Core/Rewriter/Instance.html#insert-instance_method) - insert code
 * [insert_after](https://xinminlabs.github.io/synvert-core-ruby/Synvert/Core/Rewriter/Instance.html#insert_after-instance_method) - insert the code next to the current node
 * [insert_before](https://xinminlabs.github.io/synvert-core-ruby/Synvert/Core/Rewriter/Instance.html#insert_before-instance_method) - insert the code previous to the current node

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

@@ -10,8 +10,8 @@ module Synvert::Core
         # @return [String] encoded ruby code.
         def encode(source)
           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[1..-1]) }
+                .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/rewriter/action/replace_erb_stmt_with_expr_action.rb

@@ -11,6 +11,7 @@ module Synvert::Core
     def initialize(node, erb_source)
       super(node, nil)
       @erb_source = erb_source
+      @type = :insert
     end
 
     # The new erb expr code.

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

@@ -381,6 +381,20 @@ module Synvert::Core
       @current_mutation.wrap(@current_node, prefix: prefix, suffix: suffix, newline: newline)
     end
 
+    # It indent the code of current node.
+    # @example
+    #     # class Foobar
+    #     # end
+    #     # =>
+    #     #   class Foobar
+    #     #   end
+    #     within_node type: 'class' do
+    #       indent
+    #     end
+    def indent(tab_size: 1)
+      @current_mutation.indent(@current_node, tab_size: tab_size)
+    end
+
     # No operation.
     def noop
       @current_mutation.noop(@current_node)

data/lib/synvert/core/rewriter.rb

@@ -264,6 +264,14 @@ module Synvert::Core
     def add_file(filename, content)
       return unless @options[:run_instance]
 
+      unless @options[:write_to_file]
+        result = NodeMutation::Result.new(affected: true, conflicted: false)
+        result.actions = [NodeMutation::Struct::Action.new(:add_file, 0, 0, content)]
+        result.file_path = filename
+        @test_results << result
+        return
+      end
+
       filepath = File.join(Configuration.root_path, filename)
       if File.exist?(filepath)
         puts "File #{filepath} already exists."
@@ -283,6 +291,14 @@ module Synvert::Core
     def remove_file(filename)
       return unless @options[:run_instance]
 
+      unless @options[:write_to_file]
+        result = NodeMutation::Result.new(affected: true, conflicted: false)
+        result.actions = [NodeMutation::Struct::Action.new(:remove_file, 0, -1)]
+        result.file_path = filename
+        @test_results << result
+        return
+      end
+
       file_path = File.join(Configuration.root_path, filename)
       File.delete(file_path) if File.exist?(file_path)
     end
@@ -367,7 +383,7 @@ module Synvert::Core
     end
 
     def merge_test_results(results)
-      @test_results += results.select { |result| result.affected? }
+      @test_results += results.compact.select { |result| result.affected? }
     end
   end
 end

data/lib/synvert/core/version.rb

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

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

@@ -217,11 +217,11 @@ module Synvert::Core
         EOS
         proc = Engine::Haml.generate_transform_proc(encoded_source)
         actions = [
-          NodeMutation::Struct::Action.new(50, 55, ''),
+          NodeMutation::Struct::Action.new(:delete, 50, 55, ''),
           # first end position is 69
-          NodeMutation::Struct::Action.new(100, 105, ''),
+          NodeMutation::Struct::Action.new(:delete, 100, 105, ''),
           # second end position is 111
-          NodeMutation::Struct::Action.new(120, 125, '')
+          NodeMutation::Struct::Action.new(:delete, 120, 125, '')
         ]
         proc.call(actions)
         expect(actions.first.start).to eq 50

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

@@ -204,11 +204,11 @@ module Synvert::Core
         EOS
         proc = Engine::Slim.generate_transform_proc(encoded_source)
         actions = [
-          NodeMutation::Struct::Action.new(50, 55, ''),
+          NodeMutation::Struct::Action.new(:delete, 50, 55, ''),
           # first end position is 69
-          NodeMutation::Struct::Action.new(100, 105, ''),
+          NodeMutation::Struct::Action.new(:delete, 100, 105, ''),
           # second end position is 111
-          NodeMutation::Struct::Action.new(120, 125, '')
+          NodeMutation::Struct::Action.new(:delete, 120, 125, '')
         ]
         proc.call(actions)
         expect(actions.first.start).to eq 50

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

@@ -245,6 +245,16 @@ module Synvert::Core
       instance.wrap prefix: 'module Foobar', suffix: 'end', newline: true
     end
 
+    it 'parses indent' do
+      instance.instance_variable_set(:@current_mutation, double)
+      instance.current_node = double
+      expect(instance.instance_variable_get(:@current_mutation)).to receive(:indent).with(
+        instance.current_node,
+        tab_size: 1
+      )
+      instance.indent
+    end
+
     it 'parses noop' do
       instance.instance_variable_set(:@current_mutation, double)
       instance.current_node = double
@@ -430,8 +440,8 @@ module Synvert::Core
         results = instance.test
         expect(results.file_path).to eq 'spec/models/post_spec.rb'
         expect(results.actions).to eq [
-          NodeMutation::Struct::Action.new(35, 59, 'create :user'),
-          NodeMutation::Struct::Action.new(69, 105, 'create :post, user: user')
+          NodeMutation::Struct::Action.new(:replace, 35, 59, 'create :user'),
+          NodeMutation::Struct::Action.new(:replace, 69, 105, 'create :post, user: user')
         ]
       end
 
@@ -469,7 +479,7 @@ module Synvert::Core
         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, '=')]
+        expect(result.actions).to eq [NodeMutation::Struct::Action.new(:insert, 2, 2, '=')]
       end
 
       it 'updates haml file' do
@@ -491,8 +501,9 @@ module Synvert::Core
         result = instance.test
         expect(result.file_path).to eq 'app/views/posts/_form.html.haml'
         expect(result.actions).to eq [
-          NodeMutation::Struct::Action.new("= form_for ".length, "= form_for @post".length, 'post'),
+          NodeMutation::Struct::Action.new(:replace, "= form_for ".length, "= form_for @post".length, 'post'),
           NodeMutation::Struct::Action.new(
+            :replace,
             "= form_for @post do |f|\n= form_for ".length,
             "= form_for @post do |f|\n= form_for @post".length,
             'post'
@@ -519,8 +530,9 @@ module Synvert::Core
         result = instance.test
         expect(result.file_path).to eq 'app/views/posts/_form.html.slim'
         expect(result.actions).to eq [
-          NodeMutation::Struct::Action.new("= form_for ".length, "= form_for @post".length, 'post'),
+          NodeMutation::Struct::Action.new(:replace, "= form_for ".length, "= form_for @post".length, 'post'),
           NodeMutation::Struct::Action.new(
+            :replace,
             "= form_for @post do |f|\n= form_for ".length,
             "= form_for @post do |f|\n= form_for @post".length,
             'post'

data/spec/synvert/core/rewriter_spec.rb

@@ -68,7 +68,7 @@ module Synvert::Core
           expect(results[0].file_path).to eq '/code.rb'
           expect(results[0].affected?).to be_truthy
           expect(results[0].conflicted?).to be_falsey
-          expect(results[0].actions).to eq [NodeMutation::Struct::Action.new(6, 12, 'Synvert')]
+          expect(results[0].actions).to eq [NodeMutation::Struct::Action.new(:replace, 6, 12, 'Synvert')]
         end
       end
     end
@@ -169,6 +169,18 @@ module Synvert::Core
         rewriter.process_with_sandbox
         expect(File.exist?('./foo.bar')).to be_falsey
       end
+
+      it 'returns test result' do
+        rewriter =
+          Rewriter.new 'group', 'rewriter2' do
+            add_file 'foo.bar', 'FooBar'
+          end
+        result = rewriter.test
+        expect(result[0].file_path).to eq 'foo.bar'
+        expect(result[0].affected?).to be_truthy
+        expect(result[0].conflicted?).to be_falsey
+        expect(result[0].actions).to eq [NodeMutation::Struct::Action.new(:add_file, 0, 0, 'FooBar')]
+      end
     end
 
     describe 'parses remove_file' do
@@ -201,6 +213,21 @@ module Synvert::Core
         expect(File.exist?('./foo.bar')).to be_truthy
         FileUtils.rm './foo.bar'
       end
+
+      it 'returns test result' do
+        File.write './foo.bar', 'FooBar'
+        rewriter =
+          Rewriter.new 'group', 'rewriter2' do
+            remove_file 'foo.bar'
+          end
+        result = rewriter.test
+        expect(result[0].file_path).to eq 'foo.bar'
+        expect(result[0].affected?).to be_truthy
+        expect(result[0].conflicted?).to be_falsey
+        expect(result[0].actions).to eq [NodeMutation::Struct::Action.new(:remove_file, 0, -1, nil)]
+        expect(File.exist?('./foo.bar')).to be_truthy
+        FileUtils.rm './foo.bar'
+      end
     end
 
     describe 'parses add_snippet' 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.15.1"
+  spec.add_runtime_dependency "node_mutation", ">= 1.15.3"
   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.25.0
+  version: 1.26.1
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-17 00:00:00.000000000 Z
+date: 2023-05-06 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.1
+        version: 1.15.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.15.1
+        version: 1.15.3
 - !ruby/object:Gem::Dependency
   name: parser
   requirement: !ruby/object:Gem::Requirement