synvert-core 1.28.1 → 1.28.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4fb6d702f10d7ac7f1aace3ed75a7706e7c293475b216895505b2a6ec3d3d5ef
-  data.tar.gz: f9f1f1ef09c986afa9a6553778b4d099bad26486aad1eb316468d6832013c6a8
+  metadata.gz: 4ea0617537582c8fe24441b78a96a9e7e3ec74ef50a85bd761f1a2c620bb67ae
+  data.tar.gz: 30aed9720e68b3014aced6cea3d80dcf48d746ffcc217b543c6211cd29545468
 SHA512:
-  metadata.gz: b3fbd20c3d94848a6a0dd2986f56e9da445146aaa0c3c65439e5160ae7dafdac8adfc25a4f3c74ee6498f5f59fcaec4cc6584fcfd4a2c97884d872adac86f5b6
-  data.tar.gz: 5c0d934f77c21efbfc7be6ffecff8e39cfa749c2107cc00fdd989620356f0c0dcdc79cc177b35d80c534b4850797196502e3170e15edbb24da55dbe4674cf322
+  metadata.gz: b4c4d9a0fe6833d651c25d9a574818a54976c5ffcd6ef018208763f277b990735361fca476488bfa831e8a4d5dcb96bc4b092bfc10506b5e6306b6a5941f3dd6
+  data.tar.gz: 4abe08f1cc6cf27ef830dbfcedb943737d11a377e5f87df3d6a7f67eabc6c6d790e86de647fe81a495a147cc1e2c90950a933c378665add69864f66b18a80fc2

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # CHANGELOG
 
+## 1.28.3 (2023-06-22)
+
+* Update `node_mutation` to 1.19.1
+* Remove `node_ext`
+
+## 1.28.2 (2023-06-17)
+
+* Update `node_query` to 1.13.5
+
 ## 1.28.1 (2023-06-14)
 
 * Do not use keyword options in `call_helper`

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    synvert-core (1.28.1)
+    synvert-core (1.28.3)
       activesupport (< 7.0.0)
-      node_mutation (>= 1.18.3)
-      node_query (>= 1.13.3)
+      node_mutation (>= 1.19.1)
+      node_query (>= 1.13.5)
       parallel
       parser
       parser_node_ext (>= 1.2.0)
@@ -48,10 +48,10 @@ GEM
       rb-inotify (~> 0.9, >= 0.9.10)
     lumberjack (1.2.8)
     method_source (1.0.0)
-    minitest (5.18.0)
+    minitest (5.18.1)
     nenv (0.3.0)
-    node_mutation (1.18.3)
-    node_query (1.13.3)
+    node_mutation (1.19.1)
+    node_query (1.13.5)
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)

data/lib/synvert/core/version.rb

@@ -2,6 +2,6 @@
 
 module Synvert
   module Core
-    VERSION = '1.28.1'
+    VERSION = '1.28.3'
   end
 end

data/lib/synvert/core.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'synvert/core/version'
-require_relative './core/node_ext'
 require 'active_support'
 require 'active_support/core_ext'
 require 'node_query'

data/synvert-core-ruby.gemspec

@@ -20,8 +20,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "activesupport", "< 7.0.0"
-  spec.add_runtime_dependency "node_query", ">= 1.13.3"
-  spec.add_runtime_dependency "node_mutation", ">= 1.18.3"
+  spec.add_runtime_dependency "node_query", ">= 1.13.5"
+  spec.add_runtime_dependency "node_mutation", ">= 1.19.1"
   spec.add_runtime_dependency "parser"
   spec.add_runtime_dependency "parser_node_ext", ">= 1.2.0"
   spec.add_runtime_dependency "syntax_tree"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: synvert-core
 version: !ruby/object:Gem::Version
-  version: 1.28.1
+  version: 1.28.3
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-14 00:00:00.000000000 Z
+date: 2023-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.13.3
+        version: 1.13.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.13.3
+        version: 1.13.5
 - !ruby/object:Gem::Dependency
   name: node_mutation
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.18.3
+        version: 1.19.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.18.3
+        version: 1.19.1
 - !ruby/object:Gem::Dependency
   name: parser
   requirement: !ruby/object:Gem::Requirement
@@ -149,7 +149,6 @@ files:
 - lib/synvert/core/engine/slim.rb
 - lib/synvert/core/errors.rb
 - lib/synvert/core/helper.rb
