synvert-core 0.62.1 → 0.63.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79777679e6001f32c8b4bc587e2f007f396eeecd9c0c7e29926e01a3628b4244
-  data.tar.gz: df4d3eda62e9b2f49ec1cf8da96bd98952d7d5af70fd4d6861b206bbc923cca9
+  metadata.gz: a008b0eb8cb6152ae896c550c0b5317f7c9679f9b23f4203c270e34b04f6f76a
+  data.tar.gz: 38ac175aabd6f7b8f598408bcc0615905bc9ee237070d514da3bc2aee30b96be
 SHA512:
-  metadata.gz: c9744e62dc972253304018ac041aa1f4cd01efd8a80a207a77145e088d4d69713ef4ec10ade9fe4d251811b6a8166d8e33b575ea91265fbec4f989a9e29ac376
-  data.tar.gz: cad73e2d256e25370b535a0f623fee47c02f4d5a56e3feaed50f81a798cf3c1dbb0ffd4d6ad04ab167be78fc390703a2a01f0377b79ea621f1674399aa2c7534
+  metadata.gz: e4d2c687d3f1f77ef46347718eec9753d920de3cefe410add119197814a24b8cd246c9442dd5ab09e163b719b9cd326088974d2c3519aa78a14a0fef38986457
+  data.tar.gz: 75dd1ce3fa81439af5667eedf08b5b071394e6f025d3f31887527393c8cfd9057d8d58e9b3306cb8b3150898b065c85c1094f015308b6091844f12f9b0aa4464

data/CHANGELOG.md

@@ -1,8 +1,9 @@
 # CHANGELOG
 
-## 0.62.1 (2022-01-14)
+## 0.63.0 (2022-02-26)
 
 * Add `to` option to `InsertAction`
+* Add `gt`, `gte`, `lt` and `lte` rules
 
 ## 0.62.0 (2021-12-24)
 

data/Gemfile

@@ -4,5 +4,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in synvert.gemspec
 gemspec
-
-gem 'coveralls', require: false

data/lib/synvert/core/node_ext.rb

@@ -487,27 +487,29 @@ module Parser::AST
     # @param rules [Hash] rules to match.
     # @return true if matches.
     def match?(rules)
+      keywords = %i[any contain not in not_in gt gte lt lte]
       flat_hash(rules).keys.all? do |multi_keys|
-        case multi_keys.last
+        last_key = multi_keys.last
+        actual = keywords.include?(last_key) ? actual_value(multi_keys[0...-1]) : actual_value(multi_keys)
+        expected = expected_value(rules, multi_keys)
+        case last_key
         when :any, :contain
-          actual_values = actual_value(self, multi_keys[0...-1])
-          expected = expected_value(rules, multi_keys)
-          actual_values.any? { |actual| match_value?(actual, expected) }
+          actual.any? { |actual_value| match_value?(actual_value, expected) }
         when :not
-          actual = actual_value(self, multi_keys[0...-1])
-          expected = expected_value(rules, multi_keys)
           !match_value?(actual, expected)
         when :in
-          actual = actual_value(self, multi_keys[0...-1])
-          expected_values = expected_value(rules, multi_keys)
-          expected_values.any? { |expected| match_value?(actual, expected) }
+          expected.any? { |expected_value| match_value?(actual, expected_value) }
         when :not_in
-          actual = actual_value(self, multi_keys[0...-1])
-          expected_values = expected_value(rules, multi_keys)
-          expected_values.all? { |expected| !match_value?(actual, expected) }
+          expected.all? { |expected_value| !match_value?(actual, expected_value) }
+        when :gt
+          actual > expected
+        when :gte
+          actual >= expected
+        when :lt
+          actual < expected
+        when :lte
+          actual <= expected
         else
-          actual = actual_value(self, multi_keys)
-          expected = expected_value(rules, multi_keys)
           match_value?(actual, expected)
         end
       end
@@ -696,8 +698,8 @@ module Parser::AST
     # @param node [Parser::AST::Node]
     # @param multi_keys [Array<Symbol>]
     # @return [Object] actual value.
-    def actual_value(node, multi_keys)
-      multi_keys.inject(node) { |n, key| n.send(key) if n }
+    def actual_value(multi_keys)
+      multi_keys.inject(self) { |n, key| n.send(key) if n }
     end
 
     # Get expected value from rules.

data/lib/synvert/core/version.rb

@@ -2,6 +2,6 @@
 
 module Synvert
   module Core
-    VERSION = '0.62.1'
+    VERSION = '0.63.0'
   end
 end

data/spec/spec_helper.rb

@@ -4,9 +4,6 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 require 'synvert/core'
 
-require 'coveralls'
-Coveralls.wear!
-
 Dir[File.join(File.dirname(__FILE__), 'support', '*')].each do |path|
   require path
 end

data/spec/synvert/core/node_ext_spec.rb

@@ -567,6 +567,34 @@ describe Parser::AST::Node do
       node = parse(source)
       expect(node).not_to be_match(type: 'send', message: { not_in: %i[create build] })
     end
+
+    it 'matches gt' do
+      source = 'foobar(foo, bar)'
+      node = parse(source)
+      expect(node).to be_match(type: 'send', arguments: { size: { gt: 1 } })
+      expect(node).not_to be_match(type: 'send', arguments: { size: { gt: 2 } })
+    end
+
+    it 'matches gte' do
+      source = 'foobar(foo, bar)'
+      node = parse(source)
+      expect(node).to be_match(type: 'send', arguments: { size: { gte: 2 } })
+      expect(node).not_to be_match(type: 'send', arguments: { size: { gte: 3 } })
+    end
+
+    it 'matches lt' do
+      source = 'foobar(foo, bar)'
+      node = parse(source)
+      expect(node).to be_match(type: 'send', arguments: { size: { lt: 3 } })
+      expect(node).not_to be_match(type: 'send', arguments: { size: { lt: 2 } })
+    end
+
+    it 'matches lte' do
+      source = 'foobar(foo, bar)'
+      node = parse(source)
+      expect(node).to be_match(type: 'send', arguments: { size: { lte: 2 } })
+      expect(node).not_to be_match(type: 'send', arguments: { size: { lte: 1 } })
+    end
   end
 
   describe '#child_node_by_name' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: synvert-core
 version: !ruby/object:Gem::Version
-  version: 0.62.1
+  version: 0.63.0
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-14 00:00:00.000000000 Z
+date: 2022-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport