synvert-core 0.45.2 → 0.49.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 425514bc071364c9908b0eff57e626c19fecf611ce3504dd51875af747969aea
-  data.tar.gz: 2120c05146eab24a6f6c36c9213fcce70ed3102862b1f572d2ba208659b8053a
+  metadata.gz: ff7201f9f25e9092d5bebf6359bf5fb7889d37dae90187666fc208a2a688d01d
+  data.tar.gz: 6ff9746cef63978f4cbd62cdc9862dabab9f8ba10512f12bbc1292dda19d6483
 SHA512:
-  metadata.gz: 65ff93235c9c5a437017f59a4e63fc6ef0a569b4b4f9de6cf23cbb0bf8203c796ea8cdd564ee4a434b87fb4346b0569140f4b75e94ebacfea1dc3cb3e54168f2
-  data.tar.gz: 5902bcfda3dfe77f362df46e1e8dcad4c269ff5057827936279ebfb8dcd82b19fe6b01e6e52db190d1a7b8d40233a8b15b03864191070e8ef2da8deeb0161ca3
+  metadata.gz: e7b44b09b43013829adeb097eafbf143da5d2acbeb731eeb6239388e39dd596c6946ae9cccd91c6e6c9d795bd8118e7a375794f18692461b572bad425b076c9b
+  data.tar.gz: 3b14e2a314d04bb0699125c69bef1a5ed46e2ebf79123017c342dccf66ccf6eb1b1f39f27cca3fa817e5eae51ab41d587b606c0a714bd6df1cbb862b3b9e4646

data/CHANGELOG.md

@@ -1,11 +1,25 @@
 # CHANGELOG
 
-## 0.45.2 (2021-07-24)
+## 0.49.0 (2021-08-04)
 
-* Simplify symbol `match_value?`
+* Support :erange in to_value
+* Do not use to_value in match_value?
+
+## 0.48.0 (2021-08-01)
+
+* Force to read file as utf-8
+* Add logo
 
-## 0.45.1 (2021-07-24)
+## 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)

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

@@ -252,6 +252,8 @@ module Parser::AST
         children.map(&:to_value)
       when :irange
         (children.first.to_value..children.last.to_value)
+      when :erange
+        (children.first.to_value...children.last.to_value)
       when :begin
         children.first.to_value
       else
@@ -490,6 +492,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,14 +550,14 @@ module Parser::AST
       case expected
       when Symbol
         if actual.is_a?(Parser::AST::Node)
-          actual.to_value == expected
+          actual.to_source == ":#{expected}"
         else
           actual.to_sym == expected
         end
       when String
         if actual.is_a?(Parser::AST::Node)
-          actual.to_source == expected || actual.to_value == expected ||
-            actual.to_source == unwrap_quote(expected) || actual.to_value == unwrap_quote(expected)
+          actual.to_source == expected || actual.to_source == unwrap_quote(expected) ||
+            unwrap_quote(actual.to_source) == expected || unwrap_quote(actual.to_source) == unwrap_quote(expected)
         else
           actual.to_s == expected || wrap_quote(actual.to_s) == 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.2'
+    VERSION = '0.49.0'
   end
 end

data/spec/synvert/core/node_ext_spec.rb

@@ -316,18 +316,23 @@ describe Parser::AST::Node do
       expect(node.to_value).to eq :str
     end
 
-    it 'get for boolean' do
+    it 'gets for boolean' do
       node = parse('true')
       expect(node.to_value).to be_truthy
       node = parse('false')
       expect(node.to_value).to be_falsey
     end
 
-    it 'get for range' do
+    it 'gets for irange' do
       node = parse('(1..10)')
       expect(node.to_value).to eq(1..10)
     end
 
+    it 'gets for erange' do
+      node = parse('(1...10)')
+      expect(node.to_value).to eq(1...10)
+    end
+
     it 'gets for array' do
       node = parse("['str', :str]")
       expect(node.to_value).to eq ['str', :str]
@@ -679,4 +684,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.2
+  version: 0.49.0
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-24 00:00:00.000000000 Z
+date: 2021-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport