node_mutation 1.4.3 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 739b5f521fb0df8ea2e4b47f11851574e4e771528923fa89e0d7c5a2ed8a0b7b
-  data.tar.gz: fe8c44a82ef5a21df6390936f7b5b91700c8a7f965e34ada1229ef2443b013c6
+  metadata.gz: b66c8223045972f4f91cdae0b61a5589c04e7f53f3eedf66b1c0eebee9d66b1c
+  data.tar.gz: 64a47a10bce6886a876cd04b08ff37118e6094bcc40d1e909e861d6f25c37d43
 SHA512:
-  metadata.gz: b2dd045bc579535b9ba6c6ece53c8f19ae840385682ca0f3759713b5ee36abca574cbf4a80c065b024ecbf40d23a39c423b6e7ecd3a82d4417f7b65583b78885
-  data.tar.gz: 298af0ed4518668a784df4e5c3fec4a3904fa63fc325ace94d90ec869cd111efe5e20829b6f0f8902264f38fe87ea2359c65db1ada2170813b4ce62886fdbaef
+  metadata.gz: 12f5cd0bc631511de6d7b250dec14869ce1e19d5c311ac59e5722578f2fa15f51b17be600d5fc59a3ef5ffaa1607e209ccc6e611e2046f1a9005cffb693367a9
+  data.tar.gz: 7d3496c675ed29a8ddaa35d3fbf4b538677a44016696c40020e518afa62526fa5e7ad2abec2b7339732adabb820fa037795c3d8597b0149a2cd0502c23c95883

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # NodeMutation
 
+## 1.5.0 (2022-10-17)
+
+* Remove `insert_after`
+* Fix regexp to match evaluated value
+
+## 1.4.4 (2022-09-26)
+
+* Parser adapter `child_node_by_name` support function call
+
 ## 1.4.3 (2022-09-24)
 
 * Update source only if `new_code` is not `nil`

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    node_mutation (1.4.3)
+    node_mutation (1.5.0)
       activesupport (< 7.0.0)
       erubis
 
@@ -75,7 +75,7 @@ GEM
     thor (1.2.1)
     tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
-    zeitwerk (2.6.0)
+    zeitwerk (2.6.1)
 
 PLATFORMS
   x86_64-darwin-21

data/README.md

@@ -37,8 +37,6 @@ mutation.append node, 'include FactoryGirl::Syntax::Methods'
 mutation.delete node, :dot, :message, and_comma: true
 # insert code to the ast node.
 mutation.insert node, 'URI.', at: 'beginning'
-# insert code next to the ast node.
-mutation.insert_after node, '{{arguments.first}}.include FactoryGirl::Syntax::Methods'
 # prepend code to the ast node.
 mutation.prepend node, '{{arguments.first}}.include FactoryGirl::Syntax::Methods'
 # remove source code of the ast node

data/lib/node_mutation/parser_adapter.rb

@@ -6,7 +6,7 @@ class NodeMutation::ParserAdapter < NodeMutation::Adapter
   end
 
   def rewritten_source(node, code)
-    code.gsub(/{{(.*?)}}/m) do
+    code.gsub(/{{(.+?)}}/m) do
       old_code = Regexp.last_match(1)
       if node.respond_to?(old_code.split('.').first)
         evaluated = child_node_by_name(node, old_code)
@@ -161,14 +161,18 @@ class NodeMutation::ParserAdapter < NodeMutation::Adapter
 
     if node.respond_to?(direct_child_name)
       child_node = node.send(direct_child_name)
+    elsif direct_child_name.include?('(') && direct_child_name.include?(')')
+      child_node = eval("node.#{direct_child_name}")
+    else
+      child_node = nil
+    end
 
-      return child_node_by_name(child_node, nested_child_name) if nested_child_name
+    return child_node_by_name(child_node, nested_child_name) if nested_child_name
 
-      return nil if child_node.nil?
+    return nil if child_node.nil?
 
