synvert-core 1.30.2 → 1.31.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5fce0db1974beb18ed0cdfbaae3e68e11c50c3f7ba4bd0dc5904dd7b2035975b
-  data.tar.gz: 7de77483010cb937b6ae1020579d0d8c21889f9c4076a47c8d3a379e23fd76c1
+  metadata.gz: 3346883848c81ac9a130e077d0aae4eec34df1fcc365c95b9971b558b346f1a9
+  data.tar.gz: 15f5f83ef0d59c08edcf2cd076a36d0e057e94fee8d0435ca679c1a3e094dd01
 SHA512:
-  metadata.gz: 175fc9b3ffef5f498d68667aa766a62c739940e3f2f525277c2a6c196ca4a33c025ace8b4d7dbb13ef41596e873f6fa477e46b35ddaa319fb0484debac0e5730
-  data.tar.gz: 3c43b3b9d6319998e5c9dd628c68890481c57974d68937a52586762d606772099f04f702b337a0cd1192bae733cd122d7d09742318893b1fa0ce14ed25b6fe4a
+  metadata.gz: a24728c75868284ed17baa5cdc9b9ab1d0961ba560ea00f7a71eaf0fe4bf3a01f322435002a9911e934d87a51a744f77b1c21b54bb8126739d31e0a50a9a991c
+  data.tar.gz: 65505c1d4f55b82d789f119463d535a67c11c85f18cbcbb0d7311d572f23e42085b44477d7d70c14e4019511cf5db7c502ac2e7278f0481720aaf64da7031e1f

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # CHANGELOG
 
+## 1.31.0 (2024-01-14)
+
+* Support `Configuration.test_result` in `add_file` and `remove_file` dsl
+* Get new source in `Rewriter#test`
+
+## 1.30.3 (2024-01-13)
+
+* Add `Configuration.test_result` option
+
 ## 1.30.2 (2024-01-09)
 
 * Add `Configuration.strict` option

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    synvert-core (1.30.2)
+    synvert-core (1.31.0)
       activesupport (< 7.0.0)
       node_mutation (>= 1.21.6)
       node_query (>= 1.13.12)
@@ -48,7 +48,7 @@ GEM
       rb-inotify (~> 0.9, >= 0.9.10)
     lumberjack (1.2.8)
     method_source (1.0.0)
-    minitest (5.20.0)
+    minitest (5.21.1)
     nenv (0.3.0)
     node_mutation (1.22.2)
     node_query (1.14.1)
@@ -56,7 +56,7 @@ GEM
       nenv (~> 0.1)
       shellany (~> 0.0)
     parallel (1.24.0)
-    parser (3.3.0.2)
+    parser (3.3.0.3)
       ast (~> 2.4.1)
       racc
     parser_node_ext (1.2.1)

data/lib/synvert/core/configuration.rb

@@ -12,6 +12,7 @@ module Synvert::Core
       # @!attribute [w] single_quote
       # @!attribute [w] tab_width
       # @!attribute [w] strict, if strict is false, it will ignore ruby version and gem version check.
+      # @!attribute [w] test_result, default is 'actions', it can be 'actions' or 'new_source'.
       attr_writer :root_path,
                   :skip_paths,
                   :only_paths,
@@ -19,7 +20,8 @@ module Synvert::Core
                   :number_of_workers,
                   :single_quote,
                   :tab_width,
-                  :strict
+                  :strict,
+                  :test_result
 
       # Get the path.
       #
@@ -80,6 +82,15 @@ module Synvert::Core
       def strict
         @strict.nil? ? true : @strict
       end
+
+      # Returns the value of the test_result flag.
+      #
+      # If the test_result flag is not set, it returns 'actions' by default.
+      #
+      # @return [String] the value of the test_result flag
+      def test_result
+        @test_result || 'actions'
+      end
     end
   end
 end

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

@@ -88,7 +88,7 @@ module Synvert::Core
           instance_eval(&@block)
         end
 
-        result = @current_mutation.test
+        result = Configuration.test_result == 'new_source' ? @current_mutation.process : @current_mutation.test
         result.file_path = file_path
         result
       rescue Parser::SyntaxError => e

data/lib/synvert/core/rewriter.rb

@@ -149,22 +149,26 @@ module Synvert::Core
       if !@affected_files.empty? && @redo_until_no_change # redo
         test
       end
-      @test_results.map do |filename, test_results|
-        new_actions = test_results.map(&:actions).flatten.sort_by(&:end)
-        last_start = -1
-        conflicted =
-          new_actions.any? do |action|
-            if last_start > action.end
-              true
-            else
-              last_start = action.start
-              false
+      if Configuration.test_result == 'new_source'
+        @test_results.values.flatten
+      else
+        @test_results.map do |filename, test_results|
+          new_actions = test_results.map(&:actions).flatten.sort_by(&:end)
+          last_start = -1
+          conflicted =
+            new_actions.any? do |action|
+              if last_start > action.end
+                true
+              else
+                last_start = action.start
+                false
+              end
             end
-          end
-        result = NodeMutation::Result.new(affected: true, conflicted: conflicted)
-        result.actions = new_actions
-        result.file_path = filename
-        result
+          result = NodeMutation::Result.new(affected: true, conflicted: conflicted)
+          result.actions = new_actions
+          result.file_path = filename
+          result
+        end
       end
     end
 
@@ -289,7 +293,11 @@ module Synvert::Core
 
       unless @options[:write_to_file]
         result = NodeMutation::Result.new(affected: true, conflicted: false)
-        result.actions = [NodeMutation::Struct::Action.new(:add_file, 0, 0, content)]
+        if Configuration.test_result == 'new_source'
+          result.new_source = content
+        else
+          result.actions = [NodeMutation::Struct::Action.new(:add_file, 0, 0, content)]
+        end
         result.file_path = filename
         merge_test_result(result)
         return
@@ -316,7 +324,11 @@ module Synvert::Core
 
       unless @options[:write_to_file]
         result = NodeMutation::Result.new(affected: true, conflicted: false)
-        result.actions = [NodeMutation::Struct::Action.new(:remove_file, 0, -1)]
+        if Configuration.test_result == 'new_source'
+          result.new_source = nil
+        else
+          result.actions = [NodeMutation::Struct::Action.new(:remove_file, 0, -1)]
+        end
         result.file_path = filename
         merge_test_result(result)
         return

data/lib/synvert/core/version.rb

@@ -2,6 +2,6 @@
 
 module Synvert
   module Core
-    VERSION = '1.30.2'
+    VERSION = '1.31.0'
   end
 end

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

@@ -429,7 +429,7 @@ module Synvert::Core
     describe '#test' do
       let(:rewriter) { Rewriter.new('foo', 'bar') }
 
-      it 'gets actions if afected' do
+      it 'gets actions if affected' do
         instance =
           Rewriter::Instance.new rewriter, 'spec/models/post_spec.rb' do
             with_node type: 'send', receiver: 'FactoryGirl', message: 'create' do
@@ -452,6 +452,37 @@ module Synvert::Core
         ]
       end
 
+      context 'Configuration.test_result is new_source' do
+        before { Configuration.test_result = 'new_source' }
+        after { Configuration.test_result = nil }
+
+        it 'gets new_source' do
+          instance =
+            Rewriter::Instance.new rewriter, 'spec/models/post_spec.rb' do
+              with_node type: 'send', receiver: 'FactoryGirl', message: 'create' do
+                replace_with 'create {{arguments}}'
+              end
+            end
+          input = <<~EOS
+            it 'uses factory_girl' do
+              user = FactoryGirl.create :user
+              post = FactoryGirl.create :post, user: user
+              assert post.valid?
+            end
+          EOS
+          expect(File).to receive(:read).with('./spec/models/post_spec.rb', encoding: 'UTF-8').and_return(input)
+          results = instance.test
+          expect(results.file_path).to eq 'spec/models/post_spec.rb'
+          expect(results.new_source).to eq <<~EOS
+            it 'uses factory_girl' do
+              user = create :user
+              post = create :post, user: user
+              assert post.valid?
+            end
+          EOS
+        end
+      end
+
       it 'gets nothing if not affected' do
         instance =
           Rewriter::Instance.new rewriter, 'spec/spec_helper.rb' do
@@ -591,7 +622,7 @@ module Synvert::Core
 
       context 'Configuration.single_quote = false' do
         before { Configuration.single_quote = false }
-        after { Configuration.single_quote = true }
+        after { Configuration.single_quote = nil }
 
         it 'wraps with double quotes' do
           expect(instance.wrap_with_quotes('foobar')).to eq '"foobar"'

data/spec/synvert/core/rewriter_spec.rb

@@ -100,6 +100,31 @@ module Synvert::Core
           expect(results[0].actions).to eq [NodeMutation::Struct::Action.new(:replace, 6, 12, 'Synvert')]
         end
       end
+
+      context 'Configuration.test_result is new_source' do
+        before { Configuration.test_result = 'new_source' }
+        after { Configuration.test_result = nil }
+
+        it 'gets test results with new_source' do
+          rewriter =
+            Rewriter.new('group', 'name') do
+              within_files '**/*.rb' do
+                with_node node_type: 'class', name: 'Foobar' do
+                  replace :name, with: 'Synvert'
+                end
+              end
+            end
+          input = "class Foobar\nend"
+          FakeFS do
+            File.write("code.rb", input)
+            results = rewriter.test
+            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].new_source).to eq "class Synvert\nend"
+          end
+        end
+      end
     end
 
     describe 'parses within_file' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: synvert-core
 version: !ruby/object:Gem::Version
-  version: 1.30.2
+  version: 1.31.0
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-09 00:00:00.000000000 Z
+date: 2024-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport