node_mutation 1.6.0 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42db0eff54a5fab0ba9fc766d59605e7afe0c3bcf1627e646f0ffeff71a540bf
-  data.tar.gz: 2db50e0b04dc537e51afa21930bdee0b968aecd0d57573da6497b2da740193c7
+  metadata.gz: 7b2edcdadf3b7283b4446c8b0da41cb72daa4da3c180042b9e896973a8132cba
+  data.tar.gz: 3fc7cfe62f0e7ea6699b1d3bb9a918f14d1d451bd045b5d82cf09237db3a5c5e
 SHA512:
-  metadata.gz: eef2c42ddf5d778e1b3cac59f464ba0816377424a132de4d2d9e41a65a49c5ba2743c53ca4c7278d542a83e3de804d6596408d9b2c6d3281a848b9f911fe764f
-  data.tar.gz: f188c65ace72e059b5ee91d878389ebb95c34f9fe0d64a819dee355f7b4e2e855a3907ddf92bfd79ca459d618709dfdb2d7aaec73fae8d38a75834ca3907a512
+  metadata.gz: 7d04f31b6f9983e66555cfa640c52af13546cb066468b657db99f6dffcff5d1513a26a6f3bcb58c433b6a700e8db544e638807e9e3ccd30578a979fec0cc58e4
+  data.tar.gz: a35fb59ca28655346782ea46410b34784c965f06b00f66ba6b70a5647695a20e5cfcdf4010a32cf7f4fbf9c44ca3d1e4a37db1860a46f16db1ee8149994bb05c

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # NodeMutation
 
+## 1.6.2 (2022-10-25)
+
+* Mark same position as conflict action
+
+## 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

data/Gemfile.lock

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

data/lib/node_mutation/parser_adapter.rb

@@ -13,7 +13,8 @@ class NodeMutation::ParserAdapter < NodeMutation::Adapter
   def rewritten_source(node, code)
     code.gsub(/{{(.+?)}}/m) do
       old_code = Regexp.last_match(1)
-      if node.respond_to?(old_code.split('.').first)
+      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
@@ -44,7 +45,7 @@ class NodeMutation::ParserAdapter < NodeMutation::Adapter
           raise "can not parse \"#{code}\""
         end
       else
-        raise "can not parse \"#{code}\""
+        raise NodeMutation::MethodNotSupported, "#{first_key} is not supported for #{get_source(node)}"
       end
     end
   end

data/lib/node_mutation/version.rb

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

data/lib/node_mutation.rb

@@ -262,13 +262,19 @@ class NodeMutation
     conflict_actions = []
     return [] if i < 0
 
-    start = @actions[i].start
+    begin_pos = @actions[i].start
+    end_pos = @actions[i].end
     while j > -1
-      if start < @actions[j].end
+      # if we have two insert actions at same position.
+      same_position = begin_pos == @actions[j].start && begin_pos == end_pos && @actions[j].start == @actions[j].end
+      # if we have two actions with overlapped range.
+      overlapped_position = begin_pos < @actions[j].end
+      if same_position || overlapped_position
         conflict_actions << @actions.delete_at(j)
       else
         i = j
-        start = @actions[i].start
+        begin_pos = @actions[i].start
+        end_pos = @actions[i].end
       end
       j -= 1
     end

metadata

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