synvert-core 0.7.5 → 0.8.0

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

@@ -4,61 +4,4 @@ module Synvert::Core
   # Scope finds out nodes which match rules.
   class Rewriter::Scope
   end
-
-  # WithinScope finds out nodes which match rules, then change its scope to matching node.
-  class Rewriter::WithinScope < Rewriter::Scope
-    # Initialize a scope
-    #
-    # @param instance [Synvert::Core::Rewriter::Instance]
-    # @param rules [Hash]
-    # @param block [Block]
-    def initialize(instance, rules, &block)
-      @instance = instance
-      @rules = rules
-      @block = block
-    end
-
-    # Find out the matching nodes. It checks the current node and iterates all child nodes,
-    # then run the block code with each matching node.
-    def process
-      current_node = @instance.current_node
-      return unless current_node
-      @instance.process_with_node current_node do
-        matching_nodes = []
-        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
-        matching_nodes.each do |matching_node|
-          @instance.process_with_node matching_node do
-            @instance.instance_eval &@block
-          end
-        end
-      end
-    end
-  end
-
-  # Go to and change its scope to a child node.
-  class Rewriter::GotoScope < Rewriter::Scope
-    # Initialize a scope
-    #
-    # @param instance [Synvert::Core::Rewriter::Instance]
-    # @param child_node_name [String]
-    # @param block [Block]
-    def initialize(instance, child_node_name, &block)
-      @instance = instance
-      @child_node_name = child_node_name
-      @block = block
-    end
-
-    # Go to a child now, then run the block code with the the child node.
-    def process
-      current_node = @instance.current_node
-      return unless current_node
-      child_node = current_node.send @child_node_name
-      @instance.process_with_other_node child_node do
-        @instance.instance_eval &@block
-      end
-    end
-  end
 end

data/lib/synvert/core/rewriter.rb

@@ -17,25 +17,25 @@ module Synvert::Core
   #   end
   class Rewriter
     autoload :Action, 'synvert/core/rewriter/action'
-    autoload :AppendAction, 'synvert/core/rewriter/action'
-    autoload :InsertAction, 'synvert/core/rewriter/action'
-    autoload :InsertAfterAction, 'synvert/core/rewriter/action'
-    autoload :ReplaceWithAction, 'synvert/core/rewriter/action'
-    autoload :ReplaceErbStmtWithExprAction, 'synvert/core/rewriter/action'
-    autoload :RemoveAction, 'synvert/core/rewriter/action'
+    autoload :AppendAction, 'synvert/core/rewriter/action/append_action'
+    autoload :InsertAction, 'synvert/core/rewriter/action/insert_action'
+    autoload :InsertAfterAction, 'synvert/core/rewriter/action/insert_after_action'
+    autoload :ReplaceWithAction, 'synvert/core/rewriter/action/replace_with_action'
+    autoload :ReplaceErbStmtWithExprAction, 'synvert/core/rewriter/action/replace_erb_stmt_with_expr_action'
+    autoload :RemoveAction, 'synvert/core/rewriter/action/remove_action'
 
     autoload :Warning, 'synvert/core/rewriter/warning'
 
     autoload :Instance, 'synvert/core/rewriter/instance'
 
     autoload :Scope, 'synvert/core/rewriter/scope'
-    autoload :WithinScope, 'synvert/core/rewriter/scope'
-    autoload :GotoScope, 'synvert/core/rewriter/scope'
+    autoload :WithinScope, 'synvert/core/rewriter/scope/within_scope'
+    autoload :GotoScope, 'synvert/core/rewriter/scope/goto_scope'
 
     autoload :Condition, 'synvert/core/rewriter/condition'
-    autoload :IfExistCondition, 'synvert/core/rewriter/condition'
-    autoload :UnlessExistCondition, 'synvert/core/rewriter/condition'
-    autoload :IfOnlyExistCondition, 'synvert/core/rewriter/condition'
+    autoload :IfExistCondition, 'synvert/core/rewriter/condition/if_exist_condition'
+    autoload :UnlessExistCondition, 'synvert/core/rewriter/condition/unless_exist_condition'
+    autoload :IfOnlyExistCondition, 'synvert/core/rewriter/condition/if_only_exist_condition'
 
     autoload :Helper, 'synvert/core/rewriter/helper'
 

data/lib/synvert/core/version.rb

@@ -2,6 +2,6 @@
 
 module Synvert
   module Core
-    VERSION = "0.7.5"
+    VERSION = "0.8.0"
   end
 end

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

@@ -0,0 +1,47 @@
+require 'spec_helper'
+
+module Synvert::Core
+  describe Rewriter::AppendAction do
+    describe 'class node' do
+      subject do
+        source = "class User\n  has_many :posts\nend"
+        class_node = Parser::CurrentRuby.parse(source)
+        instance = double(current_node: class_node)
+        Rewriter::AppendAction.new(instance, "def as_json\n  super\nend")
+      end
+
+      it 'gets begin_pos' do
+        expect(subject.begin_pos).to eq "calss User\n  has_many :posts".length
+      end
+
+      it 'gets end_pos' do
+        expect(subject.end_pos).to eq "class User\n  has_many :posts".length
+      end
+
+      it 'gets rewritten_code' do
+        expect(subject.rewritten_code).to eq "\n\n  def as_json\n    super\n  end"
+      end
+    end
+
+    describe 'begin node' do
+      subject do
+        source = "gem 'rails'\ngem 'mysql2'"
+        begin_node = Parser::CurrentRuby.parse(source)
+        instance = double(current_node: begin_node)
+        Rewriter::AppendAction.new(instance, "gem 'twitter'")
+      end
+
+      it 'gets begin_pos' do
+        expect(subject.begin_pos).to eq "gem 'rails'\ngem 'mysql2'".length
+      end
+
+      it 'gets end_pos' do
+        expect(subject.end_pos).to eq "gem 'rails'\ngem 'mysql2'".length
+      end
+
+      it 'gets rewritten_code' do
+        expect(subject.rewritten_code).to eq "\ngem 'twitter'"
+      end
+    end
+  end
+end

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

@@ -0,0 +1,89 @@
+require 'spec_helper'
+
+module Synvert::Core
+  describe Rewriter::InsertAction do
+    describe 'block node without args' do
+      subject {
+        source = "Synvert::Application.configure do\nend"
+        block_node = Parser::CurrentRuby.parse(source)
+        instance = double(current_node: block_node)
+        Rewriter::InsertAction.new(instance, 'config.eager_load = true')
+      }
+
+      it 'gets begin_pos' do
+        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
+      end
+
+      it 'gets rewritten_code' do
+        expect(subject.rewritten_code).to eq "\n  config.eager_load = true"
+      end
+    end
+
+    describe 'block node with args' do
+      subject {
+        source = "RSpec.configure do |config|\nend"
+        block_node = Parser::CurrentRuby.parse(source)
+        instance = double(current_node: block_node)
+        Rewriter::InsertAction.new(instance, '{{arguments.first}}.include FactoryGirl::Syntax::Methods')
+      }
+
+      it 'gets begin_pos' do
+        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
+      end
+
+      it 'gets rewritten_code' do
+        expect(subject.rewritten_code).to eq "\n  config.include FactoryGirl::Syntax::Methods"
+      end
+    end
+
+    describe 'class node without superclass' do
+      subject {
+        source = "class User\n  has_many :posts\nend"
+        class_node = Parser::CurrentRuby.parse(source)
+        instance = double(current_node: class_node)
+        Rewriter::InsertAction.new(instance, 'include Deletable')
+      }
+
+      it 'gets begin_pos' do
+        expect(subject.begin_pos).to eq "class User".length
+      end
+
+      it 'gets end_pos' do
+        expect(subject.end_pos).to eq "class User".length
+      end
+
+      it 'gets rewritten_code' do
+        expect(subject.rewritten_code).to eq "\n  include Deletable"
+      end
+    end
+
+    describe 'class node with superclass' do
+      subject {
+        source = "class User < ActiveRecord::Base\n  has_many :posts\nend"
+        class_node = Parser::CurrentRuby.parse(source)
+        instance = double(current_node: class_node)
+        Rewriter::InsertAction.new(instance, 'include Deletable')
+      }
+
+      it 'gets begin_pos' do
+        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
+      end
+
+      it 'gets rewritten_code' do
+        expect(subject.rewritten_code).to eq "\n  include Deletable"
+      end
+    end
+  end
+end

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

@@ -0,0 +1,24 @@
+require 'spec_helper'
+
+module Synvert::Core
+  describe Rewriter::InsertAfterAction do
+    subject {
+      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
+    end
+
+    it 'gets end_pos' do
+      expect(subject.end_pos).to eq "  include Foo".length
+    end
+
+    it 'gets rewritten_code' do
+      expect(subject.rewritten_code).to eq "\n  include Bar"
+    end
+  end
+end

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

@@ -0,0 +1,24 @@
+require 'spec_helper'
+
+module Synvert::Core
+  describe Rewriter::RemoveAction do
+    subject {
+      source = "user = User.new params[:user]\nuser.save\nrender\n"
+      send_node = Parser::CurrentRuby.parse(source).children[1]
+      instance = double(current_node: send_node)
+      Rewriter::RemoveAction.new(instance)
+    }
+
+    it 'gets begin_pos' do
+      expect(subject.begin_pos).to eq "user = User.new params[:user]\n".length
+    end
+
+    it 'gets end_pos' do
+      expect(subject.end_pos).to eq "user = User.new params[:user]\nuser.save".length
+    end
+
+    it 'gets rewritten_code' do
+      expect(subject.rewritten_code).to eq ""
+    end
+  end
+end

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

@@ -0,0 +1,6 @@
+require 'spec_helper'
+
+module Synvert::Core
+  describe Rewriter::ReplaceErbStmtWithExprAction do
+  end
+end

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

@@ -0,0 +1,53 @@
+require 'spec_helper'
+
+module Synvert::Core
+  describe Rewriter::ReplaceWithAction do
+    context "replace with single line" do
+      subject {
+        source = "post = FactoryGirl.create_list :post, 2"
+        send_node = Parser::CurrentRuby.parse(source).children[1]
+        instance = double(current_node: send_node)
+        Rewriter::ReplaceWithAction.new(instance, 'create_list {{arguments}}')
+      }
+
+      it 'gets begin_pos' do
+        expect(subject.begin_pos).to eq "post = ".length
+      end
+
+      it 'gets end_pos' do
+        expect(subject.end_pos).to eq "post = FactoryGirl.create_list :post, 2".length
+      end
+
+      it 'gets rewritten_code' do
+        expect(subject.rewritten_code).to eq 'create_list :post, 2'
+      end
+    end
+
+    context "#replace with multiple line" do
+      subject {
+        source = "  its(:size) { should == 1 }"
+        send_node = Parser::CurrentRuby.parse(source)
+        instance = double(current_node: send_node)
+        Rewriter::ReplaceWithAction.new(instance, """describe '#size' do
+  subject { super().size }
+  it { {{body}} }
+end""")
+      }
+
+      it 'gets begin_pos' do
+        expect(subject.begin_pos).to eq 2
+      end
+
+      it 'gets end_pos' do
+        expect(subject.end_pos).to eq "  its(:size) { should == 1 }".length
+      end
+
+      it 'gets rewritten_code' do
+        expect(subject.rewritten_code).to eq """describe '#size' do
+    subject { super().size }
+    it { should == 1 }
+  end"""
+      end
+    end
+  end
+end

data/spec/synvert/core/rewriter/action_spec.rb

@@ -13,226 +13,4 @@ module Synvert::Core
       expect(subject.line).to eq 2
     end
   end
-
-  describe Rewriter::ReplaceWithAction do
-    context "replace with single line" do
-      subject {
-        source = "post = FactoryGirl.create_list :post, 2"
-        send_node = Parser::CurrentRuby.parse(source).children[1]
-        instance = double(current_node: send_node)
-        Rewriter::ReplaceWithAction.new(instance, 'create_list {{arguments}}')
-      }
-
-      it 'gets begin_pos' do
-        expect(subject.begin_pos).to eq "post = ".length
-      end
-
-      it 'gets end_pos' do
-        expect(subject.end_pos).to eq "post = FactoryGirl.create_list :post, 2".length
-      end
-
-      it 'gets rewritten_code' do
-        expect(subject.rewritten_code).to eq 'create_list :post, 2'
-      end
-    end
-
-    context "#replace with multiple line" do
-      subject {
-        source = "  its(:size) { should == 1 }"
-        send_node = Parser::CurrentRuby.parse(source)
-        instance = double(current_node: send_node)
-        Rewriter::ReplaceWithAction.new(instance, """describe '#size' do
-  subject { super().size }
-  it { {{body}} }
-end""")
-      }
-
-      it 'gets begin_pos' do
-        expect(subject.begin_pos).to eq 2
-      end
-
-      it 'gets end_pos' do
-        expect(subject.end_pos).to eq "  its(:size) { should == 1 }".length
-      end
-
-      it 'gets rewritten_code' do
-        expect(subject.rewritten_code).to eq """describe '#size' do
-    subject { super().size }
-    it { should == 1 }
-  end"""
-      end
-    end
-  end
-
-  describe Rewriter::AppendAction < Rewriter::Action do
-    describe 'class node' do
-      subject do
-        source = "class User\n  has_many :posts\nend"
-        class_node = Parser::CurrentRuby.parse(source)
-        instance = double(current_node: class_node)
-        Rewriter::AppendAction.new(instance, "def as_json\n  super\nend")
-      end
-
-      it 'gets begin_pos' do
-        expect(subject.begin_pos).to eq "calss User\n  has_many :posts".length
-      end
-
-      it 'gets end_pos' do
-        expect(subject.end_pos).to eq "class User\n  has_many :posts".length
-      end
-
-      it 'gets rewritten_code' do
-        expect(subject.rewritten_code).to eq "\n\n  def as_json\n    super\n  end"
-      end
-    end
-
-    describe 'begin node' do
-      subject do
-        source = "gem 'rails'\ngem 'mysql2'"
-        begin_node = Parser::CurrentRuby.parse(source)
-        instance = double(current_node: begin_node)
-        Rewriter::AppendAction.new(instance, "gem 'twitter'")
-      end
-
-      it 'gets begin_pos' do
-        expect(subject.begin_pos).to eq "gem 'rails'\ngem 'mysql2'".length
-      end
-
-      it 'gets end_pos' do
-        expect(subject.end_pos).to eq "gem 'rails'\ngem 'mysql2'".length
-      end
-
-      it 'gets rewritten_code' do
-        expect(subject.rewritten_code).to eq "\ngem 'twitter'"
-      end
-    end
-  end
-
-  describe Rewriter::InsertAction do
-    describe 'block node without args' do
-      subject {
-        source = "Synvert::Application.configure do\nend"
-        block_node = Parser::CurrentRuby.parse(source)
-        instance = double(current_node: block_node)
-        Rewriter::InsertAction.new(instance, 'config.eager_load = true')
-      }
-
-      it 'gets begin_pos' do
-        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
-      end
-
-      it 'gets rewritten_code' do
-        expect(subject.rewritten_code).to eq "\n  config.eager_load = true"
-      end
-    end
-
-    describe 'block node with args' do
-      subject {
-        source = "RSpec.configure do |config|\nend"
-        block_node = Parser::CurrentRuby.parse(source)
-        instance = double(current_node: block_node)
-        Rewriter::InsertAction.new(instance, '{{arguments.first}}.include FactoryGirl::Syntax::Methods')
-      }
-
-      it 'gets begin_pos' do
-        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
-      end
-
-      it 'gets rewritten_code' do
-        expect(subject.rewritten_code).to eq "\n  config.include FactoryGirl::Syntax::Methods"
-      end
-    end
-
-    describe 'class node without superclass' do
-      subject {
-        source = "class User\n  has_many :posts\nend"
-        class_node = Parser::CurrentRuby.parse(source)
-        instance = double(current_node: class_node)
-        Rewriter::InsertAction.new(instance, 'include Deletable')
-      }
-
-      it 'gets begin_pos' do
-        expect(subject.begin_pos).to eq "class User".length
-      end
-
-      it 'gets end_pos' do
-        expect(subject.end_pos).to eq "class User".length
-      end
-
-      it 'gets rewritten_code' do
-        expect(subject.rewritten_code).to eq "\n  include Deletable"
-      end
-    end
-
-    describe 'class node with superclass' do
-      subject {
-        source = "class User < ActiveRecord::Base\n  has_many :posts\nend"
-        class_node = Parser::CurrentRuby.parse(source)
-        instance = double(current_node: class_node)
-        Rewriter::InsertAction.new(instance, 'include Deletable')
-      }
-
-      it 'gets begin_pos' do
-        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
-      end
-
-      it 'gets rewritten_code' do
-        expect(subject.rewritten_code).to eq "\n  include Deletable"
-      end
-    end
-  end
-
-  describe Rewriter::InsertAfterAction do
-    subject {
-      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
-    end
-
-    it 'gets end_pos' do
-      expect(subject.end_pos).to eq "  include Foo".length
-    end
-
-    it 'gets rewritten_code' do
-      expect(subject.rewritten_code).to eq "\n  include Bar"
-    end
-  end
-
-  describe Rewriter::RemoveAction do
-    subject {
-      source = "user = User.new params[:user]\nuser.save\nrender\n"
-      send_node = Parser::CurrentRuby.parse(source).children[1]
-      instance = double(current_node: send_node)
-      Rewriter::RemoveAction.new(instance)
-    }
-
-    it 'gets begin_pos' do
-      expect(subject.begin_pos).to eq "user = User.new params[:user]\n".length
-    end
-
-    it 'gets end_pos' do
-      expect(subject.end_pos).to eq "user = User.new params[:user]\nuser.save".length
-    end
-
-    it 'gets rewritten_code' do
-      expect(subject.rewritten_code).to eq ""
-    end
-  end
 end

data/spec/synvert/core/rewriter/condition/if_exist_condition_spec.rb

@@ -0,0 +1,36 @@
+require 'spec_helper'
+
+module Synvert::Core
+  describe Rewriter::IfExistCondition do
+    let(:source) {
+      """
+      RSpec.configure do |config|
+        config.include EmailSpec::Helpers
+        config.include EmailSpec::Methods
+      end
+      """
+    }
+    let(:node) { Parser::CurrentRuby.parse(source) }
+    let(:instance) { double(:current_node => node) }
+
+    describe '#process' do
+      it 'call block if match anything' do
+        run = false
+        condition = Rewriter::IfExistCondition.new instance, type: 'send', message: 'include', arguments: ['EmailSpec::Helpers'] do
+          run = true
+        end
+        condition.process
+        expect(run).to be_truthy
+      end
+
+      it 'not call block if not match anything' do
+        run = false
+        condition = Rewriter::IfExistCondition.new instance, type: 'send', message: 'include', arguments: ['FactoryGirl::SyntaxMethods'] do
+          run = true
+        end
+        condition.process
+        expect(run).to be_falsey
+      end
+    end
+  end
+end

data/spec/synvert/core/rewriter/condition/if_only_exist_condition_spec.rb

@@ -0,0 +1,43 @@
+require 'spec_helper'
+
+module Synvert::Core
+  describe Rewriter::IfOnlyExistCondition do
+    let(:source) {
+      """
+      RSpec.configure do |config|
+        config.include EmailSpec::Helpers
+        config.include EmailSpec::Methods
+      end
+      """
+    }
+    let(:node) { Parser::CurrentRuby.parse(source) }
+    let(:instance) { double(:current_node => node) }
+
+    describe '#process' do
+      it 'gets matching nodes' do
+        source = """
+          RSpec.configure do |config|
+            config.include EmailSpec::Helpers
+          end
+        """
+        node = Parser::CurrentRuby.parse(source)
+        instance = double(:current_node => node)
+        run = false
+        condition = Rewriter::IfOnlyExistCondition.new instance, type: 'send', message: 'include', arguments: ['EmailSpec::Helpers'] do
+          run = true
+        end
+        condition.process
+        expect(run).to be_truthy
+      end
+
+      it 'not call block if does not match' do
+        run = false
+        condition = Rewriter::IfOnlyExistCondition.new instance, type: 'send', message: 'include', arguments: ['EmailSpec::Helpers'] do
+          run = true
+        end
+        condition.process
+        expect(run).to be_falsey
+      end
+    end
+  end
+end