synvert-core 0.33.1 → 0.38.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a1f74df180f3b7583a026a0549fe82d57a075fae69990b2dd4a20d22f391fcc5
-  data.tar.gz: 0a2159eb88c03c812b3a3a5a2d45e6cdfa79f899c70e820d538a90a6aa17cf9b
+  metadata.gz: 02bb61b261f5a4b8a3f528736987402add733b18c98228b0e2345559d2694d63
+  data.tar.gz: 6dd428e975dcbcadbdc4b03dd3ed2b7a846ce37c1d9e13303a68ba33a6d4e6fa
 SHA512:
-  metadata.gz: bd505776d1d2f97f5acae2def15b808ee05536193f076e1d3ce683bdbf8ada56e89acf261db5247fc535bdf3444fb7ee8c58f2b142427ec20ac1325abdc31940
-  data.tar.gz: 971fcf29e04c1aebc6e32d5c434adc0ec12e18a6732ff415970e08318b4af885598b4925567c691cd7ce1d8dbd7b7802bed4426cf71ae6dfb21f5546d18c2c73
+  metadata.gz: 7b374648741dc853387ff5c2f4bb5ad9518bee56a1646377e8cac22e7c208285f9c9db52882c05de823cf53cb3bdc6dbd365b9a1c505c88726eb3358651c1dc6
+  data.tar.gz: 8097ef7ad23287c35bf9d40a258a4d7c0b5d63ab0e99ab3667dc52d46cd7a51fa0e7f8d0cddee07054e87019bbf449704f3c01ba4cafcda425a30161894a5130

data/CHANGELOG.md

@@ -1,5 +1,22 @@
 # CHANGELOG
 
+## 0.38.0 (2021-06-21)
+
+* Add `xxx_source` for `hash` node
+
+## 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

@@ -269,6 +269,12 @@ module Parser::AST
         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)
 
+        return nil
+      elsif :hash == type && method_name.to_s.include?('_source')
+        key = method_name.to_s.sub('_source', '')
+        return hash_value(key.to_sym)&.to_source if key?(key.to_sym)
+        return hash_value(key.to_s)&.to_source if key?(key.to_s)
+
         return nil
       end
 
@@ -281,6 +287,9 @@ module Parser::AST
       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)
+      elsif :hash == type && method_name.to_s.include?('_source')
+        key = method_name.to_s.sub('_source', '')
+        return true if key?(key.to_sym) || key?(key.to_s)
       end
 
       super
@@ -329,15 +338,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 +412,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/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.1'
+    VERSION = '0.38.0'
   end
 end

data/spec/synvert/core/node_ext_spec.rb

@@ -360,6 +360,18 @@ describe Parser::AST::Node do
     end
   end
 
+  describe 'key value source by method_missing' do
+    it 'gets for key value source' do
+      node = parse('{:foo => :bar}')
+      expect(node.foo_source).to eq ':bar'
+
+      node = parse("{'foo' => 'bar'}")
+      expect(node.foo_source).to eq "'bar'"
+
+      expect(node.bar_source).to be_nil
+    end
+  end
+
   describe '#recursive_children' do
     it 'iterates all children recursively' do
       node = parse('class Synvert; def current_node; @node; end; end')
@@ -414,6 +426,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 +465,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 +502,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 +534,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.1
+  version: 0.38.0
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-15 00:00:00.000000000 Z
+date: 2021-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport