synvert-core 0.24.0 → 0.27.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b07d8def5ce35c251b7d1f7b04388654aadce0b6498c969b81457c9867d37dfb
-  data.tar.gz: d43a62b62ba6a4fa6bd51a97f7dfd6a4a805651d8ae6a595eac4724bba67f792
+  metadata.gz: 49f00515f034212fb244c270b4d9815e51e5a4d2eb1e91c1cd8c3ddc402fca28
+  data.tar.gz: 8de939c1e2834259e1aa8af2b17e540221a5e7d0d3f936ad526081db408e994f
 SHA512:
-  metadata.gz: 98a9a81c409ca86ad13a58d00ef380ced1bc0a0fd3288c970e13f9a04ed4f13180b2b3e20ed87fc3521ee61531709507e7ce412ab7802c5d1091ef39fc63dca3
-  data.tar.gz: 05ecb25382bca6d4cc0e677b1ea3ccf19a0113bf2376fc1888135c1f069c4a4d7b2196f648b0433133761646d6dae8de4a43f43e28b506062ad97c236c9c38f3
+  metadata.gz: 12236d2c862b82798e3865755394362e50773ff27505b1ddf08e7308dd51ca0a791b604e8e3cafd768e8d3b957c76bb18ff5d5bd8daded14eef0e2a788c51c36
+  data.tar.gz: 42b67fd980a096a5d8bffe78ba023c47b18bca34ac3957a631da16bd722b979e8cb9523eaf97e8ca42b870091e4ec81922b866ff8359325f0144766cb9ceb3db

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # CHANGELOG
 
+## 0.27.0 (2021-03-31)
+
+* Support `:class` in `child_node_range`
+* Add `delete` action
+
+## 0.26.0 (2021-03-30)
+
+* attr_reader ruby_version and gem_spec
+* Add `replace` action
+
+## 0.25.0 (2021-03-23)
+
+* Use `Gem::Dependency#match?` to check gem version
+
 ## 0.24.0 (2021-03-17)
 
 * Rename helper method `has_key?` to `key?`

data/lib/synvert/core/node_ext.rb

@@ -205,7 +205,7 @@ module Parser::AST
         value_node = children.find { |pair_node| pair_node.key.to_value == key }
         value_node ? value_node.value : nil
       else
-        raise Synvert::Core::MethodNotSupported, "has_value is not handled for #{debug_info}"
+        raise Synvert::Core::MethodNotSupported, "hash_value is not handled for #{debug_info}"
       end
     end
 
@@ -317,6 +317,35 @@ module Parser::AST
       loc.expression.line
     end
 
+    # Get the source range of child node.
+    #
+    # @param [String] name of child node.
+    # @return [Parser::Source::Range] source range of child node.
+    def child_node_range(child_name)
+      case type
+      when :class
+        case child_name
+        when :name
+          loc.name
+        when :parent_class
+          parent_class&.loc&.expression
+        end
+      when :send
+        case child_name
+        when :receiver
+          receiver&.loc&.expression
+        when :dot
+          loc.dot
+        when :message
+          loc.selector
+        when :arguments
+          Parser::Source::Range.new('(string)', arguments.first.loc.expression.begin_pos, arguments.last.loc.expression.end_pos) unless arguments.empty?
+        end
+      else
+        raise Synvert::Core::MethodNotSupported, "child_node_range is not handled for #{evaluated.inspect}, child_name: #{child_name}"
+      end
+    end
+
     # Recursively iterate all child nodes of current node.
     #
     # @yield [child] Gives a child node.

data/lib/synvert/core/rewriter.rb

@@ -7,7 +7,7 @@ module Synvert::Core
   # which define the behavior what files and what codes to detect and rewrite to what code.
   #
   #   Synvert::Rewriter.new 'factory_girl_short_syntax', 'use FactoryGirl short syntax' do
-  #     if_gem 'factory_girl', {gte: '2.0.0'}
+  #     if_gem 'factory_girl', '>= 2.0.0'
   #
   #     within_files 'spec/**/*.rb' do
   #       with_node type: 'send', receiver: 'FactoryGirl', message: 'create' do
@@ -21,8 +21,10 @@ module Synvert::Core
     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 :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 :Warning, 'synvert/core/rewriter/warning'
 
@@ -147,7 +149,11 @@ module Synvert::Core
     #   @return [Array<Synvert::Core::Rewriter::Warning>] warning messages.
     # @!attribute [r] affected_files
     #   @return [Set] affected fileds
-    attr_reader :group, :name, :sub_snippets, :helpers, :warnings, :affected_files
+    # @!attribute [r] ruby_version
+    #   @return [Rewriter::RubyVersion] the ruby version
+    # @!attribute [r] gem_spec
+    #   @return [Rewriter::GemSpec] the gem spec
+    attr_reader :group, :name, :sub_snippets, :helpers, :warnings, :affected_files, :ruby_version, :gem_spec
 
     # Initialize a rewriter.
     # When a rewriter is initialized, it is also registered.
@@ -225,10 +231,9 @@ module Synvert::Core
     # Parse if_gem dsl, it compares version of the specified gem.
     #
     # @param name [String] gem name.
-    # @param comparator [Hash] equal, less than or greater than specified version, e.g. {gte: '2.0.0'},
-    #   key can be eq, lt, gt, lte, gte or ne.
-    def if_gem(name, comparator)
-      @gem_spec = Rewriter::GemSpec.new(name, comparator)
+    # @param version [String] equal, less than or greater than specified version, e.g. '>= 2.0.0',
+    def if_gem(name, version)
+      @gem_spec = Rewriter::GemSpec.new(name, version)
     end
 
     # Parse within_files dsl, it finds specified files.

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

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Synvert::Core
+  # RemoveAction to delete code.
+  class Rewriter::DeleteAction < Rewriter::Action
+    def initialize(instance, *selectors)
+      super(instance, nil)
+      @selectors = selectors
+    end
+
+    # Begin position of code to replace.
+    #
+    # @return [Integer] begin position.
+    def begin_pos
+      @selectors.map { |selector| @node.child_node_range(selector).begin_pos }.min
+    end
+
+    # End position of code to replace.
+    #
+    # @return [Integer] end position.
+    def end_pos
+      @selectors.map { |selector| @node.child_node_range(selector).end_pos }.max
+    end
+
+    # The rewritten code, always empty string.
+    def rewritten_code
+      ''
+    end
+  end
+end

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

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module Synvert::Core
+  # ReplaceAction to replace child node with code.
+  class Rewriter::ReplaceAction < Rewriter::Action
+    def initialize(instance, selector, with:)
+      @instance = instance
+      @selector = selector
+      @code = with
+      @node = @instance.current_node
+    end
+
+    # Begin position of code to replace.
+    #
+    # @return [Integer] begin position.
+    def begin_pos
+      @node.child_node_range(@selector).begin_pos
+    end
+
+    # End position of code to replace.
+    #
+    # @return [Integer] end position.
+    def end_pos
+      @node.child_node_range(@selector).end_pos
+    end
+
+    # The rewritten source code.
+    #
+    # @return [String] rewritten code.
+    def rewritten_code
+      rewritten_source
+    end
+  end
+end

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

@@ -3,22 +3,15 @@
 module Synvert::Core
   # GemSpec checks and compares gem version.
   class Rewriter::GemSpec
-    OPERATORS = { eq: '==', lt: '<', gt: '>', lte: '<=', gte: '>=', ne: '!=' }.freeze
+    attr_reader :name, :version
 
     # Initialize a gem_spec.
     #
     # @param name [String] gem name
-    # @param comparator [Hash] comparator to gem version, e.g. {eq: '2.0.0'},
-    #   comparator key can be eq, lt, gt, lte, gte or ne.
-    def initialize(name, comparator)
+    # @param version [String] gem version, e.g. '~> 2.0.0',
+    def initialize(name, version)
       @name = name
-      if comparator.is_a?(Hash)
-        @operator = comparator.keys.first
-        @version = Gem::Version.new comparator.values.first
-      else
-        @operator = :eq
-        @version = Gem::Version.new comparator
-      end
+      @version = version
     end
 
     # Check if the specified gem version in Gemfile.lock matches gem_spec comparator.
@@ -33,11 +26,7 @@ module Synvert::Core
 
       ENV['BUNDLE_GEMFILE'] = Configuration.path # make sure bundler reads Gemfile.lock in the correct path
       parser = Bundler::LockfileParser.new(File.read(gemfile_lock_path))
-      if spec = parser.specs.find { |spec| spec.name == @name }
-        Gem::Version.new(spec.version).send(OPERATORS[@operator], @version)
-      else
-        false
-      end
+      parser.specs.any? { |spec| Gem::Dependency.new(@name, @version).match?(spec) }
     end
   end
 end

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

@@ -251,17 +251,31 @@ module Synvert::Core
       @actions << Rewriter::ReplaceWithAction.new(self, code, options)
     end
 
+    # Parse replace with dsl, it creates a [Synvert::Core::Rewriter::ReplaceAction] to
+    # replace child node with code.
+    #
+    # @param selector [Symbol] selector name of child name.
+    # @param with [String] code need to be replaced with.
+    def replace(selector, with:)
+      @actions << Rewriter::ReplaceAction.new(self, selector, with: with)
+    end
+
     # Parse replace_erb_stmt_with_expr dsl, it creates a [Synvert::Core::Rewriter::ReplaceErbStmtWithExprAction] to
     # replace erb stmt code to expr code.
     def replace_erb_stmt_with_expr
       @actions << Rewriter::ReplaceErbStmtWithExprAction.new(self)
     end
 
-    # Parse remove dsl, it creates a [Synvert::Core::Rewriter::RemoveAction] to current node.
+    # Parse remove dsl, it creates a [Synvert::Core::Rewriter::RemoveAction] to remove current node.
     def remove
       @actions << Rewriter::RemoveAction.new(self)
     end
 
+    # Parse delete dsl, it creates a [Synvert::Core::Rewriter::DeleteAction] to delete child nodes.
+    def delete
+      @actions << Rewriter::DeleteAction.new(self, *selectors)
+    end
+
     # Parse warn dsl, it creates a [Synvert::Core::Rewriter::Warning] to save warning message.
     #
     # @param message [String] warning message.

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

@@ -3,6 +3,8 @@
 module Synvert::Core
   # GemSpec checks and compares gem version.
   class Rewriter::RubyVersion
+    attr_reader :version
+
     # Initialize a ruby_version.
     #
     # @param version [String] ruby version

data/lib/synvert/core/version.rb

@@ -2,6 +2,6 @@
 
 module Synvert
   module Core
-    VERSION = '0.24.0'
+    VERSION = '0.27.0'
   end
 end

data/spec/synvert/core/node_ext_spec.rb

@@ -394,6 +394,72 @@ describe Parser::AST::Node do
     end
   end
 
+  describe '#child_node_range' do
+    context 'send node' do
+      it 'checks receiver' do
+        node = parse('foo.bar(test)')
+        range = node.child_node_range(:receiver)
+        expect(range.to_range).to eq(0...3)
+
+        node = parse('foobar(test)')
+        range = node.child_node_range(:receiver)
+        expect(range).to be_nil
+      end
+
+      it 'checks dot' do
+        node = parse('foo.bar(test)')
+        range = node.child_node_range(:dot)
+        expect(range.to_range).to eq(3...4)
+
+        node = parse('foobar(test)')
+        range = node.child_node_range(:dot)
+        expect(range).to be_nil
+      end
+
+      it 'checks message' do
+        node = parse('foo.bar(test)')
+        range = node.child_node_range(:message)
+        expect(range.to_range).to eq(4...7)
+
+        node = parse('foobar(test)')
+        range = node.child_node_range(:message)
+        expect(range.to_range).to eq(0...6)
+      end
+
+      it 'checks arguments' do
+        node = parse('foo.bar(test)')
+        range = node.child_node_range(:arguments)
+        expect(range.to_range).to eq(8...12)
+
+        node = parse('foobar(test)')
+        range = node.child_node_range(:arguments)
+        expect(range.to_range).to eq(7...11)
+
+        node = parse('foo.bar')
+        range = node.child_node_range(:arguments)
+        expect(range).to be_nil
+      end
+    end
+
+    context 'class node' do
+      it 'checks name' do
+        node = parse('class Post < ActiveRecord::Base; end')
+        range = node.child_node_range(:name)
+        expect(range.to_range).to eq(6...10)
+      end
+
+      it 'checks parent_class' do
+        node = parse('class Post < ActiveRecord::Base; end')
+        range = node.child_node_range(:parent_class)
+        expect(range.to_range).to eq(13...31)
+
+        node = parse('class Post; end')
+        range = node.child_node_range(:parent_class)
+        expect(range).to be_nil
+      end
+    end
+  end
+
   describe '#rewritten_source' do
     let(:instance) {
       rewriter = Synvert::Rewriter.new('foo', 'bar')

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

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+module Synvert::Core
+  describe Rewriter::DeleteAction do
+    subject {
+      source = "arr.map {}.flatten"
+      node = Parser::CurrentRuby.parse(source)
+      instance = double(current_node: node)
+      Rewriter::DeleteAction.new(instance, :dot, :message)
+    }
+
+    it 'gets begin_pos' do
+      expect(subject.begin_pos).to eq "arr.map {}".length
+    end
+
+    it 'gets end_pos' do
+      expect(subject.end_pos).to eq "arr.map {}.flatten".length
+    end
+
+    it 'gets rewritten_code' do
+      expect(subject.rewritten_code).to eq ''
+    end
+  end
+end

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

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+module Synvert::Core
+  describe Rewriter::ReplaceAction do
+    context 'replace with single line' do
+      subject {
+        source = "'slug from title'.gsub(' ', '_')"
+        node = Parser::CurrentRuby.parse(source)
+        instance = double(current_node: node)
+        Rewriter::ReplaceAction.new(instance, :message, with: 'tr')
+      }
+
+      it 'gets begin_pos' do
+        expect(subject.begin_pos).to eq "'slug from title'.".length
+      end
+
+      it 'gets end_pos' do
+        expect(subject.end_pos).to eq "'slug from title'.gsub".length
+      end
+
+      it 'gets rewritten_code' do
+        expect(subject.rewritten_code).to eq 'tr'
+      end
+    end
+  end
+end

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

@@ -21,7 +21,7 @@ GEM
     it 'returns true if version in Gemfile.lock is greater than definition' do
       expect(File).to receive(:exist?).with('./Gemfile.lock').and_return(true)
       expect(File).to receive(:read).with('./Gemfile.lock').and_return(gemfile_lock_content)
-      gem_spec = Rewriter::GemSpec.new('ast', { gte: '1.0.0' })
+      gem_spec = Rewriter::GemSpec.new('ast', '~> 1.1')
       expect(gem_spec).to be_match
     end
 
@@ -35,7 +35,7 @@ GEM
     it 'returns false if version in Gemfile.lock is less than definition' do
       expect(File).to receive(:exist?).with('./Gemfile.lock').and_return(true)
       expect(File).to receive(:read).with('./Gemfile.lock').and_return(gemfile_lock_content)
-      gem_spec = Rewriter::GemSpec.new('ast', { gt: '1.2.0' })
+      gem_spec = Rewriter::GemSpec.new('ast', '> 1.2.0')
       expect(gem_spec).not_to be_match
     end
 

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

@@ -117,6 +117,11 @@ module Synvert::Core
       instance.replace_with 'create {{arguments}}'
     end
 
+    it 'parses replace with' do
+      expect(Rewriter::ReplaceAction).to receive(:new).with(instance, :message, with: 'test')
+      instance.replace :message, with: 'test'
+    end
+
     it 'parses remove' do
       expect(Rewriter::RemoveAction).to receive(:new).with(instance)
       instance.remove

data/spec/synvert/core/rewriter_spec.rb

@@ -29,10 +29,10 @@ module Synvert::Core
     end
 
     it 'parses if_gem' do
-      expect(Rewriter::GemSpec).to receive(:new).with('synvert', { gte: '1.0.0' })
+      expect(Rewriter::GemSpec).to receive(:new).with('synvert', '>= 1.0.0')
       rewriter =
         Rewriter.new 'group', 'name' do
-          if_gem 'synvert', { gte: '1.0.0' }
+          if_gem 'synvert', '>= 1.0.0'
         end
       rewriter.process
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: synvert-core
 version: !ruby/object:Gem::Version
-  version: 0.24.0
+  version: 0.27.0
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-17 00:00:00.000000000 Z
+date: 2021-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -147,9 +147,11 @@ files:
 - lib/synvert/core/rewriter.rb
 - lib/synvert/core/rewriter/action.rb
 - lib/synvert/core/rewriter/action/append_action.rb
+- lib/synvert/core/rewriter/action/delete_action.rb
 - lib/synvert/core/rewriter/action/insert_action.rb
 - lib/synvert/core/rewriter/action/insert_after_action.rb
 - lib/synvert/core/rewriter/action/remove_action.rb
+- 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/condition.rb
@@ -170,9 +172,11 @@ files:
 - spec/synvert/core/engine/erb_spec.rb
 - spec/synvert/core/node_ext_spec.rb
 - spec/synvert/core/rewriter/action/append_action_spec.rb
+- spec/synvert/core/rewriter/action/delete_action_spec.rb
 - spec/synvert/core/rewriter/action/insert_action_spec.rb
 - spec/synvert/core/rewriter/action/insert_after_action_spec.rb
 - spec/synvert/core/rewriter/action/remove_action_spec.rb
+- 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_spec.rb
@@ -219,9 +223,11 @@ test_files:
 - spec/synvert/core/engine/erb_spec.rb
 - spec/synvert/core/node_ext_spec.rb
 - spec/synvert/core/rewriter/action/append_action_spec.rb
+- spec/synvert/core/rewriter/action/delete_action_spec.rb
 - spec/synvert/core/rewriter/action/insert_action_spec.rb
 - spec/synvert/core/rewriter/action/insert_after_action_spec.rb
 - spec/synvert/core/rewriter/action/remove_action_spec.rb
+- 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_spec.rb