synvert-core 0.47.0 → 0.50.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9673a5aa5ad59322786e09e99a527e7f7a7e05c7067200c9baed0602c7c1fe2
-  data.tar.gz: e946fa740f8678faa4f1cb856c2d6a54b4b0c09ed10084110bb78648da1a7497
+  metadata.gz: 88e62c155c2171dfeda2631d99c88992f6ffbc9e0f50341d9db79262ef636ad2
+  data.tar.gz: 4dfec29835aa657065eb5aa35f16a804971674d81215f1b3c860dbe9b3db06fc
 SHA512:
-  metadata.gz: cebcaad6d3a1162b0ceb8354ae2d598f18e70474e068b8a91cdea8440c83f02280afae97adb8c923a5dbe7750138f02e5b73a633f4b7dbd9dfa9b0c90962c14a
-  data.tar.gz: b482a97216175c0a16492bdb23294acc33727493202c088d44a94fb73f15df6263d1addf2df5e2ef53cecc7147ff475e67c12e2eb9f3451b6c92b4b47eee42d4
+  metadata.gz: a95b38e7f84022599442040b6717e4551b7333cb28cf4337f1d0ab47610ea6ea7cec761490871579a57e25928758e8fd8f3973b56291f3198b5074f5633b0af5
+  data.tar.gz: e841587f4b654b76e0790f1272f1ff8fa2bdb2c747d1aae9126d51c4c22978ab12b393725e03118b104f6d573bfb7f63bdd2fa9eab36032a56db75958f4b7ac1

data/CHANGELOG.md

@@ -1,5 +1,20 @@
 # CHANGELOG
 
+## 0.50.0 (2021-08-11)
+
+* Support `:module` in `body`
+* 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

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

@@ -110,7 +110,7 @@ module Parser::AST
       case type
       when :begin
         children
-      when :def, :block, :class
+      when :def, :block, :class, :module
         return [] if children[2].nil?
 
         :begin == children[2].type ? children[2].body : children[2..-1]
@@ -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
@@ -548,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.47.0'
+    VERSION = '0.50.0'
   end
 end

data/spec/synvert/core/node_ext_spec.rb

@@ -151,6 +151,11 @@ describe Parser::AST::Node do
       expect(node.body).to be_empty
     end
 
+    it 'gets empty for module node' do
+      node = parse('module Admin; end')
+      expect(node.body).to be_empty
+    end
+
     it 'gets one line for class node' do
       node = parse('class User; attr_accessor :email; end')
       expect(node.body).to eq [parse('attr_accessor :email')]
@@ -316,18 +321,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 +428,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)

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.47.0
+  version: 0.50.0
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-28 00:00:00.000000000 Z
+date: 2021-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport