bot-away 1.1.0 → 1.2.0

data/spec/{lib/builder_spec.rb → views/lib/form_builder_spec.rb}

@@ -1,13 +1,5 @@
-###
-# The original implementation of BotAway extended ActionView::Helpers::FormBuilder, and these tests were written
-# for it. This approach has since been abandoned in favor of a direct override of ActionView::Helpers::InstanceTag for
-# reasons of efficiency. The FormBuilder tests have been kept around simply for an extra layer of functional testing.
-###
-
 require 'spec_helper'
 
-class MockObject; attr_accessor :method_name; def initialize; @method_name = 'method_value'; end; end
-
 describe ActionView::Helpers::FormBuilder do
   subject { builder }
 
@@ -26,7 +18,7 @@ describe ActionView::Helpers::FormBuilder do
   
   it "should not obfuscate names that have been explicitly ignored" do
     BotAway.accepts_unfiltered_params 'method_name'
-    builder.text_field('method_name').should_not match(/name="a0844d45bf150668ff1d86a6eb491969/)
+    builder.text_field('method_name').should_not match(/name="#{obfuscated_name}/)
     BotAway.unfiltered_params.delete 'method_name'
   end
   
@@ -39,7 +31,7 @@ describe ActionView::Helpers::FormBuilder do
   #grouped_collection_select(method, collection, group_method, group_label_method, option_key_method,
   #                          option_value_method, options = {}, html_options = {})
   obfuscates(:grouped_collection_select) do
-    builder.grouped_collection_select method_name, [MockObject.new], :method_name, :method_name, :to_s, :to_s
+    builder.grouped_collection_select method_name, [MockObject.new], object_name, method_name, method_name, :to_s
   end
   
   #time_zone_select(method, priority_zones = nil, options = {}, html_options = {})
@@ -51,13 +43,14 @@ describe ActionView::Helpers::FormBuilder do
     obfuscates(field) { builder.send(field, method_name) }
   end
 
-  obfuscates(:radio_button, '53640013be550817d040597218884288') { builder.radio_button method_name, :value }
+  obfuscates(:radio_button, RAILS_VERSION >= "3.0" ? "767c870add970ab6d64803043c4ccfbb" :
+          "53640013be550817d040597218884288") { builder.radio_button method_name, :value }
 
   context "#label" do
     subject { dump { builder.label(method_name) } }
 
     it "links labels to their obfuscated elements" do
-      subject.should match(/for=\"e21372563297c728093bf74c3cb6b96c\"/)
+      subject.should match(/for=\"#{obfuscated_id}\"/)
     end
   end
 end

data/spec/{lib → views/lib}/param_parser_spec.rb

@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 describe BotAway::ParamParser do
   def params(honeypots)
     @params = { 'authenticity_token' => '1234',
@@ -13,7 +15,11 @@ describe BotAway::ParamParser do
     @params = params('test' => { 'name' => '', 'posts' => [] })
   end
 
-  subject { r = BotAway::ParamParser.new(@ip, @params); puts r.params.to_yaml; r }
+  subject { dump { BotAway::ParamParser.new(@ip, @params) } }
+  
+  it "should default BotAway.dump_params => false" do
+    (!!BotAway.dump_params).should == false
+  end
   
   context "with dump_params == true" do
     before(:each) { BotAway.dump_params = true }
@@ -21,7 +27,7 @@ describe BotAway::ParamParser do
     
     it "should dump params as debug to Rails logger" do
       @params = { 'test' => "hello", :posts => [1] }
-      Rails.logger.should_receive(:debug).with(@params.inspect)
+      Rails.logger.should_receive(:debug).exactly(3).times #with(@params.inspect)
       subject
     end
   end
@@ -48,7 +54,7 @@ describe BotAway::ParamParser do
 
   context "with a filled honeypot" do
     before(:each) { @params = params({'test' => {'name' => 'colin', 'posts' => []}}) }
-    subject { r = BotAway::ParamParser.new(@ip, @params); puts r.params.to_yaml; r }
+    subject { dump { BotAway::ParamParser.new(@ip, @params) } }
 
     it "drops all parameters" do
       subject.params.should == { "suspected_bot" => true }
@@ -57,7 +63,7 @@ describe BotAway::ParamParser do
 
   context "with a filled sub-honeypot" do
     before(:each) { @params = params({'test' => {'name' => '', 'posts' => [1, 2]}}) }
-    subject { r = BotAway::ParamParser.new(@ip, @params); puts r.params.to_yaml; r }
+    subject {  dump { BotAway::ParamParser.new(@ip, @params) } }
 
     it "drops all parameters" do
       subject.params.should == { "suspected_bot" => true }

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 1
+  - 2
   - 0
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Colin MacKenzie IV
@@ -14,13 +14,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-21 00:00:00 -04:00
+date: 2010-10-14 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: actionpack
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -35,6 +36,7 @@ dependencies:
   name: sc-core-ext
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -46,53 +48,70 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rubyforge
+  name: jeweler
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
-        - 2
-        - 0
+        - 1
         - 4
-        version: 2.0.4
+        - 0
+        version: 1.4.0
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: hoe
+  name: rspec
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
-        - 2
-        - 6
+        - 1
+        - 3
         - 0
-        version: 2.6.0
+        version: 1.3.0
   type: :development
   version_requirements: *id004
-description: |-
-  Unobtrusively detects form submissions made by spambots, and silently drops those submissions. The key word here is
-  "unobtrusive" -- this is NOT a CAPTCHA. This is a transparent, modular implementation of the bot-catching techniques
-  discussed by Ned Batchelder at http://nedbatchelder.com/text/stopbots.html.
-email: 
-- sinisterchipmunk@gmail.com
+- !ruby/object:Gem::Dependency 
+  name: rspec-rails
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 3
+        - 2
+        version: 1.3.2
+  type: :development
+  version_requirements: *id005
+description: Unobtrusively detects form submissions made by spambots, and silently drops those submissions.
+email: sinisterchipmunk@gmail.com
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
-- History.txt
-- Manifest.txt
+- LICENSE
+- README.rdoc
 files: 
+- .gitignore
 - History.txt
+- LICENSE
 - Manifest.txt
 - README.rdoc
 - Rakefile
+- VERSION
+- bot-away.gemspec
 - lib/bot-away.rb
-- lib/bot-away/action_controller/request.rb
+- lib/bot-away/action_dispatch/request.rb
 - lib/bot-away/action_view/helpers/instance_tag.rb
 - lib/bot-away/param_parser.rb
 - lib/bot-away/spinner.rb
@@ -100,27 +119,30 @@ files:
 - script/destroy
 - script/generate
 - spec/controllers/test_controller_spec.rb
-- spec/lib/action_view/helpers/instance_tag_spec.rb
-- spec/lib/builder_spec.rb
-- spec/lib/param_parser_spec.rb
+- spec/rspec_version.rb
 - spec/spec_helper.rb
-- spec/support/controllers/test_controller.rb
 - spec/support/honeypot_matcher.rb
 - spec/support/obfuscation_helper.rb
 - spec/support/obfuscation_matcher.rb
+- spec/support/rails/mock_logger.rb
+- spec/support/test_controller.rb
 - spec/support/views/test/index.html.erb
 - spec/support/views/test/model_form.html.erb
+- spec/views/lib/action_view/helpers/instance_tag_spec.rb
+- spec/views/lib/disabled_for_spec.rb
+- spec/views/lib/form_builder_spec.rb
+- spec/views/lib/param_parser_spec.rb
 has_rdoc: true
-homepage: http://github.com/sinisterchipmunk/bot-away
+homepage: http://www.thoughtsincomputation.com
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-- --main
-- README.rdoc
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -128,6 +150,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -136,10 +159,21 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
 requirements: []
 
-rubyforge_project: bot-away
-rubygems_version: 1.3.6
+rubyforge_project: 
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Unobtrusively detects form submissions made by spambots, and silently drops those submissions
-test_files: []
-
+summary: Unobtrusively detects form submissions made by spambots, and silently drops those submissions.
+test_files: 
+- spec/controllers/test_controller_spec.rb
+- spec/rspec_version.rb
+- spec/spec_helper.rb
+- spec/support/honeypot_matcher.rb
+- spec/support/obfuscation_helper.rb
+- spec/support/obfuscation_matcher.rb
+- spec/support/rails/mock_logger.rb
+- spec/support/test_controller.rb
+- spec/views/lib/action_view/helpers/instance_tag_spec.rb
+- spec/views/lib/disabled_for_spec.rb
+- spec/views/lib/form_builder_spec.rb
+- spec/views/lib/param_parser_spec.rb

data/lib/bot-away/action_controller/request.rb

@@ -1,19 +0,0 @@
-class ActionController::Request < Rack::Request
-  def parameters_with_deobfuscation
-    @parameters ||= BotAway::ParamParser.new(ip, parameters_without_deobfuscation).params
-  end
-
-  class << self
-    def unfiltered_params(*keys)
-      unfiltered_params = instance_variable_get("@unfiltered_params") || instance_variable_set("@unfiltered_params", [])
-      unfiltered_params.concat keys.flatten.collect { |k| k.to_s }
-      unfiltered_params
-    end
-
-    alias_method :accepts_unfiltered_params, :unfiltered_params
-  end
-
-  delegate :accepts_unfiltered_params, :unfiltered_params, :to => :"self.class"
-  alias_method_chain :parameters, :deobfuscation
-  alias_method :params, :parameters
-end

data/spec/support/controllers/test_controller.rb

@@ -1,18 +0,0 @@
-class Post
-  attr_reader :subject, :body, :subscribers
-end
-
-class TestController < ActionController::Base
-  view_paths << File.expand_path(File.join(File.dirname(__FILE__), "../views"))
-
-  def index
-  end
-
-  def model_form
-    @post = Post.new
-  end
-
-  def proc_form
-    render :text => params.to_yaml
-  end
-end