-- lib/synvert/core/node_ext.rb
 - lib/synvert/core/rewriter.rb
 - lib/synvert/core/rewriter/action/replace_erb_stmt_with_expr_action.rb
 - lib/synvert/core/rewriter/condition.rb
@@ -173,7 +172,6 @@ files:
 - spec/synvert/core/engine/haml_spec.rb
 - spec/synvert/core/engine/slim_spec.rb
 - spec/synvert/core/helper_spec.rb
-- spec/synvert/core/node_ext_spec.rb
 - spec/synvert/core/rewriter/action/replace_erb_stmt_with_expr_action_spec.rb
 - spec/synvert/core/rewriter/condition/if_exist_condition_spec.rb
 - spec/synvert/core/rewriter/condition/if_only_exist_condition_spec.rb
@@ -220,7 +218,6 @@ test_files:
 - spec/synvert/core/engine/haml_spec.rb
 - spec/synvert/core/engine/slim_spec.rb
 - spec/synvert/core/helper_spec.rb
-- spec/synvert/core/node_ext_spec.rb
 - spec/synvert/core/rewriter/action/replace_erb_stmt_with_expr_action_spec.rb
 - spec/synvert/core/rewriter/condition/if_exist_condition_spec.rb
 - spec/synvert/core/rewriter/condition/if_only_exist_condition_spec.rb

data/lib/synvert/core/node_ext.rb

@@ -1,130 +0,0 @@
-# frozen_string_literal: true
-
-require 'parser'
-
-module Parser::AST
-  # Extend Parser::AST::Node.
-  # {https://github.com/whitequark/parser/blob/master/lib/parser/ast/node.rb}
-  #
-  # Rules
-  #
-  # Synvert compares ast nodes with key / value pairs, each ast node has
-  # multiple attributes, e.g. +receiver+, +message+ and +arguments+, it
-  # matches only when all of key / value pairs match.
-  #
-  # +type: 'send', message: :include, arguments: ['FactoryGirl::Syntax::Methods']+
-  #
-  # Synvert does comparison based on the value type
-  #
-  # 1. if value is a symbol, then compares ast node value as symbol, e.g. +message: :include+
-  # 2. if value is a string, then compares ast node original source code, e.g. +name: 'Synvert::Application'+
-  # 3. if value is a regexp, then compares ast node original source code, e.g. +message: /find_all_by_/+
-  # 4. if value is an array, then compares each ast node, e.g. +arguments: ['FactoryGirl::Syntax::Methods']+
-  # 5. if value is nil, then check if ast node is nil, e.g. +arguments: [nil]+
-  # 6. if value is true or false, then check if ast node is :true or :false, e.g. +arguments: [false]+
-  # 7. if value is ast, then compare ast node directly, e.g. +to_ast: Parser::CurrentRuby.parse("self.class.serialized_attributes")+
-  #
-  # It can also compare nested key / value pairs, like
-  #
-  # +type: 'send', receiver: { type: 'send', receiver: { type: 'send', message: 'config' }, message: 'active_record' }, message: 'identity_map='+
-  #
-  # Source Code to Ast Node
-  # {https://playground.synvert.net/ruby}
-  class Node
-    # Get the file name of node.
-    #
-    # @return [String] file name.
-    def filename
-      loc.expression&.source_buffer.name
-    end
-
-    # Get the column of node.
-    #
-    # @return [Integer] column.
-    def column
-      loc.expression.column
-    end
-
-    # Get the line of node.
-    #
-    # @return [Integer] line.
-    def line
-      loc.expression.line
-    end
-
-    # Strip curly braces for hash.
-    # @example
-    #   node # s(:hash, s(:pair, s(:sym, :foo), s(:str, "bar")))
-    #   node.strip_curly_braces # "foo: 'bar'"
-    # @return [String]
-    def strip_curly_braces
-      return to_source unless type == :hash
-
-      to_source.sub(/^{(.*)}$/) { Regexp.last_match(1).strip }
-    end
-
-    # Wrap curly braces for hash.
-    # @example
-    #   node # s(:hash, s(:pair, s(:sym, :foo), s(:str, "bar")))
-    #   node.wrap_curly_braces # "{ foo: 'bar' }"
-    # @return [String]
-    def wrap_curly_braces
-      return to_source unless type == :hash
-
-      "{ #{to_source} }"
-    end
-
-    # Get single quote string.
-    # @example
-    #   node # s(:str, "foobar")
-    #   node.to_single_quote # "'foobar'"
-    # @return [String]
-    def to_single_quote
-      return to_source unless type == :str
-
-      "'#{to_value}'"
-    end
-
-    # Convert string to symbol.
-    # @example
-    #   node # s(:str, "foobar")
-    #   node.to_symbol # ":foobar"
-    # @return [String]
-    def to_symbol
-      return to_source unless type == :str
-
-      ":#{to_value}"
-    end
-
-    # Convert symbol to string.
-    # @example
-    #   node # s(:sym, :foobar)
-    #   node.to_string # "foobar"
-    # @return [String]
-    def to_string
-      return to_source unless type == :sym
-
-      to_value.to_s
-    end
-
-    # Convert lambda {} to -> {}
-    # @example
-    #   node # s(:block, s(:send, nil, :lambda), s(:args), s(:send, nil, :foobar))
-    #   node.to_lambda_literal # "-> { foobar }"
-    # @return [String]
-    def to_lambda_literal
-      if type == :block && caller.type == :send && caller.receiver.nil? && caller.message == :lambda
-        new_source = to_source
-        if arguments.size > 1
-          new_source = new_source[0...arguments.first.loc.expression.begin_pos - 2] + new_source[arguments.last.loc.expression.end_pos + 1..-1]
-          new_source = new_source.sub('lambda', "->(#{arguments.map(&:to_source).join(', ')})")
-        else
-          new_source = new_source.sub('lambda', '->')
-        end
-        new_source
-      else
-        to_source
-      end
-    end
-  end
-end

