synvert-core 0.42.1 → 0.45.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c29440498ff5186fde3ea7828482bfc0e93551350682f68b2fd26f3054894460
-  data.tar.gz: 055d1a185ed10f154f3b6a5ee99d8f142ead2a62935e461f3b73d15a32822496
+  metadata.gz: 35318f19e568f0e25bce6e982efd115aacb5fe2857fda56406839e3b4693253b
+  data.tar.gz: 0a89e0f6376e41c13a5dae28a2bbeeee53ecb9c1e9b8e00e20ae0a082ed3c0bb
 SHA512:
-  metadata.gz: 757170374b87d2941befeaa9e1d17681bfff6bd8486880dec9fa9549e4a71ec660983e7f8bf3d9e71046ae4d24c4fc4ec0282aba71d62cd5de240d3f36962f5e
-  data.tar.gz: ad55dd58dc35f53804d11a99f2dc926881b84a05eb0e13ab3f0a3c07e374fddb1dd8ddae91ec1d8a36a3564d3c61ab3bf1c0282ac45193cb4cc93e90500ef17d
+  metadata.gz: de01431c5662dd61f698a537e68f74de2d6a19b63ecc7465fd81d6496fae158859446bc5d42fa1f432e559aeccb7c27a28d0f6b261f1195b68a97601260d0aa0
+  data.tar.gz: ee623d625ee63212b64f752cb14b0214ff9d58c01c9c7fd23b51991b9fbfcca502ae0a96e633347bfa9486af3c4bfb0b424bdcaba8cf401c44fcdeea31caa4c4

data/.github/workflows/main.yml

@@ -0,0 +1,32 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: CI
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ['2.5', '2.6', '2.7', '3.0']
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true
+    - name: Run tests
+      run: bundle exec rake

data/CHANGELOG.md

@@ -1,8 +1,19 @@
 # CHANGELOG
 
-# 0.42.1 (2021-07-14)
+# 0.45.1 (2021-07-24)
+
+* Unwrap quote when matching string value
+
+# 0.45.0 (2021-07-22)
+
+* Handle `nil` child node for `begin_pos` and `end_pos`
+* Remove `Rewriter::Instance` options
+
+# 0.44.0 (2021-07-19)
 
 * Return rewrtier after executing snippet
+* `left_value` and `right_value` support `or_asgn` node
+* `child_node_range` supports send `parentheses`
 
 # 0.42.0 (2021-07-11)
 

data/README.md

@@ -1,6 +1,6 @@
 # Synvert::Core
 
-[![Build Status](https://secure.travis-ci.org/xinminlabs/synvert-core.png)](http://travis-ci.org/xinminlabs/synvert-core)
+![Main workflow](https://github.com/xinminlabs/synvert-core/actions/workflows/main.yml/badge.svg)
 [![Coverage Status](https://coveralls.io/repos/xinminlabs/synvert-core/badge.png?branch=master)](https://coveralls.io/r/xinminlabs/synvert-core)
 [![Gem Version](https://badge.fury.io/rb/synvert-core.png)](http://badge.fury.io/rb/synvert-core)
 

data/lib/synvert/core/node_ext.rb

@@ -217,6 +217,8 @@ module Parser::AST
     def left_value
       if %i[masgn lvasgn ivasgn].include? type
         children[0]
+      elsif :or_asgn == type
+        children[0].children[0]
       else
         raise Synvert::Core::MethodNotSupported, "left_value is not handled for #{debug_info}"
       end
@@ -227,7 +229,7 @@ module Parser::AST
     # @return [Array<Parser::AST::Node>] variable nodes.
     # @raise [Synvert::Core::MethodNotSupported] if calls on other node.
     def right_value
-      if %i[masgn lvasgn ivasgn].include? type
+      if %i[masgn lvasgn ivasgn or_asgn].include? type
         children[1]
       else
         raise Synvert::Core::MethodNotSupported, "right_value is not handled for #{debug_info}"
@@ -360,6 +362,10 @@ module Parser::AST
         else
           loc.selector
         end
+      when %i[send parentheses]
+        if loc.begin && loc.end
+          Parser::Source::Range.new('(string)', loc.begin.begin_pos, loc.end.end_pos)
+        end
       else
         if respond_to?(child_name)
           child_node = send(child_name)
@@ -504,9 +510,8 @@ module Parser::AST
         end
       when String
         if actual.is_a?(Parser::AST::Node)
-          return true if (Parser::CurrentRuby.parse(expected) == actual rescue nil)
-          actual.to_source == expected || (actual.to_source[0] == ':' && actual.to_source[1..-1] == expected) ||
-            actual.to_source[1...-1] == expected
+          actual.to_source == expected || actual.to_value == expected ||
+            actual.to_source == unwrap_quote(expected) || actual.to_value == unwrap_quote(expected)
         else
           actual.to_s == expected || wrap_quote(actual.to_s) == expected
         end
@@ -585,5 +590,13 @@ module Parser::AST
         "'#{string}'"
       end
     end
+
+    def unwrap_quote(string)
+      if (string[0] == '"' && string[-1] == '"') || (string[0] == "'" && string[-1] == "'")
+        string[1...-1]
+      else
+        string
+      end
+    end
   end
 end

data/lib/synvert/core/rewriter.rb

@@ -245,13 +245,12 @@ module Synvert::Core
     # It creates a [Synvert::Core::Rewriter::Instance] to rewrite code.
     #
     # @param file_pattern [String] pattern to find files, e.g. spec/**/*_spec.rb
-    # @param options [Hash] instance options.
     # @param block [Block] the block to rewrite code in the matching files.
-    def within_files(file_pattern, options = {}, &block)
+    def within_files(file_pattern, &block)
       return if @sandbox
 
       if (!@ruby_version || @ruby_version.match?) && (!@gem_spec || @gem_spec.match?)
-        Rewriter::Instance.new(self, file_pattern, options, &block).process
+        Rewriter::Instance.new(self, file_pattern, &block).process
       end
     end
 

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

@@ -12,14 +12,14 @@ module Synvert::Core
     #
     # @return [Integer] begin position.
     def begin_pos
-      @selectors.map { |selector| @node.child_node_range(selector).begin_pos }.min
+      @selectors.map { |selector| @node.child_node_range(selector) }.compact.map(&: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
+      @selectors.map { |selector| @node.child_node_range(selector) }.compact.map(&:end_pos).max
     end
 
     # The rewritten code, always empty string.

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

@@ -64,20 +64,16 @@ module Synvert::Core
     #   @return current filename
     attr_accessor :current_node, :current_file
 
-    DEFAULT_OPTIONS = { sort_by: 'begin_pos' }.freeze
-
     # Initialize an instance.
     #
     # @param rewriter [Synvert::Core::Rewriter]
     # @param file_pattern [String] pattern to find files, e.g. spec/**/*_spec.rb
-    # @param options [Hash] instance options, it includes :sort_by.
     # @param block [Block] block code to find nodes, match conditions and rewrite code.
     # @return [Synvert::Core::Rewriter::Instance]
-    def initialize(rewriter, file_pattern, options = {}, &block)
+    def initialize(rewriter, file_pattern, &block)
       @rewriter = rewriter
       @actions = []
       @file_pattern = file_pattern
-      @options = DEFAULT_OPTIONS.merge(options)
       @block = block
       rewriter.helpers.each { |helper| singleton_class.send(:define_method, helper[:name], &helper[:block]) }
     end
@@ -107,7 +103,7 @@ module Synvert::Core
           end
 
           if @actions.length > 0
-            @actions.sort_by! { |action| action.send(@options[:sort_by]) }
+            @actions.sort_by! { |action| [action.begin_pos, action.end_pos] }
             conflict_actions = get_conflict_actions
             @actions.reverse_each do |action|
               source[action.begin_pos...action.end_pos] = action.rewritten_code

data/lib/synvert/core/version.rb

@@ -2,6 +2,6 @@
 
 module Synvert
   module Core
-    VERSION = '0.42.1'
+    VERSION = '0.45.1'
   end
 end

data/spec/synvert/core/node_ext_spec.rb

@@ -261,6 +261,11 @@ describe Parser::AST::Node do
       node = parse('@a = 1')
       expect(node.left_value).to eq :@a
     end
+
+    it 'gets for or_asgn' do
+      node = parse('a ||= 1')
+      expect(node.left_value).to eq :a
+    end
   end
 
   describe '#right_value' do
@@ -283,6 +288,11 @@ describe Parser::AST::Node do
       node = parse('@a = 1')
       expect(node.right_value).to eq parse('1')
     end
+
+    it 'gets for or_asgn' do
+      node = parse('a ||= 1')
+      expect(node.right_value).to eq parse('1')
+    end
   end
 
   describe '#to_value' do
@@ -614,6 +624,20 @@ describe Parser::AST::Node do
         range = node.child_node_range(:arguments)
         expect(range).to be_nil
       end
+
+      it 'checks parentheses' do
+        node = parse('foo.bar(test)')
+        range = node.child_node_range(:parentheses)
+        expect(range.to_range).to eq(7...13)
+
+        node = parse('foobar(test)')
+        range = node.child_node_range(:parentheses)
+        expect(range.to_range).to eq(6...12)
+
+        node = parse('foo.bar')
+        range = node.child_node_range(:parentheses)
+        expect(range).to be_nil
+      end
     end
   end
 

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

@@ -4,19 +4,18 @@ require 'spec_helper'
 
 module Synvert::Core
   describe Rewriter::GemSpec do
-    let(:gemfile_lock_content) {
-      '
-GEM
-  remote: https://rubygems.org/
-  specs:
-    ast (1.1.0)
-    parser (2.1.7)
-      ast (~> 1.1)
-      slop (~> 3.4, >= 3.4.5)
-    rake (10.1.1)
-    slop (3.4.7)
-    '
-    }
+    let(:gemfile_lock_content) { <<~EOS }
+      GEM
+        remote: https://rubygems.org/
+        specs:
+          ast (1.1.0)
+          parser (2.1.7)
+            ast (~> 1.1)
+            slop (~> 3.4, >= 3.4.5)
+          rake (10.1.1)
+          slop (3.4.7)
+    EOS
+    before { allow(File).to receive(:exist?).with(File.join(ENV['HOME'], '.gem/specs')).and_return(false) }
 
     it 'returns true if version in Gemfile.lock is greater than definition' do
       expect(File).to receive(:exist?).with('./Gemfile.lock').and_return(true)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: synvert-core
 version: !ruby/object:Gem::Version
-  version: 0.42.1
+  version: 0.45.1
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-14 00:00:00.000000000 Z
+date: 2021-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -129,9 +129,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/main.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - Guardfile

data/.travis.yml

@@ -1,8 +0,0 @@
-language: ruby
-rvm:
-  - 2.3
-  - 2.4
-  - 2.5
-  - 2.6
-  - 2.7
-  - 3.0