synvert-core 0.51.0 → 0.53.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc8d09c26c005557ec18ab8d877a8cbf5af6ba0f9de0ab44efe40298419647fa
-  data.tar.gz: abcc824dfbf93e3aab1d3d3e33dd3862886015b899b79ce7ceb97066d2b47e85
+  metadata.gz: a56859d257b024e86f223d076c77d4effd93d6ffef44de99091d49a62a12841e
+  data.tar.gz: f0b8658b8701417180ae578eb2ba5c7607e634327ced470e2ad0017980a2e0d8
 SHA512:
-  metadata.gz: f46377a1cc5b7eb69bb69608b3f018eae1e4cd2f4aed6bf3e3200bfa1f1fa9527829ba2a64fb0c9dd909e0125028f6fef15100fb76b0a88acfb4f8c6b9e33879
-  data.tar.gz: 3de1571672cff28c01937d4f1281873592847578367320123d32e657429634cde392000b9400124be0ae90f3d896627763864eaabe7539df13e98886b1c00ce1
+  metadata.gz: 320beadaca69f8e9613f1cd15c5c6fd71bf7bd51881af453ade6e99f56e9516b782264b0d63d4398bbd4fe61af8cb3c7df78d517d0e29762f76de2c2d2091255
+  data.tar.gz: 22a208b06b416f70e191e7215e21016d603a06ff91a0c7ad8795333906179f46b325e0507ffafd65b7fcebc639e99a6aaba5428632ac6f19b87a2b41dedf9e47

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 # CHANGELOG
 
+## 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)
 
 * Add `wrap` action

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" />
 
-![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
+[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.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'fileutils'
+
 module Synvert::Core
   # Rewriter is the top level namespace in a snippet.
   #

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/insert_action.rb

@@ -4,10 +4,8 @@ module Synvert::Core
   # AddAction to add code to the node.
   class Rewriter::InsertAction < Rewriter::Action
     def initialize(instance, code, at:)
-      @instance = instance
-      @code = code
+      super(instance, code)
       @at = at
-      @node = @instance.current_node
     end
 
     # Begin position to insert 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_action.rb

@@ -4,10 +4,8 @@ module Synvert::Core
   # ReplaceAction to replace child node with code.
   class Rewriter::ReplaceAction < Rewriter::Action
     def initialize(instance, *selectors, with:)
-      @instance = instance
+      super(instance, with)
       @selectors = selectors
-      @code = with
-      @node = @instance.current_node
     end
 
     # Begin position of code to replace.

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

@@ -7,10 +7,8 @@ module Synvert::Core
   # we have to put those 2 actions into 2 within_file scopes.
   class Rewriter::WrapAction < Rewriter::Action
     def initialize(instance, with:, indent: nil)
-      @instance = instance
-      @code = with
-      @node = @instance.current_node
-      @indent = indent || @node.indent
+      super(instance, with)
+      @indent = indent || @node.column
     end
 
     # Begin position of code to wrap.

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.0'
+    VERSION = '0.53.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/{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.0
+  version: 0.53.0
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-11 00:00:00.000000000 Z
+date: 2021-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -194,12 +194,12 @@ files:
 - spec/synvert/core/rewriter/instance_spec.rb
 - spec/synvert/core/rewriter/ruby_version_spec.rb
 - spec/synvert/core/rewriter/scope/goto_scope_spec.rb
-- spec/synvert/core/rewriter/scope/within_scope.rb
+- spec/synvert/core/rewriter/scope/within_scope_spec.rb
 - 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: {}
@@ -218,7 +218,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: convert ruby code to better syntax.
@@ -247,7 +247,7 @@ test_files:
 - spec/synvert/core/rewriter/instance_spec.rb
 - spec/synvert/core/rewriter/ruby_version_spec.rb
 - spec/synvert/core/rewriter/scope/goto_scope_spec.rb
-- spec/synvert/core/rewriter/scope/within_scope.rb
+- spec/synvert/core/rewriter/scope/within_scope_spec.rb
 - spec/synvert/core/rewriter/scope_spec.rb
 - spec/synvert/core/rewriter/warning_spec.rb
 - spec/synvert/core/rewriter_spec.rb