synvert-core 0.44.1 → 0.46.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 252c2e9347770f9363ca9d317d574fa6e1d9faad4826d2853816a669ad13dab1
-  data.tar.gz: 1d19aac0f1dac17a84dd4a85bcbb8606d9391afeb9c4493eff516cf2b5ed948f
+  metadata.gz: 5251fd7b7ac886ba35aeb23c94e8d25bf2d26e2124db5d454d8994bdc5cecff3
+  data.tar.gz: 5b8395085acf698b7715a3cd48e3d22539308cc81e1731081c3b48dd00210ba7
 SHA512:
-  metadata.gz: 795910a3044cc4cdbf02e0412a5784235b7c8fc0892a1243cf58677c53d09e1cdf097d7f56cf8f818864de0eab6ec65d829c59e2ba246e1d1150bdd3fd5e2b40
-  data.tar.gz: fc2f006fd4b269f598cd23d05ebfcf72b098ce4a7ccfaa1a5d6004517d058caabea1005e999d2ccaf92a73bae34941b4bc8b37124db98ae90a71730c7e749098
+  metadata.gz: 65e5e5a87c8bbe7d5d824d216c02764042f4b585705887a1a1c69469e389273b8e5ccfc00c3af2dc1003b660d49751c6365ff176980a72f6d663bfc1df60c31b
+  data.tar.gz: 9c47b80c577c5595c665658bf824c0f0f635c7bc09ceee6b0e865c636b4445d28fd449087e8eededc51d9d34eb2ab9fcd19899af676a228850ae630e3c10a726

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,16 +1,23 @@
 # CHANGELOG
 
-# 0.44.1 (2021-07-19)
+## 0.46.0 (2021-07-25)
+
+* Add `strip_curly_braces` and `wrap_curly_braces` for `hash` node
+* Simplify symbol `match_value?`
+* 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)
+## 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

@@ -490,6 +490,20 @@ module Parser::AST
       end
     end
 
+    # strip curly braces for hash
+    def strip_curly_braces
+      return to_source unless type == :hash
+
+      to_source.sub(/^{(.*)}$/) { Regexp.last_match(1).strip }
+    end
+
+    # wrap curly braces for hash
+    def wrap_curly_braces
+      return to_source unless type == :hash
+
+      "{ #{to_source} }"
+    end
+
     private
 
     # Compare actual value with expected value.
@@ -504,15 +518,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
@@ -591,5 +604,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/helper.rb

@@ -66,7 +66,7 @@ module Synvert::Core
     #   strip_brackets("(1..100)") #=> "1..100"
     def strip_brackets(code)
       code.sub(/^\((.*)\)$/) { Regexp.last_match(1) }.sub(/^\[(.*)\]$/) { Regexp.last_match(1) }.sub(/^{(.*)}$/) {
-        Regexp.last_match(1)
+        Regexp.last_match(1).strip
       }
     end
 

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.1'
+    VERSION = '0.46.0'
   end
 end

data/spec/synvert/core/node_ext_spec.rb

@@ -679,4 +679,37 @@ describe Parser::AST::Node do
       EOS
     end
   end
+
+  describe '#strip_curly_braces' do
+    context 'hash node' do
+      it 'removes curly braces' do
+        node = parse("{ foo: 'bar' }")
+        expect(node.strip_curly_braces).to eq("foo: 'bar'")
+      end
+    end
+
+    context 'other node' do
+      it 'do nothing' do
+        node = parse("'foobar'")
+        expect(node.strip_curly_braces).to eq("'foobar'")
+      end
+    end
+  end
+
+  describe '#wrap_curly_braces' do
+    context 'hash node' do
+      it 'adds curly braces' do
+        node = parse("test(foo: 'bar')").arguments.first
+        expect(node.to_source).to eq("foo: 'bar'")
+        expect(node.wrap_curly_braces).to eq("{ foo: 'bar' }")
+      end
+    end
+
+    context 'other node' do
+      it 'do nothing' do
+        node = parse("'foobar'")
+        expect(node.wrap_curly_braces).to eq("'foobar'")
+      end
+    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.44.1
+  version: 0.46.0
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-18 00:00:00.000000000 Z
+date: 2021-07-25 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