synvert-core 0.26.0 → 0.27.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2dcb08f4af325c83596a4ab4ff8ddf43a11500629e96dbccce9fa070dcf7fbc
-  data.tar.gz: 4d428fd96a41f1a31b32d6f301562f093c752d6ec63a1dd5641f6f66a62605b7
+  metadata.gz: ddab57669b905a8064083e20672a292f78cce5a651331d9202e3fce12a34f776
+  data.tar.gz: d0d9dcb748214c6d0a35609a5cdcc2fdae44e112af7ed4ce15a8e22cc9d19919
 SHA512:
-  metadata.gz: ae47fbf7a0ce9ddae8e221b9508f981534118e5c303ec1736d391db51477a477d338bbfdc215ecd3af5ba4ff6cd0090995c5a17fab6d249a24d46501f941d3b7
-  data.tar.gz: 6cf6396cbd3deb8b1d66a1166caa8a584ef0145ebd719b067d1d705f73f7f1d0177e910e16c16c55f19034995d4b641837149185ee318aefe1303e3d8e7db625
+  metadata.gz: e1964409321d68628e1e73b24ed77f9c2e223dc9190fdfde722e2ab9e6be92b0be7802468dca245a34d5fba52f3a8778ca26f9299df095308b32cb2da80a3393
+  data.tar.gz: 42ed0ba17c74b57c3b1e0019d5f50ddf9bda0f5f1a3564b124ba2b0cf379b95b124e344113bdce8c53852fb911e9744725fa91ec3593943022636584ad6c17ff

data/CHANGELOG.md

@@ -1,5 +1,23 @@
 # CHANGELOG
 
+## 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)
 
 * attr_reader ruby_version and gem_spec

data/lib/synvert/core/node_ext.rb

@@ -323,6 +323,31 @@ module Parser::AST
     # @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 :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
@@ -330,7 +355,7 @@ module Parser::AST
         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.0'
+    VERSION = '0.27.3'
   end
 end

data/spec/synvert/core/node_ext_spec.rb

@@ -395,6 +395,64 @@ describe Parser::AST::Node do
   end
 
   describe '#child_node_range' do
+    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 +479,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)

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.0
+  version: 0.27.3
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-30 00:00:00.000000000 Z
+date: 2021-03-31 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