synvert-core 0.46.0 → 0.49.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5251fd7b7ac886ba35aeb23c94e8d25bf2d26e2124db5d454d8994bdc5cecff3
-  data.tar.gz: 5b8395085acf698b7715a3cd48e3d22539308cc81e1731081c3b48dd00210ba7
+  metadata.gz: 7b694eae9a3ae1910d61accf8d93a52511c49cfa7493ccfb0d8d55f9c42d5b88
+  data.tar.gz: fed8c019f692ad9a4846961558459bf302aa72266fe06c870ba4cdeb1f17d7a8
 SHA512:
-  metadata.gz: 65e5e5a87c8bbe7d5d824d216c02764042f4b585705887a1a1c69469e389273b8e5ccfc00c3af2dc1003b660d49751c6365ff176980a72f6d663bfc1df60c31b
-  data.tar.gz: 9c47b80c577c5595c665658bf824c0f0f635c7bc09ceee6b0e865c636b4445d28fd449087e8eededc51d9d34eb2ab9fcd19899af676a228850ae630e3c10a726
+  metadata.gz: fb38d31674706ffe1bece171664e05869a66b8362e1e5021b7981c52b04185709afa7b986fd8efcb1070d28bd4e405926a09f73553721f9b9af0c543293377d6
+  data.tar.gz: 93eecc39d451a9d2cbff536db0f99e78dbb0eb405943743c78f39bd8827c002e022ce323e1641d72336158e9eb8e2f73135e2d7e3c9eb12455ce975a369dd854

data/CHANGELOG.md

@@ -1,5 +1,25 @@
 # CHANGELOG
 
+## 0.49.1 (2021-08-04)
+
+* Fix symbol match
+
+## 0.49.0 (2021-08-04)
+
+* 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.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

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
@@ -504,6 +506,36 @@ module Parser::AST
       "{ #{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.
@@ -518,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}" || actual.to_source == expected.to_s
         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/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.46.0'
+    VERSION = '0.49.1'
   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]
@@ -418,6 +423,12 @@ describe Parser::AST::Node do
       expect(node).to be_match(type: 'send', receiver: 'params', message: '[]', arguments: [:user])
     end
 
+    it 'matches pair key with symbol' do
+      source = '{ type: :model }'
+      node = parse(source).children[0]
+      expect(node).to be_match(type: 'pair', key: :type)
+    end
+
     it 'matches assign number' do
       source = 'at_least(0)'
       node = parse(source)
@@ -706,10 +717,64 @@ describe Parser::AST::Node do
     end
 
     context 'other node' do
-      it 'do nothing' 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.46.0
+  version: 0.49.1
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-25 00:00:00.000000000 Z
+date: 2021-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport