synvert-core 0.44.0 → 0.45.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f858973b7f9b7bcfd9260bf3149cb76d841279e45302c52905164b2ae464e2f1
-  data.tar.gz: df45fb62ee7cf5c6aed86bc7e78a2c610b328b124e97a6ef6e009fdcc500d263
+  metadata.gz: 425514bc071364c9908b0eff57e626c19fecf611ce3504dd51875af747969aea
+  data.tar.gz: 2120c05146eab24a6f6c36c9213fcce70ed3102862b1f572d2ba208659b8053a
 SHA512:
-  metadata.gz: cc6cbfa30627b61cf345834fd736e3795fbc6c4a6e063758459245f53cfc1954d5bbc477dc6a262f8a8754e0dbcd0f089d2196ef7edc7ce7e04b6141a374808e
-  data.tar.gz: 5bb7b3ad077e71753a4025416f62ee2c2979b8048466d34043c267b26ec92bf50ab850d57abaffd8f32013dab1d314ced834ed0b2f0e1bedbf70cb3c61d34fc9
+  metadata.gz: 65ff93235c9c5a437017f59a4e63fc6ef0a569b4b4f9de6cf23cbb0bf8203c796ea8cdd564ee4a434b87fb4346b0569140f4b75e94ebacfea1dc3cb3e54168f2
+  data.tar.gz: 5902bcfda3dfe77f362df46e1e8dcad4c269ff5057827936279ebfb8dcd82b19fe6b01e6e52db190d1a7b8d40233a8b15b03864191070e8ef2da8deeb0161ca3

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,12 +1,25 @@
 # CHANGELOG
 
-# 0.44.0 (2021-07-19)
+## 0.45.2 (2021-07-24)
+
+* Simplify symbol `match_value?`
+
+## 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)
+## 0.42.0 (2021-07-11)
 
 * Match string with quote
 * `match_value?` returns true if actual and expected are the same

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

@@ -365,8 +365,6 @@ module Parser::AST
       when %i[send parentheses]
         if loc.begin && loc.end
           Parser::Source::Range.new('(string)', loc.begin.begin_pos, loc.end.end_pos)
-        else
-          nil
         end
       else
         if respond_to?(child_name)
@@ -506,15 +504,14 @@ module Parser::AST
       case expected
       when Symbol
         if actual.is_a?(Parser::AST::Node)
-          actual.to_source == ":#{expected}"
+          actual.to_value == expected
         else
           actual.to_sym == expected
         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
@@ -593,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.44.0'
+    VERSION = '0.45.2'
   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.44.0
+  version: 0.45.2
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-18 00:00:00.000000000 Z
+date: 2021-07-24 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