synvert-core 0.51.1 → 0.54.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e3a46917323dc90674ad343c09d06621ac8817a3700c4b4ff205dbfb96a4ad7f
-  data.tar.gz: 1a72f62df4f1711af2b17e2ac2c556ac57bb5cf984cfc9f00d74ce4c7d540442
+  metadata.gz: 1c7ee99e848625ed3bad729d3e08186370d5fb58d4412fb1d09d89bf15559a22
+  data.tar.gz: 30f16d4aa02a2a6f6677a5657b24296127869e17c5237a4b63f2d6d1ed658203
 SHA512:
-  metadata.gz: 8a150ae7cd1eef26c911c29a20911d370ec227405671218c2a4fee51b05ab5cc963002b719c2380c621fa603cd9082500eed91ace57fea6294e16a026e70193b
-  data.tar.gz: 78b9d45a11f131d20790a84d40c4547582d043fc779b77d398660ca35cc0eb415c4b55d8aba3e8b1d949cc864e7c71fe7ad5565af7e47ec4e5a5079b5cd095fc
+  metadata.gz: 936f304f6b829be86eb1da55aa110a7b3ed7c249cb9da4a1bc5246a1d687fb8dd7548fe68a2632c4df874c921f829e05ec5cab838373b587db5a3e59b900a0ab
+  data.tar.gz: 15f39e1386ee166762dd3afca86b8d246e3cc8ea0cbdcb5efd15eb9141f911ffcaabaf15a6062f9a6fe31dc720e7242fe4a81633bc12ffa06c18efe431d4d410

data/CHANGELOG.md

@@ -1,8 +1,19 @@
 # CHANGELOG
 
-## 0.51.1 (2021-08-19)
+## 0.54.0 (2021-08-28)
 
+* Change `goto_scope` param from array to string
+
+## 0.53.0 (2021-08-22)
+
+* Fix nested child in Node#child_node_range
+* Rename synvert-core to synvert-core-ruby
+
+## 0.52.0 (2021-08-21)
+
+* ``Node#child_node_range`` supports nested child
 * Require `fileutils`
+* Rename `Node#indent` to `Node#column`
 
 ## 0.51.0 (2021-08-12)
 

data/README.md

@@ -1,12 +1,11 @@
-# Synvert::Core
+# synvert-core-ruby
 
-<img src="https://xinminlabs.github.io/synvert/img/logo_96.png" alt="logo" width="32" height="32" />
+<img src="https://synvert.xinminlabs.com/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)
+![Main workflow](https://github.com/xinminlabs/synvert-core-ruby/actions/workflows/main.yml/badge.svg)
 [![Gem Version](https://badge.fury.io/rb/synvert-core.png)](http://badge.fury.io/rb/synvert-core)
 
-synvert-core provides a dsl to convert ruby source code.
+synvert-core-ruby provides a dsl to convert ruby source code.
 
 ## Installation
 
@@ -31,11 +30,11 @@ Or install it yourself as:
 
 ## Contributing
 
-1. Fork it ( https://github.com/[my-github-username]/synvert-core/fork )
+1. Fork it ( https://github.com/[my-github-username]/synvert-core-ruby/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create a new Pull Request
 
-[1]: https://xinminlabs.github.io/synvert/
-[2]: https://rubydoc.info/github/xinminlabs/synvert-core/master/frames
+[1]: https://synvert.xinminlabs.com
+[2]: https://rubydoc.info/github/xinminlabs/synvert-core-ruby/master/frames

data/lib/synvert/core/node_ext.rb

@@ -322,10 +322,10 @@ module Parser::AST
       loc.expression&.source
     end
 
-    # Get the indent of current node.
+    # Get the column of current node.
     #
-    # @return [Integer] indent.
-    def indent
+    # @return [Integer] column.
+    def column
       loc.expression.column
     end
 
@@ -341,7 +341,7 @@ 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, child_name]
+      case [type, child_name.to_sym]
       when %i[block pipes], %i[def parentheses], %i[defs parentheses]
         Parser::Source::Range.new('(string)', arguments.loc.expression.begin_pos, arguments.loc.expression.end_pos)
       when %i[block arguments], %i[def arguments], %i[defs arguments]
@@ -369,8 +369,12 @@ module Parser::AST
           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)
+        direct_child_name, nested_child_name = child_name.to_s.split('.', 2)
+        if respond_to?(direct_child_name)
+          child_node = send(direct_child_name)
+
+          return child_node.child_node_range(nested_child_name) if nested_child_name
+
           return nil if child_node.nil?
 
           if child_node.is_a?(Parser::AST::Node)

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

@@ -12,7 +12,7 @@ module Synvert::Core
       if :begin == @node.type
         @node.loc.expression.end_pos
       else
-        @node.loc.expression.end_pos - @node.indent - END_LENGTH
+        @node.loc.expression.end_pos - @node.column - END_LENGTH
       end
     end
 
@@ -31,9 +31,9 @@ module Synvert::Core
     # @return [String] n times whitesphace
     def indent(node)
       if %i[block class].include? node.type
-        ' ' * (node.indent + DEFAULT_INDENT)
+        ' ' * (node.column + DEFAULT_INDENT)
       else
-        ' ' * node.indent
+        ' ' * node.column
       end
     end
   end

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

@@ -1,21 +1,21 @@
 # frozen_string_literal: true
 
 module Synvert::Core
-  # RemoveAction to delete code.
+  # DeleteAction to delete code.
   class Rewriter::DeleteAction < Rewriter::Action
     def initialize(instance, *selectors)
       super(instance, nil)
       @selectors = selectors
     end
 
-    # Begin position of code to replace.
+    # Begin position of code to delete.
     #
     # @return [Integer] begin position.
     def begin_pos
       @selectors.map { |selector| @node.child_node_range(selector) }.compact.map(&:begin_pos).min
     end
 
-    # End position of code to replace.
+    # End position of code to delete.
     #
     # @return [Integer] end position.
     def end_pos

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Synvert::Core
-  # AddAction to add code to the node.
+  # InsertAction to add code to the node.
   class Rewriter::InsertAction < Rewriter::Action
     def initialize(instance, code, at:)
       super(instance, code)

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

@@ -24,7 +24,7 @@ module Synvert::Core
     # @param node [Parser::AST::Node]
     # @return [String] n times whitesphace
     def indent(node)
-      ' ' * node.indent
+      ' ' * node.column
     end
   end
 end

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

@@ -38,9 +38,9 @@ module Synvert::Core
     # @return [String] n times whitesphace
     def indent(node)
       if %i[block class].include? node.type
-        ' ' * (node.indent + DEFAULT_INDENT)
+        ' ' * (node.column + DEFAULT_INDENT)
       else
-        ' ' * node.indent
+        ' ' * node.column
       end
     end
   end

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

@@ -24,7 +24,7 @@ module Synvert::Core
       if rewritten_source.include?("\n")
         new_code = []
         rewritten_source.split("\n").each_with_index do |line, index|
-          new_code << (index == 0 ? line : indent(@node) + line)
+          new_code << (index == 0 ? line : indent + line)
         end
         new_code.join("\n")
       else
@@ -36,10 +36,9 @@ module Synvert::Core
 
     # Indent of the node
     #
-    # @param node [Parser::AST::Node]
     # @return [String] n times whitesphace
-    def indent(node)
-      ' ' * node.indent
+    def indent
+      ' ' * @node.column
     end
   end
 end

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

@@ -8,7 +8,7 @@ module Synvert::Core
   class Rewriter::WrapAction < Rewriter::Action
     def initialize(instance, with:, indent: nil)
       super(instance, with)
-      @indent = indent || @node.indent
+      @indent = indent || @node.column
     end
 
     # Begin position of code to wrap.

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

@@ -139,7 +139,7 @@ module Synvert::Core
 
     # Set current_node properly, process and set current_node back to original current_node.
     #
-    # @param node [Parser::AST::Node] node set to current_node
+    # @param node [Parser::AST::Node] node set to other_node
     # @yield process
     def process_with_other_node(node)
       original_node = current_node
@@ -177,10 +177,10 @@ module Synvert::Core
     # Parse goto_node dsl, it creates a [Synvert::Core::Rewriter::GotoScope] to go to a child node,
     # then continue operating on the child node.
     #
-    # @param *child_node_names [Array] the name of the child nodes.
+    # @param child_node_name [Symbol|String] the name of the child nodes.
     # @param block [Block] block code to continue operating on the matching nodes.
-    def goto_node(*child_node_names, &block)
-      Rewriter::GotoScope.new(self, *child_node_names, &block).process
+    def goto_node(child_node_name, &block)
+      Rewriter::GotoScope.new(self, child_node_name, &block).process
     end
 
     # Parse if_exist_node dsl, it creates a [Synvert::Core::Rewriter::IfExistCondition] to check

data/lib/synvert/core/rewriter/scope/goto_scope.rb

@@ -6,11 +6,11 @@ module Synvert::Core
     # Initialize a scope
     #
     # @param instance [Synvert::Core::Rewriter::Instance]
-    # @param *child_node_names [Array]
+    # @param child_node_name [Symbol|string]
     # @param block [Block]
-    def initialize(instance, *child_node_names, &block)
+    def initialize(instance, child_node_name, &block)
       @instance = instance
-      @child_node_names = child_node_names
+      @child_node_name = child_node_name
       @block = block
     end
 
@@ -20,7 +20,7 @@ module Synvert::Core
       return unless current_node
 
       child_node = current_node
-      @child_node_names.each do |child_node_name|
+      @child_node_name.to_s.split('.').each do |child_node_name|
         child_node = child_node_name.is_a?(Parser::AST::Node) ? child_node_name : child_node.send(child_node_name)
       end
       @instance.process_with_other_node child_node do

data/lib/synvert/core/rewriter/scope/within_scope.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Synvert::Core
-  # WithinScope finds out nodes which match rules, then change its scope to matching node.
+  # WithinScope finds out nodes which match rules, then changes its scope to matching node.
   class Rewriter::WithinScope < Rewriter::Scope
     # Initialize a scope
     #
@@ -16,8 +16,9 @@ module Synvert::Core
       @block = block
     end
 
-    # Find out the matching nodes. It checks the current node and iterates all child nodes,
-    # then run the block code with each matching node.
+    # Find out the matching nodes.
+    # It checks the current node and iterates all child nodes,
+    # then run the block code on each matching node.
     def process
       current_node = @instance.current_node
       return unless current_node

data/lib/synvert/core/version.rb

@@ -2,6 +2,6 @@
 
 module Synvert
   module Core
-    VERSION = '0.51.1'
+    VERSION = '0.54.0'
   end
 end

data/spec/synvert/core/node_ext_spec.rb

@@ -359,10 +359,10 @@ describe Parser::AST::Node do
     end
   end
 
-  describe '#indent' do
+  describe '#column' do
     it 'gets column number' do
       node = parse('  FactoryGirl.create :post')
-      expect(node.indent).to eq 2
+      expect(node.column).to eq 2
     end
   end
 
@@ -520,6 +520,18 @@ describe Parser::AST::Node do
         range = node.child_node_range(:pipes)
         expect(range.to_range).to eq(24...30)
       end
+
+      it 'checks caller.receiver' do
+        node = parse('Factory.define :user do |user|; end')
+        range = node.child_node_range('caller.receiver')
+        expect(range.to_range).to eq(0...7)
+      end
+
+      it 'checks caller.message' do
+        node = parse('Factory.define :user do |user|; end')
+        range = node.child_node_range('caller.message')
+        expect(range.to_range).to eq(8...14)
+      end
     end
 
     context 'class node' do

data/spec/synvert/core/rewriter/scope/goto_scope_spec.rb

@@ -24,7 +24,7 @@ module Synvert::Core
         run = false
         type_in_scope = nil
         scope =
-          Rewriter::GotoScope.new instance, :caller, :receiver do
+          Rewriter::GotoScope.new instance, 'caller.receiver' do
             run = true
             type_in_scope = node.type
           end

data/{synvert-core.gemspec → synvert-core-ruby.gemspec}

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["flyerhzm@gmail.com"]
   spec.summary       = 'convert ruby code to better syntax.'
   spec.description   = 'convert ruby code to better syntax automatically.'
-  spec.homepage      = "https://github.com/xinminlabs/synvert-core"
+  spec.homepage      = "https://github.com/xinminlabs/synvert-core-ruby"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: synvert-core
 version: !ruby/object:Gem::Version
-  version: 0.51.1
+  version: 0.54.0
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-19 00:00:00.000000000 Z
+date: 2021-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -198,8 +198,8 @@ files:
 - spec/synvert/core/rewriter/scope_spec.rb
 - spec/synvert/core/rewriter/warning_spec.rb
 - spec/synvert/core/rewriter_spec.rb
-- synvert-core.gemspec
-homepage: https://github.com/xinminlabs/synvert-core
+- synvert-core-ruby.gemspec
+homepage: https://github.com/xinminlabs/synvert-core-ruby
 licenses:
 - MIT
 metadata: {}