synvert-core 0.27.4 → 0.28.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a239badccf8d5b2774e75423755123fe55393f951cb3064030800ce351e014bf
-  data.tar.gz: df9c575e61f833873bafaa672b95977390ce5eef62ace7898f209f684fef595d
+  metadata.gz: f8c211d681b7aa05969c2a167eff0f78c27803f354eff7550571b0a5b6ed735a
+  data.tar.gz: e66a98377c36ec9931a5e6afb7eb27adb9c52b97e877d442a807c24629729f8f
 SHA512:
-  metadata.gz: fc153d13c26d917155db767031b5371df250014e1c86cfbf58e89693775e5488a02276e272a62e6c41489a744056846ff2237f74433c283dbfc5b9664c989372
-  data.tar.gz: 4c6e8df70fc14379a871b1b187ef9ce4b3b32ec964aedf096d6db1f69ae911e005933576b1adbc01478a61b1c694a1d7002bd1d4f0647f1e421bcbe894f191f5
+  metadata.gz: a4d24957bb9719dc7ad41ff7a194c199d96a43ffcb539d86000fdcab36754f83ad5da47ecd54d76cbb6e3755c3816c0b59a2b3debcb87896fdb10079535782d1
+  data.tar.gz: f489d2cfbaea89bed0349283ced59fd69b9f993336069ec8a711b43fb7c3f82ae4c698c5e9e15eed473dfd0dd3fa34c433ee5af2e9719e5b17a09d84ef808838

data/CHANGELOG.md

@@ -1,20 +1,9 @@
 # CHANGELOG
 
-## 0.27.4 (2021-04-01)
-
-* Support `:block` in `child_node_range`
-
-## 0.27.3 (2021-03-31)
-
-* Support `:def` in `child_node_range`
-* Support `:defs` in `child_node_range`
-
-## 0.27.2 (2021-03-31)
-
-* Fix selector with operator in `child_node_range`
-
-## 0.27.1 (2021-03-31)
+## 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,51 +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 :block
-        case child_name
-        when :caller
-          caller&.loc&.expression
-        when :arguments
-          arguments&.loc&.expression
-        end
-      when :class
-        case child_name
-        when :name
-          loc.name
-        when :parent_class
-          parent_class&.loc&.expression
-        end
-      when :def
-        case child_name
-        when :name
-          loc.name
-        when :arguments
-          Parser::Source::Range.new('(string)', arguments.first.loc.expression.begin_pos, arguments.last.loc.expression.end_pos) unless arguments.empty?
-        end
-      when :defs
-        case child_name
-        when :dot
-          loc.operator
-        when :self
-          Parser::Source::Range.new('(string)', loc.operator.begin_pos - 4, loc.operator.begin_pos)
-        when :name
-          loc.name
-        when :arguments
-          Parser::Source::Range.new('(string)', arguments.first.loc.expression.begin_pos, arguments.last.loc.expression.end_pos) unless arguments.empty?
-        end
-      when :send
-        case child_name
-        when :receiver
-          receiver&.loc&.expression
-        when :dot
-          loc.dot
-        when :message
-          loc.operator ? Parser::Source::Range.new('(string)', loc.selector.begin_pos, loc.operator.end_pos) : 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 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.4'
+    VERSION = '0.28.0'
   end
 end

data/spec/synvert/core/node_ext_spec.rb

@@ -405,7 +405,7 @@ describe Parser::AST::Node do
       it 'checks arguments' do
         node = parse('Factory.define :user do |user|; end')
         range = node.child_node_range(:arguments)
-        expect(range.to_range).to eq(24...30)
+        expect(range.to_range).to eq(25...29)
       end
     end
 

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.4
+  version: 0.28.0
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-01 00:00:00.000000000 Z
+date: 2021-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport