rack-recaptcha 0.6.3 → 0.6.4

data/README.md

@@ -21,6 +21,10 @@ gem 'rack-recaptcha', :require => 'rack/recaptcha'
 
     * :public_key -- your ReCaptcha API public key *(required)*
     * :private_key -- your ReCaptcha API private key *(required)*
+    * :proxy_host -- the HTTP Proxy hostname *(optional)*
+    * :proxy_port -- the HTTP Proxy port *(optional)*
+    * :proxy_user -- the HTTP Proxy user *(optional, omit unless the proxy requires it)*
+    * :proxy_password -- the HTTP Proxy password *(optional, omit unless the proxy requires it)*
 
 Now configure your app to use the middleware. This might be different across each web framework.
 
@@ -45,10 +49,12 @@ helpers Rack::Recaptcha::Helpers
 
 ````ruby
 ## application.rb:
-class Application < Rails::Application
-# ...
-  config.gem 'rack-recaptcha', :lib => 'rack/recaptcha'
-  config.middleware.use Rack::Recaptcha, :public_key => 'KEY', :private_key => 'SECRET'
+module YourRailsAppName
+  class Application < Rails::Application
+    ...
+    config.gem 'rack-recaptcha', :lib => 'rack/recaptcha'
+    config.middleware.use Rack::Recaptcha, :public_key => 'KEY', :private_key => 'SECRET'
+  end
 end
 
 ## application_helper.rb or whatever helper you want it in.
@@ -57,8 +63,10 @@ module ApplicationHelper
 end
 
 ## application_controller.rb or whatever controller you want it in.
-module ApplicationController
+class ApplicationController < ActionController::Base
+  ...
   include Rack::Recaptcha::Helpers
+  ...
 end
 ````
 
@@ -137,6 +145,10 @@ Eric Hu - [eric-hu](https://github.com/eric-hu)
 
   * Patching error message issue when no `request` is present
 
+Tobias Begalke - [elcamino](https://github.com/elcamino)
+
+  * Added HTTP Proxy support
+
 #### Note on Patches/Pull Requests
 
 * Fork the project.

data/Rakefile

@@ -5,6 +5,7 @@ require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'
   test.pattern = 'test/**/*_test.rb'
+  test.warning = true
   test.verbose = true
 end
 

data/lib/rack/recaptcha.rb

@@ -10,7 +10,7 @@ module Rack
     RESPONSE_FIELD  = 'recaptcha_response_field'
 
     class << self
-      attr_accessor :private_key, :public_key, :test_mode
+      attr_accessor :private_key, :public_key, :test_mode, :proxy_host, :proxy_port, :proxy_user, :proxy_password
 
       def test_mode!(options = {})
         value = options[:return]
@@ -27,6 +27,10 @@ module Rack
       @paths = options[:paths] && [options[:paths]].flatten.compact
       self.class.private_key = options[:private_key]
       self.class.public_key = options[:public_key]
+      self.class.proxy_host = options[:proxy_host]
+      self.class.proxy_port = options[:proxy_port]
+      self.class.proxy_user = options[:proxy_user]
+      self.class.proxy_password = options[:proxy_password]
     end
 
     def call(env)
@@ -53,7 +57,21 @@ module Rack
         'challenge'  => challenge,
         'response'   => response
       }
-      response = Net::HTTP.post_form URI.parse(VERIFY_URL), params
+
+      uri  = URI.parse(VERIFY_URL)
+      http = Net::HTTP.start(uri.host, uri.port)
+
+      if self.class.proxy_host && self.class.proxy_port
+        http = Net::HTTP.Proxy(self.class.proxy_host,
+                               self.class.proxy_port,
+                               self.class.proxy_user,
+                               self.class.proxy_password).start(uri.host, uri.port)
+      end
+
+      request           = Net::HTTP::Post.new(uri.path)
+      request.form_data = params
+      response          = http.request(request)
+
       response.body.split("\n")
     end
 

data/lib/rack/recaptcha/helpers.rb

@@ -34,8 +34,8 @@ 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 = request.env['recaptcha.msg'] if request
-        params += "&error=" + URI.encode(error_message) unless error_message.nil?
+        error_message = request.env['recaptcha.msg'] if defined?(request)
+        params += "&error=" + uri_parser.escape(error_message) unless error_message.nil? 
         html = case type.to_sym
         when :challenge
           %{<script type="text/javascript" src="#{path}/challenge?#{params}">
@@ -70,6 +70,12 @@ module Rack
         test.nil? ? request.env['recaptcha.valid'] : test
       end
 
+      private
+
+      def uri_parser
+        @uri_parser ||= URI.const_defined?(:Parser) ? URI::Parser.new : URI
+      end
+
     end
   end
 end

data/rack-recaptcha.gemspec

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

data/test/helpers_test.rb

@@ -8,17 +8,25 @@ class HelperTest
     @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
 end
 
+
+# With "attr_accessor :request" HelperTest has "request" defined as a method
+# even when @request is set to nil
+#
+# defined?(request)
+# => method
+# request
+# => nil
+# self
+# => #<HelperTest:0x00000002125000 @request=nil>
+class HelperTestWithoutRequest
+  include Rack::Recaptcha::Helpers
+end
+
 context "Rack::Recaptcha::Helpers" do
   helper(:helper_test) { HelperTest.new }
 
@@ -148,8 +156,9 @@ context "Rack::Recaptcha::Helpers" do
   end
 end
 
+
 context Rack::Recaptcha::Helpers do
-  helper(:helper_test) { HelperTest.new_with_nil_request }
+  helper(:helper_test) { HelperTestWithoutRequest.new }
     context "request object not available.  Rack-recaptcha shouldn't die" do
       setup do
         helper_test.recaptcha_tag(:challenge)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-recaptcha
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2010-07-18 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2152600680 !ruby/object:Gem::Requirement
+  requirement: &2152329440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152600680
+  version_requirements: *2152329440
 - !ruby/object:Gem::Dependency
   name: riot
-  requirement: &2152600220 !ruby/object:Gem::Requirement
+  requirement: &2152328420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.12.3
   type: :development
   prerelease: false
-  version_requirements: *2152600220
+  version_requirements: *2152328420
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &2152599760 !ruby/object:Gem::Requirement
+  requirement: &2152327460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.5.7
   type: :development
   prerelease: false
-  version_requirements: *2152599760
+  version_requirements: *2152327460
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &2152599300 !ruby/object:Gem::Requirement
+  requirement: &2152326360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.3.0
   type: :development
   prerelease: false
-  version_requirements: *2152599300
+  version_requirements: *2152326360
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &2152598840 !ruby/object:Gem::Requirement
+  requirement: &2152325500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: 1.0.2
   type: :development
   prerelease: false
-  version_requirements: *2152598840
+  version_requirements: *2152325500
 description: Rack middleware Captcha verification using Recaptcha API.
 email: mr.arthur.chiu@gmail.com
 executables: []
@@ -106,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Rack middleware for Recaptcha