data/spec/synvert/core/node_ext_spec.rb

@@ -1,108 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-describe Parser::AST::Node do
-  describe '#strip_curly_braces' do
-    context 'hash node' do
-      it 'removes curly braces' do
-        node = parser_parse("{ foo: 'bar' }")
-        expect(node.strip_curly_braces).to eq("foo: 'bar'")
-      end
-    end
-
-    context 'other node' do
-      it 'do nothing' do
-        node = parser_parse("'foobar'")
-        expect(node.strip_curly_braces).to eq("'foobar'")
-      end
-    end
-  end
-
-  describe '#wrap_curly_braces' do
-    context 'hash node' do
-      it 'adds curly braces' do
-        node = parser_parse("test(foo: 'bar')").arguments.first
-        expect(node.to_source).to eq("foo: 'bar'")
-        expect(node.wrap_curly_braces).to eq("{ foo: 'bar' }")
-      end
-    end
-
-    context 'other node' do
-      it 'does nothing' do
-        node = parser_parse("'foobar'")
-        expect(node.wrap_curly_braces).to eq("'foobar'")
-      end
-    end
-  end
-
-  describe '#to_single_quote' do
-    context 'str node' do
-      it 'converts double quote to single quote' do
-        node = parser_parse('"foobar"')
-        expect(node.to_source).to eq '"foobar"'
-        expect(node.to_single_quote).to eq "'foobar'"
-      end
-    end
-
-    context 'other node' do
-      it 'does nothing' do
-        node = parser_parse(':foobar')
-        expect(node.to_single_quote).to eq ':foobar'
-      end
-    end
-  end
-
-  describe '#to_symbol' do
-    context 'str node' do
-      it 'converts string to symbol' do
-        node = parser_parse("'foobar'")
-        expect(node.to_symbol).to eq ':foobar'
-      end
-    end
-
-    context 'other node' do
-      it 'does nothing' do
-        node = parser_parse(':foobar')
-        expect(node.to_symbol).to eq ':foobar'
-      end
-    end
-  end
-
-  describe '#to_string' do
-    context 'sym node' do
-      it 'converts symbol to string' do
-        node = parser_parse(':foobar')
-        expect(node.to_string).to eq 'foobar'
-      end
-    end
-
-    context 'other node' do
-      it 'does nothing' do
-        node = parser_parse("'foobar'")
-        expect(node.to_string).to eq "'foobar'"
-      end
-    end
-  end
-
-  describe '#to_lambda_literal' do
-    context 'lambda node' do
-      it 'converts to lambda literal without arguments' do
-        node = parser_parse('lambda { foobar }')
-        expect(node.to_lambda_literal).to eq('-> { foobar }')
-      end
-
-      it 'converts to lambda literal with arguments' do
-        node = parser_parse('lambda { |x, y| foobar }')
-        expect(node.to_lambda_literal).to eq('->(x, y) { foobar }')
-      end
-    end
-
-    context 'other node' do
-      it 'does nothing' do
-        node = parser_parse(':foobar')
-        expect(node.to_lambda_literal).to eq ':foobar'
-      end
-    end
-  end
-end