synvert-core 0.39.0 → 0.40.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd079f46cc8d4a8097a794b11c02e98294c217d801538e4c9dafa4305fd3b6d8
-  data.tar.gz: 81018b9a711fca607aa4b2dc3170e9172531140392172b5cd27d4118383a6c31
+  metadata.gz: 5c729d2f456550a622a39f2e43d6d6c7f701f8b1330af038c436a03ec162d828
+  data.tar.gz: 8f5e7642d9073bfa38798dbd237a416037047991d530f4ff862623007ffa81f7
 SHA512:
-  metadata.gz: 78fd6e0b7b28661b5d352a6835f35b713ca829a2a9ae4260e605541b00e9eb151b66b45018a954e1b98682b45bbbddaac359a582281904dd784b2004ded00c9b
-  data.tar.gz: 6a4a33419eafeac609f92d68593ee12b5e5608c24865289cd53f6bb631ef047dc83f1cb7648984d70fded95c9141b6c4a58056280675b55f321836e2b3005dbd
+  metadata.gz: 1187929417e2611b85d95dad5cc2f985d86cc4a1638d0ebecc4baeacc8dfa124ed5ec6595845a941fe7fe13c1666255333aa9f4249f297899c84ab8518a1b809
+  data.tar.gz: 729ff991e4a120d655faaa5517915d6d2614396668f08268a93b70c86f00ce038ec12ff09cf7d5cc060e34b7af8604689f3e4948b32a26bf4fc85ae520da1d21

data/CHANGELOG.md

@@ -1,8 +1,12 @@
 # CHANGELOG
 
+## 0.40.0 (2021-06-23)
+
+* Rewrite `insert` action
+
 ## 0.39.0 (2021-06-23)
 
-* Add `prepend` dsl instead of `insert`
+* Add `prepend` action instead of `insert`
 
 ## 0.38.0 (2021-06-21)
 

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

@@ -1,26 +1,13 @@
 # frozen_string_literal: true
 
 module Synvert::Core
-  # InsertAction to insert code to the top of node body.
+  # AddAction to add code to the node.
   class Rewriter::InsertAction < Rewriter::Action
-    DO_LENGTH = ' do'.length
-
     # Begin position to insert 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
-        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.last.loc.expression.end_pos
-      end
+      @node.loc.expression.end_pos
     end
 
     # End position, always same to begin position.
@@ -30,18 +17,11 @@ module Synvert::Core
       begin_pos
     end
 
-    private
-
-    # Indent of the node.
+    # The rewritten source code.
     #
-    # @param node [Parser::AST::Node]
-    # @return [String] n times whitesphace
-    def indent(node)
-      if %i[block class].include? node.type
-        ' ' * (node.indent + DEFAULT_INDENT)
-      else
-        ' ' * node.indent
-      end
+    # @return [String] rewritten code.
+    def rewritten_code
+      rewritten_source
     end
   end
 end

data/lib/synvert/core/version.rb

@@ -2,6 +2,6 @@
 
 module Synvert
   module Core
-    VERSION = '0.39.0'
+    VERSION = '0.40.0'
   end
 end

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

@@ -4,88 +4,23 @@ require 'spec_helper'
 
 module Synvert::Core
   describe Rewriter::InsertAction do
-    describe 'block node without args' do
-      subject {
-        source = "Synvert::Application.configure do\nend"
-        block_node = Parser::CurrentRuby.parse(source)
-        instance = double(current_node: block_node)
-        Rewriter::InsertAction.new(instance, 'config.eager_load = true')
-      }
-
-      it 'gets begin_pos' do
-        expect(subject.begin_pos).to eq 'Synvert::Application.configure do'.length
-      end
-
-      it 'gets end_pos' do
-        expect(subject.end_pos).to eq 'Synvert::Application.configure do'.length
-      end
-
-      it 'gets rewritten_code' do
-        expect(subject.rewritten_code).to eq "\n  config.eager_load = true"
-      end
-    end
-
-    describe 'block node with args' do
-      subject {
-        source = "RSpec.configure do |config|\nend"
-        block_node = Parser::CurrentRuby.parse(source)
-        instance = double(current_node: block_node)
-        Rewriter::InsertAction.new(instance, '{{arguments.first}}.include FactoryGirl::Syntax::Methods')
-      }
-
-      it 'gets begin_pos' do
-        expect(subject.begin_pos).to eq 'RSpec.configure do |config|'.length
-      end
-
-      it 'gets end_pos' do
-        expect(subject.end_pos).to eq 'RSpec.configure do |config|'.length
-      end
-
-      it 'gets rewritten_code' do
-        expect(subject.rewritten_code).to eq "\n  config.include FactoryGirl::Syntax::Methods"
-      end
+    subject {
+      source = "User.where(username: 'Richard')"
+      node = Parser::CurrentRuby.parse(source)
+      instance = double(current_node: node)
+      Rewriter::InsertAction.new(instance, '.first')
+    }
+
+    it 'gets begin_pos' do
+      expect(subject.begin_pos).to eq "User.where(username: 'Richard')".length
     end
 
-    describe 'class node without superclass' do
-      subject {
-        source = "class User\n  has_many :posts\nend"
-        class_node = Parser::CurrentRuby.parse(source)
-        instance = double(current_node: class_node)
-        Rewriter::InsertAction.new(instance, 'include Deletable')
-      }
-
-      it 'gets begin_pos' do
-        expect(subject.begin_pos).to eq 'class User'.length
-      end
-
-      it 'gets end_pos' do
-        expect(subject.end_pos).to eq 'class User'.length
-      end
-
-      it 'gets rewritten_code' do
-        expect(subject.rewritten_code).to eq "\n  include Deletable"
-      end
+    it 'gets end_pos' do
+      expect(subject.end_pos).to eq "User.where(username: 'Richard')".length
     end
 
-    describe 'class node with superclass' do
-      subject {
-        source = "class User < ActiveRecord::Base\n  has_many :posts\nend"
-        class_node = Parser::CurrentRuby.parse(source)
-        instance = double(current_node: class_node)
-        Rewriter::InsertAction.new(instance, 'include Deletable')
-      }
-
-      it 'gets begin_pos' do
-        expect(subject.begin_pos).to eq 'class User < ActionRecord::Base'.length
-      end
-
-      it 'gets end_pos' do
-        expect(subject.end_pos).to eq 'class User < ActionRecord::Base'.length
-      end
-
-      it 'gets rewritten_code' do
-        expect(subject.rewritten_code).to eq "\n  include Deletable"
-      end
+    it 'gets rewritten_code' do
+      expect(subject.rewritten_code).to eq ".first"
     end
   end
 end

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

@@ -106,10 +106,10 @@ module Synvert::Core
     it 'parses insert' do
       expect(Rewriter::InsertAction).to receive(:new).with(
         instance,
-        '{{arguments.first}}.include FactoryGirl::Syntax::Methods',
+        '.first',
         {}
       )
-      instance.insert '{{arguments.first}}.include FactoryGirl::Syntax::Methods'
+      instance.insert '.first'
     end
 
     it 'parses insert_after' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: synvert-core
 version: !ruby/object:Gem::Version
-  version: 0.39.0
+  version: 0.40.0
 platform: ruby
 authors:
 - Richard Huang
@@ -146,7 +146,6 @@ files:
 - lib/synvert/core/node_ext.rb
 - lib/synvert/core/rewriter.rb
 - lib/synvert/core/rewriter/action.rb
-- lib/synvert/core/rewriter/action/add_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

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

@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-module Synvert::Core
-  # AddAction to add code to the node.
-  class Rewriter::AddAction < 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
-    end
-
-    private
-
-    # The rewritten source code.
-    #
-    # @return [String] rewritten code.
-    def rewritten_code
-      rewritten_source
-    end
-  end
-end