cql_ruby 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e75a456d8dff7bb1b1affde452bfc7df1e01508a2514ca1729cf996e28c3bff6
-  data.tar.gz: 57d5bdbfe2991ba0ed0c529373405885cc4382c8cf2f6cec3c86117b65fc31bf
+  metadata.gz: d117740a94a14a7c3f8a6a62f7bb22ae3dbbc450a909de2c9d5c3a9d5eb6fb91
+  data.tar.gz: 1850b47222e7d5be2caf3b50221f2facececedff355873f4b752d08a9aabf096
 SHA512:
-  metadata.gz: b56ead4780a2823d1e327c7ab24e5d73923d21096a5b95832cdfbe7bc499a335bdc2ea5d252efaff96e2ba4fd6471b4ca6e12c9c18f90249116bff509217b66d
-  data.tar.gz: 1b30aedc86c325e1cc6fdd8813abe2d46f5d76d34f542e0d9f0446b0a7fa42721c4f76dfec376c477287eff46d71311f2b86b20c1dea6c9658cfe8b04207b775
+  metadata.gz: 37a8dc083b6a7ee31d93ad01e01a1028bf58a0e5cf4ddee3fdb676ac3af606aeab679d6f9e8498865b42797cb159da93fa65479bce432811ead57f1c8827e0d9
+  data.tar.gz: a78b4f787e661d21e02f914058b6877ef863de7ed21beef8502f1ab278fa61799da32dd0a3956f54f4c0a7a9d3af95f34e7203819090f4f1189879333f0d4b70

data/bin/cql_ruby

@@ -7,7 +7,8 @@ def show_help
   puts <<~HELP
         
     \tSYNOPSIS
-    \t\tcql_ruby options pattern path filters ...
+    \t\tcql_ruby [--token] pattern path options filters ...
+    \t\tcql_ruby --node    type    path options filters ...
 
     \tDESCRIPTION
     \t\tCQL (Code Query Language) is a semantic search tool for your Ruby source code.
@@ -49,6 +50,7 @@ def extract_options
     surrounding_lines: 0,
     include_pattern: nil,
     exclude_pattern: nil,
+    search_type: :token,
   }
 
   ARGV.delete_if do |arg|
@@ -72,6 +74,10 @@ def extract_options
         options[:include_pattern] = arg.split('=')[1]
       elsif arg.start_with?('--exclude=')
         options[:exclude_pattern] = arg.split('=')[1]
+      elsif arg == '--node'
+        options[:search_type] = :node
+      elsif arg == '--token'
+        options[:search_type] = :token
       else
         raise "Unknown arg #{arg}"
       end
@@ -124,6 +130,7 @@ begin
     recursive: options[:recursive_search],
     include: options[:include_pattern],
     exclude: options[:exclude_pattern],
+    search_type: options[:search_type],
   ).search_all
 rescue
   puts "Error: #{$!}"

data/lib/cql_ruby/abstract_printer.rb

@@ -2,7 +2,7 @@
 
 module CqlRuby
   #
-  # Printing Cqlruby::Crumb-s.
+  # Printing CqlRuby::Crumb-s.
   #
   class AbstractPrinter
     def print(_crumb)

data/lib/cql_ruby/console_printer.rb

@@ -21,7 +21,7 @@ module CqlRuby
     end
 
     #
-    # @param crumb [Cqlruby::Crumb]
+    # @param crumb [CqlRuby::Crumb]
     #
     def print(crumb)
       parts = "##{color(97)}#{@counter}#{decor_reset}"
@@ -71,7 +71,7 @@ module CqlRuby
       end
     end
 
-    # @param [Cqlruby::Crumb] crumb
+    # @param [CqlRuby::Crumb] crumb
     # @return [String]
     def decorate_source_line(crumb)
       source = crumb.source

data/lib/cql_ruby/crumb_collector.rb

@@ -3,7 +3,7 @@
 module CqlRuby
   class CrumbCollector
     #
-    # @param printer [Cqlruby::AbstractPrinter]
+    # @param printer [CqlRuby::AbstractPrinter]
     #
     def initialize(printer)
       super()

data/lib/cql_ruby/executor.rb

@@ -20,7 +20,7 @@ end
 #
 # Executes search and dumps results into the collector.
 #
-# @param collector [Cqlruby::CrumbCollector]
+# @param collector [CqlRuby::CrumbCollector]
 # @param pattern [String]
 # @param path [String]
 # @param filters [Array<String>]
@@ -35,7 +35,8 @@ module CqlRuby
       filters: [],
       recursive: true,
       include: nil,
-      exclude: nil
+      exclude: nil,
+      search_type: :token
     )
       @collector = collector
       @filter_reader = filter_reader
@@ -45,6 +46,7 @@ module CqlRuby
       @recursive = recursive
       @include = include
       @exclude = exclude
+      @search_type = search_type
     end
 
     def search_all
@@ -72,11 +74,17 @@ module CqlRuby
 
     def walk(node, ancestors, source_reader)
       if node.is_a?(Parser::AST::Node)
+        if search_for_node?
+          if match?(node.type) && CqlRuby::FilterEvaluator.pass?(filter_reader, ancestors, node)
+            collector.add(CqlRuby::Crumb.new(node, ancestors, source_reader))
+          end
+        end
+
         node.children.flat_map do |child|
           walk(child, ancestors.dup + [node], source_reader)
         end
       else
-        if match?(node) && CqlRuby::FilterEvaluator.pass?(filter_reader, node, ancestors)
+        if search_for_token? && match?(node) && CqlRuby::FilterEvaluator.pass?(filter_reader, ancestors, node)
           collector.add(CqlRuby::Crumb.new(node, ancestors, source_reader))
         end
       end
@@ -98,6 +106,14 @@ module CqlRuby
       Dir.glob(clean_path)
     end
 
+    def search_for_token?
+      @search_type == :token
+    end
+
+    def search_for_node?
+      @search_type == :node
+    end
+
     attr_reader :collector
     attr_reader :filter_reader
     attr_reader :pattern
@@ -107,33 +123,55 @@ module CqlRuby
   end
 end
 
-CqlRuby::Crumb = Struct.new(:full_name, :ancestors, :source_reader) do
-  def line_no
-    ancestors.last.location.expression.line
-  end
+module CqlRuby
+  class Crumb
+    def initialize(node, ancestors, source_reader)
+      @node = node
+      @ancestors = ancestors
+      @source_reader = source_reader
+    end
 
-  def line_col_no
-    ancestors.last.location.expression.column
-  end
+    def line_no
+      anchor.location.expression.line
+    end
 
-  def source
-    source_reader.source_line(line_no)
-  end
+    def line_col_no
+      anchor.location.expression.column
+    end
 
-  def surrounding_line(offset)
-    source_reader.source_line(line_no + offset)
-  end
+    def source
+      source_reader.source_line(line_no)
+    end
 
-  def file_name
-    source_reader.file
-  end
+    def surrounding_line(offset)
+      source_reader.source_line(line_no + offset)
+    end
 
-  def expression_size
-    ancestors.last.location.expression.size
-  end
+    def file_name
+      source_reader.file
+    end
+
+    def expression_size
+      anchor.location.expression.size
+    end
+
+    def type
+      anchor.type
+    end
+
+    private
+
+    def anchor
+      if node.is_a?(Symbol)
+        ancestors.last
+      else
+        node
+      end
+    end
 
-  def type
-    ancestors.last.type
+    attr_reader :node
+    attr_reader :ancestors
+    attr_reader :source_reader
   end
 end
 

data/lib/cql_ruby/filter_evaluator.rb

@@ -3,18 +3,18 @@
 module CqlRuby
   class FilterEvaluator
     class << self
-      def pass?(filter_reader, node, ancestors)
+      def pass?(filter_reader, ancestors, node)
         [
           pass_type?(filter_reader, ancestors),
           pass_nesting?(filter_reader, ancestors),
-          pass_has?(filter_reader, node, ancestors),
+          pass_has?(filter_reader, ancestors, node),
         ].all?
       end
 
       private
 
       #
-      # @param [Cqlruby::FilterReader] filter_reader
+      # @param [CqlRuby::FilterReader] filter_reader
       # @param [Array<Parser::AST::Node>] ancestors
       #
       # @return [Boolean]
@@ -39,7 +39,6 @@ module CqlRuby
             next false unless ancestor.type.to_s == nest_rule.type
             next true unless nest_rule.restrict_name?
 
-            # TODO Make a proper matcher class.
             if %w[class module].include?(nest_rule.type)
               CqlRuby::PatternMatcher.match?(nest_rule.name, ancestor.children[0].children[1])
             elsif %[def].include?(nest_rule.type)
@@ -53,14 +52,19 @@ module CqlRuby
 
       #
       # @param [CqlRuby::FilterReader] filter_reader
-      # @param [Parser::AST::Node] node
       # @param [Array<Parser::AST::Node>] ancestors
+      # @param [Any<Parser::AST::Node, Symbol>] node
       #
-      def pass_has?(filter_reader, node, ancestors)
+      def pass_has?(filter_reader, ancestors, node)
         return true unless filter_reader.restrict_children?
 
         filter_reader.has_leaves.all? do |has_rule|
-          anchor_node = try_get_class(ancestors) || try_get_module(ancestors) || try_get_def(ancestors)
+          anchor_node = if node.is_a?(Symbol)
+            # TODO: Expand this to other wrappers (loops, conditions, etc).
+            try_get_class(ancestors) || try_get_module(ancestors) || try_get_def(ancestors)
+          else
+            node
+          end
           next false unless anchor_node
 
           has_node_with_name?(anchor_node, has_rule)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cql_ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - itarato