synvert-core 0.31.0 → 0.35.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf20c3a501940025291f9e0ae6f306d1613fb4db8ee5d5cf649d0ad7da4d1c5a
-  data.tar.gz: 425f42f736ec76ca6ade1f881ab252bfa6659f0e2cc8f3b55dd31153a4d8853a
+  metadata.gz: 9c718983fb8e6e6216ac660fba2aa1b9beeacf96db451d65b4df3df827a396c0
+  data.tar.gz: a6fd2918b8de9d92bfe4a50f1c135154d5b94eacd21b3e88c740e1869e4c4686
 SHA512:
-  metadata.gz: 52c43ad9b8986c68a4c77200e84b9cf7497fec7c46f0beb74fa695ed13d986f38519c167a3242d870dca79a0e09844fe6b564d6a54c258801801d4920be2f9da
-  data.tar.gz: 20aeb9c56536f335d8181e307bcf96ad8b3cbc7c02471077657a1ec0fa23db6c6f10269a4477aef3007ffc0b1dd07f3bb522289ecfed2c5f8f581abd49b3ee8b
+  metadata.gz: 8a828ec38b3d152a6620dd8fb5101a4fa0594da95eaede5612dd805f8b719bc52ebcaa1c00de48bb17fb306ebcf0cd6a7beb109dc91602afd5e305aafe521e47
+  data.tar.gz: 496d20ef84817d2e8073573b67635f8cb520fc430a647eba909ff9a49dce8fa4f9f5c99245123aa390d7b7d0356c955ca1f78c8073ee17984e1dfa14a8914e51

data/CHANGELOG.md

@@ -1,5 +1,22 @@
 # CHANGELOG
 
+## 0.35.0 (2021-05-17)
+
+* Add `contain` rule
+
+## 0.34.0 (2021-05-16)
+
+* `child_node_name` supports [:def, :parentheses] and [:defs, :parentheses]
+* Rename `pipe` to `pipes`
+
+## 0.33.0 (2021-05-10)
+
+* Add `body` for `class` node
+
+## 0.32.0 (2021-05-07)
+
+* Remove `ArgumentsNode`
+
 ## 0.31.0 (2021-04-27)
 
 * Add `in` and `not_in` rules

data/lib/synvert/core/node_ext.rb

@@ -1,29 +1,6 @@
 # frozen_string_literal: true
 
 module Parser::AST
-  # ArgumentsNode allows to handle all args as one node or handle all args as an array.
-  class ArgumentsNode
-    # Initialize
-    #
-    # @param node [Parser::AST::Node] args node.
-    def initialize(node)
-      @node = node
-    end
-
-    # If args node responds method itself, call method on args node.
-    # If args children (array) responds method,  call method on args children.
-    # Otherwise raise method missing error.
-    def method_missing(meth, *args, &block)
-      if @node.respond_to?(meth)
-        @node.send meth, *args, &block
-      elsif @node.children.respond_to?(meth)
-        @node.children.send meth, *args, &block
-      else
-        super
-      end
-    end
-  end
-
   # Parser::AST::Node monkey patch.
   class Node
     # Get name node of :class, :module, :const, :mlhs, :def and :defs node.
@@ -101,9 +78,9 @@ module Parser::AST
     def arguments
       case type
       when :def, :block
-        ArgumentsNode.new(children[1])
+        children[1]
       when :defs
-        ArgumentsNode.new(children[2])
+        children[2]
       when :send
         children[2..-1]
       when :defined?
@@ -133,7 +110,7 @@ module Parser::AST
       case type
       when :begin
         children
-      when :def, :block
+      when :def, :block, :class
         return [] if children[2].nil?
 
         :begin == children[2].type ? children[2].body : children[2..-1]
@@ -285,7 +262,9 @@ module Parser::AST
     # Current node is s(:hash, s(:pair, s(:sym, :number), s(:int, 10)))
     # node.number_value is 10
     def method_missing(method_name, *args, &block)
-      if :hash == type && method_name.to_s.include?('_value')
+      if :args == type && children.respond_to?(method_name)
+        return children.send(method_name, *args, &block)
+      elsif :hash == type && method_name.to_s.include?('_value')
         key = method_name.to_s.sub('_value', '')
         return hash_value(key.to_sym)&.to_value if key?(key.to_sym)
         return hash_value(key.to_s)&.to_value if key?(key.to_s)
@@ -297,7 +276,9 @@ module Parser::AST
     end
 
     def respond_to_missing?(method_name, *args)
-      if :hash == type && method_name.to_s.include?('_value')
+      if :args == type && children.respond_to?(method_name)
+        return true
+      elsif :hash == type && method_name.to_s.include?('_value')
         key = method_name.to_s.sub('_value', '')
         return true if key?(key.to_sym) || key?(key.to_s)
       end
@@ -348,18 +329,16 @@ module Parser::AST
     # @return [Parser::Source::Range] source range of child node.
     def child_node_range(child_name)
       case [type, child_name]
-      when %i[block pipe]
+      when %i[block pipes], %i[def parentheses], %i[defs parentheses]
         Parser::Source::Range.new('(string)', arguments.loc.expression.begin_pos, arguments.loc.expression.end_pos)
-      when %i[class name]
-        loc.name
-      when %i[def name]
-        loc.name
-      when %i[defs name]
+      when %i[block arguments], %i[def arguments], %i[defs arguments]
+        Parser::Source::Range.new('(string)', arguments.first.loc.expression.begin_pos, arguments.last.loc.expression.end_pos)
+      when %i[class name], %i[def name], %i[defs name]
         loc.name
       when %i[defs dot]
         loc.operator
       when %i[defs self]
-        Parser::Source::Range.new('(string)', loc.operator.begin_pos - 4, loc.operator.begin_pos)
+        Parser::Source::Range.new('(string)', loc.operator.begin_pos - 'self'.length, loc.operator.begin_pos)
       when %i[send dot]
         loc.dot
       when %i[send message]
@@ -420,7 +399,7 @@ module Parser::AST
     def match?(rules)
       flat_hash(rules).keys.all? do |multi_keys|
         case multi_keys.last
-        when :any
+        when :any, :contain
           actual_values = actual_value(self, multi_keys[0...-1])
           expected = expected_value(rules, multi_keys)
           actual_values.any? { |actual| match_value?(actual, expected) }
@@ -458,8 +437,12 @@ module Parser::AST
           evaluated = instance_eval old_code
           case evaluated
           when Parser::AST::Node
-            evaluated.loc.expression.source
-          when Array, ArgumentsNode
+            if evaluated.type == :args
+              evaluated.loc.expression.source[1...-1]
+            else
+              evaluated.loc.expression.source
+            end
+          when Array
             if evaluated.size > 0
               file_source = evaluated.first.loc.expression.source_buffer.source
               source = file_source[evaluated.first.loc.expression.begin_pos...evaluated.last.loc.expression.end_pos]

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

@@ -302,7 +302,7 @@ module Synvert::Core
 
       begin_pos = @actions[i].begin_pos
       while j > -1
-        if begin_pos <= @actions[j].end_pos
+        if begin_pos < @actions[j].end_pos
           conflict_actions << @actions.delete_at(j)
         else
           i = j

data/lib/synvert/core/version.rb

@@ -2,6 +2,6 @@
 
 module Synvert
   module Core
-    VERSION = '0.31.0'
+    VERSION = '0.35.0'
   end
 end

data/spec/synvert/core/node_ext_spec.rb

@@ -104,17 +104,17 @@ describe Parser::AST::Node do
   describe '#arguments' do
     it 'gets for def node' do
       node = parse('def test(foo, bar); foo + bar; end')
-      expect(node.arguments.map { |argument| argument.to_source }).to eq %w[foo bar]
+      expect(node.arguments.type).to eq :args
     end
 
     it 'gets for defs node' do
       node = parse('def self.test(foo, bar); foo + bar; end')
-      expect(node.arguments.map { |argument| argument.to_source }).to eq %w[foo bar]
+      expect(node.arguments.type).to eq :args
     end
 
     it 'gets for block node' do
       node = parse('RSpec.configure do |config|; end')
-      expect(node.arguments.map { |argument| argument.to_source }).to eq ['config']
+      expect(node.arguments.type).to eq :args
     end
 
     it 'gets for send node' do
@@ -146,6 +146,21 @@ describe Parser::AST::Node do
       expect(node.body).to eq [parse('include EmailSpec::Helpers'), parse('include EmailSpec::Matchers')]
     end
 
+    it 'gets empty for class node' do
+      node = parse('class User; end')
+      expect(node.body).to be_empty
+    end
+
+    it 'gets one line for class node' do
+      node = parse('class User; attr_accessor :email; end')
+      expect(node.body).to eq [parse('attr_accessor :email')]
+    end
+
+    it 'gets one line for class node' do
+      node = parse('class User; attr_accessor :email; attr_accessor :username; end')
+      expect(node.body).to eq [parse('attr_accessor :email'), parse('attr_accessor :username')]
+    end
+
     it 'gets for begin node' do
       node = parse('foo; bar')
       expect(node.body).to eq [parse('foo'), parse('bar')]
@@ -399,6 +414,12 @@ describe Parser::AST::Node do
       expect(node).to be_match(type: 'send', arguments: { any: 'Lifo::Cache' })
     end
 
+    it 'matches arguments contain' do
+      source = 'def slow(foo, bar, &block); end'
+      node = parse(source)
+      expect(node).to be_match(type: 'def', arguments: { contain: '&block' })
+    end
+
     it 'matches not' do
       source = 'class Synvert; end'
       node = parse(source)
@@ -408,13 +429,13 @@ describe Parser::AST::Node do
     it 'matches in' do
       source = 'FactoryBot.create(:user)'
       node = parse(source)
-      expect(node).to be_match(type: 'send', message: { in: [:create, :build] })
+      expect(node).to be_match(type: 'send', message: { in: %i[create build] })
     end
 
     it 'matches not_in' do
       source = 'FactoryBot.create(:user)'
       node = parse(source)
-      expect(node).not_to be_match(type: 'send', message: { not_in: [:create, :build] })
+      expect(node).not_to be_match(type: 'send', message: { not_in: %i[create build] })
     end
   end
 
@@ -432,9 +453,9 @@ describe Parser::AST::Node do
         expect(range.to_range).to eq(25...29)
       end
 
-      it 'checks pipe' do
+      it 'checks pipes' do
         node = parse('Factory.define :user do |user|; end')
-        range = node.child_node_range(:pipe)
+        range = node.child_node_range(:pipes)
         expect(range.to_range).to eq(24...30)
       end
     end
@@ -469,6 +490,12 @@ describe Parser::AST::Node do
         range = node.child_node_range(:arguments)
         expect(range.to_range).to eq(8...11)
       end
+
+      it 'checks parentheses' do
+        node = parse('def foo(bar); end')
+        range = node.child_node_range(:parentheses)
+        expect(range.to_range).to eq(7...12)
+      end
     end
 
     context 'defs node' do
@@ -495,6 +522,12 @@ describe Parser::AST::Node do
         range = node.child_node_range(:arguments)
         expect(range.to_range).to eq(13...16)
       end
+
+      it 'checks parentheses' do
+        node = parse('def self.foo(bar); end')
+        range = node.child_node_range(:parentheses)
+        expect(range.to_range).to eq(12...17)
+      end
     end
 
     context 'send node' do
@@ -566,7 +599,7 @@ describe Parser::AST::Node do
       expect(node.rewritten_source('{{name}}')).to eq 'Synvert'
     end
 
-    it 'rewrites for ArgumentsNode' do
+    it 'rewrites for arguments' do
       source = 'test { |a, b| }'
       node = parse(source)
       expect(node.rewritten_source('{{arguments}}')).to eq 'a, b'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: synvert-core
 version: !ruby/object:Gem::Version
-  version: 0.31.0
+  version: 0.35.0
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-27 00:00:00.000000000 Z
+date: 2021-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport