synvert-core 0.16.0 → 0.20.0

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

@@ -22,18 +22,8 @@ module Synvert::Core
       current_node = @instance.current_node
       return unless current_node
 
+      matching_nodes = find_matching_nodes(current_node)
       @instance.process_with_node current_node do
-        matching_nodes = []
-        matching_nodes << current_node if current_node.match? @rules
-        if @options[:recursive]
-          current_node.recursive_children do |child_node|
-            matching_nodes << child_node if child_node.match? @rules
-          end
-        else
-          current_node.children do |child_node|
-            matching_nodes << child_node if child_node.match? @rules
-          end
-        end
         matching_nodes.each do |matching_node|
           @instance.process_with_node matching_node do
             @instance.instance_eval &@block
@@ -41,5 +31,22 @@ module Synvert::Core
         end
       end
     end
+
+    private
+
+    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
+        end
+      else
+        current_node.each do |child_node|
+          matching_nodes << child_node if child_node.match? @rules
+        end
+      end
+      matching_nodes
+    end
   end
 end

data/lib/synvert/core/version.rb

@@ -2,6 +2,6 @@
 
 module Synvert
   module Core
-    VERSION = "0.16.0"
+    VERSION = '0.20.0'
   end
 end

data/spec/spec_helper.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 require 'synvert/core'
 
@@ -18,9 +18,4 @@ RSpec.configure do |config|
   config.filter_run :focus
 
   config.order = 'random'
-
-  config.before do
-    Synvert::Core::Configuration.instance.set :path, '.'
-    Synvert::Core::Configuration.instance.set :skip_files, []
-  end
 end

data/spec/synvert/core/engine/erb_spec.rb

@@ -4,38 +4,38 @@ require 'spec_helper'
 
 module Synvert::Core
   describe Engine::ERB do
-    it "encodes / decodes" do
-      source =<<-EOF
-<%content_for :head do%>
-  <style>
-    body {
-      background-image: url(<%= asset_path('bg.png') %>);
-    }
-  </style>
-<%end%>
-
-<%
-  foo = 'bar'
-  post = Post.find(:first)
-  bar = 'foo'
-%>
-
-<% if User.current &&
-      User.current.admin %>
-  <%= rounded_content("page") do %>
-  <div class='test'>
-    <% if post %>
-      <div id="title"><%= foo %></div>
-      <% form_for post do |f| %>
-        <label><%= link_to_function 'test', "confirm('test');" %></label>
-        <%= f.text_field 'bar' %>
-      <% end %>
-    <% end %></div>
-  <% end %>
-<% end %>
+    it 'encodes / decodes' do
+      source = <<~EOF
+        <%content_for :head do%>
+          <style>
+            body {
+              background-image: url(<%= asset_path('bg.png') %>);
+            }
+          </style>
+        <%end%>
+        
+        <%
+          foo = 'bar'
+          post = Post.find(:first)
+          bar = 'foo'
+        %>
+        
+        <% if User.current &&
+              User.current.admin %>
+          <%= rounded_content("page") do %>
+          <div class='test'>
+            <% if post %>
+              <div id="title"><%= foo %></div>
+              <% form_for post do |f| %>
+                <label><%= link_to_function 'test', "confirm('test');" %></label>
+                <%= f.text_field 'bar' %>
+              <% end %>
+            <% end %></div>
+          <% end %>
+        <% end %>
       EOF
       encoded_source = Engine::ERB.encode(source)
-      buffer = Parser::Source::Buffer.new "(test)"
+      buffer = Parser::Source::Buffer.new '(test)'
       buffer.source = encoded_source
       parser = Parser::CurrentRuby.new
       parser.reset

data/spec/synvert/core/node_ext_spec.rb

@@ -103,12 +103,12 @@ describe Parser::AST::Node do
 
   describe '#arguments' do
     it 'gets for def node' do
-      node = parse("def test(foo, bar); foo + bar; end")
+      node = parse('def test(foo, bar); foo + bar; end')
       expect(node.arguments.map { |argument| argument.to_source }).to eq %w[foo bar]
     end
 
     it 'gets for defs node' do
-      node = parse("def self.test(foo, bar); foo + bar; end")
+      node = parse('def self.test(foo, bar); foo + bar; end')
       expect(node.arguments.map { |argument| argument.to_source }).to eq %w[foo bar]
     end
 
@@ -172,129 +172,129 @@ describe Parser::AST::Node do
     end
   end
 
-  describe "#keys" do
+  describe '#keys' do
     it 'gets for hash node' do
       node = parse("{:foo => :bar, 'foo' => 'bar'}")
       expect(node.keys).to eq [parse(':foo'), parse("'foo'")]
     end
   end
 
-  describe "#values" do
+  describe '#values' do
     it 'gets for hash node' do
       node = parse("{:foo => :bar, 'foo' => 'bar'}")
       expect(node.values).to eq [parse(':bar'), parse("'bar'")]
     end
   end
 
-  describe "#has_key?" do
-    it "gets true if key exists" do
-      node = parse("{:foo => :bar}")
+  describe '#has_key?' do
+    it 'gets true if key exists' do
+      node = parse('{:foo => :bar}')
       expect(node.has_key?(:foo)).to be_truthy
     end
 
-    it "gets false if key does not exist" do
-      node = parse("{:foo => :bar}")
+    it 'gets false if key does not exist' do
+      node = parse('{:foo => :bar}')
       expect(node.has_key?('foo')).to be_falsey
     end
   end
 
-  describe "#hash_value" do
-    it "gets value of specified key" do
-      node = parse("{:foo => :bar}")
+  describe '#hash_value' do
+    it 'gets value of specified key' do
+      node = parse('{:foo => :bar}')
       expect(node.hash_value(:foo)).to eq parse(':bar')
     end
 
-    it "gets nil if key does not exist" do
-      node = parse("{:foo => :bar}")
+    it 'gets nil if key does not exist' do
+      node = parse('{:foo => :bar}')
       expect(node.hash_value(:bar)).to be_nil
     end
   end
 
-  describe "#key" do
+  describe '#key' do
     it 'gets for pair node' do
       node = parse("{:foo => 'bar'}").children[0]
       expect(node.key).to eq parse(':foo')
     end
   end
 
-  describe "#value" do
+  describe '#value' do
     it 'gets for hash node' do
       node = parse("{:foo => 'bar'}").children[0]
       expect(node.value).to eq parse("'bar'")
     end
   end
 
-  describe "#condition" do
+  describe '#condition' do
     it 'gets for if node' do
       node = parse('if defined?(Bundler); end')
       expect(node.condition).to eq parse('defined?(Bundler)')
     end
   end
 
-  describe "#left_value" do
+  describe '#left_value' do
     it 'gets for masgn' do
-      node = parse("a, b = 1, 2")
+      node = parse('a, b = 1, 2')
       expect(node.left_value.to_source).to eq 'a, b'
     end
 
     it 'gets for lvasgn' do
-      node = parse("a = 1")
+      node = parse('a = 1')
       expect(node.left_value).to eq :a
     end
 
     it 'gets for ivasgn' do
-      node = parse("@a = 1")
+      node = parse('@a = 1')
       expect(node.left_value).to eq :@a
     end
   end
 
-  describe "#right_value" do
+  describe '#right_value' do
     it 'gets for masgn' do
-      node = parse("a, b = 1, 2")
+      node = parse('a, b = 1, 2')
       expect(node.right_value).to eq parse('[1, 2]')
     end
 
     it 'gets for masgn' do
-      node = parse("a, b = params")
-      expect(node.right_value).to eq parse("params")
+      node = parse('a, b = params')
+      expect(node.right_value).to eq parse('params')
     end
 
     it 'gets for lvasgn' do
-      node = parse("a = 1")
-      expect(node.right_value).to eq parse("1")
+      node = parse('a = 1')
+      expect(node.right_value).to eq parse('1')
     end
 
     it 'gets for ivasgn' do
-      node = parse("@a = 1")
-      expect(node.right_value).to eq parse("1")
+      node = parse('@a = 1')
+      expect(node.right_value).to eq parse('1')
     end
   end
 
-  describe "#to_value" do
+  describe '#to_value' do
     it 'gets for int' do
-      node = parse("1")
+      node = parse('1')
       expect(node.to_value).to eq 1
     end
 
     it 'gets for string' do
       node = parse("'str'")
-      expect(node.to_value).to eq "str"
+      expect(node.to_value).to eq 'str'
     end
 
     it 'gets for symbol' do
-      node = parse(":str")
+      node = parse(':str')
       expect(node.to_value).to eq :str
     end
 
     it 'get for boolean' do
-      node = parse("true")
+      node = parse('true')
       expect(node.to_value).to be_truthy
-      node = parse("false")
+      node = parse('false')
       expect(node.to_value).to be_falsey
     end
 
     it 'get for range' do
-      node = parse("(1..10)")
+      node = parse('(1..10)')
       expect(node.to_value).to eq (1..10)
     end
 
@@ -384,13 +384,13 @@ describe Parser::AST::Node do
     it 'matches arguments any' do
       source = 'config.middleware.insert_after ActiveRecord::QueryCache, Lifo::Cache, page_cache: false'
       node = parse(source)
-      expect(node).to be_match(type: 'send', arguments: {any: 'Lifo::Cache'})
+      expect(node).to be_match(type: 'send', arguments: { any: 'Lifo::Cache' })
     end
 
     it 'matches not' do
       source = 'class Synvert; end'
       node = parse(source)
-      expect(node).not_to be_match(type: 'class', name: {not: 'Synvert'})
+      expect(node).not_to be_match(type: 'class', name: { not: 'Synvert' })
     end
   end
 
@@ -415,24 +415,25 @@ describe Parser::AST::Node do
     it 'rewrites for ArgumentsNode' do
       source = 'test { |a, b| }'
       node = parse(source)
-      expect(node.rewritten_source('{{arguments}}')).to eq %(a, b)
+      expect(node.rewritten_source('{{arguments}}')).to eq 'a, b'
     end
 
-    it 'rewrites array with multi line given as argument for method'do
-      source = <<-EOS.strip
-long_name_method([
-  1,
-  2,
-  3
-])
+    it 'rewrites array with multi line given as argument for method' do
+      source = <<~EOS.strip
+        long_name_method([
+          1,
+          2,
+          3
+        ])
       EOS
+
       node = parse(source)
-      expect(node.rewritten_source('{{arguments}}')).to eq <<-EOS.strip
-[
-  1,
-  2,
-  3
-]
+      expect(node.rewritten_source('{{arguments}}')).to eq <<~EOS.strip
+        [
+          1,
+          2,
+          3
+        ]
       EOS
     end
   end

data/spec/synvert/core/rewriter/action/insert_action_spec.rb

@@ -13,11 +13,11 @@ module Synvert::Core
       }
 
       it 'gets begin_pos' do
-        expect(subject.begin_pos).to eq "Synvert::Application.configure do".length
+        expect(subject.begin_pos).to eq 'Synvert::Application.configure do'.length
       end
 
       it 'gets end_pos' do
-        expect(subject.end_pos).to eq "Synvert::Application.configure do".length
+        expect(subject.end_pos).to eq 'Synvert::Application.configure do'.length
       end
 
       it 'gets rewritten_code' do
@@ -34,11 +34,11 @@ module Synvert::Core
       }
 
       it 'gets begin_pos' do
-        expect(subject.begin_pos).to eq "RSpec.configure do |config|".length
+        expect(subject.begin_pos).to eq 'RSpec.configure do |config|'.length
       end
 
       it 'gets end_pos' do
-        expect(subject.end_pos).to eq "RSpec.configure do |config|".length
+        expect(subject.end_pos).to eq 'RSpec.configure do |config|'.length
       end
 
       it 'gets rewritten_code' do
@@ -55,11 +55,11 @@ module Synvert::Core
       }
 
       it 'gets begin_pos' do
-        expect(subject.begin_pos).to eq "class User".length
+        expect(subject.begin_pos).to eq 'class User'.length
       end
 
       it 'gets end_pos' do
-        expect(subject.end_pos).to eq "class User".length
+        expect(subject.end_pos).to eq 'class User'.length
       end
 
       it 'gets rewritten_code' do
@@ -76,11 +76,11 @@ module Synvert::Core
       }
 
       it 'gets begin_pos' do
-        expect(subject.begin_pos).to eq "class User < ActionRecord::Base".length
+        expect(subject.begin_pos).to eq 'class User < ActionRecord::Base'.length
       end
 
       it 'gets end_pos' do
-        expect(subject.end_pos).to eq "class User < ActionRecord::Base".length
+        expect(subject.end_pos).to eq 'class User < ActionRecord::Base'.length
       end
 
       it 'gets rewritten_code' do

data/spec/synvert/core/rewriter/action/insert_after_action_spec.rb

@@ -5,18 +5,18 @@ require 'spec_helper'
 module Synvert::Core
   describe Rewriter::InsertAfterAction do
     subject {
-      source = "  include Foo"
+      source = '  include Foo'
       node = Parser::CurrentRuby.parse(source)
       instance = double(current_node: node)
       Rewriter::InsertAfterAction.new(instance, 'include Bar')
     }
 
     it 'gets begin_pos' do
-      expect(subject.begin_pos).to eq "  include Foo".length
+      expect(subject.begin_pos).to eq '  include Foo'.length
     end
 
     it 'gets end_pos' do
-      expect(subject.end_pos).to eq "  include Foo".length
+      expect(subject.end_pos).to eq '  include Foo'.length
     end
 
     it 'gets rewritten_code' do