synvert-core 0.32.0 → 0.35.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb6c6b0b57d35fa8d3f850685ccda616f56f19fe55fee0b766302574b2cc577e
-  data.tar.gz: fac77a466b7691c8b74c5a3bb4f2b00ef31be69dfdb0db93fb07593e8553702e
+  metadata.gz: 2cebe11ac19bf86abe8809a2b95401dca2dd4d75285cb3e342c1d6a81c3fc4fb
+  data.tar.gz: 300d59aded93c156a78fffe02147ab3a74adc6c9c6e0449433b5a19881b64363
 SHA512:
-  metadata.gz: 6ce9c70f4892ed3e65cb4669e0e623b745d8edce13e06fbc758c33adce27870934b6e5ea78dcf0eca480c421b96b9afa6de666599094819fd6e5cb6f4ba3b056
-  data.tar.gz: '0800aedc7b404a04f4605e2586f123faed17152f7ebe81bd430f48834f760c8189efe7fb348f41d15f2285370bdd2d08c31badb6e99df064c5b50dd98801ea88'
+  metadata.gz: 7b03da68bbb3c5be3d275c922da6f1e8b0671ec1666b004897d60f142095c555eab5f4ac1eb386981b18e7fd60d0ed3d746b65883bfa63c3f3954b015ed1b2c8
+  data.tar.gz: 57c1ce9cb9d250b3a418a0587eac7e1b21b2e8125dc1d4924e390bc07a6ede2d15eb82059e0e7acf3a029c0733608475c0478da93875ceff03cfa5889b55860b

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # 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`

data/lib/synvert/core/node_ext.rb

@@ -110,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]
@@ -329,20 +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[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]
+      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]
@@ -403,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) }

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.32.0'
+    VERSION = '0.35.1'
   end
 end

data/spec/synvert/core/node_ext_spec.rb

@@ -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)
@@ -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

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

@@ -8,16 +8,15 @@ 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.32.0
+  version: 0.35.1
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-07 00:00:00.000000000 Z
+date: 2021-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport