synvert-core 0.48.0 → 0.51.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d053ad88384be0c41958704354fff02d9c6d4aba71748ee4a57713e5502eb398
-  data.tar.gz: f856e276eb76e6cf16f72039bca6ea138b5aae6038c11887f7b81d0128b6a606
+  metadata.gz: bc8d09c26c005557ec18ab8d877a8cbf5af6ba0f9de0ab44efe40298419647fa
+  data.tar.gz: abcc824dfbf93e3aab1d3d3e33dd3862886015b899b79ce7ceb97066d2b47e85
 SHA512:
-  metadata.gz: b15b022aab4015583b3c9b966b312c9dd3e0a4ecd184c498be19b566b2ef47eaace511ba83f65ecadc70b959fd2d685b1e9ee286bb64f4697016b7c1f5e1040a
-  data.tar.gz: e62eefc4e31cf53b3b0f7dff13e2909b49db206afea12b82122aae3f7d31037627776d92b8bbf546bb5911b38a0c80b73c5063375399b8b3b61abb519439ae7b
+  metadata.gz: f46377a1cc5b7eb69bb69608b3f018eae1e4cd2f4aed6bf3e3200bfa1f1fa9527829ba2a64fb0c9dd909e0125028f6fef15100fb76b0a88acfb4f8c6b9e33879
+  data.tar.gz: 3de1571672cff28c01937d4f1281873592847578367320123d32e657429634cde392000b9400124be0ae90f3d896627763864eaabe7539df13e98886b1c00ce1

data/CHANGELOG.md

@@ -1,5 +1,20 @@
 # CHANGELOG
 
+## 0.51.0 (2021-08-12)
+
+* Add `wrap` action
+* Add new dsl `redo_until_no_change`
+
+## 0.50.0 (2021-08-11)
+
+* Support `:module` in `body`
+* Fix symbol match
+
+## 0.49.0 (2021-08-04)
+
+* Support :erange in to_value
+* Do not use to_value in match_value?
+
 ## 0.48.0 (2021-08-01)
 
 * Force to read file as utf-8

data/lib/synvert/core/node_ext.rb

@@ -110,7 +110,7 @@ module Parser::AST
       case type
       when :begin
         children
-      when :def, :block, :class
+      when :def, :block, :class, :module
         return [] if children[2].nil?
 
         :begin == children[2].type ? children[2].body : children[2..-1]
@@ -252,6 +252,8 @@ module Parser::AST
         children.map(&:to_value)
       when :irange
         (children.first.to_value..children.last.to_value)
+      when :erange
+        (children.first.to_value...children.last.to_value)
       when :begin
         children.first.to_value
       else
@@ -548,14 +550,14 @@ module Parser::AST
       case expected
       when Symbol
         if actual.is_a?(Parser::AST::Node)
-          actual.to_value == expected
+          actual.to_source == ":#{expected}" || actual.to_source == expected.to_s
         else
           actual.to_sym == expected
         end
       when String
         if actual.is_a?(Parser::AST::Node)
-          actual.to_source == expected || actual.to_value == expected ||
-            actual.to_source == unwrap_quote(expected) || actual.to_value == unwrap_quote(expected)
+          actual.to_source == expected || actual.to_source == unwrap_quote(expected) ||
+            unwrap_quote(actual.to_source) == expected || unwrap_quote(actual.to_source) == unwrap_quote(expected)
         else
           actual.to_s == expected || wrap_quote(actual.to_s) == expected
         end

data/lib/synvert/core/rewriter.rb

@@ -18,14 +18,15 @@ module Synvert::Core
   class Rewriter
     autoload :Action, 'synvert/core/rewriter/action'
     autoload :AppendAction, 'synvert/core/rewriter/action/append_action'
-    autoload :PrependAction, 'synvert/core/rewriter/action/prepend_action'
+    autoload :DeleteAction, 'synvert/core/rewriter/action/delete_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 :RemoveAction, 'synvert/core/rewriter/action/remove_action'
+    autoload :PrependAction, 'synvert/core/rewriter/action/prepend_action'
     autoload :ReplaceAction, 'synvert/core/rewriter/action/replace_action'
     autoload :ReplaceErbStmtWithExprAction, 'synvert/core/rewriter/action/replace_erb_stmt_with_expr_action'
-    autoload :RemoveAction, 'synvert/core/rewriter/action/remove_action'
-    autoload :DeleteAction, 'synvert/core/rewriter/action/delete_action'
+    autoload :ReplaceWithAction, 'synvert/core/rewriter/action/replace_with_action'
+    autoload :WrapAction, 'synvert/core/rewriter/action/wrap_action'
 
     autoload :Warning, 'synvert/core/rewriter/warning'
 
@@ -175,13 +176,18 @@ module Synvert::Core
       @sub_snippets = []
       @warnings = []
       @affected_files = Set.new
+      @redo_until_no_change = false
       self.class.register(@group, @name, self)
     end
 
     # Process the rewriter.
     # It will call the block.
     def process
+      @affected_files = Set.new
       instance_eval(&@block)
+      if !@affected_files.empty? && @redo_until_no_change
+        process
+      end
     end
 
     # Process rewriter with sandbox mode.
@@ -314,5 +320,10 @@ module Synvert::Core
         @todo
       end
     end
+
+    # Rerun the snippet until no change.
+    def redo_until_no_change
+      @redo_until_no_change = true
+    end
   end
 end

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

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Synvert::Core
+  # WrapAction to warp node within a block, class or module.
+  #
+  # Note: if WrapAction is conflicted with another action (begin_pos and end_pos are overlapped),
+  # we have to put those 2 actions into 2 within_file scopes.
+  class Rewriter::WrapAction < Rewriter::Action
+    def initialize(instance, with:, indent: nil)
+      @instance = instance
+      @code = with
+      @node = @instance.current_node
+      @indent = indent || @node.indent
+    end
+
+    # Begin position of code to wrap.
+    #
+    # @return [Integer] begin position.
+    def begin_pos
+      @node.loc.expression.begin_pos
+    end
+
+    # End position of code to wrap.
+    #
+    # @return [Integer] end position.
+    def end_pos
+      @node.loc.expression.end_pos
+    end
+
+    # The rewritten source code.
+    #
+    # @return [String] rewritten code.
+    def rewritten_code
+      "#{@code}\n#{' ' * @indent}" +
+      @node.to_source.split("\n").map { |line| "  #{line}" }.join("\n") +
+      "\n#{' ' * @indent}end"
+    end
+  end
+end

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

@@ -279,6 +279,15 @@ module Synvert::Core
       @actions << Rewriter::DeleteAction.new(self, *selectors)
     end
 
+    # Parse wrap with dsl, it creates a [Synvert::Core::Rewriter::WrapAction] to
+    # wrap current node with code.
+    #
+    # @param with [String] code need to be wrapped with.
+    # @param indent [Integer] number of whitespaces.
+    def wrap(with:, indent: nil)
+      @actions << Rewriter::WrapAction.new(self, with: with, indent: indent)
+    end
+
     # Parse warn dsl, it creates a [Synvert::Core::Rewriter::Warning] to save warning message.
     #
     # @param message [String] warning message.

data/lib/synvert/core/version.rb

@@ -2,6 +2,6 @@
 
 module Synvert
   module Core
-    VERSION = '0.48.0'
+    VERSION = '0.51.0'
   end
 end

data/spec/synvert/core/node_ext_spec.rb

@@ -151,6 +151,11 @@ describe Parser::AST::Node do
       expect(node.body).to be_empty
     end
 
+    it 'gets empty for module node' do
+      node = parse('module Admin; end')
+      expect(node.body).to be_empty
+    end
+
     it 'gets one line for class node' do
       node = parse('class User; attr_accessor :email; end')
       expect(node.body).to eq [parse('attr_accessor :email')]
@@ -316,18 +321,23 @@ describe Parser::AST::Node do
       expect(node.to_value).to eq :str
     end
 
-    it 'get for boolean' do
+    it 'gets for boolean' do
       node = parse('true')
       expect(node.to_value).to be_truthy
       node = parse('false')
       expect(node.to_value).to be_falsey
     end
 
-    it 'get for range' do
+    it 'gets for irange' do
       node = parse('(1..10)')
       expect(node.to_value).to eq(1..10)
     end
 
+    it 'gets for erange' do
+      node = parse('(1...10)')
+      expect(node.to_value).to eq(1...10)
+    end
+
     it 'gets for array' do
       node = parse("['str', :str]")
       expect(node.to_value).to eq ['str', :str]
@@ -418,6 +428,12 @@ describe Parser::AST::Node do
       expect(node).to be_match(type: 'send', receiver: 'params', message: '[]', arguments: [:user])
     end
 
+    it 'matches pair key with symbol' do
+      source = '{ type: :model }'
+      node = parse(source).children[0]
+      expect(node).to be_match(type: 'pair', key: :type)
+    end
+
     it 'matches assign number' do
       source = 'at_least(0)'
       node = parse(source)

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

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+module Synvert::Core
+  describe Rewriter::WrapAction do
+    subject {
+      source = "class Bar\nend"
+      node = Parser::CurrentRuby.parse(source)
+      instance = double(current_node: node)
+      Rewriter::WrapAction.new(instance, with: 'module Foo')
+    }
+
+    it 'gets begin_pos' do
+      expect(subject.begin_pos).to eq 0
+    end
+
+    it 'gets end_pos' do
+      expect(subject.end_pos).to eq "class Bar\nend".length
+    end
+
+    it 'gets rewritten_code' do
+      expect(subject.rewritten_code).to eq <<~EOS.strip
+        module Foo
+          class Bar
+          end
+        end
+      EOS
+    end
+  end
+end

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

@@ -140,6 +140,11 @@ module Synvert::Core
       instance.delete :dot, :message
     end
 
+    it 'parses wrap with' do
+      expect(Rewriter::WrapAction).to receive(:new).with(instance, with: 'module Foo', indent: nil)
+      instance.wrap with: 'module Foo'
+    end
+
     it 'parses warn' do
       expect(Rewriter::Warning).to receive(:new).with(instance, 'foobar')
       instance.warn 'foobar'

data/spec/synvert/core/rewriter_spec.rb

@@ -214,6 +214,15 @@ module Synvert::Core
       expect(rewriter.todo).to eq "this rewriter doesn't do blah blah blah"
     end
 
+    it 'parses redo_until_no_change' do
+      rewriter =
+        Rewriter.new 'group', 'name' do
+          redo_until_no_change
+        end
+      rewriter.process
+      expect(rewriter.instance_variable_get('@redo_until_no_change')).to be_truthy
+    end
+
     describe 'class methods' do
       before :each do
         Rewriter.clear

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: synvert-core
 version: !ruby/object:Gem::Version
-  version: 0.48.0
+  version: 0.51.0
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-01 00:00:00.000000000 Z
+date: 2021-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -155,6 +155,7 @@ files:
 - lib/synvert/core/rewriter/action/replace_action.rb
 - lib/synvert/core/rewriter/action/replace_erb_stmt_with_expr_action.rb
 - lib/synvert/core/rewriter/action/replace_with_action.rb
+- lib/synvert/core/rewriter/action/wrap_action.rb
 - lib/synvert/core/rewriter/any_value.rb
 - lib/synvert/core/rewriter/condition.rb
 - lib/synvert/core/rewriter/condition/if_exist_condition.rb
@@ -182,6 +183,7 @@ files:
 - spec/synvert/core/rewriter/action/replace_action_spec.rb
 - spec/synvert/core/rewriter/action/replace_erb_stmt_with_expr_action_spec.rb
 - spec/synvert/core/rewriter/action/replace_with_action_spec.rb
+- spec/synvert/core/rewriter/action/wrap_action_spec.rb
 - spec/synvert/core/rewriter/action_spec.rb
 - spec/synvert/core/rewriter/condition/if_exist_condition_spec.rb
 - spec/synvert/core/rewriter/condition/if_only_exist_condition_spec.rb
@@ -234,6 +236,7 @@ test_files:
 - spec/synvert/core/rewriter/action/replace_action_spec.rb
 - spec/synvert/core/rewriter/action/replace_erb_stmt_with_expr_action_spec.rb
 - spec/synvert/core/rewriter/action/replace_with_action_spec.rb
+- spec/synvert/core/rewriter/action/wrap_action_spec.rb
 - spec/synvert/core/rewriter/action_spec.rb
 - spec/synvert/core/rewriter/condition/if_exist_condition_spec.rb
 - spec/synvert/core/rewriter/condition/if_only_exist_condition_spec.rb