node_mutation 1.11.0 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d41515d4be39619d95802e531496159773a1202de61c8fa3c3d269d2a72926da
-  data.tar.gz: 2bd0415eec90cb45cdc2dcfacce1cf6529fcdf9f12e6fcd44054aa273e4c4b0b
+  metadata.gz: 97dd9f7362d033a9572811a001fcda89634580d2af15bd7736209dbb7228ba56
+  data.tar.gz: e7d4eb04cd7c0d739622105b8aedf85bc8e1e72c8e4e278bf87d840d05787fea
 SHA512:
-  metadata.gz: 656c00012eac7a7b6d2229933fb7e08fd7f0f9a986e90f7db69cc5129097702a2850cdf5494c6f1dae3d6f7da9d0ba642ffd7eb4362517a5c0f465a0d49a52d3
-  data.tar.gz: 4faced52fd71462a10c54970afb4412858c355c96bf8713e132f886535d3a1309aa792bc1f4e946c0549492c351c9750fa3ab1d05c3ecd0fda0d58f84c98427f
+  metadata.gz: 0e44b67cb7c1dc8ef15ed16ac92c10400639704df32d0a06f2db40a68b8ea6259fe73d7c0dda2df8c5dd07c03137e95d7eca62ae0948c27b2e93b36fa5752cc3
+  data.tar.gz: f07ebe6b3712ae3d13b9cf06b7b5dd3e45d68ee7cb7571a9e227f2318de16271f4db2aea0a1ec62a48bc71e6666f8c91e9fda00628cf32d685af083890f70b41

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # NodeMutation
 
+## 1.12.0 (2023-03-23)
+
+* Support `{key}_pair` for a `hash` node
+
 ## 1.11.0 (2023-03-20)
 
 * Calculate position properly for `add_comma`

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    node_mutation (1.11.0)
+    node_mutation (1.12.0)
       erubis
 
 GEM

data/lib/node_mutation/parser_adapter.rb

@@ -17,41 +17,36 @@ class NodeMutation::ParserAdapter < NodeMutation::Adapter
   def rewritten_source(node, code)
     code.gsub(/{{(.+?)}}/m) do
       old_code = Regexp.last_match(1)
-      first_key = old_code.split('.').first
-      if node.respond_to?(first_key)
-        evaluated = child_node_by_name(node, old_code)
-        case evaluated
-        when Parser::AST::Node
-          if evaluated.type == :args
-            evaluated.loc.expression.source[1...-1]
+      evaluated = child_node_by_name(node, old_code)
+      case evaluated
+      when Parser::AST::Node
+        if evaluated.type == :args
+          evaluated.loc.expression.source[1...-1]
+        else
+          evaluated.loc.expression.source
+        end
+      when Array
+        if evaluated.size > 0
+          file_source = file_content(evaluated.first)
+          source = file_source[evaluated.first.loc.expression.begin_pos...evaluated.last.loc.expression.end_pos]
+          lines = source.split "\n"
+          lines_count = lines.length
+          if lines_count > 1 && lines_count == evaluated.size
+            new_code = []
+            lines.each_with_index { |line, index|
+              new_code << (index == 0 ? line : line[evaluated.first.indent - 2..-1])
+            }
+            new_code.join("\n")
           else
-            evaluated.loc.expression.source
+            source
           end
-        when Array
-          if evaluated.size > 0
-            file_source = file_content(evaluated.first)
-            source = file_source[evaluated.first.loc.expression.begin_pos...evaluated.last.loc.expression.end_pos]
-            lines = source.split "\n"
-            lines_count = lines.length
-            if lines_count > 1 && lines_count == evaluated.size
-              new_code = []
-              lines.each_with_index { |line, index|
-                new_code << (index == 0 ? line : line[evaluated.first.indent - 2..-1])
-              }
-              new_code.join("\n")
-            else
-              source
-            end
-          end
-        when String, Symbol, Integer, Float
-          evaluated
-        when NilClass
-          ''
-        else
-          raise "can not parse \"#{code}\""
         end
+      when String, Symbol, Integer, Float
+        evaluated
+      when NilClass
+        ''
       else
-        raise NodeMutation::MethodNotSupported, "#{first_key} is not supported for #{get_source(node)}"
+        raise "can not parse \"#{code}\""
       end
     end
   end
@@ -84,7 +79,10 @@ class NodeMutation::ParserAdapter < NodeMutation::Adapter
 
     case [node.type, child_name.to_sym]
     when %i[block pipes], %i[def parentheses], %i[defs parentheses]
-      NodeMutation::Range.new(node.arguments.first.loc.expression.begin_pos - 1, node.arguments.last.loc.expression.end_pos + 1)
+      NodeMutation::Range.new(
+        node.arguments.first.loc.expression.begin_pos - 1,
+        node.arguments.last.loc.expression.end_pos + 1
+      )
     when %i[block arguments], %i[def arguments], %i[defs arguments]
       NodeMutation::Range.new(node.arguments.first.loc.expression.begin_pos, node.arguments.last.loc.expression.end_pos)
     when %i[class name], %i[const name], %i[def name], %i[defs name]
@@ -108,6 +106,15 @@ class NodeMutation::ParserAdapter < NodeMutation::Adapter
         NodeMutation::Range.new(node.loc.begin.begin_pos, node.loc.end.end_pos)
       end
     else
+      if node.type == :hash && child_name.to_s.end_with?('_pair')
+        pair_node = node.pairs.find { |pair| pair.key.to_value.to_s == child_name.to_s[0..-6] }
+        raise NodeMutation::MethodNotSupported,
+              "#{direct_child_name} is not supported for #{get_source(node)}" unless pair_node
+        return child_node_range(pair, nested_child_name) if nested_child_name
+
+        return NodeMutation::Range.new(pair_node.loc.expression.begin_pos, pair_node.loc.expression.end_pos)
+      end
+
       raise NodeMutation::MethodNotSupported,
             "#{direct_child_name} is not supported for #{get_source(node)}" unless node.respond_to?(direct_child_name)
 
@@ -178,6 +185,15 @@ class NodeMutation::ParserAdapter < NodeMutation::Adapter
       return child_node
     end
 
+    if node.is_a?(Parser::AST::Node) && node.type == :hash && direct_child_name.end_with?('_pair')
+      pair_node = node.pairs.find { |pair| pair.key.to_value.to_s == direct_child_name[0..-6] }
+      raise NodeMutation::MethodNotSupported,
+            "#{direct_child_name} is not supported for #{get_source(node)}" unless pair_node
+      return child_node_by_name(pair_node, nested_child_name) if nested_child_name
+
+      return pair_node
+    end
+
     if node.respond_to?(direct_child_name)
       child_node = node.send(direct_child_name)
     elsif direct_child_name.include?('(') && direct_child_name.include?(')')

data/lib/node_mutation/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: node_mutation
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 1.12.0
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-03-20 00:00:00.000000000 Z
+date: 2023-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis