synvert-core 0.54.0 → 0.54.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c7ee99e848625ed3bad729d3e08186370d5fb58d4412fb1d09d89bf15559a22
-  data.tar.gz: 30f16d4aa02a2a6f6677a5657b24296127869e17c5237a4b63f2d6d1ed658203
+  metadata.gz: dce993d0b27272e83abe3bd3a1ff2a9917a2c9953bb30e57671216aed001292c
+  data.tar.gz: 0b65093ca670d59065707e122a9964f163fbca2e4201fd75005295b7841e4db1
 SHA512:
-  metadata.gz: 936f304f6b829be86eb1da55aa110a7b3ed7c249cb9da4a1bc5246a1d687fb8dd7548fe68a2632c4df874c921f829e05ec5cab838373b587db5a3e59b900a0ab
-  data.tar.gz: 15f39e1386ee166762dd3afca86b8d246e3cc8ea0cbdcb5efd15eb9141f911ffcaabaf15a6062f9a6fe31dc720e7242fe4a81633bc12ffa06c18efe431d4d410
+  metadata.gz: 4bb49555a37b7778e37216f267b0e2ab938030ac5428f7bbef60d8462fb83597693bad9a5cd12c43c52a80330de48662151abbcc8edebb7572538f1520539bac
+  data.tar.gz: eaf5690913c21c3b043f5119f2b8b4afe08c16c5a9db8d9d209a42f0a64a72d4f19376da6dee6ed43b04b79d8077f4463a47acb5d18742a6dcb1499b3191db7a

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 0.54.1 (2021-09-08)
+
+* Rewrite `remove` action
+
 ## 0.54.0 (2021-08-28)
 
 * Change `goto_scope` param from array to string

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Synvert::Core
-  # DeleteAction to delete code.
+  # DeleteAction to delete child nodes.
   class Rewriter::DeleteAction < Rewriter::Action
     def initialize(instance, *selectors)
       super(instance, nil)

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

@@ -1,29 +1,55 @@
 # frozen_string_literal: true
 
 module Synvert::Core
-  # RemoveAction to remove code.
+  # RemoveAction to remove current node.
   class Rewriter::RemoveAction < Rewriter::Action
-    def initialize(instance, code = nil)
-      super
+    def initialize(instance)
+      super(instance, nil)
     end
 
     # Begin position of code to replace.
     #
     # @return [Integer] begin position.
     def begin_pos
-      @node.loc.expression.begin_pos
+      if take_whole_line?
+        start_index
+      else
+        @node.loc.expression.begin_pos
+      end
     end
 
     # End position of code to replace.
     #
     # @return [Integer] end position.
     def end_pos
-      @node.loc.expression.end_pos
+      if take_whole_line?
+        end_index
+      else
+        @node.loc.expression.end_pos
+      end
     end
 
     # The rewritten code, always empty string.
     def rewritten_code
       ''
     end
+
+    private
+
+    def take_whole_line?
+      @node.to_source == file_source[start_index...end_index].strip
+    end
+
+    def start_index
+      file_source[0..@node.loc.expression.begin_pos].rindex("\n") + "\n".length
+    end
+
+    def end_index
+      file_source[@node.loc.expression.end_pos..-1].index("\n") + @node.loc.expression.end_pos + "\n".length
+    end
+
+    def file_source
+      @file_source ||= @instance.file_source
+    end
   end
 end

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

@@ -64,6 +64,11 @@ module Synvert::Core
     #   @return current filename
     attr_accessor :current_node, :current_file
 
+    # Current file source
+    def file_source
+      self.class.file_source(current_file)
+    end
+
     # Initialize an instance.
     #
     # @param rewriter [Synvert::Core::Rewriter]
@@ -107,7 +112,6 @@ module Synvert::Core
             conflict_actions = get_conflict_actions
             @actions.reverse_each do |action|
               source[action.begin_pos...action.end_pos] = action.rewritten_code
-              source = remove_code_or_whole_line(source, action.line)
             end
             @actions = []
 
@@ -323,25 +327,6 @@ module Synvert::Core
       conflict_actions
     end
 
-    # It checks if code is removed and that line is empty.
-    #
-    # @param source [String] source code of file
-    # @param line [String] the line number
-    def remove_code_or_whole_line(source, line)
-      newline_at_end_of_line = source[-1] == "\n"
-      source_arr = source.split("\n")
-      if source_arr[line - 1] && source_arr[line - 1].strip.empty?
-        source_arr.delete_at(line - 1)
-        if source_arr[line - 2] && source_arr[line - 2].strip.empty? && source_arr[line - 1] &&
-             source_arr[line - 1].strip.empty?
-          source_arr.delete_at(line - 1)
-        end
-        source_arr.join("\n") + (newline_at_end_of_line ? "\n" : '')
-      else
-        source
-      end
-    end
-
     # It updates a file with new source code.
     #
     # @param file_path [String] the file path

data/lib/synvert/core/rewriter.rb

@@ -81,7 +81,7 @@ module Synvert::Core
       def fetch(group, name)
         group = group.to_s
         name = name.to_s
-        if exist? group, name
+        if rewriters[group] && rewriters[group][name]
           rewriters[group][name]
         else
           raise RewriterNotFound, "Rewriter #{group} #{name} not found"
@@ -96,34 +96,13 @@ module Synvert::Core
       # @return [Synvert::Core::Rewriter] the registered rewriter.
       # @raise [Synvert::Core::RewriterNotFound] if the registered rewriter is not found.
       def call(group, name, sandbox = false)
-        group = group.to_s
-        name = name.to_s
-        if exist? group, name
-          rewriter = rewriters[group][name]
-          if sandbox
-            rewriter.process_with_sandbox
-          else
-            rewriter.process
-          end
-          rewriter
-        else
-          raise RewriterNotFound, "Rewriter #{group}/#{name} not found"
-        end
-      end
-
-      # Check if one rewriter exist.
-      #
-      # @param group [String] the rewriter group.
-      # @param name [String] the rewriter name.
-      # @return [Boolean] true if the rewriter exist.
-      def exist?(group, name)
-        group = group.to_s
-        name = name.to_s
-        if rewriters[group] && rewriters[group][name]
-          true
+        rewriter = fetch(group, name)
+        if sandbox
+          rewriter.process_with_sandbox
         else
-          false
+          rewriter.process
         end
+        rewriter
       end
 
       # Get all available rewriters

data/lib/synvert/core/version.rb

@@ -2,6 +2,6 @@
 
 module Synvert
   module Core
-    VERSION = '0.54.0'
+    VERSION = '0.54.1'
   end
 end

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

@@ -7,7 +7,7 @@ module Synvert::Core
     subject {
       source = "user = User.new params[:user]\nuser.save\nrender\n"
       send_node = Parser::CurrentRuby.parse(source).children[1]
-      instance = double(current_node: send_node)
+      instance = double(current_node: send_node, file_source: source)
       Rewriter::RemoveAction.new(instance)
     }
 
@@ -16,7 +16,7 @@ module Synvert::Core
     end
 
     it 'gets end_pos' do
-      expect(subject.end_pos).to eq "user = User.new params[:user]\nuser.save".length
+      expect(subject.end_pos).to eq "user = User.new params[:user]\nuser.save\n".length
     end
 
     it 'gets rewritten_code' do

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

@@ -54,9 +54,9 @@ module Synvert::Core
     it 'parses goto_node' do
       scope = double
       block = proc {}
-      expect(Rewriter::GotoScope).to receive(:new).with(instance, :caller, :receiver, &block).and_return(scope)
+      expect(Rewriter::GotoScope).to receive(:new).with(instance, 'caller.receiver', &block).and_return(scope)
       expect(scope).to receive(:process)
-      instance.goto_node(:caller, :receiver, &block)
+      instance.goto_node('caller.receiver', &block)
     end
 
     it 'parses if_exist_node' do

data/spec/synvert/core/rewriter_spec.rb

@@ -249,17 +249,6 @@ module Synvert::Core
         expect { Rewriter.call 'group', 'rewriter' }.to raise_error(RewriterNotFound)
       end
 
-      context 'exist?' do
-        it 'returns true if rewriter exists' do
-          Rewriter.new 'group', 'rewriter'
-          expect(Rewriter.exist?('group', 'rewriter')).to be_truthy
-        end
-
-        it 'returns false if rewriter does not exist' do
-          expect(Rewriter.exist?('group', 'rewriter')).to be_falsey
-        end
-      end
-
       context 'available' do
         it 'lists empty rewriters' do
           expect(Rewriter.availables).to eq({})

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: synvert-core
 version: !ruby/object:Gem::Version
-  version: 0.54.0
+  version: 0.54.1
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-28 00:00:00.000000000 Z
+date: 2021-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport