synvert-core 0.56.1 → 0.58.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e60611e972f774c97a102f5db6bc171b024cb48aa4dcc94dd07e9de6d25506a2
-  data.tar.gz: 2a7f4da54b1ed5caeb7fea49dd07ca1cc9fad1aceef082d223e420b928825bb9
+  metadata.gz: b5580dae81209573a74a22792f5f50f329805eb67d74c67d28beb9438115a6ba
+  data.tar.gz: 3e97957ff1b4af95a5506ff240c0e500ccf69242d4c03a5db16c84ae03917520
 SHA512:
-  metadata.gz: f2fa37ef33a1ec38afbf094715b239c46e35e92aa386f5fae635be4419da964a8543f07df36c4321408b9a5d80a9a252d68674ccb9040865191d0299d9775667
-  data.tar.gz: a31385980557ef6c6031365f1554c5e957e6933b3aaaa65d902011dc3920599c8d24ae80bde55227f36643ebcc6808ee55ff2f028ca4c92cab94eeb04e606413
+  metadata.gz: 6829aded4d70daf81fa7cab074c7029ee945997434d357cc251cd993ba89ec56bb1b74b4d98964a150cad0d8f3fbb0f9781f31c5eab760b3c5ba392dffac17f1
+  data.tar.gz: 57d35f30118d60e234595d66b65580f29b205e7f09115ce3b44c1085d6845ff02c831855e2cd7267983b9e7a87a1480080f28a4cb533a0520b944e445bccd15b

data/CHANGELOG.md

@@ -1,9 +1,22 @@
 # CHANGELOG
 
-## 0.56.1 (2021-09-19)
+## 0.58.2 (2021-10-23)
+
+* Do not break the whole `recursive_children`
+
+## 0.58.0 (2021-10-23)
+
+* Support `left_value` and `right_value` for `and` and `or` node
+* Rewrite `within_node` and `within_direct_node`, `WithinScope` accepts `recursive` and `direct` options
+
+## 0.57.0 (2021-10-02)
 
 * Compare ruby version in `.ruby-version` or `.rvmrc`
+* Support `left_value` and `right_value` for `casgn` node
+* Refactor - `calculate_position` to set `begin_pos` and `end_pos`
 * Abstract `squeeze_spaces` and `squeeze_lines`
+* Remove unused comma after delete/remove action
+* Handle array child node in `childNodeRange`
 
 ## 0.56.0 (2021-09-14)
 

data/lib/synvert/core/node_ext.rb

@@ -215,7 +215,7 @@ module Parser::AST
     # @return [Parser::AST::Node] variable nodes.
     # @raise [Synvert::Core::MethodNotSupported] if calls on other node.
     def left_value
-      if %i[masgn lvasgn ivasgn].include? type
+      if %i[masgn lvasgn ivasgn cvasgn and or].include? type
         children[0]
       elsif :or_asgn == type
         children[0].children[0]
@@ -229,7 +229,7 @@ module Parser::AST
     # @return [Array<Parser::AST::Node>] variable nodes.
     # @raise [Synvert::Core::MethodNotSupported] if calls on other node.
     def right_value
-      if %i[masgn lvasgn ivasgn or_asgn].include? type
+      if %i[masgn lvasgn ivasgn cvasgn or_asgn and or].include? type
         children[1]
       else
         raise Synvert::Core::MethodNotSupported, "right_value is not handled for #{debug_info}"
@@ -373,7 +373,28 @@ module Parser::AST
         if respond_to?(direct_child_name)
           child_node = send(direct_child_name)
 
-          return child_node.child_node_range(nested_child_name) if nested_child_name
+          if nested_child_name
+            if child_node.is_a?(Array)
+              child_direct_child_name, *child_nested_child_name = nested_child_name
+              child_direct_child_node = child_direct_child_name =~ /\A\d+\z/ ? child_node[child_direct_child_name] : child_node.send(child_direct_child_name)
+              if child_nested_child_name.length > 0
+                return child_direct_child_node.child_node_range(child_nested_child_name.join('.'))
+              elsif child_direct_child_node
+                return (
+                  Parser::Source::Range.new(
+                    '(string)',
+                    child_direct_child_node.loc.expression.begin_pos,
+                    child_direct_child_node.loc.expression.end_pos
+                  )
+                )
+              else
+                raise Synvert::Core::MethodNotSupported,
+                      "child_node_range is not handled for #{debug_info}, child_name: #{child_name}"
+              end
+            end
+
+            return child_node.child_node_range(nested_child_name)
+          end
 
           return nil if child_node.nil?
 
@@ -411,8 +432,8 @@ module Parser::AST
     def recursive_children(&block)
       children.each do |child|
         if child.is_a?(Parser::AST::Node)
-          yield child
-          child.recursive_children(&block)
+          stop = yield child
+          child.recursive_children(&block) unless stop == :stop
         end
       end
     end

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

@@ -5,22 +5,9 @@ module Synvert::Core
   class Rewriter::AppendAction < Rewriter::Action
     END_LENGTH = "\nend".length
 
-    # Begin position to append code.
-    #
-    # @return [Integer] begin position.
-    def begin_pos
-      if :begin == @node.type
-        @node.loc.expression.end_pos
-      else
-        @node.loc.expression.end_pos - @node.column - END_LENGTH
-      end
-    end
-
-    # End position, always same to begin position.
-    #
-    # @return [Integer] end position.
-    def end_pos
-      begin_pos
+    def calculate_position
+      @begin_pos = :begin == @node.type ? @node.loc.expression.end_pos : @node.loc.expression.end_pos - @node.column - END_LENGTH
+      @end_pos = @begin_pos
     end
 
     private

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

@@ -8,19 +8,11 @@ module Synvert::Core
       @selectors = selectors
     end
 
-    # Begin position of code to delete.
-    #
-    # @return [Integer] begin position.
-    def begin_pos
-      pos = @selectors.map { |selector| @node.child_node_range(selector) }.compact.map(&:begin_pos).min
-      squeeze_spaces(pos, end_pos)
-    end
-
-    # End position of code to delete.
-    #
-    # @return [Integer] end position.
-    def end_pos
-      @selectors.map { |selector| @node.child_node_range(selector) }.compact.map(&:end_pos).max
+    def calculate_position
+      @begin_pos = @selectors.map { |selector| @node.child_node_range(selector) }.compact.map(&:begin_pos).min
+      @end_pos = @selectors.map { |selector| @node.child_node_range(selector) }.compact.map(&:end_pos).max
+      squeeze_spaces
+      remove_comma
     end
 
     # The rewritten code, always empty string.

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

@@ -8,22 +8,9 @@ module Synvert::Core
       @at = at
     end
 
-    # Begin position to insert code.
-    #
-    # @return [Integer] begin position.
-    def begin_pos
-      if @at == 'end'
-        @node.loc.expression.end_pos
-      else
-        @node.loc.expression.begin_pos
-      end
-    end
-
-    # End position, always same to begin position.
-    #
-    # @return [Integer] end position.
-    def end_pos
-      begin_pos
+    def calculate_position
+      @begin_pos = @at == 'end' ? @node.loc.expression.end_pos : @node.loc.expression.begin_pos
+      @end_pos = @begin_pos
     end
 
     # The rewritten source code.

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

@@ -3,18 +3,9 @@
 module Synvert::Core
   # InsertAfterAction to insert code next to the node.
   class Rewriter::InsertAfterAction < Rewriter::Action
-    # Begin position to insert code.
-    #
-    # @return [Integer] begin position.
-    def begin_pos
-      @node.loc.expression.end_pos
-    end
-
-    # End position, always same to begin position.
-    #
-    # @return [Integer] end position.
-    def end_pos
-      begin_pos
+    def calculate_position
+      @begin_pos = @node.loc.expression.end_pos
+      @end_pos = @begin_pos
     end
 
     private

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

@@ -5,29 +5,21 @@ module Synvert::Core
   class Rewriter::PrependAction < Rewriter::Action
     DO_LENGTH = ' do'.length
 
-    # Begin position to prepend code.
-    #
-    # @return [Integer] begin position.
-    def begin_pos
-      case @node.type
-      when :block
-        if @node.children[1].children.empty?
-          @node.children[0].loc.expression.end_pos + DO_LENGTH
+    def calculate_position
+      @begin_pos =
+        case @node.type
+        when :block
+          if @node.children[1].children.empty?
+            @node.children[0].loc.expression.end_pos + DO_LENGTH
+          else
+            @node.children[1].loc.expression.end_pos
+          end
+        when :class
+          @node.children[1] ? @node.children[1].loc.expression.end_pos : @node.children[0].loc.expression.end_pos
         else
-          @node.children[1].loc.expression.end_pos
+          @node.children.last.loc.expression.end_pos
         end
-      when :class
-        @node.children[1] ? @node.children[1].loc.expression.end_pos : @node.children[0].loc.expression.end_pos
-      else
-        @node.children.last.loc.expression.end_pos
-      end
-    end
-
-    # End position, always same to begin position.
-    #
-    # @return [Integer] end position.
-    def end_pos
-      begin_pos
+      @end_pos = @begin_pos
     end
 
     private

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

@@ -10,23 +10,16 @@ module Synvert::Core
     # Begin position of code to replace.
     #
     # @return [Integer] begin position.
-    def begin_pos
+    def calculate_position
       if take_whole_line?
-        start_index
+        @begin_pos = start_index
+        @end_pos = end_index
+        squeeze_lines
       else
-        pos = @node.loc.expression.begin_pos
-        squeeze_spaces(pos, end_pos)
-      end
-    end
-
-    # End position of code to replace.
-    #
-    # @return [Integer] end position.
-    def end_pos
-      if take_whole_line?
-        end_index
-      else
-        @node.loc.expression.end_pos
+        @begin_pos = @node.loc.expression.begin_pos
+        @end_pos = @node.loc.expression.end_pos
+        squeeze_spaces
+        remove_comma
       end
     end
 
@@ -48,8 +41,7 @@ module Synvert::Core
 
     def end_index
       index = file_source[@node.loc.expression.end_pos..-1].index("\n")
-      pos = index ? @node.loc.expression.end_pos + index + "\n".length : @node.loc.expression.end_pos
-      squeeze_lines(pos, @node.loc.expression.first_line, @node.loc.expression.last_line)
+      index ? @node.loc.expression.end_pos + index + "\n".length : @node.loc.expression.end_pos
     end
   end
 end

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

@@ -8,18 +8,9 @@ module Synvert::Core
       @selectors = selectors
     end
 
-    # Begin position of code to replace.
-    #
-    # @return [Integer] begin position.
-    def 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
-      @selectors.map { |selector| @node.child_node_range(selector).end_pos }.max
+    def calculate_position
+      @begin_pos = @selectors.map { |selector| @node.child_node_range(selector).begin_pos }.min
+      @end_pos = @selectors.map { |selector| @node.child_node_range(selector).end_pos }.max
     end
 
     # The rewritten source code.

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

@@ -8,25 +8,17 @@ module Synvert::Core
       super
     end
 
-    # Begin position of code to replace.
-    #
-    # @return [Integer] begin position.
-    def begin_pos
+    def calculate_position
       node_begin_pos = @node.loc.expression.begin_pos
       while @node.loc.expression.source_buffer.source[node_begin_pos -= 1] == ' '
       end
-      node_begin_pos - Engine::ERUBY_STMT_SPLITTER.length + 1
-    end
+      @begin_pos = node_begin_pos - Engine::ERUBY_STMT_SPLITTER.length + 1
 
-    # End position of code to replace.
-    #
-    # @return [Integer] end position.
-    def end_pos
       node_begin_pos = @node.loc.expression.begin_pos
       node_begin_pos += @node.loc.expression.source.index 'do'
       while @node.loc.expression.source_buffer.source[node_begin_pos += 1] != '@'
       end
-      node_begin_pos
+      @end_pos = node_begin_pos
     end
 
     # The rewritten erb expr code.

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

@@ -3,18 +3,9 @@
 module Synvert::Core
   # ReplaceWithAction to replace code.
   class Rewriter::ReplaceWithAction < Rewriter::Action
-    # Begin position of code to replace.
-    #
-    # @return [Integer] begin position.
-    def begin_pos
-      @node.loc.expression.begin_pos
-    end
-
-    # End position of code to replace.
-    #
-    # @return [Integer] end position.
-    def end_pos
-      @node.loc.expression.end_pos
+    def calculate_position
+      @begin_pos = @node.loc.expression.begin_pos
+      @end_pos = @node.loc.expression.end_pos
     end
 
     # The rewritten source code with proper indent.

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

@@ -11,18 +11,9 @@ module Synvert::Core
       @indent = indent || @node.column
     end
 
-    # Begin position of code to wrap.
-    #
-    # @return [Integer] begin position.
-    def begin_pos
-      @node.loc.expression.begin_pos
-    end
-
-    # End position of code to wrap.
-    #
-    # @return [Integer] end position.
-    def end_pos
-      @node.loc.expression.end_pos
+    def calculate_position
+      @begin_pos = @node.loc.expression.begin_pos
+      @end_pos = @node.loc.expression.end_pos
     end
 
     # The rewritten source code.

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

@@ -5,6 +5,12 @@ module Synvert::Core
   class Rewriter::Action
     DEFAULT_INDENT = 2
 
+    # @!attribute [r] begin_pos
+    #   @return [Integer] begin position
+    # @!attribute [r] end_pos
+    #   @return [Integer] end position
+    attr_reader :begin_pos, :end_pos
+
     # Initialize an action.
     #
     # @param instance [Synvert::Core::Rewriter::Instance]
@@ -15,6 +21,11 @@ module Synvert::Core
       @node = @instance.current_node
     end
 
+    def process
+      calculate_position
+      self
+    end
+
     # Line number of current node.
     #
     # @return [Integer] line number.
@@ -42,23 +53,33 @@ module Synvert::Core
       @rewritten_source ||= @node.rewritten_source(@code)
     end
 
-    def squeeze_spaces(begin_pos, end_pos)
-      if file_source[begin_pos - 1] == ' ' && file_source[end_pos] == ' '
-        begin_pos - 1
-      else
-        begin_pos
+    def squeeze_spaces
+      if file_source[@begin_pos - 1] == ' ' && file_source[@end_pos] == ' '
+        @begin_pos -= 1
       end
     end
 
-    def squeeze_lines(end_pos, begin_line, end_line)
+    def squeeze_lines
       lines = file_source.split("\n")
+      begin_line = @node.loc.expression.first_line
+      end_line = @node.loc.expression.last_line
       before_line_is_blank = begin_line == 1 || lines[begin_line - 2] == ''
       after_line_is_blank = lines[end_line] == ''
 
-      if before_line_is_blank && after_line_is_blank
-        end_pos + "\n".length
-      else
-        end_pos
+      if lines.length > 1 && before_line_is_blank && after_line_is_blank
+        @end_pos += "\n".length
+      end
+    end
+
+    def remove_comma
+      if ',' == file_source[@begin_pos - 1]
+        @begin_pos -= 1
+      elsif ', ' == file_source[@begin_pos - 2, 2]
+        @begin_pos -= 2
+      elsif ', ' == file_source[@end_pos, 2]
+        @end_pos += 2
+      elsif ',' == file_source[@end_pos]
+        @end_pos += 1
       end
     end
 

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

@@ -161,9 +161,11 @@ module Synvert::Core
     # then continue operating on each matching ast node.
     #
     # @param rules [Hash] rules to find mathing ast nodes.
+    # @param options [Hash] optional, set if recursive or not.
     # @param block [Block] block code to continue operating on the matching nodes.
-    def within_node(rules, &block)
-      Rewriter::WithinScope.new(self, rules, { recursive: true }, &block).process
+    def within_node(rules, options = nil, &block)
+      options ||= { recursive: true }
+      Rewriter::WithinScope.new(self, rules, options, &block).process
     end
 
     alias with_node within_node
@@ -174,7 +176,7 @@ module Synvert::Core
     # @param rules [Hash] rules to find mathing ast nodes.
     # @param block [Block] block code to continue operating on the matching nodes.
     def within_direct_node(rules, &block)
-      Rewriter::WithinScope.new(self, rules, { recursive: false }, &block).process
+      Rewriter::WithinScope.new(self, rules, { direct: true }, &block).process
     end
 
     alias with_direct_node within_direct_node
@@ -221,7 +223,7 @@ module Synvert::Core
     #
     # @param code [String] code need to be appended.
     def append(code)
-      @actions << Rewriter::AppendAction.new(self, code)
+      @actions << Rewriter::AppendAction.new(self, code).process
     end
 
     # Parse prepend dsl, it creates a [Synvert::Core::Rewriter::PrependAction] to
@@ -229,7 +231,7 @@ module Synvert::Core
     #
     # @param code [String] code need to be prepended.
     def prepend(code)
-      @actions << Rewriter::PrependAction.new(self, code)
+      @actions << Rewriter::PrependAction.new(self, code).process
     end
 
     # Parse insert dsl, it creates a [Synvert::Core::Rewriter::InsertAction] to
@@ -238,7 +240,7 @@ module Synvert::Core
     # @param code [String] code need to be inserted.
     # @param at [String] insert position, beginning or end, end is the default.
     def insert(code, at: 'end')
-      @actions << Rewriter::InsertAction.new(self, code, at: at)
+      @actions << Rewriter::InsertAction.new(self, code, at: at).process
     end
 
     # Parse insert_after dsl, it creates a [Synvert::Core::Rewriter::InsertAfterAction] to
@@ -246,7 +248,7 @@ module Synvert::Core
     #
     # @param code [String] code need to be inserted.
     def insert_after(node)
-      @actions << Rewriter::InsertAfterAction.new(self, node)
+      @actions << Rewriter::InsertAfterAction.new(self, node).process
     end
 
     # Parse replace_with dsl, it creates a [Synvert::Core::Rewriter::ReplaceWithAction] to
@@ -254,7 +256,7 @@ module Synvert::Core
     #
     # @param code [String] code need to be replaced with.
     def replace_with(code)
-      @actions << Rewriter::ReplaceWithAction.new(self, code)
+      @actions << Rewriter::ReplaceWithAction.new(self, code).process
     end
 
     # Parse replace with dsl, it creates a [Synvert::Core::Rewriter::ReplaceAction] to
@@ -263,25 +265,25 @@ module Synvert::Core
     # @param selectors [Array<Symbol>] selector names of child node.
     # @param with [String] code need to be replaced with.
     def replace(*selectors, with:)
-      @actions << Rewriter::ReplaceAction.new(self, *selectors, with: with)
+      @actions << Rewriter::ReplaceAction.new(self, *selectors, with: with).process
     end
 
     # Parse replace_erb_stmt_with_expr dsl, it creates a [Synvert::Core::Rewriter::ReplaceErbStmtWithExprAction] to
     # replace erb stmt code to expr code.
     def replace_erb_stmt_with_expr
-      @actions << Rewriter::ReplaceErbStmtWithExprAction.new(self)
+      @actions << Rewriter::ReplaceErbStmtWithExprAction.new(self).process
     end
 
     # Parse remove dsl, it creates a [Synvert::Core::Rewriter::RemoveAction] to remove current node.
     def remove
-      @actions << Rewriter::RemoveAction.new(self)
+      @actions << Rewriter::RemoveAction.new(self).process
     end
 
     # Parse delete dsl, it creates a [Synvert::Core::Rewriter::DeleteAction] to delete child nodes.
     #
     # @param selectors [Array<Symbol>] selector names of child node.
     def delete(*selectors)
-      @actions << Rewriter::DeleteAction.new(self, *selectors)
+      @actions << Rewriter::DeleteAction.new(self, *selectors).process
     end
 
     # Parse wrap with dsl, it creates a [Synvert::Core::Rewriter::WrapAction] to
@@ -290,7 +292,7 @@ module Synvert::Core
     # @param with [String] code need to be wrapped with.
     # @param indent [Integer] number of whitespaces.
     def wrap(with:, indent: nil)
-      @actions << Rewriter::WrapAction.new(self, with: with, indent: indent)
+      @actions << Rewriter::WrapAction.new(self, with: with, indent: indent).process
     end
 
     # Parse warn dsl, it creates a [Synvert::Core::Rewriter::Warning] to save warning message.

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

@@ -21,7 +21,7 @@ module Synvert::Core
       elsif File.exist?(File.join(Configuration.path, '.rvmrc'))
         versionFile = '.rvmrc'
       end
-      return true if !versionFile
+      return true unless versionFile
 
       version = File.read(File.join(Configuration.path, versionFile))
       Gem::Version.new(version) >= Gem::Version.new(@version)

data/lib/synvert/core/rewriter/scope/within_scope.rb

@@ -9,7 +9,7 @@ module Synvert::Core
     # @param rules [Hash]
     # @param options [Hash]
     # @param block [Block]
-    def initialize(instance, rules, options = { recursive: true }, &block)
+    def initialize(instance, rules, options = {}, &block)
       @instance = instance
       @rules = rules
       @options = options
@@ -23,7 +23,14 @@ module Synvert::Core
       current_node = @instance.current_node
       return unless current_node
 
-      matching_nodes = find_matching_nodes(current_node)
+      matching_nodes =
+        if @options[:direct]
+          find_direct_matching_nodes(current_node)
+        elsif @options[:recursive]
+          find_recursive_matching_nodes(current_node)
+        else
+          find_matching_nodes(current_node)
+        end
       @instance.process_with_node current_node do
         matching_nodes.each do |matching_node|
           @instance.process_with_node matching_node do
@@ -35,36 +42,77 @@ module Synvert::Core
 
     private
 
-    def find_matching_nodes(current_node)
+    # Find the matching nodes only in current or direct children.
+    def find_direct_matching_nodes(current_node)
       matching_nodes = []
-      if @options[:recursive]
-        if current_node.is_a?(Parser::AST::Node)
-          matching_nodes << current_node if current_node.match? @rules
-          current_node.recursive_children do |child_node|
-            matching_nodes << child_node if child_node.match? @rules
-          end
-        else
-          current_node.each do |node|
-            matching_nodes << node if node.match? @rules
-            node.recursive_children do |child_node|
-              matching_nodes << child_node if child_node.match? @rules
-            end
-          end
-        end
-      elsif current_node.is_a?(Parser::AST::Node)
+      if current_node.is_a?(Parser::AST::Node)
         if current_node.type == :begin
           current_node.children.each do |child_node|
-            matching_nodes << child_node if child_node.match? @rules
+            matching_nodes << child_node if child_node.match?(@rules)
           end
-        elsif current_node.match? @rules
+        elsif current_node.match?(@rules)
           matching_nodes << current_node
         end
       else
         current_node.each do |child_node|
-          matching_nodes << child_node if child_node.match? @rules
+          matching_nodes << child_node if child_node.match?(@rules)
+        end
+      end
+      matching_nodes
+    end
+
+    # Find matching nodes in all recursive children.
+    def find_recursive_matching_nodes(current_node)
+      matching_nodes = []
+      if current_node.is_a?(Parser::AST::Node)
+        matching_nodes << current_node if current_node.match?(@rules)
+        current_node.recursive_children do |child_node|
+          matching_nodes << child_node if child_node.match?(@rules)
+        end
+      else
+        current_node.each do |node|
+          matching_nodes << node if node.match?(@rules)
+          node.recursive_children do |child_node|
+            matching_nodes << child_node if child_node.match?(@rules)
+          end
+        end
+      end
+      matching_nodes
+    end
+
+    # Find matching nodes in recursive children but do not continue on matching nodes.
+    def find_matching_nodes(current_node)
+      matching_nodes = []
+      if current_node.is_a?(Parser::AST::Node)
+        if current_node.match?(@rules)
+          matching_nodes << current_node
+          return matching_nodes
+        end
+        current_node.recursive_children do |child_node|
+          stop = nil
+          if child_node.match?(@rules)
+            matching_nodes << child_node
+            stop = :stop
+          end
+          stop
+        end
+      else
+        current_node.each do |node|
+          if node.match?(@rules)
+            matching_nodes << node
+            next
+          end
+          node.recursive_children do |child_node|
+            stop = nil
+            if child_node.match?(@rules)
+              matching_nodes << child_node
+              stop = :stop
+            end
+            stop
+          end
         end
       end
       matching_nodes
     end
   end
-end
+end

data/lib/synvert/core/version.rb

@@ -2,6 +2,6 @@
 
 module Synvert
   module Core
-    VERSION = '0.56.1'
+    VERSION = '0.58.2'
   end
 end

data/spec/synvert/core/node_ext_spec.rb

@@ -282,10 +282,25 @@ describe Parser::AST::Node do
       expect(node.left_value).to eq :@a
     end
 
+    it 'gets for cvasgn' do
+      node = parse('@@a = 1')
+      expect(node.left_value).to eq :@@a
+    end
+
     it 'gets for or_asgn' do
       node = parse('a ||= 1')
       expect(node.left_value).to eq :a
     end
+
+    it 'gets for and' do
+      node = parse('foo && bar')
+      expect(node.left_value).to eq parse('foo')
+    end
+
+    it 'gets for or' do
+      node = parse('foo || bar')
+      expect(node.left_value).to eq parse('foo')
+    end
   end
 
   describe '#right_value' do
@@ -309,10 +324,25 @@ describe Parser::AST::Node do
       expect(node.right_value).to eq parse('1')
     end
 
+    it 'gets for cvasgn' do
+      node = parse('@@a = 1')
+      expect(node.right_value).to eq parse('1')
+    end
+
     it 'gets for or_asgn' do
       node = parse('a ||= 1')
       expect(node.right_value).to eq parse('1')
     end
+
+    it 'gets for and' do
+      node = parse('foo && bar')
+      expect(node.right_value).to eq parse('bar')
+    end
+
+    it 'gets for or' do
+      node = parse('foo || bar')
+      expect(node.right_value).to eq parse('bar')
+    end
   end
 
   describe '#to_value' do

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

@@ -9,7 +9,7 @@ module Synvert::Core
         source = "class User\n  has_many :posts\nend"
         class_node = Parser::CurrentRuby.parse(source)
         instance = double(current_node: class_node)
-        Rewriter::AppendAction.new(instance, "def as_json\n  super\nend")
+        Rewriter::AppendAction.new(instance, "def as_json\n  super\nend").process
       end
 
       it 'gets begin_pos' do
@@ -30,7 +30,7 @@ module Synvert::Core
         source = "gem 'rails'\ngem 'mysql2'"
         begin_node = Parser::CurrentRuby.parse(source)
         instance = double(current_node: begin_node)
-        Rewriter::AppendAction.new(instance, "gem 'twitter'")
+        Rewriter::AppendAction.new(instance, "gem 'twitter'").process
       end
 
       it 'gets begin_pos' do

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

@@ -8,7 +8,7 @@ module Synvert::Core
       source = 'arr.map {}.flatten'
       node = Parser::CurrentRuby.parse(source)
       instance = double(current_node: node, file_source: source)
-      Rewriter::DeleteAction.new(instance, :dot, :message)
+      Rewriter::DeleteAction.new(instance, :dot, :message).process
     }
 
     it 'gets begin_pos' do

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

@@ -9,7 +9,7 @@ module Synvert::Core
         source = "  User.where(username: 'Richard')"
         node = Parser::CurrentRuby.parse(source)
         instance = double(current_node: node)
-        Rewriter::InsertAction.new(instance, '.first', at: 'end')
+        Rewriter::InsertAction.new(instance, '.first', at: 'end').process
       }
 
       it 'gets begin_pos' do
@@ -30,7 +30,7 @@ module Synvert::Core
         source = "  open('http://test.com')"
         node = Parser::CurrentRuby.parse(source)
         instance = double(current_node: node)
-        Rewriter::InsertAction.new(instance, 'URI.', at: 'beginning')
+        Rewriter::InsertAction.new(instance, 'URI.', at: 'beginning').process
       }
 
       it 'gets begin_pos' do

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

@@ -8,7 +8,7 @@ module Synvert::Core
       source = '  include Foo'
       node = Parser::CurrentRuby.parse(source)
       instance = double(current_node: node)
-      Rewriter::InsertAfterAction.new(instance, 'include Bar')
+      Rewriter::InsertAfterAction.new(instance, 'include Bar').process
     }
 
     it 'gets begin_pos' do

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

@@ -9,7 +9,7 @@ module Synvert::Core
         source = "Synvert::Application.configure do\nend"
         block_node = Parser::CurrentRuby.parse(source)
         instance = double(current_node: block_node)
-        Rewriter::PrependAction.new(instance, 'config.eager_load = true')
+        Rewriter::PrependAction.new(instance, 'config.eager_load = true').process
       }
 
       it 'gets begin_pos' do
