rack-attack-recaptcha 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d867b620635d9c9982cb3de3d29ea2ccfa31978e
-  data.tar.gz: 5ae0d7485b457f2f3371b2ad1a56dbfdee35d2f7
+  metadata.gz: 42e689dc0d03cdf5b116e1ab5ac3f723d053edf9
+  data.tar.gz: 8876a9603be91f09dd608366ca341693b6195339
 SHA512:
-  metadata.gz: c589069fdc7844543f70b124f8a06c0d30e65d30a5a82366b6b73191d01f8024ac6a16a558d55ade91ff79e4bf24b0e72753fe59589d1cf702c309c875068451
-  data.tar.gz: 70ee51e0dc169413fac883117a1b9930bebc882ab94fc6b41f12b4206b3186ad263514efeec032c0c27bc12b63a8d0fbe4ced74bfb8ae35a5b07eff0785742d1
+  metadata.gz: d4b2d4fcf482dc6495cf50b17965d3f8948d1cc229c2024d60d8406e165a98f3b812a701152a288bb550bd25beee0c8bf8364a755a3ca11ce81324605d90b0fe
+  data.tar.gz: f4ab497698bdabf287d794640158b51d7dc89523218188f509916c7994ab376568315e2489644eddb204038d454ac2f21ff8cf4149757eaf797af7b730a0eb30

data/README.md

@@ -31,7 +31,14 @@ Tell your app to use the Rack::Attack middleware. For Rails 3+ apps:
     # In config/application.rb
     config.middleware.use Rack::Attack::Recaptcha
 
-To setup throttles, check out rack-attack's wiki.
+To setup Recaptcha throttles, you should specify the throttle's type to
+be `:recaptcha` as shown here:
+
+    Rack::Attack.throttle('req/ip', :limit => 5, :period => 1.second, :type => :recaptcha) do |req|
+      req.ip
+    end
+
+Check out [rack-attack's](https://github.com/kickstarter/rack-attack)'s wiki for more details on setting throttles.
 To setup Recaptcha credentials, check out [recaptcha](http://github.com/ambethia/recaptcha)'s wiki.
 
 ## Usage

data/lib/rack/attack/recaptcha.rb

@@ -2,17 +2,21 @@ require "rack/attack"
 require "rack/attack/recaptcha/version"
 require "rack/attack/recaptcha/client_helper"
 require "rack/attack/recaptcha/verification_helper"
-require "rack/attack/recaptcha/rails"
 
 module Rack
-  module Attack
+  class Attack
     module Recaptcha
       class << self
         def new(app)
+          @default_response = Rack::Attack.throttled_response
           @rack_attack = Rack::Attack.new(app).tap { |attack|
-            attack.throttled_response = lambda { |env|
-              env["rack.attack.use_recaptcha"] = true
-              app.call(env)
+            attack.class.throttled_response = lambda { |env|
+              if env["rack.attack.match_type"] == :recaptcha
+                env["rack.attack.use_recaptcha"] = true
+                app
+              else
+                @default_response
+              end.call(env)
             }
           }
 

data/lib/rack/attack/recaptcha/client_helper.rb

@@ -1,5 +1,5 @@
 module Rack
-  module Attack
+  class Attack
     module Recaptcha
       module ClientHelper
         def recaptcha_tags_if_under_attack(options={})

data/lib/rack/attack/recaptcha/rails.rb

@@ -1,4 +1,6 @@
-require "recaptcha/rails"
+if defined?(Rails)
+  require "recaptcha/rails"
 
-ActionView::Base.send(:include, Rack::Attack::Recaptcha::ClientHelper)
-ActionController::Base.send(:include, Rack::Attack::Recaptcha::VerificationHelper)
+  ActionView::Base.send(:include, Rack::Attack::Recaptcha::ClientHelper)
+  ActionController::Base.send(:include, Rack::Attack::Recaptcha::VerificationHelper)
+end

data/lib/rack/attack/recaptcha/verification_helper.rb

@@ -1,5 +1,5 @@
 module Rack
-  module Attack
+  class Attack
     module Recaptcha
       module VerificationHelper
         def verify_recaptcha_if_under_attack(options={})

data/lib/rack/attack/recaptcha/version.rb

@@ -1,7 +1,7 @@
 module Rack
-  module Attack
+  class Attack
     module Recaptcha
-      VERSION = "0.0.1"
+      VERSION = "0.0.2"
     end
   end
 end

data/spec/client_helper_spec.rb

@@ -14,7 +14,7 @@ class DummyView
 end
 
 module Rack
-  module Attack
+  class Attack
     module Recaptcha
       describe ClientHelper do
         describe ".recaptcha_tags_if_under_attack" do

data/spec/rack_attack_recaptcha_spec.rb

@@ -18,7 +18,7 @@ describe "Rack::Attack::Recaptcha" do
   before do
     @bad_ip = "1.2.3.4"
     Rack::Attack.cache.store = ActiveSupport::Cache::MemoryStore.new
-    Rack::Attack.throttle("req/ip", :limit => 1, :period => 1) { |req| req.ip }
+    Rack::Attack.throttle("req/ip", :limit => 1, :period => 1, :type => :recaptcha) { |req| req.ip }
   end
 
   it "always delegates request to the underlying app" do

data/spec/spec_helper.rb

@@ -1,8 +1,8 @@
+require "active_support"
 require "minitest/autorun"
 require "minitest/pride"
 require "rack/test"
 require "rack/attack/recaptcha"
-require "active_support"
 
 require 'rspec/mocks'
 

data/spec/verification_helper_spec.rb

@@ -14,7 +14,7 @@ class DummyController
 end
 
 module Rack
-  module Attack
+  class Attack
     module Recaptcha
       describe ClientHelper do
         describe ".verify_recaptcha_if_under_attack" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-attack-recaptcha
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Omer Lachish-Rauchwerger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-11 00:00:00.000000000 Z
+date: 2014-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler