node_query 1.11.0 → 1.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1acc5fa99571d7c0ca697e2719335333716539b1cf9278b98e362b3618a046ed
-  data.tar.gz: a68d2bd0cba15ed723728e1b47a819a16e1b785346eb301cddc007cc822d5cbc
+  metadata.gz: 35243974bb269cb011bc7fb7c4ca8877ef0338cd4cfb8dc80785a06e9b40ee6f
+  data.tar.gz: ad100af634d93ddaa21bd37b89c3d0d542645007ee9bcd73c0f8fd28fe7211ae
 SHA512:
-  metadata.gz: 80f8e7ccdf4b1a5938dafd6f00ad76a6417258189e0ae006420fc4d633b9656e9c60384fba72c7ec7602068ea6e599b7bc32cddd6c1287eb0ca3d3c3d35e171f
-  data.tar.gz: d92223f8d1e5792503336f2927ba65f9942250d2314eeb7e950506a0a2a26ef48a802ab2e932f8835a287218ab0b98d45cfc226e389359ab5543198fdb8bafb7
+  metadata.gz: 656a13c7124f155c6ed96c5d39a901edd248b4ee1d4b19b2d2205c2f244ba0057dec372087b5a4ba08c5d00e784ae5655a0fee1656befe3061df780e8edc9e7b
+  data.tar.gz: e811b204f0cc9848b9c65a85295049e37e7f1bf2cb1897f79236093af95a941133962ae425d125c103e123da9019960d00ddf4c41850e868cf5fabd7c245f64a

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # CHANGELOG
 
+## 1.12.1 (2023-04-06)
+
+* Fix when `actual` is nil
+
+## 1.12.0 (2023-01-16)
+
+* Drop `activesupport`
+* Remove `NodeQuery::AnyValue`
+
 ## 1.11.0 (2022-12-09)
 
 * Support negative index to fetch array element

data/Gemfile.lock

@@ -1,21 +1,13 @@
 PATH
   remote: .
   specs:
-    node_query (1.11.0)
-      activesupport (< 7.0.0)
+    node_query (1.12.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.7)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 1.6, < 2)
-      minitest (>= 5.1)
-      tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
     ast (2.4.2)
     coderay (1.1.3)
-    concurrent-ruby (1.1.10)
     diff-lcs (1.5.0)
     ffi (1.15.5)
     formatador (1.1.0)
@@ -36,27 +28,24 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    i18n (1.12.0)
-      concurrent-ruby (~> 1.0)
     listen (3.7.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     lumberjack (1.2.8)
     method_source (1.0.0)
-    minitest (5.16.3)
     nenv (0.3.0)
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
     oedipus_lex (2.6.0)
-    parser (3.1.2.0)
+    parser (3.2.1.1)
       ast (~> 2.4.1)
-    parser_node_ext (0.4.0)
+    parser_node_ext (1.0.0)
       parser
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    racc (1.6.0)
+    racc (1.6.2)
     rake (13.0.6)
     rb-fsevent (0.11.1)
     rb-inotify (0.10.1)
@@ -76,9 +65,6 @@ GEM
     rspec-support (3.11.0)
     shellany (0.0.1)
     thor (1.2.1)
-    tzinfo (2.0.5)
-      concurrent-ruby (~> 1.0)
-    zeitwerk (2.6.6)
 
 PLATFORMS
   x86_64-darwin-21

data/README.md

@@ -115,7 +115,7 @@ It matches class node whose parent class name is Base
 ### nql matches evaluated value
 
 ```
-.ivasgn[left_value="@{{right_value}}"]
+.ivasgn[variable="@{{value}}"]
 ```
 
 It matches ivasgn node whose left value equals '@' plus the evaluated value of right value.
@@ -271,7 +271,7 @@ It matches send node whose parent is def node.
 #### Adjacent sibling combinator
 
 ```
-.send[left_value=@id] + .send
+.send[variable=@id] + .send
 ```
 
 It matches send node only if it is immediately follows the send node whose left value is @id.
@@ -279,7 +279,7 @@ It matches send node only if it is immediately follows the send node whose left
 #### General sibling combinator
 
 ```
-.send[left_value=@id] ~ .send
+.send[variable=@id] ~ .send
 ```
 
 It matches send node only if it is follows the send node whose left value is @id.
@@ -323,7 +323,7 @@ It matches the last def node.
 ### nql matches multiple expressions
 
 ```
-.ivasgn[left_value=@id], .ivasgn[left_value=@name]
+.ivasgn[variable=@id], .ivasgn[variable=@name]
 ```
 
 It matches ivasgn node whose left value is either @id or @name.
@@ -363,7 +363,7 @@ It matches class node whose parent class name is Base
 ### rules matches evaluated value
 
 ```
-{ node_type: 'ivasgn', left_value: '@{{right_value}}' }
+{ node_type: 'ivasgn', variable: '@{{value}}' }
 ```
 
 It matches ivasgn node whose left value equals '@' plus the evaluated value of right value.

data/lib/node_query/adapter.rb

@@ -35,4 +35,4 @@ class NodeQuery::Adapter
   def get_siblings(node)
     raise NotImplementedError, 'get_siblings is not implemented'
   end
-end
+end

data/lib/node_query/compiler/basic_selector.rb

@@ -18,7 +18,10 @@ module NodeQuery::Compiler
     def match?(node, base_node, _operator = '==')
       return false unless node
 
-      @node_type.to_sym == NodeQuery.adapter.get_node_type(node) && (!@attribute_list || @attribute_list.match?(node, base_node))
+      @node_type.to_sym == NodeQuery.adapter.get_node_type(node) && (!@attribute_list || @attribute_list.match?(
+        node,
+        base_node
+      ))
     end
 
     def to_s

data/lib/node_query/compiler/comparable.rb

@@ -25,7 +25,9 @@ module NodeQuery::Compiler
       when '!='
         if expected.is_a?(::Array)
           !actual.is_a?(::Array) || actual.size != expected.size ||
-            actual.zip(expected).any? { |actual_child, expected_child| expected_child.match?(actual_child, base_node, '!=') }
+            actual.zip(expected).any? { |actual_child, expected_child|
+              expected_child.match?(actual_child, base_node, '!=')
+            }
         else
           !is_equal?(actual, expected)
         end
@@ -66,7 +68,9 @@ module NodeQuery::Compiler
       else
         if expected.is_a?(::Array)
           actual.is_a?(::Array) && actual.size == expected.size &&
-            actual.zip(expected).all? { |actual_child, expected_child| expected_child.match?(actual_child, base_node, '==') }
+            actual.zip(expected).all? { |actual_child, expected_child|
+              expected_child.match?(actual_child, base_node, '==')
+            }
         else
           is_equal?(actual, expected)
         end
@@ -110,7 +114,7 @@ module NodeQuery::Compiler
     # Get the expected value
     # @param base_node [Node] the base node for evaluated value
     # @return expected value, could be integer, float, string, boolean, nil, range, and etc.
-    def expected_value(base_node)
+    def expected_value(_base_node)
       @value
     end
 

data/lib/node_query/compiler/selector.rb

@@ -12,7 +12,15 @@ module NodeQuery::Compiler
     # @param attribute_list [NodeQuery::Compiler::AttributeList] the attribute list
     # @param pseudo_class [String] the pseudo class, can be <code>has</code> or <code>not_has</code>
     # @param pseudo_selector [NodeQuery::Compiler::Expression] the pseudo selector
-    def initialize(goto_scope: nil, relationship: nil, rest: nil, basic_selector: nil, position: nil, pseudo_class: nil, pseudo_selector: nil)
+    def initialize(
+      goto_scope: nil,
+      relationship: nil,
+      rest: nil,
+      basic_selector: nil,
+      position: nil,
+      pseudo_class: nil,
+      pseudo_selector: nil
+    )
       @goto_scope = goto_scope
       @relationship = relationship
       @rest = rest
@@ -36,7 +44,10 @@ module NodeQuery::Compiler
           return false
         end
       end
-      NodeQuery.adapter.is_node?(node) && (!@basic_selector || (operator == "!=" ? !@basic_selector.match?(node, base_node) : @basic_selector.match?(node, base_node))) && match_pseudo_class?(node)
+      NodeQuery.adapter.is_node?(node) && (!@basic_selector || (operator == "!=" ? !@basic_selector.match?(
+        node,
+        base_node
+      ) : @basic_selector.match?(node, base_node))) && match_pseudo_class?(node)
     end
 
     # Query nodes by the selector.

data/lib/node_query/helper.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class NodeQuery::Helper
-  class <<self
+  class << self
     # Get target node by the keys.
     # @param node [Node] ast node
     # @param keys [String|Array] keys of child node.
@@ -43,7 +43,7 @@ class NodeQuery::Helper
     # Evaluate node value.
     # @example
     #     source code of the node is @id = id
-    #     evaluated_node_value(node, "@{{right_value}}") # => @id
+    #     evaluated_node_value(node, "@{{value}}") # => @id
     # @param node [Node] ast node
     # @param str [String] string to be evaluated
     # @return [String] evaluated string
@@ -63,4 +63,4 @@ class NodeQuery::Helper
       node.to_s
     end
   end
-end
+end

data/lib/node_query/node_rules.rb

@@ -22,7 +22,7 @@ class NodeQuery::NodeRules
       return match_node?(node) ? [node] : []
     end
 
-    matching_nodes  = []
+    matching_nodes = []
     if options[:including_self] && match_node?(node)
       matching_nodes.push(node)
       return matching_nodes if options[:stop_at_first_match]
@@ -51,9 +51,10 @@ class NodeQuery::NodeRules
   def match_node?(node)
     flat_hash(@rules).keys.all? do |multi_keys|
       last_key = multi_keys.last
-      actual = KEYWORDS.include?(last_key) ?
-        NodeQuery::Helper.get_target_node(node, multi_keys[0...-1].join('.')) :
-        NodeQuery::Helper.get_target_node(node, multi_keys.join('.'))
+      actual =
+        KEYWORDS.include?(last_key) ?
+               NodeQuery::Helper.get_target_node(node, multi_keys[0...-1].join('.')) :
+               NodeQuery::Helper.get_target_node(node, multi_keys.join('.'))
       expected = expected_value(@rules, multi_keys)
       expected = NodeQuery::Helper.evaluate_node_value(node, expected) if expected.is_a?(String)
       case last_key
@@ -131,13 +132,11 @@ class NodeQuery::NodeRules
         actual == expected
       end
     when TrueClass
-      :true == actual.type
+      :true == actual&.type
     when FalseClass
-      :false == actual.type
+      :false == actual&.type
     when Parser::AST::Node
       actual == expected
-    when NodeQuery::AnyValue
-      !actual.nil?
     else
       raise NodeQuery::MethodNotSupported, "#{expected} is not supported"
     end

data/lib/node_query/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class NodeQuery
-  VERSION = "1.11.0"
+  VERSION = "1.12.1"
 end

data/lib/node_query.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'active_support/core_ext/array'
-
 require_relative "node_query/version"
 require_relative "./node_query_lexer.rex"
 require_relative "./node_query_parser.racc"
@@ -14,7 +12,6 @@ class NodeQuery
   autoload :Compiler, "node_query/compiler"
   autoload :Helper, "node_query/helper"
   autoload :NodeRules, "node_query/node_rules"
-  autoload :AnyValue, 'node_query/any_value'
 
   # Configure NodeQuery
   # @param [Hash] options options to configure

data/node_query.gemspec

@@ -28,9 +28,6 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  # Uncomment to register a new dependency of your gem
-  spec.add_dependency "activesupport", "< 7.0.0"
-
   # For more information and examples about making a new gem, check out our
   # guide at: https://bundler.io/guides/creating_gem.html
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: node_query
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 1.12.1
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-12-09 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 7.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 7.0.0
+date: 2023-04-05 00:00:00.000000000 Z
+dependencies: []
 description: ast node query language
 email:
 - flyerhzm@gmail.com
@@ -40,7 +26,6 @@ files:
 - Rakefile
 - lib/node_query.rb
 - lib/node_query/adapter.rb
-- lib/node_query/any_value.rb
 - lib/node_query/compiler.rb
 - lib/node_query/compiler/array_value.rb
 - lib/node_query/compiler/attribute.rb
@@ -92,7 +77,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: ast node query language

data/lib/node_query/any_value.rb

@@ -1,5 +0,0 @@
-# frozen_string_literal: true
-
-# A new type to match any value.
-class NodeQuery::AnyValue
-end