rack-recaptcha 0.6.2 → 0.6.3

data/README.md

@@ -133,9 +133,12 @@ Chad Johnston - [iamthechad](https://github.com/iamthechad)
 
   * Adding Error Message handling in recaptcha widget
 
+Eric Hu - [eric-hu](https://github.com/eric-hu)
+
+  * Patching error message issue when no `request` is present
 
 #### Note on Patches/Pull Requests
- 
+
 * Fork the project.
 * Make your feature addition or bug fix.
 * Add tests for it. This is important so I don't break it in a

data/lib/rack/recaptcha/helpers.rb

@@ -34,7 +34,7 @@ module Rack
         options[:public_key] ||= Rack::Recaptcha.public_key
         path = options[:ssl] ? Rack::Recaptcha::API_SECURE_URL : Rack::Recaptcha::API_URL
         params = "k=#{options[:public_key]}"
-        error_message = defined?(request) ? request.env['recaptcha.msg'] : env['recaptcha.msg']
+        error_message = request.env['recaptcha.msg'] if request
         params += "&error=" + URI.encode(error_message) unless error_message.nil?
         html = case type.to_sym
         when :challenge
@@ -67,8 +67,7 @@ module Rack
       # Helper to return whether the recaptcha was accepted.
       def recaptcha_valid?
         test = Rack::Recaptcha.test_mode
-        return test unless test.nil?
-        defined?(request) ? request.env['recaptcha.valid'] : env['recaptcha.valid']
+        test.nil? ? request.env['recaptcha.valid'] : test
       end
 
     end

data/rack-recaptcha.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = %q{rack-recaptcha}
-  s.version = "0.6.2"
+  s.version = "0.6.3"
   s.required_rubygems_version = ">=1.3.6"
   s.authors = ["Arthur Chiu"]
   s.date = %q{2010-07-18}

data/test/helpers_test.rb

@@ -3,11 +3,17 @@ require File.expand_path '../teststrap', __FILE__
 class HelperTest
   attr_accessor :request
   include Rack::Recaptcha::Helpers
-  
+
   def initialize
     @request = HelperTest::Request.new
   end
-  
+
+  def self.new_with_nil_request
+    helper = HelperTest.new
+    helper.request = nil
+    helper
+  end
+
   class Request
     attr_accessor :env
   end
@@ -112,16 +118,19 @@ context "Rack::Recaptcha::Helpers" do
       denies_topic("has js").matches %r{recaptcha_ajax.js}
       asserts_topic("has previous error").matches %r{Sample%20Error}
     end
+
   end
 
   context "recaptcha_valid?" do
 
     asserts "that it passes when recaptcha.valid is true" do
+      Rack::Recaptcha.test_mode = nil
       mock(helper_test.request.env).[]('recaptcha.valid').returns(true)
       helper_test.recaptcha_valid?
     end
 
     denies "that it passes when recaptcha.valid is false" do
+      Rack::Recaptcha.test_mode = nil
       mock(helper_test.request.env).[]('recaptcha.valid').returns(false)
       helper_test.recaptcha_valid?
     end
@@ -131,10 +140,25 @@ context "Rack::Recaptcha::Helpers" do
       helper_test.recaptcha_valid?
     end
 
-    denies "that it passes when test mode set to fil" do
+    denies "that it passes when test mode set to fail" do
       Rack::Recaptcha.test_mode! :return => false
       helper_test.recaptcha_valid?
     end
 
   end
 end
+
+context Rack::Recaptcha::Helpers do
+  helper(:helper_test) { HelperTest.new_with_nil_request }
+    context "request object not available.  Rack-recaptcha shouldn't die" do
+      setup do
+        helper_test.recaptcha_tag(:challenge)
+      end
+
+      asserts_topic("has script tag").matches %r{script}
+      asserts_topic("has challenge js").matches %r{challenge}
+      denies_topic("has js").matches %r{recaptcha_ajax.js}
+      denies_topic("has display").matches %r{RecaptchaOptions}
+      asserts_topic("has public_key").matches %r{#{'0'*40}}
+    end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-recaptcha
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2010-07-18 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2153468420 !ruby/object:Gem::Requirement
+  requirement: &2152600680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153468420
+  version_requirements: *2152600680
 - !ruby/object:Gem::Dependency
   name: riot
-  requirement: &2153467960 !ruby/object:Gem::Requirement
+  requirement: &2152600220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.12.3
   type: :development
   prerelease: false
-  version_requirements: *2153467960
+  version_requirements: *2152600220
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &2153467500 !ruby/object:Gem::Requirement
+  requirement: &2152599760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.5.7
   type: :development
   prerelease: false
-  version_requirements: *2153467500
+  version_requirements: *2152599760
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &2153467040 !ruby/object:Gem::Requirement
+  requirement: &2152599300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.3.0
   type: :development
   prerelease: false
-  version_requirements: *2153467040
+  version_requirements: *2152599300
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &2153466580 !ruby/object:Gem::Requirement
+  requirement: &2152598840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: 1.0.2
   type: :development
   prerelease: false
-  version_requirements: *2153466580
+  version_requirements: *2152598840
 description: Rack middleware Captcha verification using Recaptcha API.
 email: mr.arthur.chiu@gmail.com
 executables: []