referral 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bbc3ccfe2fc13d49b4fe81db0b450452485ff2ee6a76d05c4ab04368df20f56b
-  data.tar.gz: ecdfede161422d2a90f199f718d80ade1eb644c520e5929c71643272295e0728
+  metadata.gz: 2b444d6e3e344bd102380397e714039e2b72834f1f2f6c1023837fa097d215ee
+  data.tar.gz: 46c19b9d8deccaeb7fd1e6489b765fddce2e039bd09790d7a952de429c87b36d
 SHA512:
-  metadata.gz: 10da1ed6a90542750ec6f77ed4258017432f782245fc159dc30ec24c5ac139e12f43ea273260650c810338fdeb4367c6dc1a42aff397d29105935584960d7242
-  data.tar.gz: 0b8e3682cd38e2acad49887aaddd026c0d85bbe686e39923163b8f87f4f65a132d3ef6086411d2c7959d2eb66475b8d7256f6724c9e09cc50977be22efefecee
+  metadata.gz: 75394674def26ffe7236d85d5c8bb1bef4af3b10d752cfb4e7a1c544f75730bdd16b1e53054351e2bcf36935ce4dca8339797f32c186965c5b6b6b51773eecce
+  data.tar.gz: 4d9d68316c18f98ca8f42694bc661e2e7aa1a3549eae2757707c5745240bf23884a0800a2922765482a02e0a531da5ad354d0fcc56419d18a6bffd749b91cc2e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    referral (0.0.3)
+    referral (0.0.4)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -216,8 +216,9 @@ Usage: referral [options] files
     -n, --name [NAME]                Partial or complete name(s) to filter
         --exact-name [NAME]          Exact name(s) to filter
         --full-name [NAME]           Exact, fully-qualified name(s) to filter
+        --scope [SCOPE]              Scope(s) in which to filter (e.g. Hastack#hide)
     -p, --pattern [PATTERN]          Regex pattern to filter
-    -t, --type [TYPES]              Include only certain types. See Referral::TOKEN_TYPES.
+    -t, --type [TYPES]               Include only certain types. See Referral::TOKEN_TYPES.
         --include-unnamed            Include reference without identifiers (default: false)
     -s, --sort {file,scope}          (default: file). See Referral::SORT_FUNCTIONS
         --print-headers              Print header names (default: false)
@@ -227,7 +228,7 @@ Usage: referral [options] files
 
 A few things to note:
 
-* Each of `--name`, `--exact-name`, `--full-name`, `--type`, and `--columns`
+* Each of `--name`, `--exact-name`, `--full-name`, `--scope`, `--type`, and `--columns`
   accept comma-separated arrays (e.g. `--name foo,bar,baz`)
 
 * You can browse available sort functions [in

data/lib/referral/filters_tokens.rb

@@ -9,12 +9,17 @@ module Referral
     },
     exact_name: ->(token, exact_names) {
       exact_names.any? { |query|
-        MatchesTokenNames.subset(token, query)
+        MatchesTokenNames.subset(token.full_name_tokens, query)
       }
     },
-    full_name: ->(token, exact_names) {
-      exact_names.any? { |query|
-        MatchesTokenNames.entirely(token, query)
+    full_name: ->(token, full_names) {
+      full_names.any? { |query|
+        MatchesTokenNames.entirely(token.full_name_tokens, query)
+      }
+    },
+    scope: ->(token, scope_names) {
+      scope_names.any? { |query|
+        MatchesTokenNames.subset(token.scope_tokens, query)
       }
     },
     pattern: ->(token, regex) {

data/lib/referral/matches_token_names.rb

@@ -1,18 +1,18 @@
 module Referral
   class MatchesTokenNames
-    def self.subset(token, query)
-      token_tokens = names_from_token(token)
+    def self.subset(tokens, query)
+      token_tokens = names_from_tokens(tokens)
       query_tokens = names_from_query(query)
 
       token_tokens & query_tokens == query_tokens
     end
 
-    def self.entirely(token, query)
-      names_from_token(token) == names_from_query(query)
+    def self.entirely(tokens, query)
+      names_from_tokens(tokens) == names_from_query(query)
     end
 
-    def self.names_from_token(token)
-      token.full_name_tokens.reject { |t| t.name.nil? }.map { |t| t.name.to_s }
+    def self.names_from_tokens(tokens)
+      tokens.reject { |t| t.name.nil? }.map { |t| t.name.to_s }
     end
 
     def self.names_from_query(query)

data/lib/referral/parses_options.rb

@@ -22,6 +22,7 @@ module Referral
         op.on("-n", "--name [NAME]", Array, "Partial or complete name(s) to filter")
         op.on("--exact-name [NAME]", Array, "Exact name(s) to filter")
         op.on("--full-name [NAME]", Array, "Exact, fully-qualified name(s) to filter")
+        op.on("--scope [SCOPE]", Array, "Scope(s) in which to filter (e.g. Hastack#hide)")
         op.on("-p", "--pattern [PATTERN]", Regexp, "Regex pattern to filter")
         op.on("-t", "--type [TYPES]", Array, "Include only certain types. See Referral::TOKEN_TYPES.")
         op.on("--include-unnamed", TrueClass, "Include reference without identifiers (default: false)")

data/lib/referral/translates_node_to_token.rb

@@ -9,21 +9,11 @@ module Referral
       Value::Token.new(
         name: type.name_finder.call(node),
         node_type: type,
-        parent: parent_unless_bad_parent(parent, type),
+        parent: parent,
         file: file,
         line: node.first_lineno,
         column: node.first_column
       )
     end
-
-    private
-
-    def parent_unless_bad_parent(parent_token, type)
-      return parent_token if parent_token&.node_type&.good_parent
-
-      # puts "should a #{parent_token.node_type.name} parent a #{type.name}?"
-      # return if parent_token.node_type.name == :local_var_assign
-      # parent_token
-    end
   end
 end

data/lib/referral/value/options.rb

@@ -6,6 +6,7 @@ module Referral
       :name,
       :exact_name,
       :full_name,
+      :scope,
       :pattern,
       :type,
       :include_unnamed,

data/lib/referral/value/token.rb

@@ -15,8 +15,18 @@ module Referral
       end
 
       def scope
-        return "" unless parent
-        parent.full_name
+        join_names(scope_tokens)
+      end
+
+      def scope_tokens
+        return [] if parent.nil?
+
+        ancestors.take_while { |t| t.node_type.good_parent }.flat_map(&:literal_name_tokens)
+      end
+
+      def ancestors
+        return [] if parent.nil?
+        [*parent.ancestors, parent]
       end
 
       def full_name

data/lib/referral/version.rb

@@ -1,3 +1,3 @@
 module Referral
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: referral
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Justin Searls