synvert-core 0.41.0 → 0.42.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b54b506cc880f8fff9834b131659fd6f32cc60082bfade8a07d2d9a767352dd
-  data.tar.gz: 0ec762ecd158a05142674be271a10a0cbbe260ae7d4e0f0cd36ab4d426cefcd7
+  metadata.gz: c29440498ff5186fde3ea7828482bfc0e93551350682f68b2fd26f3054894460
+  data.tar.gz: 055d1a185ed10f154f3b6a5ee99d8f142ead2a62935e461f3b73d15a32822496
 SHA512:
-  metadata.gz: dabaa021af949aa5b15bbe5830d2e6154eb1679d5144d614c933c48d5767b92f0b1ad10b281d7d3819f755a762677c7dac26d696b501710e29f9730188f4afe9
-  data.tar.gz: 319e76c109e66ee558ff5c844ba3c9a1f3b6be1f2e6ca769bb3a97dedb19c6c0e4cf7dd22f7e04ff9a2508722f2a96e77e4f7521356f1c97ad0aef0e9959fe0f
+  metadata.gz: 757170374b87d2941befeaa9e1d17681bfff6bd8486880dec9fa9549e4a71ec660983e7f8bf3d9e71046ae4d24c4fc4ec0282aba71d62cd5de240d3f36962f5e
+  data.tar.gz: ad55dd58dc35f53804d11a99f2dc926881b84a05eb0e13ab3f0a3c07e374fddb1dd8ddae91ec1d8a36a3564d3c61ab3bf1c0282ac45193cb4cc93e90500ef17d

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # CHANGELOG
 
+# 0.42.1 (2021-07-14)
+
+* Return rewrtier after executing snippet
+
+# 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
 
@@ -388,7 +388,7 @@ module Parser::AST
         end
 
         raise Synvert::Core::MethodNotSupported,
-              "child_node_range is not handled for #{evaluated.inspect}, child_name: #{child_name}"
+              "child_node_range is not handled for #{debug_info}, child_name: #{child_name}"
       end
     end
 
@@ -493,6 +493,8 @@ module Parser::AST
     # @return [Integer] -1, 0 or 1.
     # @raise [Synvert::Core::MethodNotSupported] if expected class is not supported.
     def match_value?(actual, expected)
+      return true if actual == expected
+
       case expected
       when Symbol
         if actual.is_a?(Parser::AST::Node)
@@ -502,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)
@@ -563,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.
@@ -578,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/rewriter.rb

@@ -52,7 +52,9 @@ module Synvert::Core
       #
       # @param block [Block] a block defines the behaviors of the rewriter.
       def execute(&block)
-        Rewriter.new('', '', &block).process
+        rewriter = Rewriter.new('', '', &block)
+        rewriter.process
+        rewriter
       end
 
       # Register a rewriter with its group and name.

data/lib/synvert/core/version.rb

@@ -2,6 +2,6 @@
 
 module Synvert
   module Core
-    VERSION = '0.41.0'
+    VERSION = '0.42.1'
   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.0
+  version: 0.42.1
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-24 00:00:00.000000000 Z
+date: 2021-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport