synvert-core 0.27.2 → 0.29.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: afa25ca6412906c13399aa27967676033670bcbab36910a7bd528e3a9948e61d
-  data.tar.gz: f5844fee19d2aec45fd24b50af95decb53b7b33c90e2c83fad4fb62d565d0782
+  metadata.gz: 31ee6b89cd48a4accb2dc71fdec2e487c534e8d6eb4a9bd6050817cd88f7ba3c
+  data.tar.gz: cd4c005e0f7a21e52e984e5279a45d4325d341b92d67feedbbc455ddc062e0fc
 SHA512:
-  metadata.gz: 2d188889dec4144d5508fc2ff3f9c6356703354cc1d37464a4d59fa406c56095fd1be796c5ffa474263bcb9a232f2ebbf48796de778fe80bbfe0a18137b7d048
-  data.tar.gz: 85a83b35f0b9c60682d75647a63eff485eff55cf41e46e12b7849b00d098c1268e615eee9d363e3ce068c8c4239e05bc499a86cb73d4ba70d1c986366e2f96a0
+  metadata.gz: 4d1e8642e682a155eedb03c6cdbabca55f53f22c258d4774da7200877159ec18c0a7d568823c5c379fd93810d0baf945a2bc139f8444423855c6279241acb0bc
+  data.tar.gz: 73a369f23d1add90b21ce578faf37a3136a6ffcb384f47fa5b3881fd4241af4b087b19fb0d854143ed1e3d9b76f350fc41b2415cddc29671cde3afe0e46d4709

data/CHANGELOG.md

@@ -1,11 +1,14 @@
 # CHANGELOG
 
-## 0.27.2 (2021-03-31)
+## 0.29.0 (2021-04-25)
 
-* Fix selector with operator in `child_node_range`
+* Make `child_name_range` support [:block, :pipe]
+* Get key value for hash node
 
-## 0.27.1 (2021-03-31)
+## 0.28.0 (2021-04-07)
 
+* Make `child_name_range` support all dsl nodes
+* Make `replace` action support multi child names
 * Fix `delete` action arguments
 
 ## 0.27.0 (2021-03-31)

data/lib/synvert/core/node_ext.rb

@@ -101,9 +101,9 @@ module Parser::AST
     def arguments
       case type
       when :def, :block
-        ArgumentsNode.new children[1]
+        ArgumentsNode.new(children[1])
       when :defs
-        ArgumentsNode.new children[2]
+        ArgumentsNode.new(children[2])
       when :send
         children[2..-1]
       when :defined?
@@ -203,7 +203,7 @@ module Parser::AST
     def hash_value(key)
       if :hash == type
         value_node = children.find { |pair_node| pair_node.key.to_value == key }
-        value_node ? value_node.value : nil
+        value_node&.value
       else
         raise Synvert::Core::MethodNotSupported, "hash_value is not handled for #{debug_info}"
       end
@@ -280,6 +280,29 @@ module Parser::AST
       end
     end
 
+    # Respond key value for hash node, e.g.
+    #
+    # Current node is s(:hash, s(:pair, s(:sym, :number), s(:int, 10)))
+    # node.number_value is 10
+    def method_missing(method_name, *args, &block)
+      if :hash == type && method_name.to_s.include?('_value')
+        key = method_name.to_s.sub('_value', '')
+        return hash_value(key.to_sym)&.to_value if key?(key.to_sym)
+        return hash_value(key.to_s)&.to_value if key?(key.to_s)
+      end
+
+      super
+    end
+
+    def respond_to_missing?(method_name, *args)
+      if :hash == type && method_name.to_s.include?('_value')
+        key = method_name.to_s.sub('_value', '')
+        return true if key?(key.to_sym) || key?(key.to_s)
+      end
+
+      super
+    end
+
     def to_s
       if :mlhs == type
         "(#{children.map(&:name).join(', ')})"
@@ -322,27 +345,56 @@ module Parser::AST
     # @param [String] name of child node.
     # @return [Parser::Source::Range] source range of child node.
     def child_node_range(child_name)
-      case type
-      when :class
-        case child_name
-        when :name
-          loc.name
-        when :parent_class
-          parent_class&.loc&.expression
-        end
-      when :send
-        case child_name
-        when :receiver
-          receiver&.loc&.expression
-        when :dot
-          loc.dot
-        when :message
-          loc.operator ? Parser::Source::Range.new('(string)', loc.selector.begin_pos, loc.operator.end_pos) : loc.selector
-        when :arguments
-          Parser::Source::Range.new('(string)', arguments.first.loc.expression.begin_pos, arguments.last.loc.expression.end_pos) unless arguments.empty?
+      case [type, child_name]
+      when %i[block pipe]
+        Parser::Source::Range.new('(string)', arguments.loc.expression.begin_pos, arguments.loc.expression.end_pos)
+      when %i[class name]
+        loc.name
+      when %i[def name]
+        loc.name
+      when %i[defs name]
+        loc.name
+      when %i[defs dot]
+        loc.operator
+      when %i[defs self]
+        Parser::Source::Range.new('(string)', loc.operator.begin_pos - 4, loc.operator.begin_pos)
+      when %i[send dot]
+        loc.dot
+      when %i[send message]
+        if loc.operator
+          Parser::Source::Range.new('(string)', loc.selector.begin_pos, loc.operator.end_pos)
+        else
+          loc.selector
         end
       else
-        raise Synvert::Core::MethodNotSupported, "child_node_range is not handled for #{evaluated.inspect}, child_name: #{child_name}"
+        if respond_to?(child_name)
+          child_node = send(child_name)
+          return nil if child_node.nil?
+
+          if child_node.is_a?(Parser::AST::Node)
+            return(
+              Parser::Source::Range.new(
+                '(string)',
+                child_node.loc.expression.begin_pos,
+                child_node.loc.expression.end_pos
+              )
+            )
+          end
+
+          # arguments
+          return nil if child_node.empty?
+
+          return(
+            Parser::Source::Range.new(
+              '(string)',
+              child_node.first.loc.expression.begin_pos,
+              child_node.last.loc.expression.end_pos
+            )
+          )
+        end
+
+        raise Synvert::Core::MethodNotSupported,
+              "child_node_range is not handled for #{evaluated.inspect}, child_name: #{child_name}"
       end
     end
 

data/lib/synvert/core/rewriter/action/replace_action.rb

@@ -3,9 +3,9 @@
 module Synvert::Core
   # ReplaceAction to replace child node with code.
   class Rewriter::ReplaceAction < Rewriter::Action
-    def initialize(instance, selector, with:)
+    def initialize(instance, *selectors, with:)
       @instance = instance
-      @selector = selector
+      @selectors = selectors
       @code = with
       @node = @instance.current_node
     end
@@ -14,14 +14,14 @@ module Synvert::Core
     #
     # @return [Integer] begin position.
     def begin_pos
-      @node.child_node_range(@selector).begin_pos
+      @selectors.map { |selector| @node.child_node_range(selector).begin_pos }.min
     end
 
     # End position of code to replace.
     #
     # @return [Integer] end position.
     def end_pos
-      @node.child_node_range(@selector).end_pos
+      @selectors.map { |selector| @node.child_node_range(selector).end_pos }.max
     end
 
     # The rewritten source code.

data/lib/synvert/core/rewriter/instance.rb

@@ -252,12 +252,12 @@ module Synvert::Core
     end
 
     # Parse replace with dsl, it creates a [Synvert::Core::Rewriter::ReplaceAction] to
-    # replace child node with code.
+    # replace child nodes with code.
     #
-    # @param selector [Symbol] selector name of child node.
+    # @param selectors [Array<Symbol>] selector names of child node.
     # @param with [String] code need to be replaced with.
-    def replace(selector, with:)
-      @actions << Rewriter::ReplaceAction.new(self, selector, with: with)
+    def replace(*selectors, with:)
+      @actions << Rewriter::ReplaceAction.new(self, *selectors, with: with)
     end
 
     # Parse replace_erb_stmt_with_expr dsl, it creates a [Synvert::Core::Rewriter::ReplaceErbStmtWithExprAction] to

data/lib/synvert/core/version.rb

@@ -2,6 +2,6 @@
 
 module Synvert
   module Core
-    VERSION = '0.27.2'
+    VERSION = '0.29.0'
   end
 end

data/spec/synvert/core/node_ext_spec.rb

@@ -333,6 +333,16 @@ describe Parser::AST::Node do
     end
   end
 
+  describe 'key value by method_missing' do
+    it 'gets for key value' do
+      node = parse("{:foo => :bar}")
+      expect(node.foo_value).to eq :bar
+
+      node = parse("{'foo' => 'bar'}")
+      expect(node.foo_value).to eq 'bar'
+    end
+  end
+
   describe '#recursive_children' do
     it 'iterates all children recursively' do
       node = parse('class Synvert; def current_node; @node; end; end')
@@ -395,6 +405,84 @@ describe Parser::AST::Node do
   end
 
   describe '#child_node_range' do
+    context 'block node' do
+      it 'checks caller' do
+        node = parse('Factory.define :user do |user|; end')
+        range = node.child_node_range(:caller)
+        expect(range.to_range).to eq(0...20)
+      end
+
+      it 'checks arguments' do
+        node = parse('Factory.define :user do |user|; end')
+        range = node.child_node_range(:arguments)
+        expect(range.to_range).to eq(25...29)
+      end
+
+      it 'checks pipe' do
+        node = parse('Factory.define :user do |user|; end')
+        range = node.child_node_range(:pipe)
+        expect(range.to_range).to eq(24...30)
+      end
+    end
+
+    context 'class node' do
+      it 'checks name' do
+        node = parse('class Post < ActiveRecord::Base; end')
+        range = node.child_node_range(:name)
+        expect(range.to_range).to eq(6...10)
+      end
+
+      it 'checks parent_class' do
+        node = parse('class Post < ActiveRecord::Base; end')
+        range = node.child_node_range(:parent_class)
+        expect(range.to_range).to eq(13...31)
+
+        node = parse('class Post; end')
+        range = node.child_node_range(:parent_class)
+        expect(range).to be_nil
+      end
+    end
+
+    context 'def node' do
+      it 'checks name' do
+        node = parse('def foo(bar); end')
+        range = node.child_node_range(:name)
+        expect(range.to_range).to eq(4...7)
+      end
+
+      it 'checks arguments' do
+        node = parse('def foo(bar); end')
+        range = node.child_node_range(:arguments)
+        expect(range.to_range).to eq(8...11)
+      end
+    end
+
+    context 'defs node' do
+      it 'checks self' do
+        node = parse('def self.foo(bar); end')
+        range = node.child_node_range(:self)
+        expect(range.to_range).to eq(4...8)
+      end
+
+      it 'checks dot' do
+        node = parse('def self.foo(bar); end')
+        range = node.child_node_range(:dot)
+        expect(range.to_range).to eq(8...9)
+      end
+
+      it 'checks name' do
+        node = parse('def self.foo(bar); end')
+        range = node.child_node_range(:name)
+        expect(range.to_range).to eq(9...12)
+      end
+
+      it 'checks arguments' do
+        node = parse('def self.foo(bar); end')
+        range = node.child_node_range(:arguments)
+        expect(range.to_range).to eq(13...16)
+      end
+    end
+
     context 'send node' do
       it 'checks receiver' do
         node = parse('foo.bar(test)')
@@ -444,24 +532,6 @@ describe Parser::AST::Node do
         expect(range).to be_nil
       end
     end
-
-    context 'class node' do
-      it 'checks name' do
-        node = parse('class Post < ActiveRecord::Base; end')
-        range = node.child_node_range(:name)
-        expect(range.to_range).to eq(6...10)
-      end
-
-      it 'checks parent_class' do
-        node = parse('class Post < ActiveRecord::Base; end')
-        range = node.child_node_range(:parent_class)
-        expect(range.to_range).to eq(13...31)
-
-        node = parse('class Post; end')
-        range = node.child_node_range(:parent_class)
-        expect(range).to be_nil
-      end
-    end
   end
 
   describe '#rewritten_source' do

data/spec/synvert/core/rewriter/action/delete_action_spec.rb

@@ -5,18 +5,18 @@ require 'spec_helper'
 module Synvert::Core
   describe Rewriter::DeleteAction do
     subject {
-      source = "arr.map {}.flatten"
+      source = 'arr.map {}.flatten'
       node = Parser::CurrentRuby.parse(source)
       instance = double(current_node: node)
       Rewriter::DeleteAction.new(instance, :dot, :message)
     }
 
     it 'gets begin_pos' do
-      expect(subject.begin_pos).to eq "arr.map {}".length
+      expect(subject.begin_pos).to eq 'arr.map {}'.length
     end
 
     it 'gets end_pos' do
-      expect(subject.end_pos).to eq "arr.map {}.flatten".length
+      expect(subject.end_pos).to eq 'arr.map {}.flatten'.length
     end
 
     it 'gets rewritten_code' do

data/spec/synvert/core/rewriter/action/replace_action_spec.rb

@@ -6,22 +6,22 @@ module Synvert::Core
   describe Rewriter::ReplaceAction do
     context 'replace with single line' do
       subject {
-        source = "'slug from title'.gsub(' ', '_')"
+        source = 'FactoryBot.create(:user)'
         node = Parser::CurrentRuby.parse(source)
         instance = double(current_node: node)
-        Rewriter::ReplaceAction.new(instance, :message, with: 'tr')
+        Rewriter::ReplaceAction.new(instance, :receiver, :dot, :message, with: 'create')
       }
 
       it 'gets begin_pos' do
-        expect(subject.begin_pos).to eq "'slug from title'.".length
+        expect(subject.begin_pos).to eq 0
       end
 
       it 'gets end_pos' do
-        expect(subject.end_pos).to eq "'slug from title'.gsub".length
+        expect(subject.end_pos).to eq 'FactoryBot.create'.length
       end
 
       it 'gets rewritten_code' do
-        expect(subject.rewritten_code).to eq 'tr'
+        expect(subject.rewritten_code).to eq 'create'
       end
     end
   end

data/synvert-core.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "activesupport"
   spec.add_runtime_dependency "erubis"
-  spec.add_runtime_dependency "parser", "~> 3.0.0"
+  spec.add_runtime_dependency "parser"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "guard"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: synvert-core
 version: !ruby/object:Gem::Version
-  version: 0.27.2
+  version: 0.29.0
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-31 00:00:00.000000000 Z
+date: 2021-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -42,16 +42,16 @@ dependencies:
   name: parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -213,7 +213,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: convert ruby code to better syntax.