scrape 0.2.1 → 0.2.2

data/lib/scrape/match.rb

@@ -3,11 +3,12 @@ class Scrape::Match
 
   def initialize matcher, &proc
     @matcher, @proc = matcher, proc
-    raise ArgumentError.new("Match block expects one argument") if proc.arity != 1
+    raise ArgumentError, "Not enough arguments in block" if proc.arity == 0
   end
 
-  def invoke doc
-    @proc.call doc
+  def invoke *args
+    args = args[0, @proc.arity] unless @proc.arity == -1
+    @proc.call *args
   end
 
   def =~ url

data/lib/scrape/site.rb

@@ -23,7 +23,7 @@ class Scrape::Site
     url = normalize url
     doc = Nokogiri::HTML Scrape.open(url)
 
-    @matches.each{|match| match.invoke doc if match =~ url }
+    @matches.each{|match| match.invoke doc, url if match =~ url }
 
     doc.css("a[href]").map{|node| normalize node['href'], url }.select{|url| accept? url }
   end

data/lib/scrape/version.rb

@@ -1,3 +1,3 @@
 module Scrape
-  VERSION = '0.2.1' unless defined? ::Scrape::VERSION
+  VERSION = '0.2.2' unless defined? ::Scrape::VERSION
 end

data/test/unit/match_test.rb

@@ -14,12 +14,25 @@ class MatchTest < Scrape::TestCase
     assert ok, "Proc was not called"
   end
 
-  test "#invoke should pass the document to the proc" do
-    doc = "yay"
+  test "#invoke should pass 1 argument to proc" do
     ok = false
-    match = Scrape::Match.new("test"){|d| ok = (doc == d) }
-    match.invoke doc
-    assert ok, "Document was not passed into the proc"
+    match = Scrape::Match.new("test"){|one| ok = (one == "foo") }
+    match.invoke "foo"
+    assert ok, "Expected 1 argument to be passed"
+  end
+
+  test "#invoke should pass 2 arguments to proc" do
+    ok = false
+    match = Scrape::Match.new("test"){|one, two| ok = (one == "foo" && two == "bar") }
+    match.invoke "foo", "bar"
+    assert ok, "Expected 2 arguments to be passed"
+  end
+
+  test "#invoke should pass all arguments to proc" do
+    ok = false
+    match = Scrape::Match.new("test"){|*args| ok = (args == ["foo", "bar"]) }
+    match.invoke "foo", "bar"
+    assert ok, "Expected 2 arguments to be passed"
   end
 
   test "#=~ should return true when contains string" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scrape
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-12 00:00:00.000000000 Z
+date: 2012-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri