rack-recaptcha 0.3.0 → 0.4.0

data/README.md

@@ -19,31 +19,34 @@ You have to require 'rack-recaptcha' in your gemfile.
 
     * :public_key -- your ReCaptcha API public key *(required)*
     * :private_key -- your ReCaptcha API private key *(required)*
-    * :paths -- where user goes to login or access the recaptcha (array of paths or single path)
-
 
 Now configure your app to use the middleware. This might be different across each web framework.
 
 #### Sinatra
     ## app.rb
-    use Rack::Recaptcha, :public_key => 'KEY', :private_key => 'SECRET', :paths => 'PATH'
+    use Rack::Recaptcha, :public_key => 'KEY', :private_key => 'SECRET'
     helpers Rack::Recaptcha::Helpers
 
 #### Padrino
 
     ## app/app.rb
-    use Rack::Recaptcha, :public_key => 'KEY', :private_key => 'SECRET', :paths => 'PATH'
+    use Rack::Recaptcha, :public_key => 'KEY', :private_key => 'SECRET'
     helpers Rack::Recaptcha::Helpers
 
 
 #### Rails
 
-    ## environment.rb:
-    config.gem 'rack-recaptcha', :lib => 'rack/recaptcha'
-    config.middleware.use Rack::Recaptcha, :public_key => 'KEY', :private_key => 'SECRET', :paths => 'PATH'
+    ## application.rb:
+    class Application < Rails::Application
+    # ...
+      config.gem 'rack-recaptcha', :lib => 'rack/recaptcha'
+      config.middleware.use Rack::Recaptcha, :public_key => 'KEY', :private_key => 'SECRET'
+    end
 
-    ## application_controller.rb
-    include Rack::Recaptcha::Helpers
+    ## application_helper.rb
+    module ApplicationHelper
+      include Rack::Recaptcha::Helpers
+    end
 
 ### Helpers
 
@@ -80,6 +83,12 @@ In Padrino, here's how you would use the helpers.
       end
     end
 
+In rails, you'll need to use also use the raw method:
+
+    ## new.html.haml
+    - form_tag '/login' do
+      = raw recaptcha_tag(:challenge)
+      = submit_tag "Submit"
 
 ### Contributors
 

data/lib/rack/recaptcha.rb

@@ -15,7 +15,7 @@ module Rack
     # Initialize the Rack Middleware. Some of the available options are:
     #   :public_key  -- your ReCaptcha API public key *(required)*
     #   :private_key -- your ReCaptcha API private key *(required)*
-    #   :paths       -- where user goes to login or access the recaptcha (array of paths or single path)
+    #
     def initialize(app,options = {})
       @app = app
       @paths = options[:paths] && [options[:paths]].flatten.compact
@@ -29,8 +29,7 @@ module Rack
 
     def _call(env)
       request = Request.new(env)
-      if request.params[CHALLENGE_FIELD] and
-        request.params[RESPONSE_FIELD] and (not @paths or @paths.include?(request.path))
+      if request.params[CHALLENGE_FIELD] and request.params[RESPONSE_FIELD]
         value, msg = verify(
           request.ip,
           request.params[CHALLENGE_FIELD],

data/rack-recaptcha.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = %q{rack-recaptcha}
-  s.version = "0.3.0"
+  s.version = "0.4.0"
   s.required_rubygems_version = ">=1.3.6"
   s.authors = ["Arthur Chiu"]
   s.date = %q{2010-07-18}
@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.summary = %q{Rack middleware for Recaptcha}
   s.test_files = Dir.glob("test/**/*")
   s.add_runtime_dependency "json", ">= 0"
-  s.add_development_dependency "riot",      "~> 0.12.1"
+  s.add_development_dependency "riot",      "~> 0.12.3"
   s.add_development_dependency "rack-test", "~> 0.5.7"
   s.add_development_dependency "fakeweb",   "~> 1.3.0"
   s.add_development_dependency "rr",        "~> 1.0.2"

data/test/teststrap.rb

@@ -35,16 +35,11 @@ class Riot::Situation
     }
 
     builder = Rack::Builder.new
-    builder.use Rack::Recaptcha, :private_key => PRIVATE_KEY, :public_key => PUBLIC_KEY, :paths => '/login'
+    builder.use Rack::Recaptcha, :private_key => PRIVATE_KEY, :public_key => PUBLIC_KEY
     builder.run main_app
     builder.to_app
   end
 end
 
 class Riot::Context
-
-  # denies_topic currently on edge. Will remove once its released
-  def denies_topic(what)
-    denies(what) { topic }
-  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rack-recaptcha
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 15
   prerelease: 
   segments: 
   - 0
-  - 3
+  - 4
   - 0
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Arthur Chiu
@@ -40,12 +40,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 45
+        hash: 41
         segments: 
         - 0
         - 12
-        - 1
-        version: 0.12.1
+        - 3
+        version: 0.12.3
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency