rack-honeypot 0.1.0 → 0.1.1

data/lib/rack/honeypot.rb

@@ -16,52 +16,56 @@ module Rack
     def call(env)
       if spambot_submission?(Rack::Request.new(env).params)
         @logger.warn("[Rack::Honeypot] Spam bot detected; responded with null") unless @logger.nil?
-        send_to_dead_end
+        null_response
       else
         status, headers, response = @app.call(env)
-        new_body = insert_honeypot(build_response_body(response))
-        new_headers = recalculate_body_length(headers, new_body)
+        new_body = insert_honeypot(response_body(response))
+        new_headers = response_headers(headers, new_body)
         [status, new_headers, new_body]
       end
     end
 
+    private
+
     def spambot_submission?(form_hash)
       form_hash && form_hash[@input_name] && form_hash[@input_name] != @input_value
     end
     
-    def send_to_dead_end
+    def null_response
       [200, {'Content-Type' => 'text/html', "Content-Length" => "0"}, []]
     end
     
-    def build_response_body(response)
-      response_body = ""
-      response.each { |part| response_body += part }
-      response_body
+    def response_body(response)
+      response.join("")
     end
     
-    def recalculate_body_length(headers, body)
-      new_headers = headers
-      new_headers["Content-Length"] = body.length.to_s
-      new_headers
+    def response_headers(headers, body)
+      headers.merge("Content-Length" => body.length.to_s)
     end
 
     def insert_honeypot(body)
-      css = unindent <<-BLOCK
+      body.gsub!(/<\/head>/, css + "\n</head>")
+      body.gsub!(/<form(.*)>/, '<form\1>' + "\n" + div)
+      body
+    end
+
+    def css
+      unindent <<-BLOCK
         <style type='text/css' media='all'>
           div.#{@class_name} {
             display:none;
           }
         </style>
       BLOCK
-      div = unindent <<-BLOCK
+    end
+
+    def div
+      unindent <<-BLOCK
         <div class='#{@class_name}'>
           <label for='#{@input_name}'>#{@label}</label>
           <input type='text' name='#{@input_name}' value='#{@input_value}'/>
         </div>
       BLOCK
-      body.gsub!(/<\/head>/, css + "\n</head>")
-      body.gsub!(/<form(.*)>/, '<form\1>' + "\n" + div)
-      body
     end
 
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rack-honeypot
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Luigi Montanez
@@ -19,24 +19,10 @@ cert_chain: []
 
 date: 2011-10-05 00:00:00 Z
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rake
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: unindentable
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -48,25 +34,11 @@ dependencies:
         - 4
         version: 0.0.4
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rack
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rack-test
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -76,7 +48,7 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id002
 description: This middleware acts as a spam trap. It inserts, into every outputted <form>, a text field that a spambot will really want to fill in, but is actually not used by the app. The field is hidden to humans via CSS, and includes a warning label for screenreading software.
 email: luigi.montanez@gmail.com
 executables: []
@@ -87,13 +59,10 @@ extra_rdoc_files:
 - LICENSE.md
 - README.md
 files: 
-- Gemfile
 - LICENSE.md
 - README.md
-- Rakefile
 - VERSION
 - lib/rack/honeypot.rb
-- test/test_honeypot.rb
 homepage: http://github.com/sunlightlabs/rack-honeypot
 licenses: []
 

data/Gemfile

@@ -1,7 +0,0 @@
-source 'http://rubygems.org/'
-
-gem 'rake'
-gem 'unindentable', '0.0.4'
-gem 'rack'
-gem 'mocha'
-gem 'rack-test'

data/Rakefile

@@ -1,6 +0,0 @@
-
-require 'rake/testtask'
-
-Rake::TestTask.new do |task|
-  task.test_files = FileList['test/test_*.rb']
-end

data/test/test_honeypot.rb

@@ -1,87 +0,0 @@
-require 'rack/test'
-require 'test/unit'
-require 'mocha'
-require 'unindentable'
-
-require File.expand_path(File.dirname(__FILE__) + '/../lib/rack/honeypot')
-
-# To run this test, you need to have rack-test gem installed: sudo gem install rack-test
-
-class HoneypotTest < Test::Unit::TestCase
-  include Rack::Test::Methods
-  include Unindentable
-
-  def setup
-    @logger = stub("logger", :warn => nil)
-  end
-
-  def app
-    content = unindent <<-BLOCK
-      <html>
-        <head>
-        </head>
-        <body>
-          <form></form>
-          Hello World!
-        </body>
-      </html>
-    BLOCK
-
-    hello_world_app = lambda do |env|
-      [
-        200,
-        {
-          'Content-Type'   => 'text/plain',
-          'Content-Length' => content.length.to_s
-        },
-        [content]
-      ]
-    end
-
-    Rack::Honeypot.new(hello_world_app, :input_name => 'honeypot_email', :logger => @logger)
-  end
-
-  def test_normal_request_should_go_through
-    get '/'
-    assert_equal 200, last_response.status
-    assert_not_equal '', last_response.body
-  end
-
-  def test_request_with_form_should_add_honeypot_css
-    get '/'
-    assert_equal 200, last_response.status
-    css = unindent <<-BLOCK
-      <style type='text/css' media='all'>
-        div.phonetoy {
-          display:none;
-        }
-      </style>
-    BLOCK
-    assert last_response.body.index(css)
-  end
-
-  def test_request_with_form_should_add_honeypot_div
-    get '/'
-    assert_equal 200, last_response.status
-  
-    div = unindent <<-BLOCK
-      <div class='phonetoy'>
-        <label for='honeypot_email'>Don't fill in this field</label>
-        <input type='text' name='honeypot_email' value=''/>
-      </div>
-    BLOCK
-    assert last_response.body.index(div)
-  end
-  
-  def test_spam_request_should_be_sent_to_dead_end
-    post '/', :honeypot_email => 'joe@example.com'
-    assert_equal 200, last_response.status
-    assert_equal '', last_response.body
-  end
-
-  def test_spam_request_should_be_logged
-    @logger.expects(:warn).with("[Rack::Honeypot] Spam bot detected; responded with null")
-    post '/', :honeypot_email => 'joe@example.com'
-  end
-    
-end