darkhelmet-darkext 0.9.4 → 0.9.5

data/History.txt

@@ -1,3 +1,10 @@
+== 0.9.5 2009-3-2
+
+* add fibers
+* add string#ends_with? and string#starts_with?
+* make beagle not suck as much, but still suck a bit
+* don't load sitemap_generator on include
+
 == 0.9.4 2009-2-27
 
 * Speed up beagle a bit...

data/VERSION.yml

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

data/lib/darkext/beagle.rb

@@ -1,11 +1,51 @@
-require 'darkext/io'
+require 'colored'
+require 'darkext/fiber'
+require 'darkext/string'
 require 'darkext/symbol'
-require 'extensions/string'
+
+"Beagle.query is not secure! Use with caution".red.printn
 
 module Beagle
-  class BeagleError < RuntimeError
-    def initialize(msg)
-      super(msg)
+  class BeagleError < RuntimeError; end
+
+  class BeagleResultsHelper
+    def initialize(io)
+      @io = io
+      @fiber = Fiber.new do
+        while !@io.eof?
+          result = Hash.new
+          loop do
+            line = @io.gets
+            break if line.nil?
+            if !line.include?('=') || line.starts_with?(' Snip')
+              parts = line.split(':')
+              k = parts.shift.strip
+              break if result.keys.include?(k)
+              v = parts.join(':').strip
+              result[k] = v unless k.empty? || v.empty?
+            elsif line.include?('=')
+              k,v = line.split('=')
+              k = k.split(':').last.strip
+              break if result.keys.include?(k)
+              v = v.gsub("'",'').strip
+              result[k] = v unless k.empty? || v.empty?
+            end
+          end
+          Fiber.yield(result)
+        end
+      end
+    end
+
+    def next
+      begin
+        return @fiber.resume
+      rescue FiberError
+        return nil
+      end
+    end
+
+    def close
+      @io.close
     end
   end
 
@@ -27,17 +67,17 @@ module Beagle
     system('beagle-shutdown')
   end
 
-  def self.query(query, verbose = false, max_hits = 40)
+  def self.query(query, max_hits = 100)
     raise BeagleError, "Beagle.home (BEAGLE_HOME) not set!" if home.nil?
     args = Array.new
     args << 'beagle-query'
-    args << '--verbose' if verbose
+    args << '--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
-    parser.call(output)
+    cmd = args.join(' ')
+    cmd.printn
+    return BeagleResultsHelper.new(IO.popen(cmd))
   end
 
   def self.running?
@@ -50,37 +90,4 @@ module Beagle
     raise BeagleError, "Beagle.home (BEAGLE_HOME) not set!" if home.nil?
     DarkIO.capture_output(:stderr => false) { system('beagle-info','--status') }.strip
   end
-
-private
-
-  def self.verbose_parser
-    lambda do |output|
-      sections = output.strip.split("\n\n")
-      results = sections.map do |section|
-        section_lines = section.split("\n")
-        section_hash = Hash.new
-        section_lines.each do |line|
-          if !line.include?('=') || line.starts_with?(' Snip')
-            parts = line.split(':')
-            k = parts.shift
-            v = parts.join(':')
-            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
-        end
-        section_hash
-      end
-      results.sort { |l,r| l['Score'].to_f <=> r['Score'].to_f }
-    end
-  end
-
-  def self.regular_parser
-    lambda do |output|
-      output.split("\n").map(&:strip)
-    end
-  end
 end

data/lib/darkext/fiber.rb

@@ -0,0 +1,48 @@
+# Poor Man's Fiber (API compatible Thread based Fiber implementation for Ruby 1.8)
+# (c) 2008 Aman Gupta (tmm1)
+
+unless defined? Fiber
+  require 'thread'
+
+  class FiberError < StandardError; end
+
+  class Fiber
+    def initialize
+      raise ArgumentError, 'new Fiber requires a block' unless block_given?
+
+      @yield = Queue.new
+      @resume = Queue.new
+
+      @thread = Thread.new{ @yield.push [ *yield(*@resume.pop) ] }
+      @thread.abort_on_exception = true
+      @thread[:fiber] = self
+    end
+    attr_reader :thread
+
+    def resume *args
+      raise FiberError, 'dead fiber called' unless @thread.alive?
+      @resume.push(args)
+      result = @yield.pop
+      result.size > 1 ? result : result.first
+    end
+
+    def yield *args
+      @yield.push(args)
+      result = @resume.pop
+      result.size > 1 ? result : result.first
+    end
+
+    def self.yield *args
+      raise FiberError, "can't yield from root fiber" unless fiber = Thread.current[:fiber]
+      fiber.yield(*args)
+    end
+
+    def self.current
+      Thread.current[:fiber] or raise FiberError, 'not inside a fiber'
+    end
+
+    def inspect
+      "#<#{self.class}:0x#{self.object_id.to_s(16)}>"
+    end
+  end
+end

data/lib/darkext/io.rb

@@ -3,7 +3,7 @@ require 'darkext/hash'
 module DarkIO
   # Runs a block and captures the output it generates
   def self.capture_output(opts = { }) # yield e
-    opts.with_defaults!(:stdout => true, :stderr => true)
+    opts.with_defaults!(:stdout => true, :stderr => false)
     cout,cerr = opts[:stdout],opts[:stderr]
 
     yield and return if !cout && !cerr

data/lib/darkext/string.rb

@@ -51,5 +51,15 @@ class String
     self.downcase == 'false'
   end
 
+  def starts_with?(str)
+    str = str.to_s
+    str == self[0, str.length]
+  end
+
+  def ends_with?(str)
+    str = str.to_s
+    str == self[-str.length, str.length]
+  end
+
   alias :/ :split
 end

data/lib/darkext.rb

@@ -2,5 +2,6 @@ $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 Dir[File.join(File.join(File.dirname(__FILE__), 'darkext'), '*.rb')].sort.each do |lib|
-  require lib unless lib.include?('sinatra') # don't include sinatra stuff by defaults
+  # don't include sinatra stuff by defaults
+  require lib unless lib.include?('sinatra') || lib.include?('sitemap')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: darkhelmet-darkext
 version: !ruby/object:Gem::Version 
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors: 
 - Daniel Huckstep
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-27 00:00:00 -08:00
+date: 2009-03-02 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -29,6 +29,7 @@ files:
 - lib/darkext/numeric.rb
 - lib/darkext/string.rb
 - lib/darkext/io.rb
+- lib/darkext/fiber.rb
 - lib/darkext/symbol.rb
 - lib/darkext/statistics.rb
 - lib/darkext/sinatra.rb