synvert-core 0.20.1 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e79328425014eade02674c22ee7649670616cb47a023f1e75e2d81ba9eb2411
-  data.tar.gz: 33b1adcd23f4a5b9906b9d3b51a2c566e9e1ebf9a10edb898502481c660065fa
+  metadata.gz: bdaf84db78fb98d9d71b00025af06c099f821fc8a178002ecbc5b5e3ff68c740
+  data.tar.gz: 46ddc90eea269bb83475296081acfd0f73ed13ee94d7523bdd0e5e15434c760e
 SHA512:
-  metadata.gz: d72029dfcba9c771d2abc464fd6a51cb3a3aefbdc4faad59c8dafc69bf8756c0b9535ea5c3090d87d974576625d74cb20dd621c952590a3bb209d40be64ae01f
-  data.tar.gz: c96c45e9ae82b5d34286392eb593b9298ab7ee6b9536b40e0638986377d20418de52132875e5357adf99854f75c4bdb47fcea742388f4b11e14156d21e9ae3ad
+  metadata.gz: c84578b52bf4bf4f60136f764b0df276c97c4ee32be3595fd55b1303a823f282fc35f6dfee1a68166b85b0b592a2f239b22b796b0f10af861ea62bdb11e29641
+  data.tar.gz: dd47cdf203979bbd4b1cd8e164cffe6561894d25a3edcd98527983bbf46d7089f92e04d01db28893a8ac6fa1182ab846210fee4137b8b18fbbdf746f3fa0e144

data/CHANGELOG.md

@@ -1,9 +1,10 @@
 # CHANGELOG
 
-## 0.20.1 (2021-02-20)
+## 0.21.0 (2021-02-25)
 
-* Set env['BUNDLE_GEMFILE'] before parsing Gemfile.lock
-* Add Rewriter::RubyVersion test
+* Set `env['BUNDLE_GEMFILE']` before parsing `Gemfile.lock`
+* Add `Rewriter::RubyVersion` test
+* Add `reject_keys_from_hash` helper method
 
 ## 0.20.0 (2021-02-15)
 

data/lib/synvert/core/engine/erb.rb

@@ -31,21 +31,23 @@ module Synvert::Core
         private
 
         def decode_ruby_stmt(source)
-          source.gsub(/#{ERUBY_STMT_SPLITTER}(.+?)#{ERUBY_STMT_SPLITTER}/m) { "<%#{$1}%>" }
+          source.gsub(/#{ERUBY_STMT_SPLITTER}(.+?)#{ERUBY_STMT_SPLITTER}/mo) { "<%#{Regexp.last_match(1)}%>" }
         end
 
         def decode_ruby_output(source)
-          source.gsub(/@output_buffer.append=\((.+?)\);#{ERUBY_EXPR_SPLITTER}/m) { "<%=#{$1}%>" }.gsub(
-            /@output_buffer.append= (.+?)\s+(do|\{)(\s*\|[^|]*\|)?\s*#{ERUBY_EXPR_SPLITTER}/m
-          ) { |m| "<%=#{m.sub('@output_buffer.append= ', '').sub(ERUBY_EXPR_SPLITTER, '')}%>" }
+          source.gsub(/@output_buffer.append=\((.+?)\);#{ERUBY_EXPR_SPLITTER}/mo) {
+            "<%=#{Regexp.last_match(1)}%>"
+          }.gsub(/@output_buffer.append= (.+?)\s+(do|\{)(\s*\|[^|]*\|)?\s*#{ERUBY_EXPR_SPLITTER}/mo) { |m|
+            "<%=#{m.sub('@output_buffer.append= ', '').sub(ERUBY_EXPR_SPLITTER, '')}%>"
+          }
         end
 
         def decode_html_output(source)
-          source.gsub(/@output_buffer.safe_append='(.+?)'.freeze;/m) { reverse_escape_text($1) }.gsub(
-            /@output_buffer.safe_append=\((.+?)\);#{ERUBY_EXPR_SPLITTER}/m
-          ) { reverse_escape_text($1) }.gsub(
-            /@output_buffer.safe_append=(.+?)\s+(do|\{)(\s*\|[^|]*\|)?\s*#{ERUBY_EXPR_SPLITTER}/m
-          ) { reverse_escape_text($1) }
+          source.gsub(/@output_buffer.safe_append='(.+?)'.freeze;/m) { reverse_escape_text(Regexp.last_match(1)) }.gsub(
+            /@output_buffer.safe_append=\((.+?)\);#{ERUBY_EXPR_SPLITTER}/mo
+          ) { reverse_escape_text(Regexp.last_match(1)) }.gsub(
+            /@output_buffer.safe_append=(.+?)\s+(do|\{)(\s*\|[^|]*\|)?\s*#{ERUBY_EXPR_SPLITTER}/mo
+          ) { reverse_escape_text(Regexp.last_match(1)) }
         end
 
         def remove_erubis_buf(source)
@@ -97,7 +99,7 @@ module Synvert::Core
 
       def add_expr_literal(src, code)
         flush_newline_if_pending(src)
-        if code =~ BLOCK_EXPR
+        if BLOCK_EXPR.match?(code)
           src << '@output_buffer.append= ' << code << ERUBY_EXPR_SPLITTER
         else
           src << '@output_buffer.append=(' << code << ');' << ERUBY_EXPR_SPLITTER
@@ -106,7 +108,7 @@ module Synvert::Core
 
       def add_expr_escaped(src, code)
         flush_newline_if_pending(src)
-        if code =~ BLOCK_EXPR
+        if BLOCK_EXPR.match?(code)
           src << '@output_buffer.safe_append= ' << code << ERUBY_EXPR_SPLITTER
         else
           src << '@output_buffer.safe_append=(' << code << ');' << ERUBY_EXPR_SPLITTER
@@ -119,9 +121,9 @@ module Synvert::Core
           index =
             case code
             when /\A(\s*)\r?\n/
-              $1.length
+              Regexp.last_match(1).length
             when /\A(\s+)/
-              $1.end_with?(' ') ? $1.length - 1 : $1.length
+              Regexp.last_match(1).end_with?(' ') ? Regexp.last_match(1).length - 1 : Regexp.last_match(1).length
             else
               0
             end

data/lib/synvert/core/node_ext.rb

@@ -321,11 +321,11 @@ module Parser::AST
     #
     # @yield [child] Gives a child node.
     # @yieldparam child [Parser::AST::Node] child node
-    def recursive_children
+    def recursive_children(&block)
       children.each do |child|
-        if Parser::AST::Node === child
+        if child.is_a?(Parser::AST::Node)
           yield child
-          child.recursive_children { |c| yield c }
+          child.recursive_children(&block)
         end
       end
     end
@@ -364,7 +364,7 @@ module Parser::AST
     # @raise [Synvert::Core::MethodNotSupported] if string in block {{ }} does not support.
     def rewritten_source(code)
       code.gsub(/{{(.*?)}}/m) do
-        old_code = $1
+        old_code = Regexp.last_match(1)
         if respond_to? old_code.split(/\.|\[/).first
           evaluated = instance_eval old_code
           case evaluated
@@ -410,20 +410,20 @@ module Parser::AST
     def match_value?(actual, expected)
       case expected
       when Symbol
-        if Parser::AST::Node === actual
+        if actual.is_a?(Parser::AST::Node)
           actual.to_source == ":#{expected}"
         else
           actual.to_sym == expected
         end
       when String
-        if Parser::AST::Node === actual
+        if actual.is_a?(Parser::AST::Node)
           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
         end
       when Regexp
-        if Parser::AST::Node === actual
+        if actual.is_a?(Parser::AST::Node)
           actual.to_source =~ Regexp.new(expected.to_s, Regexp::MULTILINE)
         else
           actual.to_s =~ Regexp.new(expected.to_s, Regexp::MULTILINE)
@@ -435,7 +435,7 @@ module Parser::AST
       when NilClass
         actual.nil?
       when Numeric
-        if Parser::AST::Node === actual
+        if actual.is_a?(Parser::AST::Node)
           actual.children[0] == expected
         else
           actual == expected

data/lib/synvert/core/rewriter/condition/if_exist_condition.rb

@@ -7,7 +7,7 @@ module Synvert::Core
     def match?
       match = false
       @instance.current_node.recursive_children do |child_node|
-        match ||= (child_node&.match?(@rules))
+        match ||= child_node&.match?(@rules)
       end
       match
     end

data/lib/synvert/core/rewriter/condition/unless_exist_condition.rb

@@ -7,7 +7,7 @@ module Synvert::Core
     def match?
       match = false
       @instance.current_node.recursive_children do |child_node|
-        match ||= (child_node&.match?(@rules))
+        match ||= child_node&.match?(@rules)
       end
       !match
     end

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

@@ -17,7 +17,7 @@ module Synvert::Core
 
     # If condition matches, run the block code.
     def process
-      @instance.instance_eval &@block if match?
+      @instance.instance_eval(&@block) if match?
     end
   end
 end

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

@@ -12,7 +12,7 @@ module Synvert::Core
     #   comparator key can be eq, lt, gt, lte, gte or ne.
     def initialize(name, comparator)
       @name = name
-      if Hash === comparator
+      if comparator.is_a?(Hash)
         @operator = comparator.keys.first
         @version = Gem::Version.new comparator.values.first
       else

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

@@ -65,7 +65,23 @@ module Synvert::Core
     #
     #   strip_brackets("(1..100)") #=> "1..100"
     def strip_brackets(code)
-      code.sub(/^\((.*)\)$/) { $1 }.sub(/^\[(.*)\]$/) { $1 }.sub(/^{(.*)}$/) { $1 }
+      code.sub(/^\((.*)\)$/) { Regexp.last_match(1) }.sub(/^\[(.*)\]$/) { Regexp.last_match(1) }.sub(/^{(.*)}$/) {
+        Regexp.last_match(1)
+      }
+    end
+
+    # Reject some keys from hash node.
+    #
+    # @param hash_node [Parser::AST::Node]
+    # @param keys [Array] keys should be rejected from the hash.
+    # @return [String] source of of the hash node after rejecting some keys.
+    #
+    # @example
+    #
+    #   hash_node = Parser::CurrentRuby.parse("{ key1: 'value1', key2: 'value2' }")
+    #   reject_keys_from_hash(hash_node, :key1) => "key2: 'value2'"
+    def reject_keys_from_hash(hash_node, *keys)
+      hash_node.children.reject { |pair_node| keys.include?(pair_node.key.to_value) }.map(&:to_source).join(', ')
     end
   end
 end

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

@@ -18,7 +18,7 @@ module Synvert::Core
         @file_source[file_path] ||=
           begin
             source = File.read(file_path)
-            source = Engine::ERB.encode(source) if file_path =~ /\.erb$/
+            source = Engine::ERB.encode(source) if /\.erb$/.match?(file_path)
             source
           end
       end
@@ -45,7 +45,7 @@ module Synvert::Core
       # @param file_path [String] file path
       # @param source [String] file source
       def write_file(file_path, source)
-        source = Engine::ERB.decode(source) if file_path =~ /\.erb/
+        source = Engine::ERB.decode(source) if /\.erb/.match?(file_path)
         File.write file_path, source.gsub(/ +\n/, "\n")
         @file_source[file_path] = nil
         @file_ast[file_path] = nil
@@ -101,7 +101,7 @@ module Synvert::Core
 
             process_with_node ast do
               begin
-                instance_eval &@block
+                instance_eval(&@block)
               rescue NoMethodError
                 puts @current_node.debug_info
                 raise

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

@@ -21,7 +21,7 @@ module Synvert::Core
 
       child_node = current_node.send @child_node_name
       @instance.process_with_other_node child_node do
-        @instance.instance_eval &@block
+        @instance.instance_eval(&@block)
       end
     end
   end

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

@@ -26,7 +26,7 @@ module Synvert::Core
       @instance.process_with_node current_node do
         matching_nodes.each do |matching_node|
           @instance.process_with_node matching_node do
-            @instance.instance_eval &@block
+            @instance.instance_eval(&@block)
           end
         end
       end

data/lib/synvert/core/rewriter.rb

@@ -56,7 +56,8 @@ module Synvert::Core
       # @param name [String] the unique rewriter name.
       # @param rewriter [Synvert::Core::Rewriter] the rewriter to register.
       def register(group, name, rewriter)
-        group, name = group.to_s, name.to_s
+        group = group.to_s
+        name = name.to_s
         rewriters[group] ||= {}
         rewriters[group][name] = rewriter
       end
@@ -68,7 +69,8 @@ module Synvert::Core
       # @return [Synvert::Core::Rewriter] the matching rewriter.
       # @raise [Synvert::Core::RewriterNotFound] if the registered rewriter is not found.
       def fetch(group, name)
-        group, name = group.to_s, name.to_s
+        group = group.to_s
+        name = name.to_s
         if exist? group, name
           rewriters[group][name]
         else
@@ -84,7 +86,8 @@ module Synvert::Core
       # @return [Synvert::Core::Rewriter] the registered rewriter.
       # @raise [Synvert::Core::RewriterNotFound] if the registered rewriter is not found.
       def call(group, name, sandbox = false)
-        group, name = group.to_s, name.to_s
+        group = group.to_s
+        name = name.to_s
         if exist? group, name
           rewriter = rewriters[group][name]
           if sandbox
@@ -104,7 +107,8 @@ module Synvert::Core
       # @param name [String] the rewriter name.
       # @return [Boolean] true if the rewriter exist.
       def exist?(group, name)
-        group, name = group.to_s, name.to_s
+        group = group.to_s
+        name = name.to_s
         if rewriters[group] && rewriters[group][name]
           true
         else
@@ -163,7 +167,7 @@ module Synvert::Core
     # Process the rewriter.
     # It will call the block.
     def process
-      instance_eval &@block
+      instance_eval(&@block)
     end
 
     # Process rewriter with sandbox mode.

data/lib/synvert/core/version.rb

@@ -2,6 +2,6 @@
 
 module Synvert
   module Core
-    VERSION = '0.20.1'
+    VERSION = '0.21.0'
   end
 end

data/spec/synvert/core/node_ext_spec.rb

@@ -295,7 +295,7 @@ describe Parser::AST::Node do
 
     it 'get for range' do
       node = parse('(1..10)')
-      expect(node.to_value).to eq (1..10)
+      expect(node.to_value).to eq(1..10)
     end
 
     it 'gets for array' do

data/spec/synvert/core/rewriter/helper_spec.rb

@@ -80,5 +80,17 @@ module Synvert::Core
         expect(dummy_instance.strip_brackets('(123]')).to eq '(123]'
       end
     end
+
+    describe '#reject_keys_from_hash' do
+      it 'rejects single key' do
+        hash_node = Parser::CurrentRuby.parse("{ key1: 'value1', key2: 'value2' }")
+        expect(dummy_instance.reject_keys_from_hash(hash_node, :key1)).to eq "key2: 'value2'"
+      end
+
+      it 'rejects multi keys' do
+        hash_node = Parser::CurrentRuby.parse("{ key1: 'value1', key2: 'value2', key3: 'value3', key4: 'value4' }")
+        expect(dummy_instance.reject_keys_from_hash(hash_node, :key1, :key3)).to eq "key2: 'value2', key4: 'value4'"
+      end
+    end
   end
 end

data/synvert-core.gemspec

@@ -1,5 +1,6 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'synvert/core/version'
 
@@ -8,8 +9,8 @@ Gem::Specification.new do |spec|
   spec.version       = Synvert::Core::VERSION
   spec.authors       = ["Richard Huang"]
   spec.email         = ["flyerhzm@gmail.com"]
-  spec.summary       = %q{convert ruby code to better syntax.}
-  spec.description   = %q{convert ruby code to better syntax automatically.}
+  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.license       = "MIT"
 
@@ -18,13 +19,13 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "parser", "~> 3.0.0"
   spec.add_runtime_dependency "activesupport"
   spec.add_runtime_dependency "erubis"
+  spec.add_runtime_dependency "parser", "~> 3.0.0"
 
   spec.add_development_dependency "bundler"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
   spec.add_development_dependency "guard"
   spec.add_development_dependency "guard-rspec"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
 end

metadata

@@ -1,31 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: synvert-core
 version: !ruby/object:Gem::Version
-  version: 0.20.1
+  version: 0.21.0
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-20 00:00:00.000000000 Z
+date: 2021-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: parser
+  name: activesupport
   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: activesupport
+  name: erubis
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: erubis
+  name: parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: guard
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: guard-rspec
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="