synvert-core 0.41.2 → 0.42.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e9e29097976ca69f755a698d9a3a78769105c4043b07c96a7ac1e714ae659a0
-  data.tar.gz: 12d45e30a5de2ffc03bb440b503ff1a230e7baa55eb6a69e43518023e7d24f08
+  metadata.gz: 19c77660c79cc18a6c2d720d7a8bada136dc0397a2cc73610cc87d3412ac5306
+  data.tar.gz: '083cc96fa1b41d83a4bd5c3512440ec88223bbc67969aca2d03dd58f87a26b24'
 SHA512:
-  metadata.gz: 28802dbdd2f53b267c621f811b959a0041064f97ff4f54ee009f75d230eeb2a1ff3fbb9b1c3cee524d990f53b8e7447105fa57e86cb4ee2b042cd4e17ef63c9e
-  data.tar.gz: 8c0f5604e24d9ea0034214aa2b4d36f26d6c5f181d7d0d70f75a78fe71b0cab1868379953b2d071ea3ab922e62855a51ee5a0cb14ed7b4e26ebb8cc57adcb396
+  metadata.gz: 6403332404a070851c4817321702097cbff8cc34f75bc23d8dba236be878c83948012f79ba36ed51bea4e275f61f4adf4a5b638e35b0c8fd88dfd370b720854f
+  data.tar.gz: dc6bbc40dc208bb9ed9b8f9003b7a11e59ece0e79fb8db3cc4466f7c5b6f70574f71a5c7e4e161e762498854954293105b2023a996802b2906df04af51286f9a

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+# 0.42.0 (2021-07-11)
+
+* Match string with quote
+* `match_value?` returns true if actual and expected are the same
+
 ## 0.41.0 (2021-06-24)
 
 * Remove unused autoindent option

data/lib/synvert/core/node_ext.rb

@@ -240,7 +240,7 @@ module Parser::AST
     # @raise [Synvert::Core::MethodNotSupported] if calls on other node.
     def to_value
       case type
-      when :int, :str, :sym
+      when :int, :float, :str, :sym
         children.last
       when :true
         true
@@ -253,7 +253,7 @@ module Parser::AST
       when :begin
         children.first.to_value
       else
-        raise Synvert::Core::MethodNotSupported, "to_value is not handled for #{debug_info}"
+        self
       end
     end
 
@@ -504,10 +504,11 @@ module Parser::AST
         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
         else
-          actual.to_s == expected
+          actual.to_s == expected || wrap_quote(actual.to_s) == expected
         end
       when Regexp
         if actual.is_a?(Parser::AST::Node)
@@ -565,11 +566,7 @@ module Parser::AST
     # @param multi_keys [Array<Symbol>]
     # @return [Object] actual value.
     def actual_value(node, multi_keys)
-      multi_keys.inject(node) { |n, key|
-        if n
-          key == :source ? n.send(key) : n.send(key)
-        end
-      }
+      multi_keys.inject(node) { |n, key| n.send(key) if n }
     end
 
     # Get expected value from rules.
@@ -580,5 +577,13 @@ module Parser::AST
     def expected_value(rules, multi_keys)
       multi_keys.inject(rules) { |o, key| o[key] }
     end
+
+    def wrap_quote(string)
+      if string.include?("'")
+        "\"#{string}\""
+      else
+        "'#{string}'"
+      end
+    end
   end
 end

data/lib/synvert/core/version.rb

@@ -2,6 +2,6 @@
 
 module Synvert
   module Core
-    VERSION = '0.41.2'
+    VERSION = '0.42.0'
   end
 end

data/spec/synvert/core/node_ext_spec.rb

@@ -291,6 +291,11 @@ describe Parser::AST::Node do
       expect(node.to_value).to eq 1
     end
 
+    it 'gets for float' do
+      node = parse('1.5')
+      expect(node.to_value).to eq 1.5
+    end
+
     it 'gets for string' do
       node = parse("'str'")
       expect(node.to_value).to eq 'str'
@@ -385,11 +390,6 @@ describe Parser::AST::Node do
   end
 
   describe '#match?' do
-    let(:instance) {
-      rewriter = Synvert::Rewriter.new('foo', 'bar')
-      Synvert::Rewriter::Instance.new(rewriter, 'file pattern')
-    }
-
     it 'matches class name' do
       source = 'class Synvert; end'
       node = parse(source)
@@ -414,18 +414,42 @@ describe Parser::AST::Node do
       expect(node).to be_match(type: 'send', arguments: [0])
     end
 
+    it 'matches assign float' do
+      source = 'at_least(1.5)'
+      node = parse(source)
+      expect(node).to be_match(type: 'send', arguments: [1.5])
+    end
+
     it 'matches arguments with string' do
       source = 'params["user"]'
       node = parse(source)
       expect(node).to be_match(type: 'send', receiver: 'params', message: '[]', arguments: ['user'])
     end
 
+    it 'matches arguments with string 2' do
+      source = 'params["user"]'
+      node = parse(source)
+      expect(node).to be_match(type: 'send', receiver: 'params', message: '[]', arguments: ["'user'"])
+    end
+
+    it 'matches arguments with string 3' do
+      source = "{ notice: 'Welcome' }"
+      node = parse(source)
+      expect(node).to be_match(type: 'hash', notice_value: "'Welcome'")
+    end
+
     it 'matches arguments any' do
       source = 'config.middleware.insert_after ActiveRecord::QueryCache, Lifo::Cache, page_cache: false'
       node = parse(source)
       expect(node).to be_match(type: 'send', arguments: { any: 'Lifo::Cache' })
     end
 
+    it 'matches arguments with nested hash' do
+      source = '{ user_id: user.id }'
+      node = parse(source)
+      expect(node).to be_match(type: 'hash', user_id_value: { type: 'send', receiver: { type: 'send', message: 'user' }, message: 'id' })
+    end
+
     it 'matches arguments contain' do
       source = 'def slow(foo, bar, &block); end'
       node = parse(source)
@@ -594,11 +618,6 @@ describe Parser::AST::Node do
   end
 
   describe '#rewritten_source' do
-    let(:instance) {
-      rewriter = Synvert::Rewriter.new('foo', 'bar')
-      Synvert::Rewriter::Instance.new(rewriter, 'file pattern')
-    }
-
     it 'does not rewrite with unknown method' do
       source = 'class Synvert; end'
       node = parse(source)

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

@@ -155,22 +155,20 @@ module Synvert::Core
               replace_with 'create {{arguments}}'
             end
           end
-        input =
-          "
-it 'uses factory_girl' do
-  user = FactoryGirl.create :user
-  post = FactoryGirl.create :post, user: user
-  assert post.valid?
-end
-"
-        output =
-          "
-it 'uses factory_girl' do
-  user = create :user
-  post = create :post, user: user
-  assert post.valid?
-end
-"
+        input = <<~EOS
+          it 'uses factory_girl' do
+            user = FactoryGirl.create :user
+            post = FactoryGirl.create :post, user: user
+            assert post.valid?
+          end
+        EOS
+        output = <<~EOS
+          it 'uses factory_girl' do
+            user = create :user
+            post = create :post, user: user
+            assert post.valid?
+          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(:write).with('spec/models/post_spec.rb', output)
@@ -186,18 +184,16 @@ end
               end
             end
           end
-        input =
-          '
-        RSpec.configure do |config|
-          config.include FactoryGirl::Syntax::Methods
-        end
-        '
-        output =
-          '
-        RSpec.configure do |config|
-          config.include FactoryGirl::Syntax::Methods
-        end
-        '
+        input = <<~EOS
+          RSpec.configure do |config|
+            config.include FactoryGirl::Syntax::Methods
+          end
+        EOS
+        output = <<~EOS
+          RSpec.configure do |config|
+            config.include FactoryGirl::Syntax::Methods
+          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).not_to receive(:write).with('spec/spec_helper.rb', output)
@@ -213,18 +209,16 @@ end
               end
             end
           end
-        input =
-          '
-        RSpec.configure do |config|
-          config.include FactoryGirl::Syntax::Methods
-        end
-        '
-        output =
-          '
-        RSpec.configure do |config|
-          config.include FactoryGirl::Syntax::Methods
-        end
-        '
+        input = <<~EOS
+          RSpec.configure do |config|
+            config.include FactoryGirl::Syntax::Methods
+          end
+        EOS
+        output = <<~EOS
+          RSpec.configure do |config|
+            config.include FactoryGirl::Syntax::Methods
+          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).not_to receive(:write).with('spec/spec_helper.rb', output)
@@ -239,22 +233,20 @@ end
               replace_with 'create {{arguments}}'
             end
           end
-        input =
-          "
-it 'uses factory_girl' do
-  user = FactoryGirl.create :user
-  post = FactoryGirl.create :post, user: user
-  assert post.valid?
-end
-"
-        output =
-          "
-it 'uses factory_girl' do
-  user = create :user
-  post = create :post, user: user
-  assert post.valid?
-end
-"
+        input = <<~EOS
+          it 'uses factory_girl' do
+            user = FactoryGirl.create :user
+            post = FactoryGirl.create :post, user: user
+            assert post.valid?
+          end
+        EOS
+        output = <<~EOS
+          it 'uses factory_girl' do
+            user = create :user
+            post = create :post, user: user
+            assert post.valid?
+          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(:write).with('spec/models/post_spec.rb', output)

metadata

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