drewolson-pipe 0.1.0 → 0.1.1

data/README.txt

@@ -17,7 +17,7 @@ plus patterns those tags must fit. Use with sinatra, easy as pie.
  Make a new file called ruby_pipe.rb:
 
   require 'rubygems'
-  require 'pipes'
+  require 'pipe'
   require 'sinatra'
 
   get '/' do

data/lib/pipe.rb

@@ -3,7 +3,7 @@ require 'rubygems'
 require 'hpricot'
 
 class Pipe
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
   HEADER = %q{<?xml version="1.0" encoding="UTF-8"?><rss version="2.0"><channel>}
   FOOTER = %q{</channel></rss>}
 
@@ -11,7 +11,13 @@ class Pipe
 
   def self.create(&block)
     pipe = Pipe.new
-    pipe.instance_eval(&block)
+    
+    if block.arity.zero?
+      pipe.instance_eval(&block)
+    else
+      block.call(pipe)
+    end
+
     HEADER + pipe.content + FOOTER
   end
 
@@ -20,10 +26,12 @@ class Pipe
   end
 
   def feed(url,filters={})
+    enum = (filters[:combine_with] == :and ? :all? : :any?)
+
     doc = Hpricot.XML(open(url))
 
     @content += (doc/:item).select do |item|
-      filters.all? { |field,pattern| (item/field).to_s =~ pattern }
+      filters.send(enum) { |field,pattern| (item/field).to_s =~ pattern }
     end.to_s
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: drewolson-pipe
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Drew Olson
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-10 00:00:00 -08:00
+date: 2008-12-12 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency