synvert-core 0.27.0 → 0.28.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49f00515f034212fb244c270b4d9815e51e5a4d2eb1e91c1cd8c3ddc402fca28
-  data.tar.gz: 8de939c1e2834259e1aa8af2b17e540221a5e7d0d3f936ad526081db408e994f
+  metadata.gz: f8c211d681b7aa05969c2a167eff0f78c27803f354eff7550571b0a5b6ed735a
+  data.tar.gz: e66a98377c36ec9931a5e6afb7eb27adb9c52b97e877d442a807c24629729f8f
 SHA512:
-  metadata.gz: 12236d2c862b82798e3865755394362e50773ff27505b1ddf08e7308dd51ca0a791b604e8e3cafd768e8d3b957c76bb18ff5d5bd8daded14eef0e2a788c51c36
-  data.tar.gz: 42b67fd980a096a5d8bffe78ba023c47b18bca34ac3957a631da16bd722b979e8cb9523eaf97e8ca42b870091e4ec81922b866ff8359325f0144766cb9ceb3db
+  metadata.gz: a4d24957bb9719dc7ad41ff7a194c199d96a43ffcb539d86000fdcab36754f83ad5da47ecd54d76cbb6e3755c3816c0b59a2b3debcb87896fdb10079535782d1
+  data.tar.gz: f489d2cfbaea89bed0349283ced59fd69b9f993336069ec8a711b43fb7c3f82ae4c698c5e9e15eed473dfd0dd3fa34c433ee5af2e9719e5b17a09d84ef808838

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## 0.28.0 (2021-04-07)
+
+* Make `child_name_range` support all dsl nodes
+* Make `replace` action support multi child names
+* Fix `delete` action arguments
+
 ## 0.27.0 (2021-03-31)
 
 * Support `:class` in `child_node_range`

data/lib/synvert/core/node_ext.rb

@@ -101,9 +101,9 @@ module Parser::AST
     def arguments
       case type
       when :def, :block
-        ArgumentsNode.new children[1]
+        ArgumentsNode.new(children[1])
       when :defs
-        ArgumentsNode.new children[2]
+        ArgumentsNode.new(children[2])
       when :send
         children[2..-1]
       when :defined?
@@ -322,26 +322,33 @@ module Parser::AST
     # @param [String] name of child node.
     # @return [Parser::Source::Range] source range of child node.
     def child_node_range(child_name)
-      case type
-      when :class
-        case child_name
-        when :name
-          loc.name
-        when :parent_class
-          parent_class&.loc&.expression
-        end
-      when :send
-        case child_name
-        when :receiver
-          receiver&.loc&.expression
-        when :dot
-          loc.dot
-        when :message
-          loc.selector
-        when :arguments
-          Parser::Source::Range.new('(string)', arguments.first.loc.expression.begin_pos, arguments.last.loc.expression.end_pos) unless arguments.empty?
-        end
+      case [type, child_name]
+      when [:class, :name]
+        loc.name
+      when [:def, :name]
+        loc.name
+      when [:defs, :name]
+        loc.name
+      when [:defs, :dot]
+        loc.operator
+      when [:defs, :self]
+        Parser::Source::Range.new('(string)', loc.operator.begin_pos - 4, loc.operator.begin_pos)
+      when [:send, :dot]
+        loc.dot
+      when [:send, :message]
+        loc.operator ? Parser::Source::Range.new('(string)', loc.selector.begin_pos, loc.operator.end_pos) : loc.selector
       else
+        if respond_to?(child_name)
+          child_node = send(child_name)
+          return nil if child_node.nil?
+          if child_node.is_a?(Parser::AST::Node)
+            return Parser::Source::Range.new('(string)', child_node.loc.expression.begin_pos, child_node.loc.expression.end_pos)
+          end
+          # arguments
+          return nil if child_node.empty?
+          return Parser::Source::Range.new('(string)', child_node.first.loc.expression.begin_pos, child_node.last.loc.expression.end_pos)
+        end
+
         raise Synvert::Core::MethodNotSupported, "child_node_range is not handled for #{evaluated.inspect}, child_name: #{child_name}"
       end
     end

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

@@ -3,9 +3,9 @@
 module Synvert::Core
   # ReplaceAction to replace child node with code.
   class Rewriter::ReplaceAction < Rewriter::Action
-    def initialize(instance, selector, with:)
+    def initialize(instance, *selectors, with:)
       @instance = instance
-      @selector = selector
+      @selectors = selectors
       @code = with
       @node = @instance.current_node
     end
@@ -14,14 +14,14 @@ module Synvert::Core
     #
     # @return [Integer] begin position.
     def begin_pos
-      @node.child_node_range(@selector).begin_pos
+      @selectors.map { |selector| @node.child_node_range(selector).begin_pos }.min
     end
 
     # End position of code to replace.
     #
     # @return [Integer] end position.
     def end_pos
-      @node.child_node_range(@selector).end_pos
+      @selectors.map { |selector| @node.child_node_range(selector).end_pos }.max
     end
 
     # The rewritten source code.

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

@@ -252,12 +252,12 @@ module Synvert::Core
     end
 
     # Parse replace with dsl, it creates a [Synvert::Core::Rewriter::ReplaceAction] to
-    # replace child node with code.
+    # replace child nodes with code.
     #
-    # @param selector [Symbol] selector name of child name.
+    # @param selectors [Array<Symbol>] selector names of child node.
     # @param with [String] code need to be replaced with.
-    def replace(selector, with:)
-      @actions << Rewriter::ReplaceAction.new(self, selector, with: with)
+    def replace(*selectors, with:)
+      @actions << Rewriter::ReplaceAction.new(self, *selectors, with: with)
     end
 
     # Parse replace_erb_stmt_with_expr dsl, it creates a [Synvert::Core::Rewriter::ReplaceErbStmtWithExprAction] to
@@ -272,7 +272,9 @@ module Synvert::Core
     end
 
     # Parse delete dsl, it creates a [Synvert::Core::Rewriter::DeleteAction] to delete child nodes.
-    def delete
+    #
+    # @param selectors [Array<Symbol>] selector names of child node.
+    def delete(*selectors)
       @actions << Rewriter::DeleteAction.new(self, *selectors)
     end
 

data/lib/synvert/core/version.rb

@@ -2,6 +2,6 @@
 
 module Synvert
   module Core
-    VERSION = '0.27.0'
+    VERSION = '0.28.0'
   end
 end

data/spec/synvert/core/node_ext_spec.rb

@@ -395,6 +395,78 @@ describe Parser::AST::Node do
   end
 
   describe '#child_node_range' do
+    context 'block node' do
+      it 'checks caller' do
+        node = parse('Factory.define :user do |user|; end')
+        range = node.child_node_range(:caller)
+        expect(range.to_range).to eq(0...20)
+      end
+
+      it 'checks arguments' do
+        node = parse('Factory.define :user do |user|; end')
+        range = node.child_node_range(:arguments)
+        expect(range.to_range).to eq(25...29)
+      end
+    end
+
+    context 'class node' do
+      it 'checks name' do
+        node = parse('class Post < ActiveRecord::Base; end')
+        range = node.child_node_range(:name)
+        expect(range.to_range).to eq(6...10)
+      end
+
+      it 'checks parent_class' do
+        node = parse('class Post < ActiveRecord::Base; end')
+        range = node.child_node_range(:parent_class)
+        expect(range.to_range).to eq(13...31)
+
+        node = parse('class Post; end')
+        range = node.child_node_range(:parent_class)
+        expect(range).to be_nil
+      end
+    end
+
+    context 'def node' do
+      it 'checks name' do
+        node = parse('def foo(bar); end')
+        range = node.child_node_range(:name)
+        expect(range.to_range).to eq(4...7)
+      end
+
+      it 'checks arguments' do
+        node = parse('def foo(bar); end')
+        range = node.child_node_range(:arguments)
+        expect(range.to_range).to eq(8...11)
+      end
+    end
+
+    context 'defs node' do
+      it 'checks self' do
+        node = parse('def self.foo(bar); end')
+        range = node.child_node_range(:self)
+        expect(range.to_range).to eq(4...8)
+      end
+
+      it 'checks dot' do
+        node = parse('def self.foo(bar); end')
+        range = node.child_node_range(:dot)
+        expect(range.to_range).to eq(8...9)
+      end
+
+      it 'checks name' do
+        node = parse('def self.foo(bar); end')
+        range = node.child_node_range(:name)
+        expect(range.to_range).to eq(9...12)
+      end
+
+      it 'checks arguments' do
+        node = parse('def self.foo(bar); end')
+        range = node.child_node_range(:arguments)
+        expect(range.to_range).to eq(13...16)
+      end
+    end
+
     context 'send node' do
       it 'checks receiver' do
         node = parse('foo.bar(test)')
@@ -421,6 +493,10 @@ describe Parser::AST::Node do
         range = node.child_node_range(:message)
         expect(range.to_range).to eq(4...7)
 
+        node = parse('foo.bar = test')
+        range = node.child_node_range(:message)
+        expect(range.to_range).to eq(4...9)
+
         node = parse('foobar(test)')
         range = node.child_node_range(:message)
         expect(range.to_range).to eq(0...6)
@@ -440,24 +516,6 @@ describe Parser::AST::Node do
         expect(range).to be_nil
       end
     end
-
-    context 'class node' do
-      it 'checks name' do
-        node = parse('class Post < ActiveRecord::Base; end')
-        range = node.child_node_range(:name)
-        expect(range.to_range).to eq(6...10)
-      end
-
-      it 'checks parent_class' do
-        node = parse('class Post < ActiveRecord::Base; end')
-        range = node.child_node_range(:parent_class)
-        expect(range.to_range).to eq(13...31)
-
-        node = parse('class Post; end')
-        range = node.child_node_range(:parent_class)
-        expect(range).to be_nil
-      end
-    end
   end
 
   describe '#rewritten_source' do

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

@@ -6,22 +6,22 @@ module Synvert::Core
   describe Rewriter::ReplaceAction do
     context 'replace with single line' do
       subject {
-        source = "'slug from title'.gsub(' ', '_')"
+        source = "FactoryBot.create(:user)"
         node = Parser::CurrentRuby.parse(source)
         instance = double(current_node: node)
-        Rewriter::ReplaceAction.new(instance, :message, with: 'tr')
+        Rewriter::ReplaceAction.new(instance, :receiver, :dot, :message, with: 'create')
       }
 
       it 'gets begin_pos' do
-        expect(subject.begin_pos).to eq "'slug from title'.".length
+        expect(subject.begin_pos).to eq 0
       end
 
       it 'gets end_pos' do
-        expect(subject.end_pos).to eq "'slug from title'.gsub".length
+        expect(subject.end_pos).to eq "FactoryBot.create".length
       end
 
       it 'gets rewritten_code' do
-        expect(subject.rewritten_code).to eq 'tr'
+        expect(subject.rewritten_code).to eq 'create'
       end
     end
   end

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

@@ -127,6 +127,11 @@ module Synvert::Core
       instance.remove
     end
 
+    it 'parses remove' do
+      expect(Rewriter::DeleteAction).to receive(:new).with(instance, :dot, :message)
+      instance.delete :dot, :message
+    end
+
     it 'parses warn' do
       expect(Rewriter::Warning).to receive(:new).with(instance, 'foobar')
       instance.warn 'foobar'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: synvert-core
 version: !ruby/object:Gem::Version
-  version: 0.27.0
+  version: 0.28.0
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-31 00:00:00.000000000 Z
+date: 2021-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport