synvert-core 0.4.3 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0bde34eb3461990b83ea42cb438131ed34dab7ff
-  data.tar.gz: 856cce48e98b4b1930f247125a7dd156a3c0e2b2
+  metadata.gz: 908d88152aaea79eafba824db6d91351f6b02394
+  data.tar.gz: b68026829b49fd6a6b78295f8c8abae77a0812b2
 SHA512:
-  metadata.gz: 2abd9040ab9b7f2908c1ef1f3c617bbf367fc177e0fb78a4b088b13520d60dd85cdd1afb93fb39d9bbeca20d25eabac4468dde07b99fc459a90335b1ec41df7a
-  data.tar.gz: 7848b2dd867efe89b7ee79207274e59cf33660ea5115a23af4ec20fff9e3400f2df27a23492e8b2e5ecc294e79453e72f021ea207040f302accfdedbda3d9e4b
+  metadata.gz: b5bbe05c11edcc9b1f4688f962850851b07a9e5a2a01871f8455a3213823ff15a565c686e73eae92f6045eba29f810993a2e4a2ab1cecc5340b5838e707b728f
+  data.tar.gz: 5808b8122edd185de72864ac178e64bae3888a8be284774bd3e5bc274dfebc43d6280978d98d4d91e8046503f5dd94c4bfe06bd8149e6cf766f529f792ddcb1f

data/CHANGELOG.md

@@ -1,20 +1,12 @@
 # CHANGELOG
 
-## 0.4.3
+## 0.5.0 (2014-08-21)
 
+* Add group to rewriter
 * Add parent_class for :class node
-* Move process_with_node to instance
-* Add Instance#process_with_other_node
-* Fix indent for append action
-
-## 0.4.2
-
-* Do not rewrite code in {{ }} in synvert can't rewrite it
-* Fix indent for replace_with action
-
-## 0.4.1
-
 * Add Rewriter::Helper module to provide common helper methods.
+* Fix indent for append and replace_with action
+* Cache file source and ast
 
 ## 0.4.0 (2014-07-26)
 

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

@@ -35,5 +35,26 @@ module Synvert::Core
           .sub(/^\[(.*)\]$/) { $1 }
           .sub(/^{(.*)}$/) { $1 }
     end
+
+    # Set current_node to node and process.
+    #
+    # @param node [Parser::AST::Node] node set to current_node
+    # @yield process
+    def process_with_node(node)
+      self.current_node = node
+      yield
+      self.current_node = node
+    end
+
+    # Set current_node properly, process and set current_node back to original current_node.
+    #
+    # @param node [Parser::AST::Node] node set to current_node
+    # @yield process
+    def process_with_other_node(node)
+      original_node = self.current_node
+      self.current_node = node
+      yield
+      self.current_node = original_node
+    end
   end
 end

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

@@ -9,7 +9,57 @@ module Synvert::Core
     include Rewriter::Helper
 
     class <<self
+      # @!attribute [rw] current
+      #   @return current instance
       attr_accessor :current
+
+      # Cached file source.
+      #
+      # @param file_path [String] file path
+      # @return [String] file source
+      def file_source(file_path)
+        @file_source ||= {}
+        @file_source[file_path] ||=
+          begin
+            source = File.read(file_path)
+            source = Engine::ERB.encode(source) if file_path =~ /\.erb$/
+            source
+          end
+      end
+
+      # Cached file ast.
+      #
+      # @param file_path [String] file path
+      # @return [String] ast node for file
+      def file_ast(file_path)
+        @file_ast ||= {}
+        @file_ast[file_path] ||=
+          begin
+            buffer = Parser::Source::Buffer.new file_path
+            buffer.source = file_source(file_path)
+
+            parser = Parser::CurrentRuby.new
+            parser.reset
+            parser.parse buffer
+          end
+      end
+
+      # Write source to file and remove cached file source and ast.
+      #
+      # @param file_path [String] file path
+      # @param source [String] file source
+      def write_file(file_path, source)
+        source = Engine::ERB.decode(source) if file_path =~ /\.erb/
+        File.write file_path, source
+        @file_source[file_path] = nil
+        @file_ast[file_path] = nil
+      end
+
+      # Reset cached file source and ast.
+      def reset
+        @file_source = {}
+        @file_ast = {}
+      end
     end
 
     # @!attribute [rw] current_node
@@ -40,36 +90,33 @@ module Synvert::Core
     def process
       self.class.current = self
 
-      parser = Parser::CurrentRuby.new
       file_pattern = File.join(Configuration.instance.get(:path), @file_pattern)
       Dir.glob(file_pattern).each do |file_path|
         unless Configuration.instance.get(:skip_files).include? file_path
           begin
-            source = File.read(file_path)
-            source = Engine::ERB.encode(source) if file_path =~ /\.erb$/
-            buffer = Parser::Source::Buffer.new file_path
-            buffer.source = source
-
-            parser.reset
-            ast = parser.parse buffer
+            conflict_actions = []
+            source = self.class.file_source(file_path)
+            ast = self.class.file_ast(file_path)
 
             @current_file = file_path
             @current_source = source
+
             self.process_with_node ast do
               instance_eval &@block
             end
 
-            @actions.sort!
-            check_conflict_actions
-            @actions.reverse.each do |action|
-              source[action.begin_pos...action.end_pos] = action.rewritten_code
-              source = remove_code_or_whole_line(source, action.line)
-            end
-            @actions = []
+            if @actions.length > 0
+              @actions.sort!
+              conflict_actions = get_conflict_actions
+              @actions.reverse.each do |action|
+                source[action.begin_pos...action.end_pos] = action.rewritten_code
+                source = remove_code_or_whole_line(source, action.line)
+              end
+              @actions = []
 
-            source = Engine::ERB.decode(source) if file_path =~ /\.erb/
-            File.write file_path, source
-          end while !@conflict_actions.empty?
+              self.class.write_file(file_path, source)
+            end
+          end while !conflict_actions.empty?
         end
       end
     end
@@ -174,44 +221,27 @@ module Synvert::Core
       @rewriter.add_warning Rewriter::Warning.new(self, message)
     end
 
-    # Set current_node to node and process.
-    # @param node [Parser::AST::Node] node set to current_node
-    def process_with_node(node)
-      self.current_node = node
-      yield
-      self.current_node = node
-    end
-
-    # Set current_node properly, process and set current_node back to original current_node.
-    # @param node [Parser::AST::Node] node set to current_node
-    def process_with_other_node(node)
-      original_node = self.current_node
-      self.current_node = node
-      yield
-      self.current_node = original_node
-    end
-
   private
 
-    # It changes source code from bottom to top, and it can change source code twice at the same time.
+    # It changes source code from bottom to top, and it can change source code twice at the same time,
     # So if there is an overlap between two actions, it removes the conflict actions and operate them in the next loop.
-    def check_conflict_actions
+    def get_conflict_actions
       i = @actions.length - 1
       j = i - 1
-      @conflict_actions = []
+      conflict_actions = []
       return if i < 0
 
       begin_pos = @actions[i].begin_pos
       while j > -1
         if begin_pos <= @actions[j].end_pos
-          @conflict_actions << @actions.delete_at(j)
+          conflict_actions << @actions.delete_at(j)
         else
           i = j
           begin_pos = @actions[i].begin_pos
         end
         j -= 1
       end
-      @conflict_actions
+      conflict_actions
     end
 
     # It checks if code is removed and that line is empty.

data/lib/synvert/core/rewriter.rb

@@ -40,42 +40,46 @@ module Synvert::Core
     autoload :GemSpec, 'synvert/core/rewriter/gem_spec'
 
     class <<self
-      # Register a rewriter with its name.
+      # Register a rewriter with its group and name.
       #
+      # @param group [String] the rewriter group.
       # @param name [String] the unique rewriter name.
       # @param rewriter [Synvert::Core::Rewriter] the rewriter to register.
-      def register(name, rewriter)
+      def register(group, name, rewriter)
         @rewriters ||= {}
-        @rewriters[name] = rewriter
+        @rewriters[group] ||= {}
+        @rewriters[group][name] = rewriter
       end
 
-      # Fetch a rewriter by name.
+      # Fetch a rewriter by group and name.
       #
+      # @param group [String] rewrtier group.
       # @param name [String] rewrtier name.
       # @return [Synvert::Core::Rewriter] the matching rewriter.
-      def fetch(name)
-        @rewriters[name]
+      def fetch(group, name)
+        @rewriters[group][name]
       end
 
-      # Get a registered rewriter by name and process that rewriter.
+      # Get a registered rewriter by group and name, then process that rewriter.
       #
