synvert-core 0.7.5 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 147d5855d29224ef920cd0249c021c0825f52ae7
-  data.tar.gz: 151c8fcd306d95ac3e401f6b5e7c266dde352bd5
+  metadata.gz: 7574aaacdd63c1c6cd7f6372491e69aa62b916dc
+  data.tar.gz: ff1c06c93de47e0a6a06d58cdf7f1d6856f05eb3
 SHA512:
-  metadata.gz: efd95157a71e181ad15658aa06c3ddb41d85a80801ecb118cd4d74877db98bdfaf9a6ff66d9838deca432cdcbd3cc122c572c6998120053a3711db6ac6ea02b2
-  data.tar.gz: 4d7105931e33abe42f7d6722e9948251151155db3ee401ecb6f187228c67226b0662f831dc45b3de0050a4bf280400781c20c1b6d3b43251889e28635030b8d1
+  metadata.gz: a36cf26c775659fecf1c73899d95b2b16a199a6675f8604df9514370afed213efec5c8425d6d4420265fce46f8df7575c7acdb83009464f5b3cbfe72f39b8662
+  data.tar.gz: 92e7917386a8497847d87f32ba68f0fecd3470cd007b1457dda3c51bb01b4a341a42990698cd18e0d64535bc277b4eec92239ffd12dd25314e9e1c4a62f1b95d

data/CHANGELOG.md

@@ -1,26 +1,14 @@
 # CHANGELOG
 
-## 0.7.5
-
-* Fix left_value and right_value node attribute
-
-## 0.7.4
+## 0.8.0 (2014-10-26)
 
+* Add line method to ast node
 * Add add_arguments_with_parenthesis_if_necessary helper method
-
-## 0.7.3
-
+* Fix left_value and right_value node attribute
+* Print warn when file was not parsed correctly
 * Handle indent for node array source
-* Add line method to ast node
-
-## 0.7.2
-
 * Rescue NoMethodError and output node debug info
 
-## 0.7.1
-
-* Hotfix a typo
-
 ## 0.7.0 (2014-09-29)
 
 * Add debug info for MethodNotSupported error.

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

@@ -0,0 +1,38 @@
+# encoding: utf-8
+
+module Synvert::Core
+  # AppendWithAction to append code to the bottom of node body.
+  class Rewriter::AppendAction < Rewriter::Action
+    # Begin position to append code.
+    #
+    # @return [Integer] begin position.
+    def begin_pos
+      if :begin == @node.type
+        @node.loc.expression.end_pos
+      else
+        @node.loc.expression.end_pos - @node.indent - 4
+      end
+    end
+
+    # End position, always same to begin position.
+    #
+    # @return [Integer] end position.
+    def end_pos
+      begin_pos
+    end
+
+  private
+
+    # Indent of the node.
+    #
+    # @param node [Parser::AST::Node]
+    # @return [String] n times whitesphace
+    def indent(node)
+      if [:block, :class].include? node.type
+        ' ' * (node.indent + 2)
+      else
+        ' ' * node.indent
+      end
+    end
+  end
+end

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

@@ -0,0 +1,48 @@
+# encoding: utf-8
+
+module Synvert::Core
+  # InsertAction to insert code to the top of node body.
+  class Rewriter::InsertAction < Rewriter::Action
+    # Begin position to insert code.
+    #
+    # @return [Integer] begin position.
+    def begin_pos
+      insert_position(@node)
+    end
+
+    # End position, always same to begin position.
+    #
+    # @return [Integer] end position.
+    def end_pos
+      begin_pos
+    end
+
+  private
+
+    # Insert position.
+    #
+    # @return [Integer] insert position.
+    def insert_position(node)
+      case node.type
+      when :block
+        node.children[1].children.empty? ? node.children[0].loc.expression.end_pos + 3 : node.children[1].loc.expression.end_pos
+      when :class
+        node.children[1] ? node.children[1].loc.expression.end_pos : node.children[0].loc.expression.end_pos
+      else
+        node.children.last.loc.expression.end_pos
+      end
+    end
+
+    # Indent of the node.
+    #
+    # @param node [Parser::AST::Node]
+    # @return [String] n times whitesphace
+    def indent(node)
+      if [:block, :class].include? node.type
+        ' ' * (node.indent + 2)
+      else
+        ' ' * node.indent
+      end
+    end
+  end
+end

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

@@ -0,0 +1,30 @@
+# encoding: utf-8
+
+module Synvert::Core
+  # InsertAfterAction to insert code next to the node.
+  class Rewriter::InsertAfterAction < Rewriter::Action
+    # Begin position to insert code.
+    #
+    # @return [Integer] begin position.
+    def begin_pos
+      @node.loc.expression.end_pos
+    end
+
+    # End position, always same to begin position.
+    #
+    # @return [Integer] end position.
+    def end_pos
+      begin_pos
+    end
+
+  private
+
+    # Indent of the node.
+    #
+    # @param node [Parser::AST::Node]
+    # @return [String] n times whitesphace
+    def indent(node)
+      ' ' * node.indent
+    end
+  end
+end

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

@@ -0,0 +1,29 @@
+# encoding: utf-8
+
+module Synvert::Core
+  # RemoveAction to remove code.
+  class Rewriter::RemoveAction < Rewriter::Action
+    def initialize(instance, code=nil)
+      super
+    end
+
+    # Begin position of code to replace.
+    #
+    # @return [Integer] begin position.
+    def begin_pos
+      @node.loc.expression.begin_pos
+    end
+
+    # End position of code to replace.
+    #
+    # @return [Integer] end position.
+    def end_pos
+      @node.loc.expression.end_pos
+    end
+
+    # The rewritten code, always empty string.
+    def rewritten_code
+      ''
+    end
+  end
+end

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

@@ -0,0 +1,40 @@
+# encoding: utf-8
+
+module Synvert::Core
+  # ReplaceErbStmtWithExprAction to replace erb stmt code to expr,
+  #   e.g. <% form_for ... %> => <%= form_for ... %>.
+  class Rewriter::ReplaceErbStmtWithExprAction < Rewriter::Action
+    def initialize(instance, code=nil)
+      super
+    end
+
+    # Begin position of code to replace.
+    #
+    # @return [Integer] begin position.
+    def begin_pos
+      node_begin_pos = @node.loc.expression.begin_pos
+      while @node.loc.expression.source_buffer.source[node_begin_pos -= 1] == ' '
+      end
+      node_begin_pos - Engine::ERUBY_STMT_SPLITTER.length + 1
+    end
+
+    # End position of code to replace.
+    #
+    # @return [Integer] end position.
+    def end_pos
+      node_begin_pos = @node.loc.expression.begin_pos
+      node_begin_pos += @node.loc.expression.source.index "do"
+      while @node.loc.expression.source_buffer.source[node_begin_pos += 1] != '@'
+      end
+      node_begin_pos
+    end
+
+    # The rewritten erb expr code.
+    #
+    # @return [String] rewritten code.
+    def rewritten_code
+      @node.loc.expression.source_buffer.source[begin_pos...end_pos].sub(Engine::ERUBY_STMT_SPLITTER, "@output_buffer.append= ")
+        .sub(Engine::ERUBY_STMT_SPLITTER, Engine::ERUBY_EXPR_SPLITTER)
+    end
+  end
+end

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

@@ -0,0 +1,45 @@
+# encoding: utf-8
+
+module Synvert::Core
+  # ReplaceWithAction to replace code.
+  class Rewriter::ReplaceWithAction < Rewriter::Action
+    # Begin position of code to replace.
+    #
+    # @return [Integer] begin position.
+    def begin_pos
+      @node.loc.expression.begin_pos
+    end
+
+    # End position of code to replace.
+    #
+    # @return [Integer] end position.
+    def end_pos
+      @node.loc.expression.end_pos
+    end
+
+    # The rewritten source code with proper indent.
+    #
+    # @return [String] rewritten code.
+    def rewritten_code
+      if rewritten_source.split("\n").length > 1
+        new_code = []
+        rewritten_source.split("\n").each_with_index { |line, index|
+          new_code << (index == 0 ? line : indent(@node) + line)
+        }
+        new_code.join("\n")
+      else
+        rewritten_source
+      end
+    end
+
+  private
+
+    # Indent of the node
+    #
+    # @param node [Parser::AST::Node]
+    # @return [String] n times whitesphace
+    def indent(node)
+      ' ' * node.indent
+    end
+  end
+end

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

@@ -48,216 +48,5 @@ module Synvert::Core
       self.begin_pos <=> action.begin_pos
     end
   end
-
-  # ReplaceWithAction to replace code.
-  class Rewriter::ReplaceWithAction < Rewriter::Action
-    # Begin position of code to replace.
-    #
-    # @return [Integer] begin position.
-    def begin_pos
-      @node.loc.expression.begin_pos
-    end
-
-    # End position of code to replace.
-    #
-    # @return [Integer] end position.
-    def end_pos
-      @node.loc.expression.end_pos
-    end
-
-    # The rewritten source code with proper indent.
-    #
-    # @return [String] rewritten code.
-    def rewritten_code
-      if rewritten_source.split("\n").length > 1
-        new_code = []
-        rewritten_source.split("\n").each_with_index { |line, index|
-          new_code << (index == 0 ? line : indent(@node) + line)
-        }
-        new_code.join("\n")
-      else
-        rewritten_source
-      end
-    end
-
-  private
-
-    # Indent of the node
-    #
-    # @param node [Parser::AST::Node]
-    # @return [String] n times whitesphace
-    def indent(node)
-      ' ' * node.indent
-    end
-  end
-
-  # AppendWithAction to append code to the bottom of node body.
-  class Rewriter::AppendAction < Rewriter::Action
-    # Begin position to append code.
-    #
-    # @return [Integer] begin position.
-    def begin_pos
-      if :begin == @node.type
-        @node.loc.expression.end_pos
-      else
-        @node.loc.expression.end_pos - @node.indent - 4
-      end
-    end
-
-    # End position, always same to begin position.
-    #
-    # @return [Integer] end position.
-    def end_pos
-      begin_pos
-    end
-
-  private
-
-    # Indent of the node.
-    #
-    # @param node [Parser::AST::Node]
-    # @return [String] n times whitesphace
-    def indent(node)
-      if [:block, :class].include? node.type
-        ' ' * (node.indent + 2)
-      else
-        ' ' * node.indent
-      end
-    end
-  end
-
-  # InsertAction to insert code to the top of node body.
-  class Rewriter::InsertAction < Rewriter::Action
-    # Begin position to insert code.
-    #
-    # @return [Integer] begin position.
-    def begin_pos
-      insert_position(@node)
-    end
-
-    # End position, always same to begin position.
-    #
-    # @return [Integer] end position.
-    def end_pos
-      begin_pos
-    end
-
-  private
-
-    # Insert position.
-    #
-    # @return [Integer] insert position.
-    def insert_position(node)
-      case node.type
-      when :block
-        node.children[1].children.empty? ? node.children[0].loc.expression.end_pos + 3 : node.children[1].loc.expression.end_pos
-      when :class
-        node.children[1] ? node.children[1].loc.expression.end_pos : node.children[0].loc.expression.end_pos
-      else
-        node.children.last.loc.expression.end_pos
-      end
-    end
-
-    # Indent of the node.
-    #
-    # @param node [Parser::AST::Node]
-    # @return [String] n times whitesphace
-    def indent(node)
-      if [:block, :class].include? node.type
-        ' ' * (node.indent + 2)
-      else
-        ' ' * node.indent
-      end
-    end
-  end
-
-  # InsertAfterAction to insert code next to the node.
-  class Rewriter::InsertAfterAction < Rewriter::Action
-    # Begin position to insert code.
-    #
-    # @return [Integer] begin position.
-    def begin_pos
-      @node.loc.expression.end_pos
-    end
-
-    # End position, always same to begin position.
-    #
-    # @return [Integer] end position.
-    def end_pos
-      begin_pos
-    end
-
-  private
-
-    # Indent of the node.
-    #
-    # @param node [Parser::AST::Node]
-    # @return [String] n times whitesphace
-    def indent(node)
-      ' ' * node.indent
-    end
-  end
-
-  # RemoveAction to remove code.
-  class Rewriter::RemoveAction < Rewriter::Action
-    def initialize(instance, code=nil)
-      super
-    end
-
-    # Begin position of code to replace.
-    #
-    # @return [Integer] begin position.
-    def begin_pos
-      @node.loc.expression.begin_pos
-    end
-
-    # End position of code to replace.
-    #
-    # @return [Integer] end position.
-    def end_pos
-      @node.loc.expression.end_pos
-    end
-
-    # The rewritten code, always empty string.
-    def rewritten_code
-      ''
-    end
-  end
-
-  # ReplaceErbStmtWithExprAction to replace erb stmt code to expr,
-  #   e.g. <% form_for ... %> => <%= form_for ... %>.
-  class Rewriter::ReplaceErbStmtWithExprAction < Rewriter::Action
-    def initialize(instance, code=nil)
-      super
-    end
-
-    # Begin position of code to replace.
-    #
-    # @return [Integer] begin position.
-    def begin_pos
-      node_begin_pos = @node.loc.expression.begin_pos
-      while @node.loc.expression.source_buffer.source[node_begin_pos -= 1] == ' '
-      end
-      node_begin_pos - Engine::ERUBY_STMT_SPLITTER.length + 1
-    end
-
-    # End position of code to replace.
-    #
-    # @return [Integer] end position.
-    def end_pos
-      node_begin_pos = @node.loc.expression.begin_pos
-      node_begin_pos += @node.loc.expression.source.index "do"
-      while @node.loc.expression.source_buffer.source[node_begin_pos += 1] != '@'
-      end
-      node_begin_pos
-    end
-
-    # The rewritten erb expr code.
-    #
-    # @return [String] rewritten code.
-    def rewritten_code
-      @node.loc.expression.source_buffer.source[begin_pos...end_pos].sub(Engine::ERUBY_STMT_SPLITTER, "@output_buffer.append= ")
-        .sub(Engine::ERUBY_STMT_SPLITTER, Engine::ERUBY_EXPR_SPLITTER)
-    end
-  end
 end
+

data/lib/synvert/core/rewriter/condition/if_exist_condition.rb

@@ -0,0 +1,15 @@
+# encoding: utf-8
+
+module Synvert::Core
+  # IfExistCondition checks if matching node exists in the node children.
+  class Rewriter::IfExistCondition < Rewriter::Condition
+    # check if any child node matches the rules.
+    def match?
+      match = false
+      @instance.current_node.recursive_children do |child_node|
+        match = match || (child_node && child_node.match?(@rules))
+      end
+      match
+    end
+  end
+end

data/lib/synvert/core/rewriter/condition/if_only_exist_condition.rb

@@ -0,0 +1,12 @@
+# encoding: utf-8
+
+module Synvert::Core
+  # IfExistCondition checks if node has only one child node and the child node matches rules.
+  class Rewriter::IfOnlyExistCondition < Rewriter::Condition
+    # check if only have one child node and the child node matches rules.
+    def match?
+      @instance.current_node.body.size == 1 &&
+        @instance.current_node.body.first.match?(@rules)
+    end
+  end
+end

data/lib/synvert/core/rewriter/condition/unless_exist_condition.rb

@@ -0,0 +1,15 @@
+# encoding: utf-8
+
+module Synvert::Core
+  # UnlessExistCondition checks if matching node doesn't exist in the node children.
+  class Rewriter::UnlessExistCondition < Rewriter::Condition
+    # check if none of child node matches the rules.
+    def match?
+      match = false
+      @instance.current_node.recursive_children do |child_node|
+        match = match || (child_node && child_node.match?(@rules))
+      end
+      !match
+    end
+  end
+end

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

@@ -20,37 +20,4 @@ module Synvert::Core
       @instance.instance_eval &@block if match?
     end
   end
-
-  # IfExistCondition checks if matching node exists in the node children.
-  class Rewriter::IfExistCondition < Rewriter::Condition
-    # check if any child node matches the rules.
-    def match?
-      match = false
-      @instance.current_node.recursive_children do |child_node|
-        match = match || (child_node && child_node.match?(@rules))
-      end
-      match
-    end
-  end
-
-  # UnlessExistCondition checks if matching node doesn't exist in the node children.
-  class Rewriter::UnlessExistCondition < Rewriter::Condition
-    # check if none of child node matches the rules.
-    def match?
-      match = false
-      @instance.current_node.recursive_children do |child_node|
-        match = match || (child_node && child_node.match?(@rules))
-      end
-      !match
-    end
-  end
-
-  # IfExistCondition checks if node has only one child node and the child node matches rules.
-  class Rewriter::IfOnlyExistCondition < Rewriter::Condition
-    # check if only have one child node and the child node matches rules.
-    def match?
-      @instance.current_node.body.size == 1 &&
-        @instance.current_node.body.first.match?(@rules)
-    end
-  end
 end

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

@@ -112,6 +112,9 @@ module Synvert::Core
 
               self.class.write_file(file_path, source)
             end
+          rescue Parser::SyntaxError
+            puts "[Warn] file #{file_path} was not parsed correctly."
+            # do nothing, iterate next file
           end while !conflict_actions.empty?
         end
       end

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

@@ -0,0 +1,27 @@
+# encoding: utf-8
+
+module Synvert::Core
+  # 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/scope/within_scope.rb

@@ -0,0 +1,36 @@
+# encoding: utf-8
+
+module Synvert::Core
+  # 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
+end