synvert-core 1.12.0 → 1.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e526dbe6f12418da40df7cb5b945f7ed957820573455b575f2a609c334b58e72
-  data.tar.gz: 1f22528b636b548c9ddb05466d366e62dce813794d173c11b8de11ef522b97a8
+  metadata.gz: d3d907ab2e51c1861a28d12934cf453f63df79fc23e072c1005013c5f9b137be
+  data.tar.gz: 16e8425a70a74b779b36265eec12aacca4b6073e5911052b0114726a740f6e99
 SHA512:
-  metadata.gz: 46f29de95717e764a33c0303c20086fb3fc3dcc43c7548c174b4eb46f368e2b0cec6b1ea6ff88eed04654f58cf9dad3066aa679ece8d7a6cfb2a7676095fe4aa
-  data.tar.gz: 7622e84c396751bd49b57464424efee84ba3f45d727c5653528fb11a5da7d26e856c0008ea1dc5967e7ee3afe8f238a8dbb6c67bc5071970312523a426a98dd3
+  metadata.gz: 3a73e71ccb24cbdf40fe515fcb732e242e27e5dbac5b130bc9e88d19b8c3ef315cc7c3e00195d3d4e15f6a24bd4fb89336686ae379451e3fa7433548bd3402c8
+  data.tar.gz: c6e026527d96e8766a330626c330d280c6ab650834e71b56c64c4cf81a4dd7d0911d89919c16e0f651208e0d0ce1c9c3b36f6c08f4c9f5f7d04d0af4849a713d

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## 1.13.0 (2022-10-17)
+
+* Add `insert_before` dsl
+* Update `insert_after` to reuse `NodeMutation#insert`
+
 ## 1.12.0 (2022-10-14)
 
 * Condition accepts both nql and rules

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    synvert-core (1.12.0)
+    synvert-core (1.13.0)
       activesupport (< 7.0.0)
       erubis
       node_mutation
@@ -50,10 +50,10 @@ GEM
     method_source (1.0.0)
     minitest (5.16.3)
     nenv (0.3.0)
-    node_mutation (1.4.4)
+    node_mutation (1.5.0)
       activesupport (< 7.0.0)
       erubis
-    node_query (1.7.0)
+    node_query (1.8.1)
       activesupport (< 7.0.0)
     notiffany (0.1.3)
       nenv (~> 0.1)

data/README.md

@@ -90,6 +90,7 @@ Actions:
 * [prepend](./Synvert/Core/Rewriter/Instance.html#prepend-instance_method) - prepend the code to the bottom of current node body
 * [insert](./Synvert/Core/Rewriter/Instance.html#insert-instance_method) - insert code
 * [insert_after](./Synvert/Core/Rewriter/Instance.html#insert_after-instance_method) - insert the code next to the current node
+* [insert_before](./Synvert/Core/Rewriter/Instance.html#insert_before-instance_method) - insert the code previous to the current node
 * [replace](./Synvert/Core/Rewriter/Instance.html#replace-instance_method) - replace the code of specified child nodes
 * [delete](./Synvert/Core/Rewriter/Instance.html#delete-instance_method) - delete the code specified child nodes
 * [wrap](./Synvert/Core/Rewriter/Instance.html#wrap-instance_method) - wrap the current node with code

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

@@ -166,8 +166,7 @@ module Synvert::Core
       Rewriter::IfOnlyExistCondition.new(self, nql_or_rules, &block).process
     end
 
-    # Parse +append+ dsl, it creates a {Synvert::Core::Rewriter::AppendAction} to
-    # append the code to the bottom of current node body.
+    # Parse +append+ dsl, it appends the code to the bottom of current node body.
     # @example
     #   # def teardown
     #   #   clean_something
@@ -185,8 +184,7 @@ module Synvert::Core
       @current_mutation.append(@current_node, code)
     end
 
-    # Parse +prepend+ dsl, it creates a {Synvert::Core::Rewriter::PrependAction} to
-    # prepend the code to the top of current node body.
+    # Parse +prepend+ dsl, it prepends the code to the top of current node body.
     # @example
     #   # def setup
     #   #   do_something
@@ -204,7 +202,7 @@ module Synvert::Core
       @current_mutation.prepend(@current_node, code)
     end
 
-    # Parse +insert+ dsl, it creates a {Synvert::Core::Rewriter::InsertAction} to insert code.
+    # Parse +insert+ dsl, it inserts code.
     # @example
     #   # open('http://test.com')
     #   # =>
@@ -219,8 +217,7 @@ module Synvert::Core
       @current_mutation.insert(@current_node, code, at: at, to: to)
     end
 
-    # Parse +insert_after+ dsl, it creates a {Synvert::Core::Rewriter::InsertAfterAction} to
-    # insert the code next to the current node.
+    # Parse +insert_after+ dsl, it inserts the code next to the current node.
     # @example
     #   # Synvert::Application.config.secret_token = "0447aa931d42918bfb934750bb78257088fb671186b5d1b6f9fddf126fc8a14d34f1d045cefab3900751c3da121a8dd929aec9bafe975f1cabb48232b4002e4e"
     #   # =>
@@ -231,11 +228,26 @@ module Synvert::Core
     #   end
     # @param code [String] code need to be inserted.
     def insert_after(code)
-      @current_mutation.insert_after(@current_node, code)
+      column = ' ' * NodeMutation.adapter.get_start_loc(@current_node).column
+      @current_mutation.insert(@current_node, "\n#{column}#{code}", { at: 'end' })
     end
 
-    # Parse +replace_erb_stmt_with_expr+ dsl, it creates a {Synvert::Core::Rewriter::ReplaceErbStmtWithExprAction} to
-    # replace erb stmt code to expr code.
+    # Parse +insert_before+ dsl, it inserts the code previous to the current node.
+    # @example
+    #   # Synvert::Application.config.secret_token = "0447aa931d42918bfb934750bb78257088fb671186b5d1b6f9fddf126fc8a14d34f1d045cefab3900751c3da121a8dd929aec9bafe975f1cabb48232b4002e4e"
+    #   # =>
+    #   # Synvert::Application.config.secret_key_base = "bf4f3f46924ecd9adcb6515681c78144545bba454420973a274d7021ff946b8ef043a95ca1a15a9d1b75f9fbdf85d1a3afaf22f4e3c2f3f78e24a0a188b581df"
+    #   # Synvert::Application.config.secret_token = "0447aa931d42918bfb934750bb78257088fb671186b5d1b6f9fddf126fc8a14d34f1d045cefab3900751c3da121a8dd929aec9bafe975f1cabb48232b4002e4e"
+    #   with_node type: 'send', message: 'secret_token=' do
+    #     insert_before "{{receiver}}.secret_key_base = \"#{SecureRandom.hex(64)}\""
+    #   end
+    # @param code [String] code need to be inserted.
+    def insert_before(code)
+      column = ' ' * NodeMutation.adapter.get_start_loc(@current_node).column
+      @current_mutation.insert(@current_node, "#{code}\n#{column}", { at: 'beginning' })
+    end
+
+    # Parse +replace_erb_stmt_with_expr+ dsl, it replaces erb stmt code to expr code.
     # @example
     #   # <% form_for post do |f| %>
     #   # <% end %>
@@ -249,8 +261,7 @@ module Synvert::Core
       @current_mutation.actions << Rewriter::ReplaceErbStmtWithExprAction.new(@current_node).process
     end
 
-    # Parse +replace_with+ dsl, it creates a {Synvert::Core::Rewriter::ReplaceWithAction} to
-    # replace the whole code of current node.
+    # Parse +replace_with+ dsl, it replaces the whole code of current node.
     # @example
     #   # obj.stub(:foo => 1, :bar => 2)
     #   # =>
@@ -263,8 +274,7 @@ module Synvert::Core
       @current_mutation.replace_with(@current_node, code)
     end
 
-    # Parse +replace+ dsl, it creates a {Synvert::Core::Rewriter::ReplaceAction} to
-    # replace the code of specified child nodes.
+    # Parse +replace+ dsl, it replaces the code of specified child nodes.
     # @example
     #   # assert(object.empty?)
     #   # =>
@@ -279,7 +289,7 @@ module Synvert::Core
       @current_mutation.replace(@current_node, *selectors, with: with)
     end
 
-    # Parse +remove+ dsl, it creates a {Synvert::Core::Rewriter::RemoveAction} to remove current node.
+    # Parse +remove+ dsl, it removes current node.
     # @example
     #   with_node type: 'send', message: { in: %w[puts p] } do
     #     remove
@@ -290,7 +300,7 @@ module Synvert::Core
       @current_mutation.remove(@current_node, **options)
     end
 
-    # Parse +delete+ dsl, it creates a {Synvert::Core::Rewriter::DeleteAction} to delete child nodes.
+    # Parse +delete+ dsl, it deletes child nodes.
     # @example
     #   # FactoryBot.create(...)
     #   # =>
@@ -305,8 +315,7 @@ module Synvert::Core
       @current_mutation.delete(@current_node, *selectors, **options)
     end
 
-    # Parse +wrap+ dsl, it creates a {Synvert::Core::Rewriter::WrapAction} to
-    # wrap current node with code.
+    # Parse +wrap+ dsl, it wraps current node with code.
     # @example
     #   # class Foobar
     #   # end

data/lib/synvert/core/version.rb

@@ -2,6 +2,6 @@
 
 module Synvert
   module Core
-    VERSION = '1.12.0'
+    VERSION = '1.13.0'
   end
 end

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

@@ -127,10 +127,19 @@ module Synvert::Core
     it 'parses insert_after' do
       instance.current_mutation = double
       instance.current_node = double
-      expect(instance.current_mutation).to receive(:insert_after).with(instance.current_node, 'Foobar')
+      expect(NodeMutation).to receive_message_chain(:adapter, :get_start_loc, :column).and_return(2)
+      expect(instance.current_mutation).to receive(:insert).with(instance.current_node, "\n  Foobar", at: 'end')
       instance.insert_after 'Foobar'
     end
 
+    it 'parses insert_before' do
+      instance.current_mutation = double
+      instance.current_node = double
+      expect(NodeMutation).to receive_message_chain(:adapter, :get_start_loc, :column).and_return(2)
+      expect(instance.current_mutation).to receive(:insert).with(instance.current_node, "Foobar\n  ", at: 'beginning')
+      instance.insert_before 'Foobar'
+    end
+
     it 'parses replace_erb_stmt_with_expr' do
       instance.current_mutation = double
       instance.current_node = double

metadata

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