+      # @param group [String] the rewriter group.
       # @param name [String] the rewriter name.
       # @return [Synvert::Core::Rewriter] the registered rewriter.
       # @raise [Synvert::Core::RewriterNotFound] if the registered rewriter is not found.
-      def call(name)
-        if (rewriter = @rewriters[name])
+      def call(group, name)
+        if (rewriter = @rewriters[group][name])
           rewriter.process
           rewriter
         else
-          raise RewriterNotFound.new "Rewriter #{name} not found"
+          raise RewriterNotFound.new "Rewriter #{group} #{name} not found"
         end
       end
 
       # Get all available rewriters
       #
-      # @return [Array<Synvert::Core::Rewriter>]
+      # @return [Hash<String, Hash<String, Rewriter>>]
       def availables
-        @rewriters ? @rewriters.values : []
+        @rewriters
       end
 
       # Clear all registered rewriters.
@@ -84,6 +88,8 @@ module Synvert::Core
       end
     end
 
+    # @!attribute [r] group
+    #   @return [String] the group of rewriter
     # @!attribute [r] name
     #   @return [String] the unique name of rewriter
     # @!attribute [r] sub_snippets
@@ -92,21 +98,23 @@ module Synvert::Core
     #   @return [Array] helper methods.
     # @!attribute [r] warnings
     #   @return [Array<Synvert::Core::Rewriter::Warning>] warning messages.
-    attr_reader :name, :sub_snippets, :helpers, :warnings
+    attr_reader :group, :name, :sub_snippets, :helpers, :warnings
 
     # Initialize a rewriter.
     # When a rewriter is initialized, it is also registered.
     #
+    # @param group [String] group of the rewriter.
     # @param name [String] name of the rewriter.
     # @param block [Block] a block defines the behaviors of the rewriter, block code won't be called when initialization.
     # @return [Synvert::Core::Rewriter]
-    def initialize(name, &block)
-      @name = name.to_s
+    def initialize(group, name, &block)
+      @group = group
+      @name = name
       @block = block
       @helpers = []
       @sub_snippets = []
       @warnings = []
-      self.class.register(@name, self)
+      self.class.register(@group, @name, self)
     end
 
     # Process the rewriter.
@@ -196,9 +204,10 @@ module Synvert::Core
 
     # Parse add_snippet dsl, it calls anther rewriter.
     #
+    # @param group [String] group of another rewriter.
     # @param name [String] name of another rewriter.
-    def add_snippet(name)
-      @sub_snippets << self.class.call(name.to_s)
+    def add_snippet(group, name)
+      @sub_snippets << self.class.call(group.to_s, name.to_s)
     end
 
     # Parse helper_method dsl, it defines helper method for [Synvert::Core::Rewriter::Instance].

data/lib/synvert/core/version.rb

@@ -2,6 +2,6 @@
 
 module Synvert
   module Core
-    VERSION = "0.4.3"
+    VERSION = "0.5.0"
   end
 end

data/spec/synvert/core/node_ext_spec.rb

@@ -220,7 +220,7 @@ describe Parser::AST::Node do
 
   describe '#match?' do
     let(:instance) {
-      rewriter = Synvert::Rewriter.new('foobar')
+      rewriter = Synvert::Rewriter.new('foo', 'bar')
       Synvert::Rewriter::Instance.new(rewriter, 'file pattern')
     }
     before { Synvert::Rewriter::Instance.current = instance }
@@ -277,7 +277,7 @@ describe Parser::AST::Node do
 
   describe '#rewritten_source' do
     let(:instance) {
-      rewriter = Synvert::Rewriter.new('foobar')
+      rewriter = Synvert::Rewriter.new('foo', 'bar')
       Synvert::Rewriter::Instance.new(rewriter, 'file pattern')
     }
     before { Synvert::Rewriter::Instance.current = instance }

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

@@ -3,6 +3,10 @@ require 'spec_helper'
 module Synvert::Core
   describe Rewriter::Helper do
     let(:dummy_instance) { Class.new { include Rewriter::Helper }.new }
+    let(:instance) do
+      rewriter = Rewriter.new('foo', 'bar')
+      Rewriter::Instance.new rewriter, 'spec/**/*_spec.rb' do; end
+    end
 
     describe "add_receiver_if_necessary" do
       context "with receiver" do
@@ -41,5 +45,31 @@ module Synvert::Core
         expect(dummy_instance.strip_brackets("(123]")).to eq "(123]"
       end
     end
+
+    describe '#process_with_node' do
+      it 'resets current_node' do
+        node1 = double()
+        node2 = double()
+        instance.process_with_node(node1) do
+          instance.current_node = node2
+          expect(instance.current_node).to eq node2
+        end
+        expect(instance.current_node).to eq node1
+      end
+    end
+
+    describe '#process_with_other_node' do
+      it 'resets current_node' do
+        node1 = double()
+        node2 = double()
+        node3 = double()
+        instance.current_node = node1
+        instance.process_with_other_node(node2) do
+          instance.current_node = node3
+          expect(instance.current_node).to eq node3
+        end
+        expect(instance.current_node).to eq node1
+      end
+    end
   end
 end

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

@@ -2,8 +2,10 @@ require 'spec_helper'
 
 module Synvert::Core
   describe Rewriter::Instance do
+    before { Rewriter::Instance.reset }
+
     let(:instance) {
-      rewriter = Rewriter.new('foobar')
+      rewriter = Rewriter.new('foo', 'bar')
       Rewriter::Instance.new(rewriter, 'file pattern')
     }
 
@@ -78,9 +80,9 @@ module Synvert::Core
     end
 
     describe '#process' do
-      let(:rewriter) { Rewriter.new('foobar') }
+      let(:rewriter) { Rewriter.new('foo', 'bar') }
 
-      it 'FactoryGirl uses short syntax' do
+      it 'writes new code to file' do
         instance = Rewriter::Instance.new rewriter, 'spec/**/*_spec.rb' do
           with_node type: 'send', receiver: 'FactoryGirl', message: 'create' do
             replace_with 'create {{arguments}}'
@@ -106,8 +108,8 @@ end
         instance.process
       end
 
-      it 'includes FactoryGirl::Syntax::Methods' do
-        instance = Rewriter::Instance.new rewriter, 'spec/spec_helper.rb'  do
+      it 'does not write if file content is not changed' do
+        instance = Rewriter::Instance.new rewriter, 'spec/spec_helper.rb' do
           with_node type: 'block', caller: {receiver: 'RSpec', message: 'configure'} do
             unless_exist_node type: 'send', message: 'include', arguments: ['FactoryGirl::Syntax::Methods'] do
               insert "{{arguments.first}}.include FactoryGirl::Syntax::Methods"
@@ -116,6 +118,7 @@ end
         end
         input = """
         RSpec.configure do |config|
+          config.include FactoryGirl::Syntax::Methods
         end
         """
         output = """
@@ -125,11 +128,11 @@ end
         """
         expect(Dir).to receive(:glob).with('./spec/spec_helper.rb').and_return(['spec/spec_helper.rb'])
         expect(File).to receive(:read).with('spec/spec_helper.rb').and_return(input)
-        expect(File).to receive(:write).with('spec/spec_helper.rb', output)
+        expect(File).not_to receive(:write).with('spec/spec_helper.rb', output)
         instance.process
       end
 
-      it 'does not include FactoryGirl::Syntax::Methods' do
+      it 'does not read file if already read' do
         instance = Rewriter::Instance.new rewriter, 'spec/spec_helper.rb' do
           with_node type: 'block', caller: {receiver: 'RSpec', message: 'configure'} do
             unless_exist_node type: 'send', message: 'include', arguments: ['FactoryGirl::Syntax::Methods'] do