@@ -30,7 +30,7 @@ module Synvert::Core
         source = "RSpec.configure do |config|\nend"
         block_node = Parser::CurrentRuby.parse(source)
         instance = double(current_node: block_node)
-        Rewriter::PrependAction.new(instance, '{{arguments.first}}.include FactoryGirl::Syntax::Methods')
+        Rewriter::PrependAction.new(instance, '{{arguments.first}}.include FactoryGirl::Syntax::Methods').process
       }
 
       it 'gets begin_pos' do
@@ -51,7 +51,7 @@ module Synvert::Core
         source = "class User\n  has_many :posts\nend"
         class_node = Parser::CurrentRuby.parse(source)
         instance = double(current_node: class_node)
-        Rewriter::PrependAction.new(instance, 'include Deletable')
+        Rewriter::PrependAction.new(instance, 'include Deletable').process
       }
 
       it 'gets begin_pos' do
@@ -72,7 +72,7 @@ module Synvert::Core
         source = "class User < ActiveRecord::Base\n  has_many :posts\nend"
         class_node = Parser::CurrentRuby.parse(source)
         instance = double(current_node: class_node)
-        Rewriter::PrependAction.new(instance, 'include Deletable')
+        Rewriter::PrependAction.new(instance, 'include Deletable').process
       }
 
       it 'gets begin_pos' do

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

@@ -8,7 +8,7 @@ module Synvert::Core
       source = "user = User.new params[:user]\nuser.save\nrender\n"
       send_node = Parser::CurrentRuby.parse(source).children[1]
       instance = double(current_node: send_node, file_source: source)
-      Rewriter::RemoveAction.new(instance)
+      Rewriter::RemoveAction.new(instance).process
     }
 
     it 'gets begin_pos' do

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

@@ -9,7 +9,7 @@ module Synvert::Core
         source = 'FactoryBot.create(:user)'
         node = Parser::CurrentRuby.parse(source)
         instance = double(current_node: node)
-        Rewriter::ReplaceAction.new(instance, :receiver, :dot, :message, with: 'create')
+        Rewriter::ReplaceAction.new(instance, :receiver, :dot, :message, with: 'create').process
       }
 
       it 'gets begin_pos' do

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

@@ -9,7 +9,7 @@ module Synvert::Core
         source = 'post = FactoryGirl.create_list :post, 2'
         send_node = Parser::CurrentRuby.parse(source).children[1]
         instance = double(current_node: send_node)
-        Rewriter::ReplaceWithAction.new(instance, 'create_list {{arguments}}')
+        Rewriter::ReplaceWithAction.new(instance, 'create_list {{arguments}}').process
       }
 
       it 'gets begin_pos' do
@@ -30,7 +30,7 @@ module Synvert::Core
         source = '  its(:size) { should == 1 }'
         send_node = Parser::CurrentRuby.parse(source)
         instance = double(current_node: send_node)
-        Rewriter::ReplaceWithAction.new(instance, <<~EOS)
+        Rewriter::ReplaceWithAction.new(instance, <<~EOS).process
           describe '#size' do
             subject { super().size }
             it { {{body}} }

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

@@ -8,7 +8,7 @@ module Synvert::Core
       source = "class Bar\nend"
       node = Parser::CurrentRuby.parse(source)
       instance = double(current_node: node)
-      Rewriter::WrapAction.new(instance, with: 'module Foo')
+      Rewriter::WrapAction.new(instance, with: 'module Foo').process
     }
 
     it 'gets begin_pos' do

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

@@ -31,13 +31,23 @@ module Synvert::Core
       instance.with_node(type: 'send', message: 'create', &block)
     end
 
-    it 'parses within_direct_node' do
+    it 'parses within_node with recursive false' do
       scope = double
       block = proc {}
       expect(Rewriter::WithinScope).to receive(:new)
         .with(instance, { type: 'send', message: 'create' }, { recursive: false }, &block)
         .and_return(scope)
       expect(scope).to receive(:process)
+      instance.within_node({ type: 'send', message: 'create' }, { recursive: false }, &block)
+    end
+
+    it 'parses within_direct_node' do
+      scope = double
+      block = proc {}
+      expect(Rewriter::WithinScope).to receive(:new)
+        .with(instance, { type: 'send', message: 'create' }, { direct: true }, &block)
+        .and_return(scope)
+      expect(scope).to receive(:process)
       instance.within_direct_node(type: 'send', message: 'create', &block)
     end
 
@@ -45,7 +55,7 @@ module Synvert::Core
       scope = double
       block = proc {}
       expect(Rewriter::WithinScope).to receive(:new)
-        .with(instance, { type: 'send', message: 'create' }, { recursive: false }, &block)
+        .with(instance, { type: 'send', message: 'create' }, { direct: true }, &block)
         .and_return(scope)
       expect(scope).to receive(:process)
       instance.with_direct_node(type: 'send', message: 'create', &block)
