node_query 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 937481646456841ca565042544794aa91a0339c40790f14233d721f45b0531fa
-  data.tar.gz: 807b2709a6350489229a86febb0d6d7eb9684f8ce4fb712603d6bcd6cb62f192
+  metadata.gz: 6e8376d63c29cbdec1d39e74083667724b0b84e872d7a26fc281b18061e82f02
+  data.tar.gz: '078fc70a86d2bfca404c791c6f9466780daca529aca5e984aca4ecdc6fb4c760'
 SHA512:
-  metadata.gz: 9bff7b923a263ad1817226f7fbb095cb9275b1f0e6f27dadd5562202c04aa2ba7bebb0c5b4659484dfeafc5adff268a7f8cd09e7c1f628b17d9c638fbc280c41
-  data.tar.gz: 102c406278c8b752c6ead8856247678f79a5ca2fb178f625a746030c330f9310a6f3d4decdb860a12cad8ae95982d014b102704c5afe60edfe95c066ad26dc3f
+  metadata.gz: 444e804e949a7ebd40ebc10312de06bd570115995044598fe324210a60e85fd90931393f0eaa6845ec46c916101ab69e23ccd9490ffa40c99626ecc96c0acfb1
+  data.tar.gz: e0c5ab049ddc1f608b6559b186bd9f43b16b4d6a6b8ed906bcf261cebdb18a482768673727644797dc8f29465d423fc3148c722db001904439d1890cd80541db

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## 1.2.0 (2022-07-01)
+
+* Rename `NodeQuery.get_adapter` to `NodeQuery.adapter`
+* Use generic type in rbs
+* Fix `Compiler::Array` to `Compiler::ArrayValue`
+
 ## 1.1.0 (2022-06-27)
 
 * Support `*` in attribute key

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    node_query (1.1.0)
+    node_query (1.2.0)
       activesupport
 
 GEM
@@ -50,7 +50,7 @@ GEM
     oedipus_lex (2.6.0)
     parser (3.1.2.0)
       ast (~> 2.4.1)
-    parser_node_ext (0.1.0)
+    parser_node_ext (0.2.0)
       parser
     pry (0.14.1)
       coderay (~> 1.1)

data/lib/node_query/compiler/basic_selector.rb

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

data/lib/node_query/compiler/comparable.rb

@@ -75,9 +75,9 @@ module NodeQuery::Compiler
     # @return the node value, could be integer, float, string, boolean, nil, range, and etc.
     def actual_value(node)
       if node.is_a?(::Parser::AST::Node)
-        case NodeQuery.get_adapter.get_node_type(node)
+        case NodeQuery.adapter.get_node_type(node)
         when :int, :float, :str, :sym
-          NodeQuery.get_adapter.get_children(node).last
+          NodeQuery.adapter.get_children(node).last
         when :true
           true
         when :false
@@ -85,13 +85,13 @@ module NodeQuery::Compiler
         when :nil
           nil
         when :array
-          NodeQuery.get_adapter.get_children(node).map { |child_node| actual_value(child_node) }
+          NodeQuery.adapter.get_children(node).map { |child_node| actual_value(child_node) }
         when :irange
-          actual_value(NodeQuery.get_adapter.get_children(node).first)..actual_value(NodeQuery.get_adapter.get_children(node).last)
+          actual_value(NodeQuery.adapter.get_children(node).first)..actual_value(NodeQuery.adapter.get_children(node).last)
         when :erange
-          actual_value(NodeQuery.get_adapter.get_children(node).first)...actual_value(NodeQuery.get_adapter.get_children(node).last)
+          actual_value(NodeQuery.adapter.get_children(node).first)...actual_value(NodeQuery.adapter.get_children(node).last)
         when :begin
-          actual_value(NodeQuery.get_adapter.get_children(node).first)
+          actual_value(NodeQuery.adapter.get_children(node).first)
         else
           node
         end

data/lib/node_query/compiler/evaluated_value.rb

@@ -20,7 +20,7 @@ module NodeQuery::Compiler
     # @return [String] if node is a {Node}, return the node source code, otherwise return the node itself.
     def actual_value(node)
       if node.is_a?(::Parser::AST::Node)
-        NodeQuery.get_adapter.get_source(node)
+        NodeQuery.adapter.get_source(node)
       else
         node
       end
@@ -31,7 +31,7 @@ module NodeQuery::Compiler
     def expected_value
       node = NodeQuery::Helper.get_target_node(base_node, @value)
       if node.is_a?(::Parser::AST::Node)
-        NodeQuery.get_adapter.get_source(node)
+        NodeQuery.adapter.get_source(node)
       else
         node
       end

data/lib/node_query/compiler/identifier.rb

@@ -20,7 +20,7 @@ module NodeQuery::Compiler
     # otherwise, return the String value.
     def actual_value(node)
       if node.is_a?(::Parser::AST::Node)
-        NodeQuery.get_adapter.get_source(node)
+        NodeQuery.adapter.get_source(node)
       elsif node.is_a?(::Array)
         node.map { |n| actual_value(n) }
       else

data/lib/node_query/compiler/regexp.rb

@@ -18,7 +18,7 @@ module NodeQuery::Compiler
     def match?(node, operator = '=~')
       match =
         if node.is_a?(::Parser::AST::Node)
-          @value.match(NodeQuery.get_adapter.get_source(node))
+          @value.match(NodeQuery.adapter.get_source(node))
         else
           @value.match(node.to_s)
         end

data/lib/node_query/helper.rb

@@ -30,8 +30,8 @@ class NodeQuery::Helper
   # @yield [child] Gives a child node.
   # @yieldparam child [Parser::AST::Node] child node
   def self.handle_recursive_child(node, &block)
-    NodeQuery.get_adapter.get_children(node).each do |child|
-      if NodeQuery.get_adapter.is_node?(child)
+    NodeQuery.adapter.get_children(node).each do |child|
+      if NodeQuery.adapter.is_node?(child)
         block.call(child)
         handle_recursive_child(child, &block)
       end

data/lib/node_query/version.rb

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

data/lib/node_query.rb

@@ -3,13 +3,15 @@
 require 'active_support/core_ext/array'
 
 require_relative "node_query/version"
-require_relative "node_query/parser_adapter"
-require_relative "node_query/compiler"
-require_relative "node_query/helper"
 require_relative "./node_query_lexer.rex"
 require_relative "./node_query_parser.racc"
 
 class NodeQuery
+  autoload :Adapter, "node_query/adapter"
+  autoload :ParserAdapter, "node_query/parser_adapter"
+  autoload :Compiler, "node_query/compiler"
+  autoload :Helper, "node_query/helper"
+
   # Configure NodeQuery
   # @param [Hash] options options to configure
   # @option options [NodeQuery::Adapter] :adapter the adpater
@@ -19,7 +21,7 @@ class NodeQuery
 
   # Get the adapter
   # @return [NodeQuery::Adapter] current adapter, by default is {NodeQuery::ParserAdapter}
-  def self.get_adapter
+  def self.adapter
     @adapter ||= ParserAdapter.new
   end
 

data/lib/node_query_parser.racc.rb

@@ -249,7 +249,7 @@ def _reduce_13(val, _values)
 end
 
 def _reduce_14(val, _values)
- NodeQuery::Compiler::Attribute.new(key: val[0], value: NodeQuery::Compiler::Array.new, operator: val[1])
+ NodeQuery::Compiler::Attribute.new(key: val[0], value: NodeQuery::Compiler::ArrayValue.new, operator: val[1])
 end
 
 def _reduce_15(val, _values)

data/lib/node_query_parser.y

@@ -28,7 +28,7 @@ rule
 
   attribute
     : tKEY tOPERATOR value { NodeQuery::Compiler::Attribute.new(key: val[0], value: val[2], operator: val[1]) }
-    | tKEY tOPERATOR tOPEN_ARRAY tCLOSE_ARRAY { NodeQuery::Compiler::Attribute.new(key: val[0], value: NodeQuery::Compiler::Array.new, operator: val[1]) }
+    | tKEY tOPERATOR tOPEN_ARRAY tCLOSE_ARRAY { NodeQuery::Compiler::Attribute.new(key: val[0], value: NodeQuery::Compiler::ArrayValue.new, operator: val[1]) }
     | tKEY tOPERATOR tOPEN_ARRAY array_value tCLOSE_ARRAY { NodeQuery::Compiler::Attribute.new(key: val[0], value: val[3], operator: val[1]) }
 
   array_value
@@ -60,4 +60,4 @@ end
 
     def next_token
       @lexer.next_token
-    end
+    end

data/sig/node_query/adapter.rbs

@@ -1,11 +1,11 @@
-class NodeQuery::Adapter
-  def is_node?: (node: Node) -> Boolean
+class NodeQuery::Adapter[T]
+  def is_node?: (node: T) -> bool
 
-  def get_node_type: (node: Node) -> String
+  def get_node_type: (node: T) -> String
 
-  def get_source: (node: Node) -> String
+  def get_source: (node: T) -> String
 
-  def get_children: (node: Node) -> Array[Node]
+  def get_children: (node: T) -> Array[T]
 
-  def get_siblings: (node: Node) -> Array[Node]
+  def get_siblings: (node: T) -> Array[T]
 end

data/sig/node_query.rbs

@@ -1,11 +1,11 @@
-class NodeQuery
+class NodeQuery[T]
   VERSION: String
 
   def self.configure: (options: { adapter: NodeQuery::Adapter }) -> void
 
-  def self.get_adapter: () -> NodeQuery::Adapter
+  def self.adapter: () -> NodeQuery::Adapter
 
   def initialize: (nql: String) -> NodeQuery
 
-  def parse: (node: Node) -> Array[Node]
+  def parse: (node: T) -> Array[T]
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: node_query
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-06-27 00:00:00.000000000 Z
+date: 2022-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport