starscope 0.0.2 → 0.0.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    starscope (0.0.1)
+    starscope (0.0.3)
       parser
 
 GEM

data/bin/starscope.rb

@@ -35,7 +35,7 @@ END
   opts.on("-n", "--no-auto", "Don't automatically update/create the database") do
     options[:auto] = false
   end
-  opts.on("-r", "--read-db READ", "Reads the DB from PATH instead of the default") do |path|
+  opts.on("-r", "--read-db PATH", "Reads the DB from PATH instead of the default") do |path|
     options[:read] = path
   end
   opts.on("-w", "--write-db PATH", "Writes the DB to PATH instead of the default") do |path|

data/lib/starscope/datum.rb

@@ -15,10 +15,8 @@ class StarScope::Datum
     fqn[0...-1].reverse.each do |test|
       if test.to_sym == @scope[i]
         score += 5
-      elsif Regexp.new(test).match(@scope[i])
-        score += 3
       elsif Regexp.new(test, Regexp::IGNORECASE).match(@scope[i])
-        score += 1
+        score += 2
       end
       i -= 1
     end

data/lib/starscope/db.rb

@@ -6,6 +6,8 @@ LANGS = [StarScope::Lang::Ruby]
 
 class StarScope::DB
 
+  DB_FORMAT = 1
+
   def initialize
     @dirs = []
     @files = {}
@@ -15,7 +17,7 @@ class StarScope::DB
   def load(file)
     File.open(file, 'r') do |file|
       Zlib::GzipReader.wrap(file) do |file|
-        raise "File version doesn't match" if StarScope::VERSION != file.gets.chomp
+        raise "Database format not recognized" if DB_FORMAT != file.gets.to_i
         @dirs   = load_part(file)
         @files  = load_part(file)
         @tables = load_part(file)
@@ -26,7 +28,7 @@ class StarScope::DB
   def save(file)
     File.open(file, 'w') do |file|
       Zlib::GzipWriter.wrap(file) do |file|
-        file.puts StarScope::VERSION
+        file.puts DB_FORMAT
         save_part(file, @dirs)
         save_part(file, @files)
         save_part(file, @tables)
@@ -73,7 +75,13 @@ class StarScope::DB
   def query(table, value)
     fqn = value.split("::")
     results = @tables[table][fqn[-1].to_sym]
-    puts results.sort {|a,b| b.score_match(fqn) <=> a.score_match(fqn)}
+    results.sort! {|a,b| b.score_match(fqn) <=> a.score_match(fqn)}
+    best_score = results[0].score_match(fqn)
+    results.each do |result|
+      # 4 is a guess at the best heuristic, not magic
+      return if best_score - result.score_match(fqn) > 4
+      puts result
+    end
   end
 
   private

data/lib/starscope/langs/ruby.rb

@@ -48,7 +48,7 @@ module StarScope::Lang
           yield :calls, scoped_name(node), node.source_map.expression.line
 
           if node.children[0].nil? and node.children[1] == :require and node.children[2].type == :str
-            yield :includes, node.children[2].children[0].split("/"), node.source_map.expression.line
+            yield :requires, node.children[2].children[0].split("/"), node.source_map.expression.line
           end
         end
 

data/lib/starscope/version.rb

@@ -1,3 +1,3 @@
 module StarScope
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -2,7 +2,7 @@
 name: starscope
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Evan Huus