synvert-core 0.41.2 → 0.44.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e9e29097976ca69f755a698d9a3a78769105c4043b07c96a7ac1e714ae659a0
-  data.tar.gz: 12d45e30a5de2ffc03bb440b503ff1a230e7baa55eb6a69e43518023e7d24f08
+  metadata.gz: 252c2e9347770f9363ca9d317d574fa6e1d9faad4826d2853816a669ad13dab1
+  data.tar.gz: 1d19aac0f1dac17a84dd4a85bcbb8606d9391afeb9c4493eff516cf2b5ed948f
 SHA512:
-  metadata.gz: 28802dbdd2f53b267c621f811b959a0041064f97ff4f54ee009f75d230eeb2a1ff3fbb9b1c3cee524d990f53b8e7447105fa57e86cb4ee2b042cd4e17ef63c9e
-  data.tar.gz: 8c0f5604e24d9ea0034214aa2b4d36f26d6c5f181d7d0d70f75a78fe71b0cab1868379953b2d071ea3ab922e62855a51ee5a0cb14ed7b4e26ebb8cc57adcb396
+  metadata.gz: 795910a3044cc4cdbf02e0412a5784235b7c8fc0892a1243cf58677c53d09e1cdf097d7f56cf8f818864de0eab6ec65d829c59e2ba246e1d1150bdd3fd5e2b40
+  data.tar.gz: fc2f006fd4b269f598cd23d05ebfcf72b098ce4a7ccfaa1a5d6004517d058caabea1005e999d2ccaf92a73bae34941b4bc8b37124db98ae90a71730c7e749098

data/CHANGELOG.md

@@ -1,5 +1,20 @@
 # CHANGELOG
 
+# 0.44.1 (2021-07-19)
+
+* Handle `nil` child node for `begin_pos` and `end_pos`
+
+# 0.44.0 (2021-07-19)
+
+* Return rewrtier after executing snippet
+* `left_value` and `right_value` support `or_asgn` node
+* `child_node_range` supports send `parentheses`
+
+# 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

@@ -217,6 +217,8 @@ module Parser::AST
     def left_value
       if %i[masgn lvasgn ivasgn].include? type
         children[0]
+      elsif :or_asgn == type
+        children[0].children[0]
       else
         raise Synvert::Core::MethodNotSupported, "left_value is not handled for #{debug_info}"
       end
@@ -227,7 +229,7 @@ module Parser::AST
     # @return [Array<Parser::AST::Node>] variable nodes.
     # @raise [Synvert::Core::MethodNotSupported] if calls on other node.
     def right_value
-      if %i[masgn lvasgn ivasgn].include? type
+      if %i[masgn lvasgn ivasgn or_asgn].include? type
         children[1]
       else
         raise Synvert::Core::MethodNotSupported, "right_value is not handled for #{debug_info}"
@@ -240,7 +242,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 +255,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
 
@@ -360,6 +362,10 @@ module Parser::AST
         else
           loc.selector
         end
+      when %i[send parentheses]
+        if loc.begin && loc.end
+          Parser::Source::Range.new('(string)', loc.begin.begin_pos, loc.end.end_pos)
+        end
       else
         if respond_to?(child_name)
           child_node = send(child_name)
@@ -504,10 +510,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 +572,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 +583,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/rewriter/action/delete_action.rb

@@ -12,14 +12,14 @@ module Synvert::Core
     #
     # @return [Integer] begin position.
     def begin_pos
-      @selectors.map { |selector| @node.child_node_range(selector).begin_pos }.min
+      @selectors.map { |selector| @node.child_node_range(selector) }.compact.map(&:begin_pos).min
     end
 
     # End position of code to replace.
     #
     # @return [Integer] end position.
     def end_pos
-      @selectors.map { |selector| @node.child_node_range(selector).end_pos }.max
+      @selectors.map { |selector| @node.child_node_range(selector) }.compact.map(&:end_pos).max
     end
 
     # The rewritten code, always empty string.

data/lib/synvert/core/version.rb

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

data/spec/synvert/core/node_ext_spec.rb

@@ -261,6 +261,11 @@ describe Parser::AST::Node do
       node = parse('@a = 1')
       expect(node.left_value).to eq :@a
     end
+
+    it 'gets for or_asgn' do
+      node = parse('a ||= 1')
+      expect(node.left_value).to eq :a
+    end
   end
 
   describe '#right_value' do
@@ -283,6 +288,11 @@ describe Parser::AST::Node do
       node = parse('@a = 1')
       expect(node.right_value).to eq parse('1')
     end
+
+    it 'gets for or_asgn' do
+      node = parse('a ||= 1')
+      expect(node.right_value).to eq parse('1')
+    end
   end
 
   describe '#to_value' do
@@ -291,6 +301,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 +400,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 +424,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)
@@ -590,15 +624,24 @@ describe Parser::AST::Node do
         range = node.child_node_range(:arguments)
         expect(range).to be_nil
       end
+
+      it 'checks parentheses' do
+        node = parse('foo.bar(test)')
+        range = node.child_node_range(:parentheses)
+        expect(range.to_range).to eq(7...13)
+
+        node = parse('foobar(test)')
+        range = node.child_node_range(:parentheses)
+        expect(range.to_range).to eq(6...12)
+
+        node = parse('foo.bar')
+        range = node.child_node_range(:parentheses)
+        expect(range).to be_nil
+      end
     end
   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.44.1
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-06 00:00:00.000000000 Z
+date: 2021-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport