synvert-core 0.45.1 → 0.48.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35318f19e568f0e25bce6e982efd115aacb5fe2857fda56406839e3b4693253b
-  data.tar.gz: 0a89e0f6376e41c13a5dae28a2bbeeee53ecb9c1e9b8e00e20ae0a082ed3c0bb
+  metadata.gz: d053ad88384be0c41958704354fff02d9c6d4aba71748ee4a57713e5502eb398
+  data.tar.gz: f856e276eb76e6cf16f72039bca6ea138b5aae6038c11887f7b81d0128b6a606
 SHA512:
-  metadata.gz: de01431c5662dd61f698a537e68f74de2d6a19b63ecc7465fd81d6496fae158859446bc5d42fa1f432e559aeccb7c27a28d0f6b261f1195b68a97601260d0aa0
-  data.tar.gz: ee623d625ee63212b64f752cb14b0214ff9d58c01c9c7fd23b51991b9fbfcca502ae0a96e633347bfa9486af3c4bfb0b424bdcaba8cf401c44fcdeea31caa4c4
+  metadata.gz: b15b022aab4015583b3c9b966b312c9dd3e0a4ecd184c498be19b566b2ef47eaace511ba83f65ecadc70b959fd2d685b1e9ee286bb64f4697016b7c1f5e1040a
+  data.tar.gz: e62eefc4e31cf53b3b0f7dff13e2909b49db206afea12b82122aae3f7d31037627776d92b8bbf546bb5911b38a0c80b73c5063375399b8b3b61abb519439ae7b

data/CHANGELOG.md

@@ -1,21 +1,34 @@
 # CHANGELOG
 
-# 0.45.1 (2021-07-24)
+## 0.48.0 (2021-08-01)
 
+* Force to read file as utf-8
+* Add logo
+
+## 0.47.0 (2021-07-28)
+
+* Add `to_single_quote` to `str` node
+* Add `to_symbol` to `str` node
+* Add `to_lambda_literal` to `lambda` node
+
+## 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)
+## 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,5 +1,7 @@
 # Synvert::Core
 
+<img src="https://xinminlabs.github.io/synvert/img/logo_96.png" alt="logo" width="32" height="32" />
+
 ![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)
@@ -35,5 +37,5 @@ Or install it yourself as:
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create a new Pull Request
 
-[1]: http://xinminlabs.github.io/synvert/
-[2]: http://rubydoc.info/github/xinminlabs/synvert-core/master/frames
+[1]: https://xinminlabs.github.io/synvert/
+[2]: https://rubydoc.info/github/xinminlabs/synvert-core/master/frames

data/lib/synvert/core/node_ext.rb

@@ -490,6 +490,50 @@ 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
+
+    # get single quote string
+    def to_single_quote
+      return to_source unless type == :str
+
+      "'#{to_value}'"
+    end
+
+    # convert string to symbol
+    def to_symbol
+      return to_source unless type == :str
+
+      ":#{to_value}"
+    end
+
+    # convert lambda {} to -> {}
+    def to_lambda_literal
+      if type == :block && caller.type == :send && caller.receiver.nil? && caller.message == :lambda
+        new_source = to_source
+        if arguments.size > 1
+          new_source = new_source[0...arguments.loc.begin.to_range.begin - 1] + new_source[arguments.loc.end.to_range.end..-1]
+          new_source = new_source.sub('lambda', "->(#{arguments.map(&:to_source).join(', ')})")
+        else
+          new_source = new_source.sub('lambda', '->')
+        end
+        new_source
+      else
+        to_source
+      end
+    end
+
     private
 
     # Compare actual value with expected value.
@@ -504,7 +548,7 @@ 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

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

@@ -17,7 +17,7 @@ module Synvert::Core
         @file_source ||= {}
         @file_source[file_path] ||=
           begin
-            source = File.read(file_path)
+            source = File.read(file_path, encoding: 'UTF-8')
             source = Engine::ERB.encode(source) if /\.erb$/.match?(file_path)
             source
           end

data/lib/synvert/core/version.rb

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

data/spec/synvert/core/node_ext_spec.rb

@@ -679,4 +679,91 @@ 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 'does nothing' do
+        node = parse("'foobar'")
+        expect(node.wrap_curly_braces).to eq("'foobar'")
+      end
+    end
+  end
+
+  describe '#to_single_quote' do
+    context 'str node' do
+      it 'converts double quote to single quote' do
+        node = parse('"foobar"')
+        expect(node.to_source).to eq '"foobar"'
+        expect(node.to_single_quote).to eq "'foobar'"
+      end
+    end
+
+    context 'other node' do
+      it 'does nothing' do
+        node = parse(':foobar')
+        expect(node.to_single_quote).to eq ':foobar'
+      end
+    end
+  end
+
+  describe '#to_symbol' do
+    context 'str node' do
+      it 'converts string to symbol' do
+        node = parse("'foobar'")
+        expect(node.to_symbol).to eq ':foobar'
+      end
+    end
+
+    context 'other node' do
+      it 'does nothing' do
+        node = parse(':foobar')
+        expect(node.to_symbol).to eq ':foobar'
+      end
+    end
+  end
+
+  describe '#to_lambda_literal' do
+    context 'lambda node' do
+      it 'converts to lambda literal without arguments' do
+        node = parse('lambda { foobar }')
+        expect(node.to_lambda_literal).to eq('-> { foobar }')
+      end
+
+      it 'converts to lambda literal with arguments' do
+        node = parse('lambda { |x, y| foobar }')
+        expect(node.to_lambda_literal).to eq('->(x, y) { foobar }')
+      end
+    end
+
+    context 'other node' do
+      it 'does nothing' do
+        node = parse(':foobar')
+        expect(node.to_lambda_literal).to eq ':foobar'
+      end
+    end
+  end
 end

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

@@ -170,7 +170,7 @@ module Synvert::Core
           end
         EOS
         expect(Dir).to receive(:glob).with('./spec/**/*_spec.rb').and_return(['spec/models/post_spec.rb'])
-        expect(File).to receive(:read).with('spec/models/post_spec.rb').and_return(input)
+        expect(File).to receive(:read).with('spec/models/post_spec.rb', encoding: 'UTF-8').and_return(input)
         expect(File).to receive(:write).with('spec/models/post_spec.rb', output)
         instance.process
       end
@@ -195,7 +195,7 @@ module Synvert::Core
           end
         EOS
         expect(Dir).to receive(:glob).with('./spec/spec_helper.rb').and_return(['spec/spec_helper.rb'])
-        expect(File).to receive(:read).with('spec/spec_helper.rb').and_return(input)
+        expect(File).to receive(:read).with('spec/spec_helper.rb', encoding: 'UTF-8').and_return(input)
         expect(File).not_to receive(:write).with('spec/spec_helper.rb', output)
         instance.process
       end
@@ -220,7 +220,7 @@ module Synvert::Core
           end
         EOS
         expect(Dir).to receive(:glob).with('./spec/spec_helper.rb').and_return(['spec/spec_helper.rb']).twice
-        expect(File).to receive(:read).with('spec/spec_helper.rb').and_return(input).once
+        expect(File).to receive(:read).with('spec/spec_helper.rb', encoding: 'UTF-8').and_return(input).once
         expect(File).not_to receive(:write).with('spec/spec_helper.rb', output)
         instance.process
         instance.process
@@ -248,9 +248,9 @@ module Synvert::Core
           end
         EOS
         expect(Dir).to receive(:glob).with('./spec/**/*_spec.rb').and_return(['spec/models/post_spec.rb']).twice
-        expect(File).to receive(:read).with('spec/models/post_spec.rb').and_return(input)
+        expect(File).to receive(:read).with('spec/models/post_spec.rb', encoding: 'UTF-8').and_return(input)
         expect(File).to receive(:write).with('spec/models/post_spec.rb', output)
-        expect(File).to receive(:read).with('spec/models/post_spec.rb').and_return(output)
+        expect(File).to receive(:read).with('spec/models/post_spec.rb', encoding: 'UTF-8').and_return(output)
         instance.process
         instance.process
         expect(rewriter.affected_files).to be_include('spec/models/post_spec.rb')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: synvert-core
 version: !ruby/object:Gem::Version
-  version: 0.45.1
+  version: 0.48.0
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-23 00:00:00.000000000 Z
+date: 2021-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport