synvert-core 0.28.1 → 0.29.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b240936c7390b45a27e9352da7acec3784499d38d5ec10aae3b3403036df36b5
-  data.tar.gz: a9c9a91d25352ef1c5fc09bd1cc0d8751d4239513a2fcff0e2618ccec6e93855
+  metadata.gz: 31ee6b89cd48a4accb2dc71fdec2e487c534e8d6eb4a9bd6050817cd88f7ba3c
+  data.tar.gz: cd4c005e0f7a21e52e984e5279a45d4325d341b92d67feedbbc455ddc062e0fc
 SHA512:
-  metadata.gz: 92298a2a06c408cac4aa99870f85138bc754dcb286b636976a01eb88f63613e6f81b80a1d0fc680922a394ab6b7167b9bdd70d6bf2b14a89a7f1a6faaf5292d0
-  data.tar.gz: f5c10e0e949dd459035e92fb172ed20ad7717369923a93e77dfb8077c7ba7c45c31da3ef1756768215ccdeff8b6b36fef063fe0b6db9fa53b3b9457bd895c8ae
+  metadata.gz: 4d1e8642e682a155eedb03c6cdbabca55f53f22c258d4774da7200877159ec18c0a7d568823c5c379fd93810d0baf945a2bc139f8444423855c6279241acb0bc
+  data.tar.gz: 73a369f23d1add90b21ce578faf37a3136a6ffcb384f47fa5b3881fd4241af4b087b19fb0d854143ed1e3d9b76f350fc41b2415cddc29671cde3afe0e46d4709

data/CHANGELOG.md

@@ -1,8 +1,9 @@
 # CHANGELOG
 
-## 0.28.1 (2021-04-09)
+## 0.29.0 (2021-04-25)
 
 * Make `child_name_range` support [:block, :pipe]
+* Get key value for hash node
 
 ## 0.28.0 (2021-04-07)
 

data/lib/synvert/core/node_ext.rb

@@ -203,7 +203,7 @@ module Parser::AST
     def hash_value(key)
       if :hash == type
         value_node = children.find { |pair_node| pair_node.key.to_value == key }
-        value_node ? value_node.value : nil
+        value_node&.value
       else
         raise Synvert::Core::MethodNotSupported, "hash_value is not handled for #{debug_info}"
       end
@@ -280,6 +280,29 @@ module Parser::AST
       end
     end
 
+    # Respond key value for hash node, e.g.
+    #
+    # Current node is s(:hash, s(:pair, s(:sym, :number), s(:int, 10)))
+    # node.number_value is 10
+    def method_missing(method_name, *args, &block)
+      if :hash == type && method_name.to_s.include?('_value')
+        key = method_name.to_s.sub('_value', '')
+        return hash_value(key.to_sym)&.to_value if key?(key.to_sym)
+        return hash_value(key.to_s)&.to_value if key?(key.to_s)
+      end
+
+      super
+    end
+
+    def respond_to_missing?(method_name, *args)
+      if :hash == type && method_name.to_s.include?('_value')
+        key = method_name.to_s.sub('_value', '')
+        return true if key?(key.to_sym) || key?(key.to_s)
+      end
+
+      super
+    end
+
     def to_s
       if :mlhs == type
         "(#{children.map(&:name).join(', ')})"
@@ -323,35 +346,55 @@ module Parser::AST
     # @return [Parser::Source::Range] source range of child node.
     def child_node_range(child_name)
       case [type, child_name]
-      when [:block, :pipe]
+      when %i[block pipe]
         Parser::Source::Range.new('(string)', arguments.loc.expression.begin_pos, arguments.loc.expression.end_pos)
-      when [:class, :name]
+      when %i[class name]
         loc.name
-      when [:def, :name]
+      when %i[def name]
         loc.name
-      when [:defs, :name]
+      when %i[defs name]
         loc.name
-      when [:defs, :dot]
+      when %i[defs dot]
         loc.operator
-      when [:defs, :self]
+      when %i[defs self]
         Parser::Source::Range.new('(string)', loc.operator.begin_pos - 4, loc.operator.begin_pos)
-      when [:send, :dot]
+      when %i[send dot]
         loc.dot
-      when [:send, :message]
-        loc.operator ? Parser::Source::Range.new('(string)', loc.selector.begin_pos, loc.operator.end_pos) : loc.selector
+      when %i[send message]
+        if loc.operator
+          Parser::Source::Range.new('(string)', loc.selector.begin_pos, loc.operator.end_pos)
+        else
+          loc.selector
+        end
       else
         if respond_to?(child_name)
           child_node = send(child_name)
           return nil if child_node.nil?
+
           if child_node.is_a?(Parser::AST::Node)
-            return Parser::Source::Range.new('(string)', child_node.loc.expression.begin_pos, child_node.loc.expression.end_pos)
+            return(
+              Parser::Source::Range.new(
+                '(string)',
+                child_node.loc.expression.begin_pos,
+                child_node.loc.expression.end_pos
+              )
+            )
           end
+
           # arguments
           return nil if child_node.empty?
-          return Parser::Source::Range.new('(string)', child_node.first.loc.expression.begin_pos, child_node.last.loc.expression.end_pos)
+
+          return(
+            Parser::Source::Range.new(
+              '(string)',
+              child_node.first.loc.expression.begin_pos,
+              child_node.last.loc.expression.end_pos
+            )
+          )
         end
 
-        raise Synvert::Core::MethodNotSupported, "child_node_range is not handled for #{evaluated.inspect}, child_name: #{child_name}"
+        raise Synvert::Core::MethodNotSupported,
+              "child_node_range is not handled for #{evaluated.inspect}, child_name: #{child_name}"
       end
     end
 

data/lib/synvert/core/version.rb

@@ -2,6 +2,6 @@
 
 module Synvert
   module Core
-    VERSION = '0.28.1'
+    VERSION = '0.29.0'
   end
 end

data/spec/synvert/core/node_ext_spec.rb

@@ -333,6 +333,16 @@ describe Parser::AST::Node do
     end
   end
 
+  describe 'key value by method_missing' do
+    it 'gets for key value' do
+      node = parse("{:foo => :bar}")
+      expect(node.foo_value).to eq :bar
+
+      node = parse("{'foo' => 'bar'}")
+      expect(node.foo_value).to eq 'bar'
+    end
+  end
+
   describe '#recursive_children' do
     it 'iterates all children recursively' do
       node = parse('class Synvert; def current_node; @node; end; end')

data/spec/synvert/core/rewriter/action/delete_action_spec.rb

@@ -5,18 +5,18 @@ require 'spec_helper'
 module Synvert::Core
   describe Rewriter::DeleteAction do
     subject {
-      source = "arr.map {}.flatten"
+      source = 'arr.map {}.flatten'
       node = Parser::CurrentRuby.parse(source)
       instance = double(current_node: node)
       Rewriter::DeleteAction.new(instance, :dot, :message)
     }
 
     it 'gets begin_pos' do
-      expect(subject.begin_pos).to eq "arr.map {}".length
+      expect(subject.begin_pos).to eq 'arr.map {}'.length
     end
 
     it 'gets end_pos' do
-      expect(subject.end_pos).to eq "arr.map {}.flatten".length
+      expect(subject.end_pos).to eq 'arr.map {}.flatten'.length
     end
 
     it 'gets rewritten_code' do

data/spec/synvert/core/rewriter/action/replace_action_spec.rb

@@ -6,7 +6,7 @@ module Synvert::Core
   describe Rewriter::ReplaceAction do
     context 'replace with single line' do
       subject {
-        source = "FactoryBot.create(:user)"
+        source = 'FactoryBot.create(:user)'
         node = Parser::CurrentRuby.parse(source)
         instance = double(current_node: node)
         Rewriter::ReplaceAction.new(instance, :receiver, :dot, :message, with: 'create')
@@ -17,7 +17,7 @@ module Synvert::Core
       end
 
       it 'gets end_pos' do
-        expect(subject.end_pos).to eq "FactoryBot.create".length
+        expect(subject.end_pos).to eq 'FactoryBot.create'.length
       end
 
       it 'gets rewritten_code' do

data/synvert-core.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "activesupport"
   spec.add_runtime_dependency "erubis"
-  spec.add_runtime_dependency "parser", "~> 3.0.0"
+  spec.add_runtime_dependency "parser"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "guard"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: synvert-core
 version: !ruby/object:Gem::Version
-  version: 0.28.1
+  version: 0.29.0
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-09 00:00:00.000000000 Z
+date: 2021-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -42,16 +42,16 @@ dependencies:
   name: parser
   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: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -213,7 +213,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: convert ruby code to better syntax.