synvert-core 0.15.1 → 0.15.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 991ca9778419ac8a11db3c9828322a98538168b99ef4771a92db7ac97b472f8d
-  data.tar.gz: 863462dccb67e99f09663630450004468dbb2278831cb21e6a1c9f4231498885
+  metadata.gz: d2aaa8ceb8c8b0961d58714137b5022acbd369cc610e7a38b6da928cbb7ba86c
+  data.tar.gz: b7fe630b61237f937e4f0b81382a2b2794facf68c93f0c0f98ce58d96b251874
 SHA512:
-  metadata.gz: c452bfc0e989411e73ddaeeadf99d2929d9218ab7ff19ea2e54acbcc700b3a453fee082b3b0098b600860d1c398a2125c5edfffe8c4238f7d30df0f16324786e
-  data.tar.gz: 31c1e7290e440e4dca4b6e16af84bc4c61f41203e256d4fff10c4543cb82ab4cb6e15a251e7747bde41a2b9823945bf98aa77d00f5df6abc66ff84aacb05f3cd
+  metadata.gz: 7ec722e6324794f00fe7152aadb17e02532b654f6a00a15f08c0fd4b0569fd722cea3a9328e5ed2fa2d8c07fc7c2ad263dd44f78970e9eac7e5db8aac9e1dfac
+  data.tar.gz: 0b0ef0c5ec24954255ee2d1e5e1c6537571d51fbfeedd0999b3d2ee00d70cdc2b231d96626077793ab0614c78896c494d3e177541e28d3c387bbc524336294c1

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

@@ -4,6 +4,7 @@ module Synvert::Core
   # Action defines rewriter action, add, replace or remove code.
   class Rewriter::Action
     DEFAULT_OPTIONS = { autoindent: true }
+    DEFAULT_INDENT = 2
 
     # Initialize an action.
     #
@@ -45,4 +46,3 @@ module Synvert::Core
     end
   end
 end
-

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

@@ -1,8 +1,10 @@
 # encoding: utf-8
 
 module Synvert::Core
-  # AppendWithAction to append code to the bottom of node body.
+  # AppendAction to append code to the bottom of node body.
   class Rewriter::AppendAction < Rewriter::Action
+    END_LENGTH = "\nend".length
+
     # Begin position to append code.
     #
     # @return [Integer] begin position.
@@ -10,7 +12,7 @@ module Synvert::Core
       if :begin == @node.type
         @node.loc.expression.end_pos
       else
-        @node.loc.expression.end_pos - @node.indent - 4
+        @node.loc.expression.end_pos - @node.indent - END_LENGTH
       end
     end
 
@@ -29,7 +31,7 @@ module Synvert::Core
     # @return [String] n times whitesphace
     def indent(node)
       if [:block, :class].include? node.type
-        ' ' * (node.indent + 2)
+        ' ' * (node.indent + DEFAULT_INDENT)
       else
         ' ' * node.indent
       end

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

@@ -3,11 +3,20 @@
 module Synvert::Core
   # InsertAction to insert code to the top of node body.
   class Rewriter::InsertAction < Rewriter::Action
+    DO_LENGTH = " do".length
+
     # Begin position to insert code.
     #
     # @return [Integer] begin position.
     def begin_pos
-      insert_position(@node)
+      case @node.type
+      when :block
+        @node.children[1].children.empty? ? @node.children[0].loc.expression.end_pos + DO_LENGTH : @node.children[1].loc.expression.end_pos
+      when :class
+        @node.children[1] ? @node.children[1].loc.expression.end_pos : @node.children[0].loc.expression.end_pos
+      else
+        @node.children.last.loc.expression.end_pos
+      end
     end
 
     # End position, always same to begin position.
@@ -19,27 +28,13 @@ module Synvert::Core
 
   private
 
-    # Insert position.
-    #
-    # @return [Integer] insert position.
-    def insert_position(node)
-      case node.type
-      when :block
-        node.children[1].children.empty? ? node.children[0].loc.expression.end_pos + 3 : node.children[1].loc.expression.end_pos
-      when :class
-        node.children[1] ? node.children[1].loc.expression.end_pos : node.children[0].loc.expression.end_pos
-      else
-        node.children.last.loc.expression.end_pos
-      end
-    end
-
     # Indent of the node.
     #
     # @param node [Parser::AST::Node]
     # @return [String] n times whitesphace
     def indent(node)
       if [:block, :class].include? node.type
-        ' ' * (node.indent + 2)
+        ' ' * (node.indent + DEFAULT_INDENT)
       else
         ' ' * node.indent
       end

data/lib/synvert/core/version.rb

@@ -2,6 +2,6 @@
 
 module Synvert
   module Core
-    VERSION = "0.15.1"
+    VERSION = "0.15.2"
   end
 end

data/synvert-core.gemspec

@@ -18,11 +18,11 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "parser", "~> 2.6.5"
+  spec.add_runtime_dependency "parser", "~> 3.0.0"
   spec.add_runtime_dependency "activesupport"
   spec.add_runtime_dependency "erubis"
 
-  spec.add_development_dependency "bundler", "~> 1.6"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "guard"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: synvert-core
 version: !ruby/object:Gem::Version
-  version: 0.15.1
+  version: 0.15.2
 platform: ruby
 authors:
 - Richard Huang
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-10-11 00:00:00.000000000 Z
+date: 2021-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.5
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.5
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -56,16 +56,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -194,7 +194,7 @@ homepage: https://github.com/xinminlabs/synvert-core
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -209,8 +209,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: convert ruby code to better syntax.
 test_files: