synvert-core 0.27.1 → 0.28.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb60c127f3d144f90a63f896297a53d0dd8470c8af33df21db0b6c8e0b3e98ac
-  data.tar.gz: 4f94a007e769fda2d174c89a7882b56b7708501ff829b2090c3f94833af939ab
+  metadata.gz: b240936c7390b45a27e9352da7acec3784499d38d5ec10aae3b3403036df36b5
+  data.tar.gz: a9c9a91d25352ef1c5fc09bd1cc0d8751d4239513a2fcff0e2618ccec6e93855
 SHA512:
-  metadata.gz: 51f4397c0f9d50f0ab447d5958ada0b89dc6b163a5356d7131be7f1500d880147f2c033a2ec8b8b227d4bb654b23de1b2b3e7e74c44bcd2fc4444da60dc0fed1
-  data.tar.gz: 323790b368a9241314aef449420950a83dc8051520fb4509f4614679f425bd2048e80eba3c3317f96a1c22eb7d80f359dda1731c53ceed54b227e4a8bb6b50fd
+  metadata.gz: 92298a2a06c408cac4aa99870f85138bc754dcb286b636976a01eb88f63613e6f81b80a1d0fc680922a394ab6b7167b9bdd70d6bf2b14a89a7f1a6faaf5292d0
+  data.tar.gz: f5c10e0e949dd459035e92fb172ed20ad7717369923a93e77dfb8077c7ba7c45c31da3ef1756768215ccdeff8b6b36fef063fe0b6db9fa53b3b9457bd895c8ae

data/CHANGELOG.md

@@ -1,7 +1,13 @@
 # CHANGELOG
 
-## 0.27.1 (2021-03-31)
+## 0.28.1 (2021-04-09)
 
+* Make `child_name_range` support [:block, :pipe]
+
+## 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)

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,35 @@ 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 [:block, :pipe]
+        Parser::Source::Range.new('(string)', arguments.loc.expression.begin_pos, arguments.loc.expression.end_pos)
+      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 node.
+    # @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

data/lib/synvert/core/version.rb

@@ -2,6 +2,6 @@
 
 module Synvert
   module Core
-    VERSION = '0.27.1'
+    VERSION = '0.28.1'
   end
 end

data/spec/synvert/core/node_ext_spec.rb

@@ -395,6 +395,84 @@ 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
+
+      it 'checks pipe' do
+        node = parse('Factory.define :user do |user|; end')
+        range = node.child_node_range(:pipe)
+        expect(range.to_range).to eq(24...30)
+      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 +499,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 +522,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

metadata

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