cypher-rack-dickbarblocker 0.2.1 → 0.2.2

data/README.markdown

@@ -1,6 +1,6 @@
 # rack-dickbarblocker
 
-A Rack middleware that displays a special page when the DiggBar is used.
+A Rack middleware that displays a special page to anyone using the DiggBar.
 
 Hat-tip to [rue](http://github.com/rue) for suggesting the name.
 
@@ -31,7 +31,7 @@ Hat-tip to [rue](http://github.com/rue) for suggesting the name.
           # rest of your config
         end
 
-By default, it shows the following text (sans markup):
+By default, it shows the following text, taken from John Grubers page (sans markup):
 
 > Dear Digg,  
 > Framing sites is bullshit.
@@ -59,9 +59,8 @@ You can override this by supplying the middleware with a block that returns what
 
 This would return an HTML page with "Kittens are fun!" on it instead.
 
-DickBarBlocker expects the return value of the body to respond to `to_s`.
-It also currently hardcodes the content type to `text/html`, so your response should
-be HTML.
+DickBarBlocker expects the return value of the block to respond to `to_s`.
+It also currently hardcodes the content type to `text/html`, so your return value should also be (or generate) HTML.
 
 ## Copyright
 

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 2
-:patch: 1
+:patch: 2

data/lib/rack/contrib/dick_bar_blocker.rb

@@ -12,7 +12,7 @@ module Rack
       def call(env)
         referrer = env['HTTP_REFERER']
         # Regex courtesy of John Gruber: http://daringfireball.net/2009/04/how_to_block_the_diggbar
-        if referrer && referrer =~ %r{http://digg.com/\w{1,8}/*(\?.*)?$}
+        if referrer && referrer =~ %r{http://(?:www\.)?digg.com/\w{1,8}/*(\?.*)?$}
           if @block
             body = @block.call.to_s
           else

data/test/spec_rack_dick_bar_blocker.rb

@@ -25,6 +25,15 @@ context "Rack::Contrib::DickBarBlocker" do
       body.should =~ %r{Dear Digg,<br>\s+Framing sites is bullshit\.<br>\s+<br>\s+Your pal,<br>\s+—J.G.}mi
     end
 
+    specify "works also with a www.digg.com referrer" do
+      status, headers, body = Rack::Contrib::DickBarBlocker.new(app, 'J.G.').call({'HTTP_REFERER' => 'http://www.digg.com/d1oNOZ'})
+
+      status.should.equal 200
+      headers['Content-Type'].should.equal 'text/html'
+      body.should =~ %r{<title>Don't be a dick, say no to the DiggBar</title>}i
+      body.should =~ %r{Dear Digg,<br>\s+Framing sites is bullshit\.<br>\s+<br>\s+Your pal,<br>\s+—J.G.}mi
+    end
+
     specify "uses the given name" do
       name = "test name"
       status, headers, body = Rack::Contrib::DickBarBlocker.new(app, name).call({'HTTP_REFERER' => 'http://digg.com/d1oNOZ'})

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cypher-rack-dickbarblocker
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Markus Prinz