@@ -90,58 +100,78 @@ module Synvert::Core
     end
 
     it 'parses append' do
-      expect(Rewriter::AppendAction).to receive(:new).with(instance, 'include FactoryGirl::Syntax::Methods')
+      action = double
+      expect(Rewriter::AppendAction).to receive(:new).with(instance, 'include FactoryGirl::Syntax::Methods').and_return(action)
+      expect(action).to receive(:process)
       instance.append 'include FactoryGirl::Syntax::Methods'
     end
 
     it 'parses prepend' do
+      action = double
       expect(Rewriter::PrependAction).to receive(:new).with(
         instance,
         '{{arguments.first}}.include FactoryGirl::Syntax::Methods'
-      )
+      ).and_return(action)
+      expect(action).to receive(:process)
       instance.prepend '{{arguments.first}}.include FactoryGirl::Syntax::Methods'
     end
 
-    it 'parses insert' do
-      expect(Rewriter::InsertAction).to receive(:new).with(instance, '.first', at: 'end')
+    it 'parses insert at end' do
+      action = double
+      expect(Rewriter::InsertAction).to receive(:new).with(instance, '.first', at: 'end').and_return(action)
+      expect(action).to receive(:process)
       instance.insert '.first'
     end
 
-    it 'parses insert' do
-      expect(Rewriter::InsertAction).to receive(:new).with(instance, 'URI.', at: 'beginning')
+    it 'parses insert at beginning' do
+      action = double
+      expect(Rewriter::InsertAction).to receive(:new).with(instance, 'URI.', at: 'beginning').and_return(action)
+      expect(action).to receive(:process)
       instance.insert 'URI.', at: 'beginning'
     end
 
     it 'parses insert_after' do
+      action = double
       expect(Rewriter::InsertAfterAction).to receive(:new).with(
         instance,
         '{{arguments.first}}.include FactoryGirl::Syntax::Methods'
-      )
+      ).and_return(action)
+      expect(action).to receive(:process)
       instance.insert_after '{{arguments.first}}.include FactoryGirl::Syntax::Methods'
     end
 
     it 'parses replace_with' do
-      expect(Rewriter::ReplaceWithAction).to receive(:new).with(instance, 'create {{arguments}}')
+      action = double
+      expect(Rewriter::ReplaceWithAction).to receive(:new).with(instance, 'create {{arguments}}').and_return(action)
+      expect(action).to receive(:process)
       instance.replace_with 'create {{arguments}}'
     end
 
     it 'parses replace with' do
-      expect(Rewriter::ReplaceAction).to receive(:new).with(instance, :message, with: 'test')
+      action = double
+      expect(Rewriter::ReplaceAction).to receive(:new).with(instance, :message, with: 'test').and_return(action)
+      expect(action).to receive(:process)
       instance.replace :message, with: 'test'
     end
 
     it 'parses remove' do
-      expect(Rewriter::RemoveAction).to receive(:new).with(instance)
+      action = double
+      expect(Rewriter::RemoveAction).to receive(:new).with(instance).and_return(action)
+      expect(action).to receive(:process)
       instance.remove
     end
 
     it 'parses remove' do
-      expect(Rewriter::DeleteAction).to receive(:new).with(instance, :dot, :message)
+      action = double
+      expect(Rewriter::DeleteAction).to receive(:new).with(instance, :dot, :message).and_return(action)
+      expect(action).to receive(:process)
       instance.delete :dot, :message
     end
 
     it 'parses wrap with' do
-      expect(Rewriter::WrapAction).to receive(:new).with(instance, with: 'module Foo', indent: nil)
+      action = double
+      expect(Rewriter::WrapAction).to receive(:new).with(instance, with: 'module Foo', indent: nil).and_return(action)
+      expect(action).to receive(:process)
       instance.wrap with: 'module Foo'
     end
 

data/spec/synvert/core/rewriter/scope/within_scope_spec.rb

@@ -51,6 +51,33 @@ module Synvert::Core
         expect(type_in_scope).to eq :send
         expect(instance.current_node.type).to eq :block
       end
+
+      it 'matches multiple block nodes' do
+        block_nodes = []
+        scope = Rewriter::WithinScope.new(instance, { type: 'block' }, { recursive: true }) do
+          block_nodes << node
+        end
+        scope.process
+        expect(block_nodes.size).to eq 2
+      end
+
+      it 'matches only one block node if no recursive' do
+        block_nodes = []
+        scope = Rewriter::WithinScope.new(instance, { type: 'block' } , { recursive: false }) do
+          block_nodes << node
+        end
+        scope.process
+        expect(block_nodes.size).to eq 1
+      end
+
+      it 'matches only one direct node' do
+        block_nodes = []
+        scope = Rewriter::WithinScope.new(instance, { type: 'block' } , { direct: true }) do
+          block_nodes << node
+        end
+        scope.process
+        expect(block_nodes.size).to eq 1
+      end
     end
   end
 end

metadata

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