synvert-core 0.33.0 → 0.36.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4448b6bf2d17c1128bb6d20732de90a7458019ca33835fa9740e5d6f8102e4a
-  data.tar.gz: 10df72247c2d5a0e7293481096221e755322218e6031ae6b613470938e1d01c4
+  metadata.gz: c655af17df02f43f106cc3653955acbe13eb2348b5d5be0f8fe7003936c88cd8
+  data.tar.gz: 93ecf8e0645716448b308e76dc14bbc873a79b773bf2722edeb7dea31e092aba
 SHA512:
-  metadata.gz: 949edd01e98bd306456ed368bbb4fe16b9d9d320cb82aafd8ddb1a0f2367ba7b8e18ba5d43143aa51a91a64bb95c5d895ea5a7c07beea5dd6f8faf078709267d
-  data.tar.gz: 04ba8cfbb5d3c66855f300712417a5ad7476f4ac307d46824d8f02f8b0667c8bfcdf909ae978c8a442fee75d1f46faed15bb50cc81c0a360f8e824333fa321a0
+  metadata.gz: 53767e387c4b0a3e7e3a18add1488d830afc78a5e9505d237d111a51614e92eb46274611cde2520510dc6fb1e5bf11bb70e7373f8163b709c0245ef1e408cbd5
+  data.tar.gz: 91e279203e9c0fb0d968d7b81a0d25de25b05847891532744f6bb9cf701abedb92c8c51361f21813ef6d279b488c9da5df83611f52ccdc48f3ac38c134bd94c8

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # CHANGELOG
 
+## 0.36.0 (2021-06-21)
+
+* Require `active_support/core_ext/array`
+
+## 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

data/lib/synvert/core.rb

@@ -6,6 +6,7 @@ require 'parser'
 require 'parser/current'
 require 'ast'
 require 'active_support/core_ext/object'
+require 'active_support/core_ext/array'
 require 'erubis'
 require 'set'
 require 'synvert/core/node_ext'

data/lib/synvert/core/node_ext.rb

@@ -329,15 +329,15 @@ 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[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]
-        loc.name
-      when %i[def name]
-        loc.name
-      when %i[defs name]
+        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
@@ -403,7 +403,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) }

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/rewriter/scope/within_scope.rb

@@ -37,9 +37,18 @@ module Synvert::Core
     def find_matching_nodes(current_node)
       matching_nodes = []
       if @options[:recursive]
-        matching_nodes << current_node if current_node.match? @rules
-        current_node.recursive_children do |child_node|
-          matching_nodes << child_node if child_node.match? @rules
+        if current_node.is_a?(Parser::AST::Node)
+          matching_nodes << current_node if current_node.match? @rules
+          current_node.recursive_children do |child_node|
+            matching_nodes << child_node if child_node.match? @rules
+          end
+        else
+          current_node.each do |node|
+            matching_nodes << node if node.match? @rules
+            node.recursive_children do |child_node|
+              matching_nodes << child_node if child_node.match? @rules
+            end
+          end
         end
       elsif current_node.is_a?(Parser::AST::Node)
         if current_node.type == :begin

data/lib/synvert/core/version.rb

@@ -2,6 +2,6 @@
 
 module Synvert
   module Core
-    VERSION = '0.33.0'
+    VERSION = '0.36.0'
   end
 end

data/spec/synvert/core/node_ext_spec.rb

@@ -414,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)
@@ -447,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
@@ -484,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
@@ -510,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

data/spec/synvert/core/rewriter/scope/within_scope.rb

@@ -8,16 +8,16 @@ module Synvert::Core
       rewriter = Rewriter.new('foo', 'bar')
       Rewriter::Instance.new(rewriter, 'file pattern')
     }
-    let(:source) {
-      "
-describe Post do
-  it 'gets post' do
-    FactoryGirl.create :post
-  end
-end
-    "
-    }
+    let(:source) { <<~EOS }
+      describe Post do
+        it 'gets post' do
+          FactoryGirl.create :post
+        end
+      end
+    EOS
+
     let(:node) { Parser::CurrentRuby.parse(source) }
+
     before do
       Rewriter::Instance.reset
       instance.current_node = node

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: synvert-core
 version: !ruby/object:Gem::Version
-  version: 0.33.0
+  version: 0.36.0
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-10 00:00:00.000000000 Z
+date: 2021-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport