node_mutation 1.5.1 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44339bec6d4624f5f7cf60b9253e701c7215f2b5bae0094b0532bf86e4c6cf91
-  data.tar.gz: 4878c3c9f61830b728d6ea21424588d62c039e42aa5a029b1786844a1c7b74db
+  metadata.gz: 1a919cd77334f1c935135667972c64670f1513a31c63dde2a71405dcb165077f
+  data.tar.gz: ce7faaade885a41905b1371b04cb2c94962cd044404f754a6bd1d0537b6c871a
 SHA512:
-  metadata.gz: 1d0b12e168a2a8aa7a8019484125bd0edcdb159846216de1d1822e1a75f1b47e1f57f87b5de0cb94a0ebec45e950b2f32c9349c76294ac6156d0d382be85d52e
-  data.tar.gz: deb03d485ddf7ca91797cafbe28526ea5e91b7f862c71173e801587d727ced13680f7ff4dc3d4f2d563e8830c52622e5ce44dc4f02d84ddc6f26f572941db6d5
+  metadata.gz: ee3c31054d31ba1b997e366f3c2ac0fd4d6b3587f9f49e59d12d72a23cb8b8d4b1f12dcfb7f5d72440cbd867b4ed5ef01e19cfcdfbaa11a9c3d4b7db53c047e6
+  data.tar.gz: 2295e27670dbaa6be22ef320cd3e13cbb69e86fcf2f8824f8be4ada1607deb98fa7d6d1891bb3a4360debd37abf5876f155276ddd7bf45b0aac6667df67920af

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # NodeMutation
 
+## 1.6.1 (2022-10-24)
+
+* Better error message when node does not respond to a key
+
+## 1.6.0 (2022-10-19)
+
+* Raise `NodeMutation::MethodNotSupported` if not respond to child node name
+
 ## 1.5.1 (2022-10-19)
 
 * Better error message for unknown code

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    node_mutation (1.5.1)
+    node_mutation (1.6.1)
       activesupport (< 7.0.0)
       erubis
 

data/lib/node_mutation/parser_adapter.rb

@@ -2,13 +2,19 @@
 
 class NodeMutation::ParserAdapter < NodeMutation::Adapter
   def get_source(node)
-    node.loc.expression.source
+    if node.is_a?(Array)
+      source = file_content(node.first)
+      source[node.first.loc.expression.begin_pos...node.last.loc.expression.end_pos]
+    else
+      node.loc.expression.source
+    end
   end
 
   def rewritten_source(node, code)
     code.gsub(/{{(.+?)}}/m) do
       old_code = Regexp.last_match(1)
-      begin
+      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
@@ -35,13 +41,11 @@ class NodeMutation::ParserAdapter < NodeMutation::Adapter
           end
         when String, Symbol, Integer, Float
           evaluated
-        when NilClass
-          'nil'
         else
-          raise "rewritten_source is not handled for #{evaluated.inspect}"
+          raise "can not parse \"#{code}\""
         end
-      rescue StandardError => e
-        raise "can not parse \"#{code}\""
+      else
+        raise NodeMutation::MethodNotSupported, "#{first_key} is not supported for #{get_source(node)}"
       end
     end
   end
@@ -51,19 +55,23 @@ class NodeMutation::ParserAdapter < NodeMutation::Adapter
   end
 
   def child_node_range(node, child_name)
+    direct_child_name, nested_child_name = child_name.to_s.split('.', 2)
+
     if node.is_a?(Array)
-      direct_child_name, nested_child_name = child_name.split('.', 2)
-      child_node = direct_child_name =~ /\A\d+\z/ ? node[direct_child_name.to_i - 1] : node.send(direct_child_name)
-      if nested_child_name
-        return child_node_range(child_node, nested_child_name)
-      elsif child_node
-        return OpenStruct.new(
-          start: child_node.loc.expression.begin_pos,
-          end: child_node.loc.expression.end_pos
-        )
-      else
-        raise MethodNotSupported, "child_node_range is not handled for #{get_source(node)}, child_name: #{child_name}"
+      if direct_child_name =~ /\A\d+\z/
+        child_node = node[direct_child_name.to_i - 1]
+        raise NodeMutation::MethodNotSupported, "#{direct_child_name} is not supported for #{get_source(node)}" unless child_node
+        return child_node_range(child_node, nested_child_name) if nested_child_name
+        return OpenStruct.new(start: child_node.loc.expression.begin_pos, end: child_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)
+      child_node = node.send(direct_child_name)
+      return child_node_range(child_node, nested_child_name) if nested_child_name
+      return OpenStruct.new(
+        start: child_node.loc.expression.begin_pos,
+        end: child_node.loc.expression.end_pos
+      )
     end
 
     case [node.type, child_name.to_sym]
@@ -96,33 +104,32 @@ class NodeMutation::ParserAdapter < NodeMutation::Adapter
         OpenStruct.new(start: node.loc.begin.begin_pos, end: node.loc.end.end_pos)
       end
     else
-      direct_child_name, nested_child_name = child_name.to_s.split('.', 2)
-      if node.respond_to?(direct_child_name)
-        child_node = node.send(direct_child_name)
-
-        return child_node_range(child_node, nested_child_name) if nested_child_name
+      raise NodeMutation::MethodNotSupported, "#{direct_child_name} is not supported for #{get_source(node)}" unless node.respond_to?(direct_child_name)
 
-        return nil if child_node.nil?
+      child_node = node.send(direct_child_name)
 
-        if child_node.is_a?(Parser::AST::Node)
-          return(
-            OpenStruct.new(
-              start: child_node.loc.expression.begin_pos,
-              end: child_node.loc.expression.end_pos
-            )
-          )
-        end
+      return child_node_range(child_node, nested_child_name) if nested_child_name
 
-        # arguments
-        return nil if child_node.empty?
+      return nil if child_node.nil?
 
+      if child_node.is_a?(Parser::AST::Node)
         return(
           OpenStruct.new(
-            start: child_node.first.loc.expression.begin_pos,
-            end: child_node.last.loc.expression.end_pos
+            start: child_node.loc.expression.begin_pos,
+            end: child_node.loc.expression.end_pos
           )
         )
       end
+
+      # arguments
+      return nil if child_node.empty?
+
+      return(
+        OpenStruct.new(
+          start: child_node.first.loc.expression.begin_pos,
+          end: child_node.last.loc.expression.end_pos
+        )
+      )
     end
   end
 
@@ -154,9 +161,17 @@ class NodeMutation::ParserAdapter < NodeMutation::Adapter
     direct_child_name, nested_child_name = child_name.to_s.split('.', 2)
 
     if node.is_a?(Array)
-      child_direct_child_node = direct_child_name =~ /\A\d+\z/ ? node[direct_child_name.to_i - 1] : node.send(direct_child_name)
-      return child_node_by_name(child_direct_child_node, nested_child_name) if nested_child_name
-      return child_direct_child_node if child_direct_child_node
+      if direct_child_name =~ /\A\d+\z/
+        child_node = node[direct_child_name.to_i - 1]
+        raise NodeMutation::MethodNotSupported, "#{direct_child_name} is not supported for #{get_source(node)}" unless child_node
+        return child_node_by_name(child_node, nested_child_name) if nested_child_name
+        return child_node
+      end
+
+      raise NodeMutation::MethodNotSupported, "#{direct_child_name} is not supported for #{get_source(node)}" unless node.respond_to?(direct_child_name)
+      child_node = node.send(direct_child_name)
+      return child_node_by_name(child_node, nested_child_name) if nested_child_name
+      return child_node
     end
 
     if node.respond_to?(direct_child_name)
@@ -164,15 +179,11 @@ class NodeMutation::ParserAdapter < NodeMutation::Adapter
     elsif direct_child_name.include?('(') && direct_child_name.include?(')')
       child_node = eval("node.#{direct_child_name}")
     else
-      child_node = nil
+      raise NodeMutation::MethodNotSupported, "#{direct_child_name} is not supported for #{get_source(node)}"
     end
 
     return child_node_by_name(child_node, nested_child_name) if nested_child_name
 
-    return nil if child_node.nil?
-
-    return child_node if child_node.is_a?(Parser::AST::Node)
-
-    return child_node
+    child_node
   end
 end

data/lib/node_mutation/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: node_mutation
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.6.1
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-10-19 00:00:00.000000000 Z
+date: 2022-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport