synvert-core 0.26.1 → 0.27.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e3f85c5eb0a82ffb3447ad72ac9f901883a074b1f16c244176008a333b3e90cc
-  data.tar.gz: c13b895edc3ef7f9d126795933e2bf01267b0b912e2904a4481baff175eebca4
+  metadata.gz: a239badccf8d5b2774e75423755123fe55393f951cb3064030800ce351e014bf
+  data.tar.gz: df9c575e61f833873bafaa672b95977390ce5eef62ace7898f209f684fef595d
 SHA512:
-  metadata.gz: 16ceb23eaf30909e4950cefbaae20b650f90320a496fee4a095a054dc7996fe91bfbcb79fc6252caa38f09b5998c687d4171bee050fc605cf2c8ee8ddac93c61
-  data.tar.gz: fc0202a47909b7bcffdd0e235c198419afcf2653f89bcd9abce626b412ab3c4a92a0bfbc71be8971873d15aeac85e4e2d0f80575ee44f75374d7c755af281c12
+  metadata.gz: fc153d13c26d917155db767031b5371df250014e1c86cfbf58e89693775e5488a02276e272a62e6c41489a744056846ff2237f74433c283dbfc5b9664c989372
+  data.tar.gz: 4c6e8df70fc14379a871b1b187ef9ce4b3b32ec964aedf096d6db1f69ae911e005933576b1adbc01478a61b1c694a1d7002bd1d4f0647f1e421bcbe894f191f5

data/CHANGELOG.md

@@ -1,8 +1,26 @@
 # CHANGELOG
 
-## 0.26.1 (2021-03-31)
+## 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)
+
+* Fix `delete` action arguments
+
+## 0.27.0 (2021-03-31)
 
 * Support `:class` in `child_node_range`
+* Add `delete` action
 
 ## 0.26.0 (2021-03-30)
 

data/lib/synvert/core/node_ext.rb

@@ -323,6 +323,13 @@ module Parser::AST
     # @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
@@ -330,12 +337,32 @@ module Parser::AST
         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.selector
+          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

data/lib/synvert/core/rewriter.rb

@@ -24,6 +24,7 @@ module Synvert::Core
     autoload :ReplaceAction, 'synvert/core/rewriter/action/replace_action'
     autoload :ReplaceErbStmtWithExprAction, 'synvert/core/rewriter/action/replace_erb_stmt_with_expr_action'
     autoload :RemoveAction, 'synvert/core/rewriter/action/remove_action'
+    autoload :DeleteAction, 'synvert/core/rewriter/action/delete_action'
 
     autoload :Warning, 'synvert/core/rewriter/warning'
 

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

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Synvert::Core
+  # RemoveAction to delete code.
+  class Rewriter::DeleteAction < Rewriter::Action
+    def initialize(instance, *selectors)
+      super(instance, nil)
+      @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
+    end
+
+    # The rewritten code, always empty string.
+    def rewritten_code
+      ''
+    end
+  end
+end

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

@@ -254,7 +254,7 @@ module Synvert::Core
     # Parse replace with dsl, it creates a [Synvert::Core::Rewriter::ReplaceAction] to
     # replace child node with code.
     #
-    # @param selector [Symbol] selector name of child name.
+    # @param selector [Symbol] selector name of child node.
     # @param with [String] code need to be replaced with.
     def replace(selector, with:)
       @actions << Rewriter::ReplaceAction.new(self, selector, with: with)
@@ -266,11 +266,18 @@ module Synvert::Core
       @actions << Rewriter::ReplaceErbStmtWithExprAction.new(self)
     end
 
-    # Parse remove dsl, it creates a [Synvert::Core::Rewriter::RemoveAction] to current node.
+    # Parse remove dsl, it creates a [Synvert::Core::Rewriter::RemoveAction] to remove current node.
     def remove
       @actions << Rewriter::RemoveAction.new(self)
     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)
+    end
+
     # Parse warn dsl, it creates a [Synvert::Core::Rewriter::Warning] to save warning message.
     #
     # @param message [String] warning message.

data/lib/synvert/core/version.rb

@@ -2,6 +2,6 @@
 
 module Synvert
   module Core
-    VERSION = '0.26.1'
+    VERSION = '0.27.4'
   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(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)')
@@ -406,11 +478,25 @@ describe Parser::AST::Node do
         expect(range).to be_nil
       end
 
+      it 'checks dot' do
+        node = parse('foo.bar(test)')
+        range = node.child_node_range(:dot)
+        expect(range.to_range).to eq(3...4)
+
+        node = parse('foobar(test)')
+        range = node.child_node_range(:dot)
+        expect(range).to be_nil
+      end
+
       it 'checks message' do
         node = parse('foo.bar(test)')
         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)
@@ -430,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/delete_action_spec.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+module Synvert::Core
+  describe Rewriter::DeleteAction do
+    subject {
+      source = "arr.map {}.flatten"
+      node = Parser::CurrentRuby.parse(source)
+      instance = double(current_node: node)
+      Rewriter::DeleteAction.new(instance, :dot, :message)
+    }
+
+    it 'gets begin_pos' do
+      expect(subject.begin_pos).to eq "arr.map {}".length
+    end
+
+    it 'gets end_pos' do
+      expect(subject.end_pos).to eq "arr.map {}.flatten".length
+    end
+
+    it 'gets rewritten_code' do
+      expect(subject.rewritten_code).to eq ''
+    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.26.1
+  version: 0.27.4
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-31 00:00:00.000000000 Z
+date: 2021-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -147,6 +147,7 @@ files:
 - lib/synvert/core/rewriter.rb
 - lib/synvert/core/rewriter/action.rb
 - lib/synvert/core/rewriter/action/append_action.rb
+- lib/synvert/core/rewriter/action/delete_action.rb
 - lib/synvert/core/rewriter/action/insert_action.rb
 - lib/synvert/core/rewriter/action/insert_after_action.rb
 - lib/synvert/core/rewriter/action/remove_action.rb
@@ -171,6 +172,7 @@ files:
 - spec/synvert/core/engine/erb_spec.rb
 - spec/synvert/core/node_ext_spec.rb
 - spec/synvert/core/rewriter/action/append_action_spec.rb
+- spec/synvert/core/rewriter/action/delete_action_spec.rb
 - spec/synvert/core/rewriter/action/insert_action_spec.rb
 - spec/synvert/core/rewriter/action/insert_after_action_spec.rb
 - spec/synvert/core/rewriter/action/remove_action_spec.rb
@@ -221,6 +223,7 @@ test_files:
 - spec/synvert/core/engine/erb_spec.rb
 - spec/synvert/core/node_ext_spec.rb
 - spec/synvert/core/rewriter/action/append_action_spec.rb
+- spec/synvert/core/rewriter/action/delete_action_spec.rb
 - spec/synvert/core/rewriter/action/insert_action_spec.rb
 - spec/synvert/core/rewriter/action/insert_after_action_spec.rb
 - spec/synvert/core/rewriter/action/remove_action_spec.rb