-      return child_node if child_node.is_a?(Parser::AST::Node)
+    return child_node if child_node.is_a?(Parser::AST::Node)
 
-      return child_node
-    end
+    return child_node
   end
 end

data/lib/node_mutation/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class NodeMutation
-  VERSION = "1.4.3"
+  VERSION = "1.5.0"
 end

data/lib/node_mutation.rb

@@ -18,7 +18,6 @@ class NodeMutation
   autoload :AppendAction, 'node_mutation/action/append_action'
   autoload :DeleteAction, 'node_mutation/action/delete_action'
   autoload :InsertAction, 'node_mutation/action/insert_action'
-  autoload :InsertAfterAction, 'node_mutation/action/insert_after_action'
   autoload :RemoveAction, 'node_mutation/action/remove_action'
   autoload :PrependAction, 'node_mutation/action/prepend_action'
   autoload :ReplaceAction, 'node_mutation/action/replace_action'
@@ -112,21 +111,6 @@ class NodeMutation
     @actions << InsertAction.new(node, code, at: at, to: to).process
   end
 
-  # Insert code next to the ast node.
-  # @param node [Node] ast node
-  # @param code [String] new code to insert.
-  # @example
-  # source code of the ast node is
-  #     Synvert::Application.config.secret_token = "0447aa931d42918bfb934750bb78257088fb671186b5d1b6f9fddf126fc8a14d34f1d045cefab3900751c3da121a8dd929aec9bafe975f1cabb48232b4002e4e"
-  # then we call
-  #     mutation.insert_after(node, "{{receiver}}.secret_key_base = \"#{SecureRandom.hex(64)}\"")
-  # the source code will be rewritten to
-  #     Synvert::Application.config.secret_token = "0447aa931d42918bfb934750bb78257088fb671186b5d1b6f9fddf126fc8a14d34f1d045cefab3900751c3da121a8dd929aec9bafe975f1cabb48232b4002e4e"
-  #     Synvert::Application.config.secret_key_base = "bf4f3f46924ecd9adcb6515681c78144545bba454420973a274d7021ff946b8ef043a95ca1a15a9d1b75f9fbdf85d1a3afaf22f4e3c2f3f78e24a0a188b581df"
-  def insert_after(node, code)
-    @actions << InsertAfterAction.new(node, code).process
-  end
-
   # Prepend code to the ast node.
   # @param node [Node] ast node
   # @param code [String] new code to prepend.

data/sig/node_mutation.rbs

@@ -27,8 +27,6 @@ module NodeMutation[T]
 
   def insert: (node: T, code: String, ?at: "beginning" | "end", ?to: nil | String) -> void
 
-  def insert_after: (node: T, code: String) -> void
-
   def prepend: (node: T, code: String) -> void
 
   def remove: (node: T, **options: { and_comma: bool }) -> void

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: node_mutation
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.5.0
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-23 00:00:00.000000000 Z
+date: 2022-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -58,7 +58,6 @@ files:
 - lib/node_mutation/action/append_action.rb
 - lib/node_mutation/action/delete_action.rb
 - lib/node_mutation/action/insert_action.rb
-- lib/node_mutation/action/insert_after_action.rb
 - lib/node_mutation/action/noop_action.rb
 - lib/node_mutation/action/prepend_action.rb
 - lib/node_mutation/action/remove_action.rb
@@ -96,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.3.22
 signing_key:
 specification_version: 4
 summary: ast node mutation apis

data/lib/node_mutation/action/insert_after_action.rb

@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-
-# InsertAfterAction to insert code next to the node.
-class NodeMutation::InsertAfterAction < NodeMutation::Action
-  private
-
-  # Calculate the begin and end positions.
-  def calculate_position
-    @start = NodeMutation.adapter.get_end(@node)
-    @end = @start
-  end
-
-  # Indent of the node.
-  #
-  # @param node [Parser::AST::Node]
-  # @return [Integer] indent size
-  def indent(node)
-    ' ' * NodeMutation.adapter.get_start_loc(node).column
-  end
-end