synvert-core 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d77822c52c87146007c9915c7ae6e6d4c3d539ee
-  data.tar.gz: 639a0bbc823cddb2476142ef3035b2ea73c954c8
+  metadata.gz: 0bde34eb3461990b83ea42cb438131ed34dab7ff
+  data.tar.gz: 856cce48e98b4b1930f247125a7dd156a3c0e2b2
 SHA512:
-  metadata.gz: 06127d574c1450a0689ab8f43d2403cee8e3aa859c4fd7ae645da98832112f5e70b3f7807f793762a6caae5c64d0f912259a65d945de220e4e92a697907fe529
-  data.tar.gz: 7a29c3fa1178fe44056460df4692c5a7b8af7fc7832fd3edd5b35e39f9ea57068faa818611ef2fa043a5244d3b9089e93b2e62e6ab7db8aafff6e32c136ec3b0
+  metadata.gz: 2abd9040ab9b7f2908c1ef1f3c617bbf367fc177e0fb78a4b088b13520d60dd85cdd1afb93fb39d9bbeca20d25eabac4468dde07b99fc459a90335b1ec41df7a
+  data.tar.gz: 7848b2dd867efe89b7ee79207274e59cf33660ea5115a23af4ec20fff9e3400f2df27a23492e8b2e5ecc294e79453e72f021ea207040f302accfdedbda3d9e4b

data/CHANGELOG.md

@@ -1,13 +1,20 @@
 # CHANGELOG
 
+## 0.4.3
+
+* 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
+* 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.
+* Add Rewriter::Helper module to provide common helper methods.
 
 ## 0.4.0 (2014-07-26)
 

data/lib/synvert/core/node_ext.rb

@@ -15,6 +15,18 @@ class Parser::AST::Node
     end
   end
 
+  # Get parent_class node of :class node.
+  #
+  # @return [Parser::AST::Node] parent_class node.
+  # @raise [Synvert::Core::MethodNotSupported] if calls on other node.
+  def parent_class
+    if :class == self.type
+      self.children[1]
+    else
+      raise Synvert::Core::MethodNotSupported.new "parent_class is not handled for #{self.inspect}"
+    end
+  end
+
   # Get receiver node of :send node.
   #
   # @return [Parser::AST::Node] receiver node.
@@ -266,7 +278,7 @@ class Parser::AST::Node
             source = evaluated.first.loc.expression.source_buffer.source
             source[evaluated.first.loc.expression.begin_pos...evaluated.last.loc.expression.end_pos]
           end
-        when String
+        when String, Symbol
           evaluated
         when NilClass
           'nil'

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

@@ -100,7 +100,7 @@ module Synvert::Core
       if :begin == @node.type
         @node.loc.expression.end_pos
       else
-        @node.loc.expression.end_pos - 4
+        @node.loc.expression.end_pos - @node.indent - 4
       end
     end
 

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

@@ -55,9 +55,9 @@ module Synvert::Core
 
             @current_file = file_path
             @current_source = source
-            @current_node = ast
-            instance_eval &@block
-            @current_node = ast
+            self.process_with_node ast do
+              instance_eval &@block
+            end
 
             @actions.sort!
             check_conflict_actions
@@ -174,6 +174,23 @@ 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.

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

@@ -19,28 +19,18 @@ module Synvert::Core
     def process
       current_node = @instance.current_node
       return unless current_node
-      process_with_node current_node do
+      @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|
-          process_with_node matching_node do
+          @instance.process_with_node matching_node do
             @instance.instance_eval &@block
           end
         end
       end
     end
-
-  private
-
-    # Set instance current node properly and process.
-    # @param node [Parser::AST::Node]
-    def process_with_node(node)
-      @instance.current_node = node
-      yield
-      @instance.current_node = node
-    end
   end
 end

data/lib/synvert/core/version.rb

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

data/spec/synvert/core/node_ext_spec.rb

@@ -26,6 +26,13 @@ describe Parser::AST::Node do
     end
   end
 
+  describe '#parent_class' do
+    it 'gets for class node' do
+      node = parse('class Post < ActiveRecord::Base; end')
+      expect(node.parent_class).to eq parse('ActiveRecord::Base')
+    end
+  end
+
   describe '#receiver' do
     it 'gets for send node' do
       node = parse('FactoryGirl.create :post')

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

@@ -191,5 +191,37 @@ end
         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
+      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
+      end
+    end
   end
 end

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

@@ -18,7 +18,10 @@ end
     }
     let(:node) { Parser::CurrentRuby.parse(source) }
     let(:instance) { double(:current_node => node, :current_node= => node, :current_source => source) }
-    before { Rewriter::Instance.current = instance }
+    before do
+      allow(instance).to receive(:process_with_node).and_yield
+      Rewriter::Instance.current = instance
+    end
 
     describe '#process' do
       it 'not call block if no matching node' do

metadata

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