synvert-core 0.45.0 → 0.47.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79cd6bc1c9d3e69d97ee47a276165412326be82a0d87f4527742c6d6c2acdca8
-  data.tar.gz: efa16f88a2a075aa33b3dc5aba653e8c188317840a5a0af75dfba87878a4c7d3
+  metadata.gz: c9673a5aa5ad59322786e09e99a527e7f7a7e05c7067200c9baed0602c7c1fe2
+  data.tar.gz: e946fa740f8678faa4f1cb856c2d6a54b4b0c09ed10084110bb78648da1a7497
 SHA512:
-  metadata.gz: 51115212e46d96e19fc611a565535246e0fa25d43b8ad6d8830c7e149571b0ff682621ba9525a2d9ab0250d1a98afde7f02d5d8f414457d00fcbbd5bf5352372
-  data.tar.gz: a6b3c930b1183abd25ee03e5c371a5a937f22e686e975f8de48afb882ff82deb8b43432ada7ff85254c2f04e7be1081bca8b7cd4af475cc94ad1250fd8c02846
+  metadata.gz: cebcaad6d3a1162b0ceb8354ae2d598f18e70474e068b8a91cdea8440c83f02280afae97adb8c923a5dbe7750138f02e5b73a633f4b7dbd9dfa9b0c90962c14a
+  data.tar.gz: b482a97216175c0a16492bdb23294acc33727493202c088d44a94fb73f15df6263d1addf2df5e2ef53cecc7147ff475e67c12e2eb9f3451b6c92b4b47eee42d4

data/CHANGELOG.md

@@ -1,17 +1,29 @@
 # CHANGELOG
 
-# 0.45.0 (2021-07-22)
+## 0.47.0 (2021-07-28)
+
+* Add `to_single_quote` to `str` node
+* Add `to_symbol` to `str` node
+* Add `to_lambda_literal` to `lambda` node
+
+## 0.46.0 (2021-07-25)
+
+* Add `strip_curly_braces` and `wrap_curly_braces` for `hash` node
+* Simplify symbol `match_value?`
+* Unwrap quote when matching string value
+
+## 0.45.0 (2021-07-22)
 
 * Handle `nil` child node for `begin_pos` and `end_pos`
 * Remove `Rewriter::Instance` options
 
-# 0.44.0 (2021-07-19)
+## 0.44.0 (2021-07-19)
 
 * Return rewrtier after executing snippet
 * `left_value` and `right_value` support `or_asgn` node
 * `child_node_range` supports send `parentheses`
 
-# 0.42.0 (2021-07-11)
+## 0.42.0 (2021-07-11)
 
 * Match string with quote
 * `match_value?` returns true if actual and expected are the same

data/lib/synvert/core/node_ext.rb

@@ -490,6 +490,50 @@ module Parser::AST
       end
     end
 
+    # strip curly braces for hash
+    def strip_curly_braces
+      return to_source unless type == :hash
+
+      to_source.sub(/^{(.*)}$/) { Regexp.last_match(1).strip }
+    end
+
+    # wrap curly braces for hash
+    def wrap_curly_braces
+      return to_source unless type == :hash
+
+      "{ #{to_source} }"
+    end
+
+    # get single quote string
+    def to_single_quote
+      return to_source unless type == :str
+
+      "'#{to_value}'"
+    end
+
+    # convert string to symbol
+    def to_symbol
+      return to_source unless type == :str
+
+      ":#{to_value}"
+    end
+
+    # convert lambda {} to -> {}
+    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.loc.begin.to_range.begin - 1] + new_source[arguments.loc.end.to_range.end..-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
+
     private
 
     # Compare actual value with expected value.
@@ -504,15 +548,14 @@ module Parser::AST
       case expected
       when Symbol
         if actual.is_a?(Parser::AST::Node)
-          actual.to_source == ":#{expected}"
+          actual.to_value == expected
         else
           actual.to_sym == expected
         end
       when String
         if actual.is_a?(Parser::AST::Node)
-          return true if (Parser::CurrentRuby.parse(expected) == actual rescue nil)
-          actual.to_source == expected || (actual.to_source[0] == ':' && actual.to_source[1..-1] == expected) ||
-            actual.to_source[1...-1] == expected
+          actual.to_source == expected || actual.to_value == expected ||
+            actual.to_source == unwrap_quote(expected) || actual.to_value == unwrap_quote(expected)
         else
           actual.to_s == expected || wrap_quote(actual.to_s) == expected
         end
@@ -591,5 +634,13 @@ module Parser::AST
         "'#{string}'"
       end
     end
+
+    def unwrap_quote(string)
+      if (string[0] == '"' && string[-1] == '"') || (string[0] == "'" && string[-1] == "'")
+        string[1...-1]
+      else
+        string
+      end
+    end
   end
 end

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

@@ -66,7 +66,7 @@ module Synvert::Core
     #   strip_brackets("(1..100)") #=> "1..100"
     def strip_brackets(code)
       code.sub(/^\((.*)\)$/) { Regexp.last_match(1) }.sub(/^\[(.*)\]$/) { Regexp.last_match(1) }.sub(/^{(.*)}$/) {
-        Regexp.last_match(1)
+        Regexp.last_match(1).strip
       }
     end
 

data/lib/synvert/core/version.rb

@@ -2,6 +2,6 @@
 
 module Synvert
   module Core
-    VERSION = '0.45.0'
+    VERSION = '0.47.0'
   end
 end

data/spec/synvert/core/node_ext_spec.rb

@@ -679,4 +679,91 @@ describe Parser::AST::Node do
       EOS
     end
   end
+
+  describe '#strip_curly_braces' do
+    context 'hash node' do
+      it 'removes curly braces' do
+        node = parse("{ foo: 'bar' }")
+        expect(node.strip_curly_braces).to eq("foo: 'bar'")
+      end
+    end
+
+    context 'other node' do
+      it 'do nothing' do
+        node = 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 = 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 = 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 = 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 = 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 = parse("'foobar'")
+        expect(node.to_symbol).to eq ':foobar'
+      end
+    end
+
+    context 'other node' do
+      it 'does nothing' do
+        node = parse(':foobar')
+        expect(node.to_symbol).to eq ':foobar'
+      end
+    end
+  end
+
+  describe '#to_lambda_literal' do
+    context 'lambda node' do
+      it 'converts to lambda literal without arguments' do
+        node = parse('lambda { foobar }')
+        expect(node.to_lambda_literal).to eq('-> { foobar }')
+      end
+
+      it 'converts to lambda literal with arguments' do
+        node = 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 = parse(':foobar')
+        expect(node.to_lambda_literal).to eq ':foobar'
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: synvert-core
 version: !ruby/object:Gem::Version
-  version: 0.45.0
+  version: 0.47.0
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-22 00:00:00.000000000 Z
+date: 2021-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport