synvert-core 0.40.0 → 0.41.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c729d2f456550a622a39f2e43d6d6c7f701f8b1330af038c436a03ec162d828
-  data.tar.gz: 8f5e7642d9073bfa38798dbd237a416037047991d530f4ff862623007ffa81f7
+  metadata.gz: 4b54b506cc880f8fff9834b131659fd6f32cc60082bfade8a07d2d9a767352dd
+  data.tar.gz: 0ec762ecd158a05142674be271a10a0cbbe260ae7d4e0f0cd36ab4d426cefcd7
 SHA512:
-  metadata.gz: 1187929417e2611b85d95dad5cc2f985d86cc4a1638d0ebecc4baeacc8dfa124ed5ec6595845a941fe7fe13c1666255333aa9f4249f297899c84ab8518a1b809
-  data.tar.gz: 729ff991e4a120d655faaa5517915d6d2614396668f08268a93b70c86f00ce038ec12ff09cf7d5cc060e34b7af8604689f3e4948b32a26bf4fc85ae520da1d21
+  metadata.gz: dabaa021af949aa5b15bbe5830d2e6154eb1679d5144d614c933c48d5767b92f0b1ad10b281d7d3819f755a762677c7dac26d696b501710e29f9730188f4afe9
+  data.tar.gz: 319e76c109e66ee558ff5c844ba3c9a1f3b6be1f2e6ca769bb3a97dedb19c6c0e4cf7dd22f7e04ff9a2508722f2a96e77e4f7521356f1c97ad0aef0e9959fe0f

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## 0.41.0 (2021-06-24)
+
+* Remove unused autoindent option
+* Add `insert 'xxx', at: 'beginning'`
+
 ## 0.40.0 (2021-06-23)
 
 * Rewrite `insert` action

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

@@ -3,18 +3,15 @@
 module Synvert::Core
   # Action defines rewriter action, add, replace or remove code.
   class Rewriter::Action
-    DEFAULT_OPTIONS = { autoindent: true }.freeze
     DEFAULT_INDENT = 2
 
     # Initialize an action.
     #
     # @param instance [Synvert::Core::Rewriter::Instance]
     # @param code [String] new code to add, replace or remove.
-    # @param options [Hash] action options, it includes :autoindent.
-    def initialize(instance, code, options = {})
+    def initialize(instance, code)
       @instance = instance
       @code = code
-      @options = DEFAULT_OPTIONS.merge(options)
       @node = @instance.current_node
     end
 

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

@@ -3,11 +3,22 @@
 module Synvert::Core
   # AddAction to add code to the node.
   class Rewriter::InsertAction < Rewriter::Action
+    def initialize(instance, code, at:)
+      @instance = instance
+      @code = code
+      @at = at
+      @node = @instance.current_node
+    end
+
     # Begin position to insert code.
     #
     # @return [Integer] begin position.
     def begin_pos
-      @node.loc.expression.end_pos
+      if @at == 'end'
+        @node.loc.expression.end_pos
+      else
+        @node.loc.expression.begin_pos
+      end
     end
 
     # End position, always same to begin position.

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

@@ -21,11 +21,11 @@ module Synvert::Core
     #
     # @return [String] rewritten code.
     def rewritten_code
-      if rewritten_source.split("\n").length > 1
+      if rewritten_source.include?("\n")
         new_code = []
-        rewritten_source.split("\n").each_with_index { |line, index|
-          new_code << (index == 0 || !@options[:autoindent] ? line : indent(@node) + line)
-        }
+        rewritten_source.split("\n").each_with_index do |line, index|
+          new_code << (index == 0 ? line : indent(@node) + line)
+        end
         new_code.join("\n")
       else
         rewritten_source

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

@@ -219,45 +219,41 @@ module Synvert::Core
     # append the code to the bottom of current node body.
     #
     # @param code [String] code need to be appended.
-    # @param options [Hash] action options.
-    def append(code, options = {})
-      @actions << Rewriter::AppendAction.new(self, code, options)
+    def append(code)
+      @actions << Rewriter::AppendAction.new(self, code)
     end
 
     # Parse prepend dsl, it creates a [Synvert::Core::Rewriter::PrependAction] to
     # prepend the code to the top of current node body.
     #
     # @param code [String] code need to be prepended.
-    # @param options [Hash] action options.
-    def prepend(code, options = {})
-      @actions << Rewriter::PrependAction.new(self, code, options)
+    def prepend(code)
+      @actions << Rewriter::PrependAction.new(self, code)
     end
 
     # Parse insert dsl, it creates a [Synvert::Core::Rewriter::InsertAction] to
     # insert the code to the top of current node body.
     #
     # @param code [String] code need to be inserted.
-    # @param options [Hash] action options.
-    def insert(code, options = {})
-      @actions << Rewriter::InsertAction.new(self, code, options)
+    # @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)
     end
 
     # Parse insert_after dsl, it creates a [Synvert::Core::Rewriter::InsertAfterAction] to
     # insert the code next to the current node.
     #
     # @param code [String] code need to be inserted.
-    # @param options [Hash] action options.
-    def insert_after(node, options = {})
-      @actions << Rewriter::InsertAfterAction.new(self, node, options)
+    def insert_after(node)
+      @actions << Rewriter::InsertAfterAction.new(self, node)
     end
 
     # Parse replace_with dsl, it creates a [Synvert::Core::Rewriter::ReplaceWithAction] to
     # replace current node with code.
     #
     # @param code [String] code need to be replaced with.
-    # @param options [Hash] action options.
-    def replace_with(code, options = {})
-      @actions << Rewriter::ReplaceWithAction.new(self, code, options)
+    def replace_with(code)
+      @actions << Rewriter::ReplaceWithAction.new(self, code)
     end
 
     # Parse replace with dsl, it creates a [Synvert::Core::Rewriter::ReplaceAction] to

data/lib/synvert/core/version.rb

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

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

@@ -4,23 +4,46 @@ require 'spec_helper'
 
 module Synvert::Core
   describe Rewriter::InsertAction do
-    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
+    context 'at end' do
+      subject {
+        source = "  User.where(username: 'Richard')"
+        node = Parser::CurrentRuby.parse(source)
+        instance = double(current_node: node)
+        Rewriter::InsertAction.new(instance, '.first', at: 'end')
+      }
+
+      it 'gets begin_pos' do
+        expect(subject.begin_pos).to eq "  User.where(username: 'Richard')".length
+      end
+
+      it 'gets end_pos' do
+        expect(subject.end_pos).to eq "  User.where(username: 'Richard')".length
+      end
 
-    it 'gets end_pos' do
-      expect(subject.end_pos).to eq "User.where(username: 'Richard')".length
+      it 'gets rewritten_code' do
+        expect(subject.rewritten_code).to eq '.first'
+      end
     end
 
-    it 'gets rewritten_code' do
-      expect(subject.rewritten_code).to eq ".first"
+    context 'at beginning' do
+      subject {
+        source = "  open('http://test.com')"
+        node = Parser::CurrentRuby.parse(source)
+        instance = double(current_node: node)
+        Rewriter::InsertAction.new(instance, 'URI.', at: 'beginning')
+      }
+
+      it 'gets begin_pos' do
+        expect(subject.begin_pos).to eq 2
+      end
+
+      it 'gets end_pos' do
+        expect(subject.end_pos).to eq 2
+      end
+
+      it 'gets rewritten_code' do
+        expect(subject.rewritten_code).to eq 'URI.'
+      end
     end
   end
 end

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

@@ -30,14 +30,12 @@ module Synvert::Core
         source = '  its(:size) { should == 1 }'
         send_node = Parser::CurrentRuby.parse(source)
         instance = double(current_node: send_node)
-        Rewriter::ReplaceWithAction.new(
-          instance,
-          "describe '#size' do
-  subject { super().size }
-  it { {{body}} }
-end",
-          autoindent: false
-        )
+        Rewriter::ReplaceWithAction.new(instance, <<~EOS)
+          describe '#size' do
+            subject { super().size }
+            it { {{body}} }
+          end
+        EOS
       }
 
       it 'gets begin_pos' do
@@ -49,10 +47,12 @@ end",
       end
 
       it 'gets rewritten_code' do
-        expect(subject.rewritten_code).to eq "describe '#size' do
-  subject { super().size }
-  it { should == 1 }
-end"
+        expect(subject.rewritten_code).to eq <<~EOS.strip
+          describe '#size' do
+              subject { super().size }
+              it { should == 1 }
+            end
+        EOS
       end
     end
   end

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

@@ -90,39 +90,38 @@ module Synvert::Core
     end
 
     it 'parses append' do
-      expect(Rewriter::AppendAction).to receive(:new).with(instance, 'include FactoryGirl::Syntax::Methods', {})
+      expect(Rewriter::AppendAction).to receive(:new).with(instance, 'include FactoryGirl::Syntax::Methods')
       instance.append 'include FactoryGirl::Syntax::Methods'
     end
 
     it 'parses prepend' do
       expect(Rewriter::PrependAction).to receive(:new).with(
         instance,
-        '{{arguments.first}}.include FactoryGirl::Syntax::Methods',
-        {}
+        '{{arguments.first}}.include FactoryGirl::Syntax::Methods'
       )
       instance.prepend '{{arguments.first}}.include FactoryGirl::Syntax::Methods'
     end
 
     it 'parses insert' do
-      expect(Rewriter::InsertAction).to receive(:new).with(
-        instance,
-        '.first',
-        {}
-      )
+      expect(Rewriter::InsertAction).to receive(:new).with(instance, '.first', at: 'end')
       instance.insert '.first'
     end
 
+    it 'parses insert' do
+      expect(Rewriter::InsertAction).to receive(:new).with(instance, 'URI.', at: 'beginning')
+      instance.insert 'URI.', at: 'beginning'
+    end
+
     it 'parses insert_after' do
       expect(Rewriter::InsertAfterAction).to receive(:new).with(
         instance,
-        '{{arguments.first}}.include FactoryGirl::Syntax::Methods',
-        {}
+        '{{arguments.first}}.include FactoryGirl::Syntax::Methods'
       )
       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}}', {})
+      expect(Rewriter::ReplaceWithAction).to receive(:new).with(instance, 'create {{arguments}}')
       instance.replace_with 'create {{arguments}}'
     end
 

metadata

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