synvert-core 0.61.0 → 0.61.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff83abb1009ca5d9fe97a1c2e64701c31942a1c235e2b5a9bfe6cec1875f0956
-  data.tar.gz: b983862aa7a7861801104d43dc19cd794a5b83e4c2be5b137888b2e92a6f8068
+  metadata.gz: f2496379cf2e2ab4bfd7df1466e0780965830a34601ce0e4dce0a8d23975e9a9
+  data.tar.gz: a59a23e473d98e05415aeb053202a4334e0527c6055b9f5f32415c0e29b3224c
 SHA512:
-  metadata.gz: 6978c684ad91c8a59c9774129c5ab21162b66f4f3b4eb043337a008c2dd5a5df3634b7781442d03147ae8829b250bd73f279b31379f6b3861e852da75209ba26
-  data.tar.gz: 96299eb5b9b6254a3781abaff6e3d9f2ac6e1da8e1216b17990471558408bf6ceecb439175183819f3aadd860de94754639c4434705910469318e91abd57f124
+  metadata.gz: 90a027ececec24e20efd6f9e35517e1557393f2f3d1831da52cac012cc953d1f387ab1cdbba779f559f48e73643d8774013b418da40d3c3ae5f33b8a361d4edc
+  data.tar.gz: ffa1b43ec24296c9fd3f0b684b25f80de7459f0007dd3fb157df899ecc6610b4f22a83624ad2fc5da964a685bcaef3c697e28dade547587816b4d1b010b05149

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## 0.61.1 (2021-12-12)
+
+* Fix prepend action for def and defs nodes
+* Fix append action for def and defs nodes
+
 ## 0.61.0 (2021-12-10)
 
 * Add `Node#child_node_by_name`

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

@@ -17,7 +17,7 @@ module Synvert::Core
     # @param node [Parser::AST::Node]
     # @return [String] n times whitesphace
     def indent(node)
-      if %i[block class].include? node.type
+      if %i[block class def defs].include? node.type
         ' ' * (node.column + DEFAULT_INDENT)
       else
         ' ' * node.column

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

@@ -16,6 +16,10 @@ module Synvert::Core
           end
         when :class
           @node.children[1] ? @node.children[1].loc.expression.end_pos : @node.children[0].loc.expression.end_pos
+        when :def
+          @node.children[1].empty? ? @node.loc.name.end_pos : @node.children[1].loc.expression.end_pos
+        when :defs
+          @node.children[2].empty? ? @node.loc.name.end_pos : @node.children[2].loc.expression.end_pos
         else
           @node.children.last.loc.expression.end_pos
         end
@@ -29,7 +33,7 @@ module Synvert::Core
     # @param node [Parser::AST::Node]
     # @return [String] n times whitesphace
     def indent(node)
-      if %i[block class].include? node.type
+      if %i[block class def defs].include?(node.type)
         ' ' * (node.column + DEFAULT_INDENT)
       else
         ' ' * node.column

data/lib/synvert/core/version.rb

@@ -2,6 +2,6 @@
 
 module Synvert
   module Core
-    VERSION = '0.61.0'
+    VERSION = '0.61.1'
   end
 end

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

@@ -45,5 +45,26 @@ module Synvert::Core
         expect(subject.rewritten_code).to eq "\ngem 'twitter'"
       end
     end
+
+    describe 'def node' do
+      subject do
+        source = "def teardown\n  do_something\nend"
+        class_node = Parser::CurrentRuby.parse(source)
+        instance = double(current_node: class_node)
+        Rewriter::AppendAction.new(instance, 'super').process
+      end
+
+      it 'gets begin_pos' do
+        expect(subject.begin_pos).to eq "def teardown\n  do_something".length
+      end
+
+      it 'gets end_pos' do
+        expect(subject.end_pos).to eq "def teardown\n  do_something".length
+      end
+
+      it 'gets rewritten_code' do
+        expect(subject.rewritten_code).to eq "\n  super"
+      end
+    end
   end
 end

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

@@ -87,5 +87,89 @@ module Synvert::Core
         expect(subject.rewritten_code).to eq "\n  include Deletable"
       end
     end
+
+    describe 'def node without args' do
+      subject do
+        source = "def setup\n  do_something\nend"
+        def_node = Parser::CurrentRuby.parse(source)
+        instance = double(current_node: def_node)
+        Rewriter::PrependAction.new(instance, 'super').process
+      end
+
+      it 'gets begin_pos' do
+        expect(subject.begin_pos).to eq 'def setup'.length
+      end
+
+      it 'gets end_pos' do
+        expect(subject.end_pos).to eq 'def setup'.length
+      end
+
+      it 'gets rewritten_code' do
+        expect(subject.rewritten_code).to eq "\n  super"
+      end
+    end
+
+    describe 'def node with args' do
+      subject do
+        source = "def setup(foobar)\n  do_something\nend"
+        def_node = Parser::CurrentRuby.parse(source)
+        instance = double(current_node: def_node)
+        Rewriter::PrependAction.new(instance, 'super').process
+      end
+
+      it 'gets begin_pos' do
+        expect(subject.begin_pos).to eq 'def setup(foobar)'.length
+      end
+
+      it 'gets end_pos' do
+        expect(subject.end_pos).to eq 'def setup(foobar)'.length
+      end
+
+      it 'gets rewritten_code' do
+        expect(subject.rewritten_code).to eq "\n  super"
+      end
+    end
+
+    describe 'defs node without args' do
+      subject do
+        source = "def self.foo\n  do_something\nend"
+        def_node = Parser::CurrentRuby.parse(source)
+        instance = double(current_node: def_node)
+        Rewriter::PrependAction.new(instance, 'do_something_first').process
+      end
+
+      it 'gets begin_pos' do
+        expect(subject.begin_pos).to eq 'def self.foo'.length
+      end
+
+      it 'gets end_pos' do
+        expect(subject.end_pos).to eq 'def self.foo'.length
+      end
+
+      it 'gets rewritten_code' do
+        expect(subject.rewritten_code).to eq "\n  do_something_first"
+      end
+    end
+
+    describe 'defs node with args' do
+      subject do
+        source = "def self.foo(bar)\n  do_something\nend"
+        def_node = Parser::CurrentRuby.parse(source)
+        instance = double(current_node: def_node)
+        Rewriter::PrependAction.new(instance, 'do_something_first').process
+      end
+
+      it 'gets begin_pos' do
+        expect(subject.begin_pos).to eq 'def self.foo(bar)'.length
+      end
+
+      it 'gets end_pos' do
+        expect(subject.end_pos).to eq 'def self.foo(bar)'.length
+      end
+
+      it 'gets rewritten_code' do
+        expect(subject.rewritten_code).to eq "\n  do_something_first"
+      end
+    end
   end
 end

metadata

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