darkhelmet-darkext 0.9.3 → 0.9.4

data/History.txt

@@ -1,3 +1,7 @@
+== 0.9.4 2009-2-27
+
+* Speed up beagle a bit...
+
 == 0.9.3 2009-2-27
 
 * Download open/write any file if not HTTPOK

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :minor: 9
-:patch: 3
+:patch: 4
 :major: 0

data/lib/darkext/beagle.rb

@@ -27,11 +27,13 @@ module Beagle
     system('beagle-shutdown')
   end
 
-  def self.query(query, verbose = false)
+  def self.query(query, verbose = false, max_hits = 40)
     raise BeagleError, "Beagle.home (BEAGLE_HOME) not set!" if home.nil?
     args = Array.new
     args << 'beagle-query'
     args << '--verbose' if verbose
+    args << '--max-hits'
+    args << max_hits.to_s
     args << query
     output = DarkIO.capture_output(:stderr => false) { system(*args) }
     parser = verbose ? verbose_parser : regular_parser
@@ -53,12 +55,7 @@ private
 
   def self.verbose_parser
     lambda do |output|
-      lines = output.split("\n")
-      2.times do
-        lines.shift
-        lines.pop
-      end
-      sections = lines.join("\n").strip.split("\n\n")
+      sections = output.strip.split("\n\n")
       results = sections.map do |section|
         section_lines = section.split("\n")
         section_hash = Hash.new
@@ -67,16 +64,17 @@ private
             parts = line.split(':')
             k = parts.shift
             v = parts.join(':')
-          else
+            section_hash[k.strip] = v.strip
+          elsif line.include?('=')
             k,v = line.split('=')
             k = k.split(':').last
             v.gsub!("'",'')
+            section_hash[k.strip] = v.strip
           end
-          section_hash[k.strip] = v.strip
         end
         section_hash
       end
-      results.sort { |l,r| l['Score'] <=> r['Score'] }
+      results.sort { |l,r| l['Score'].to_f <=> r['Score'].to_f }
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: darkhelmet-darkext
 version: !ruby/object:Gem::Version 
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors: 
 - Daniel Huckstep