@@ -147,80 +150,65 @@ end
           config.include FactoryGirl::Syntax::Methods
         end
         """
-        expect(Dir).to receive(:glob).with('./spec/spec_helper.rb').and_return(['spec/spec_helper.rb'])
-        expect(File).to receive(:read).with('spec/spec_helper.rb').and_return(input)
-        expect(File).to receive(:write).with('spec/spec_helper.rb', output)
+        expect(Dir).to receive(:glob).with('./spec/spec_helper.rb').and_return(['spec/spec_helper.rb']).twice
+        expect(File).to receive(:read).with('spec/spec_helper.rb').and_return(input).once
+        expect(File).not_to receive(:write).with('spec/spec_helper.rb', output)
+        instance.process
         instance.process
       end
 
-      it 'process nested send nodes' do
-        instance = Rewriter::Instance.new rewriter, 'config/*.rb'  do
-          with_node type: 'send', receiver: {type: 'send', receiver: {type: 'send', message: 'config'}, message: 'active_record'}, message: 'identity_map=' do
-            remove
+      it 'updates file_source and file_ast when writing a file' do
+        instance = Rewriter::Instance.new rewriter, 'spec/**/*_spec.rb' do
+          with_node type: 'send', receiver: 'FactoryGirl', message: 'create' do
+            replace_with 'create {{arguments}}'
           end
         end
-        input = 'config.active_record.identity_map = true'
-        output = ''
-        expect(Dir).to receive(:glob).with('./config/*.rb').and_return(['config/environments/production.rb'])
-        expect(File).to receive(:read).with('config/environments/production.rb').and_return(input)
-        expect(File).to receive(:write).with('config/environments/production.rb', output)
+        input = """
+it 'uses factory_girl' do
+  user = FactoryGirl.create :user
+  post = FactoryGirl.create :post, user: user
+  assert post.valid?
+end
+"""
+        output = """
+it 'uses factory_girl' do
+  user = create :user
+  post = create :post, user: user
+  assert post.valid?
+end
+"""
+        expect(Dir).to receive(:glob).with('./spec/**/*_spec.rb').and_return(['spec/models/post_spec.rb']).twice
+        expect(File).to receive(:read).with('spec/models/post_spec.rb').and_return(input)
+        expect(File).to receive(:write).with('spec/models/post_spec.rb', output)
+        expect(File).to receive(:read).with('spec/models/post_spec.rb').and_return(output)
+        instance.process
         instance.process
-      end
-
-      describe "#check_conflict_actions" do
-        it "has no conflict" do
-          action1 = double(begin_pos: 10, end_pos: 20)
-          action2 = double(begin_pos: 30, end_pos: 40)
-          action3 = double(begin_pos: 50, end_pos: 60)
-          instance = Rewriter::Instance.new rewriter, 'spec/spec_helper.rb'
-          instance.instance_variable_set :@actions, [action1, action2, action3]
-          instance.send(:check_conflict_actions)
-          expect(instance.instance_variable_get :@conflict_actions).to eq []
-          expect(instance.instance_variable_get :@actions).to eq [action1, action2, action3]
-        end
-
-        it "has no conflict" do
-          action1 = double(begin_pos: 30, end_pos: 40)
-          action2 = double(begin_pos: 50, end_pos: 60)
-          action3 = double(begin_pos: 10, end_pos: 20)
-          instance = Rewriter::Instance.new rewriter, 'spec/spec_helper.rb'
-          instance.instance_variable_set :@actions, [action1, action2, action3]
-          instance.send(:check_conflict_actions)
-          expect(instance.instance_variable_get :@conflict_actions).to eq [action2, action1]
-          expect(instance.instance_variable_get :@actions).to eq [action3]
-        end
       end
     end
 
-    describe '#process_with_node' do
-      let(:rewriter) { Rewriter.new('foobar') }
-
-      it 'resets current_node' do
-        instance = Rewriter::Instance.new rewriter, 'spec/**/*_spec.rb' do; end
-        node1 = double()
-        node2 = double()
-        instance.process_with_node(node1) do
-          instance.current_node = node2
-          expect(instance.current_node).to eq node2
-        end
-        expect(instance.current_node).to eq node1
+    describe "#get_conflict_actions" do
+      let(:rewriter) { Rewriter.new('foo', 'bar') }
+
+      it "has no conflict" do
+        action1 = double(begin_pos: 10, end_pos: 20)
+        action2 = double(begin_pos: 30, end_pos: 40)
+        action3 = double(begin_pos: 50, end_pos: 60)
+        instance = Rewriter::Instance.new rewriter, 'spec/spec_helper.rb'
+        instance.instance_variable_set :@actions, [action1, action2, action3]
+        conflict_actions = instance.send(:get_conflict_actions)
+        expect(conflict_actions).to eq []
+        expect(instance.instance_variable_get :@actions).to eq [action1, action2, action3]
       end
-    end
 
-    describe '#process_with_other_node' do
-      let(:rewriter) { Rewriter.new('foobar') }
-
-      it 'resets current_node' do
-        instance = Rewriter::Instance.new rewriter, 'spec/**/*_spec.rb' do; end
-        node1 = double()
-        node2 = double()
-        node3 = double()
-        instance.current_node = node1
-        instance.process_with_other_node(node2) do
-          instance.current_node = node3
-          expect(instance.current_node).to eq node3
-        end
-        expect(instance.current_node).to eq node1
+      it "has no conflict" do
+        action1 = double(begin_pos: 30, end_pos: 40)
+        action2 = double(begin_pos: 50, end_pos: 60)
+        action3 = double(begin_pos: 10, end_pos: 20)
+        instance = Rewriter::Instance.new rewriter, 'spec/spec_helper.rb'
+        instance.instance_variable_set :@actions, [action1, action2, action3]
+        conflict_actions = instance.send(:get_conflict_actions)
+        expect(conflict_actions).to eq [action2, action1]
+        expect(instance.instance_variable_get :@actions).to eq [action3]
       end
     end
   end

data/spec/synvert/core/rewriter_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 module Synvert::Core
   describe Rewriter do
     it 'parses description' do
-      rewriter = Rewriter.new 'name' do
+      rewriter = Rewriter.new 'group', 'name' do
         description 'rewriter description'
       end
       rewriter.process
@@ -12,7 +12,7 @@ module Synvert::Core
 
     it 'parses if_gem' do
       expect(Rewriter::GemSpec).to receive(:new).with('synvert', {gte: '1.0.0'})
-      rewriter = Rewriter.new 'name' do
+      rewriter = Rewriter.new 'group', 'name' do
         if_gem 'synvert', {gte: '1.0.0'}
       end
       rewriter.process
@@ -22,7 +22,7 @@ module Synvert::Core
       it 'does nothing if if_gem not match' do
         expect_any_instance_of(Rewriter::GemSpec).to receive(:match?).and_return(false)
         expect_any_instance_of(Rewriter::Instance).not_to receive(:process)
-        rewriter = Rewriter.new 'name' do
+        rewriter = Rewriter.new 'group', 'name' do
           if_gem 'synvert', '1.0.0'
           within_file 'config/routes.rb' do; end
         end
@@ -31,7 +31,7 @@ module Synvert::Core
 
       it 'delegates process to instances if if_gem not exist' do
         expect_any_instance_of(Rewriter::Instance).to receive(:process)
-        rewriter = Rewriter.new 'name' do
+        rewriter = Rewriter.new 'group', 'name' do
           within_file 'config/routes.rb' do; end
         end
         rewriter.process
@@ -40,7 +40,7 @@ module Synvert::Core
       it 'delegates process to instances if if_gem matches' do
         expect_any_instance_of(Rewriter::GemSpec).to receive(:match?).and_return(true)
         expect_any_instance_of(Rewriter::Instance).to receive(:process)
-        rewriter = Rewriter.new 'name' do
+        rewriter = Rewriter.new 'group', 'name' do
           if_gem 'synvert', '1.0.0'
           within_file 'config/routes.rb' do; end
         end
@@ -50,7 +50,7 @@ module Synvert::Core
       it 'does nothing in sandbox mode' do
         expect_any_instance_of(Rewriter::GemSpec).not_to receive(:match?)
         expect_any_instance_of(Rewriter::Instance).not_to receive(:process)
-        rewriter = Rewriter.new 'name' do
+        rewriter = Rewriter.new 'group', 'name' do
           if_gem 'synvert', '1.0.0'
           within_file 'config/routes.rb' do; end
         end
@@ -60,7 +60,7 @@ module Synvert::Core
 
     describe 'parses add_file' do
       it 'creates a new file' do
-        rewriter = Rewriter.new 'rewriter2' do
+        rewriter = Rewriter.new 'group', 'rewriter2' do
           add_file 'foo.bar', 'FooBar'
         end
         rewriter.process
@@ -69,7 +69,7 @@ module Synvert::Core
       end
 
       it 'does nothing in sandbox mode' do
-        rewriter = Rewriter.new 'rewriter2' do
+        rewriter = Rewriter.new 'group', 'rewriter2' do
           add_file 'foo.bar', 'FooBar'
         end
         rewriter.process_with_sandbox
@@ -80,7 +80,7 @@ module Synvert::Core
     describe 'parses remove_file' do
       it 'removes a file' do
         FileUtils.touch './foo.bar'
-        rewriter = Rewriter.new 'rewriter2' do
+        rewriter = Rewriter.new 'group', 'rewriter2' do
           remove_file 'foo.bar'
         end
         rewriter.process
@@ -88,7 +88,7 @@ module Synvert::Core
       end
 
       it 'does nothing if file not exist' do
-        rewriter = Rewriter.new 'rewriter2' do
+        rewriter = Rewriter.new 'group', 'rewriter2' do
           remove_file 'foo.bar'
         end
         rewriter.process
@@ -97,7 +97,7 @@ module Synvert::Core
 
       it 'does nothing in sandbox mode' do
         FileUtils.touch './foo.bar'
-        rewriter = Rewriter.new 'rewriter2' do
+        rewriter = Rewriter.new 'group', 'rewriter2' do
           add_file 'foo.bar', 'FooBar'
         end
         rewriter.process_with_sandbox
@@ -108,18 +108,18 @@ module Synvert::Core
 
     describe 'parses add_snippet' do
       it 'processes the rewritter' do
-        rewriter1 = Rewriter.new 'rewriter1'
-        rewriter2 = Rewriter.new 'rewriter2' do
-          add_snippet :rewriter1
+        rewriter1 = Rewriter.new 'group', 'rewriter1'
+        rewriter2 = Rewriter.new 'group', 'rewriter2' do
+          add_snippet :group, :rewriter1
         end
         expect(rewriter1).to receive(:process)
         rewriter2.process
       end
 
       it 'adds sub_snippets' do
-        rewriter1 = Rewriter.new 'rewriter1'
-        rewriter2 = Rewriter.new 'rewriter2' do
-          add_snippet :rewriter1
+        rewriter1 = Rewriter.new 'group', 'rewriter1'
+        rewriter2 = Rewriter.new 'group', 'rewriter2' do
+          add_snippet :group, :rewriter1
         end
         expect(rewriter1).to receive(:process)
         rewriter2.process
@@ -127,15 +127,15 @@ module Synvert::Core
       end
 
       it 'raises RewriterNotFound' do
-        rewriter = Rewriter.new 'name' do
-          add_snippet :not_exist
+        rewriter = Rewriter.new 'group', 'name' do
+          add_snippet :group, :not_exist
         end
         expect { rewriter.process }.to raise_error(RewriterNotFound)
       end
     end
 
     it 'parses helper_method' do
-      rewriter = Rewriter.new 'name' do
+      rewriter = Rewriter.new 'group', 'name' do
         helper_method 'dynamic_helper' do |arg1, arg2|
           'dynamic result'
         end
@@ -146,7 +146,7 @@ module Synvert::Core
     end
 
     it 'parses todo' do
-      rewriter = Rewriter.new 'name' do
+      rewriter = Rewriter.new 'group', 'name' do
         todo "this rewriter doesn't do blah blah blah"
       end
       rewriter.process
@@ -159,25 +159,25 @@ module Synvert::Core
       end
 
       it 'registers and fetches' do
-        rewriter = Rewriter.new 'rewriter'
-        expect(Rewriter.fetch('rewriter')).to eq rewriter
+        rewriter = Rewriter.new 'group', 'rewriter'
+        expect(Rewriter.fetch('group', 'rewriter')).to eq rewriter
       end
 
       it 'registers and calls rewriter' do
-        rewriter = Rewriter.new 'rewriter'
+        rewriter = Rewriter.new 'group', 'rewriter'
         expect(rewriter).to receive(:process)
-        Rewriter.call 'rewriter'
+        Rewriter.call 'group', 'rewriter'
       end
 
       context "available" do
         it 'lists empty rewriters' do
-          expect(Rewriter.availables).to eq []
+          expect(Rewriter.availables).to eq({})
         end
 
         it 'registers and lists all available rewriters' do
-          rewriter1 = Rewriter.new 'rewriter1'
-          rewriter2 = Rewriter.new 'rewriter2'
-          expect(Rewriter.availables).to eq [rewriter1, rewriter2]
+          rewriter1 = Rewriter.new 'group', 'rewriter1'
+          rewriter2 = Rewriter.new 'group', 'rewriter2'
+          expect(Rewriter.availables).to eq({'group' => {'rewriter1' => rewriter1, 'rewriter2' => rewriter2}})
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: synvert-core
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.0
 platform: ruby
 authors:
 - Richard Huang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-16 00:00:00.000000000 Z
+date: 2014-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser