rack-recaptcha 0.6.5 → 0.6.6

data/README.md

@@ -192,6 +192,10 @@ Rob Worley - [robworley](https://github.com/robworley)
   
   * Adding language setting for recaptcha form
 
+sam71 - [sam71](https://github.com/sam71)
+
+  * Fix recaptcha hanging when used in proxy environment.
+
 #### Note on Patches/Pull Requests
 
 * Fork the project.

data/lib/rack/recaptcha.rb

@@ -59,13 +59,15 @@ module Rack
       }
 
       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)
+      else
+        http = Net::HTTP.start(uri.host, uri.port)
       end
 
       request           = Net::HTTP::Post.new(uri.path)

data/rack-recaptcha.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = %q{rack-recaptcha}
-  s.version = "0.6.5"
+  s.version = "0.6.6"
   s.required_rubygems_version = ">=1.3.6"
   s.authors = ["Arthur Chiu"]
   s.date = %q{2010-07-18}
@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.test_files = Dir.glob("test/**/*")
   s.add_runtime_dependency "json", ">= 0"
   s.add_development_dependency "rake",      "~> 0.9.2"
-  s.add_development_dependency "riot",      "~> 0.12.3"
+  s.add_development_dependency "minitest",  "~> 4.6"
   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/helpers_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path '../teststrap', __FILE__
+require File.expand_path '../test_helper', __FILE__
 
 class HelperTest
   attr_accessor :request
@@ -13,7 +13,6 @@ class HelperTest
   end
 end
 
-
 # With "attr_accessor :request" HelperTest has "request" defined as a method
 # even when @request is set to nil
 #
@@ -27,150 +26,139 @@ class HelperTestWithoutRequest
   include Rack::Recaptcha::Helpers
 end
 
-context "Rack::Recaptcha::Helpers" do
-  helper(:helper_test) { HelperTest.new }
-
-  setup { Rack::Recaptcha.public_key = '0'*40 }
-
-  context "recaptcha_tag" do
-
-    context "ajax" do
-      context "with display" do
-        setup do
-          mock(helper_test.request.env).[]('recaptcha.msg').returns(nil)
-          helper_test.recaptcha_tag(:ajax,:display => {:theme => 'red'})
-        end
-
-        asserts_topic('has js').matches %r{recaptcha_ajax.js}
-        asserts_topic('has div').matches %r{<div id="ajax_recaptcha"></div>}
-        asserts_topic('has display').matches %r{RecaptchaOptions}
-        asserts_topic('has theme').matches %r{"theme":"red"}
-      end
-
-      context "without display" do
-        setup do
-          mock(helper_test.request.env).[]('recaptcha.msg').returns(nil)
-          helper_test.recaptcha_tag(:ajax)
-        end
-
-        asserts_topic('has js').matches %r{recaptcha_ajax.js}
-        asserts_topic('has div').matches %r{<div id="ajax_recaptcha"></div>}
-        denies_topic('has display').matches %r{RecaptchaOptions}
-        denies_topic('has theme').matches %r{"theme":"red"}
-      end
+describe Rack::Recaptcha::Helpers do
+
+  def helper_test
+    HelperTest.new
+  end
+
+  def helper_test_without_request
+    HelperTestWithoutRequest.new
+  end
+
+  before do
+    Rack::Recaptcha.public_key = ::PUBLIC_KEY
+  end
+
+  describe ".recaptcha_tag" do
+
+    it "should render ajax with display" do
+      mock(helper_test.request.env).[]('recaptcha.msg').returns(nil)
+      topic = helper_test.recaptcha_tag(:ajax,:display => {:theme => 'red'})
+
+      assert_match %r{recaptcha_ajax.js},               topic
+      assert_match %r{<div id="ajax_recaptcha"></div>}, topic
+      assert_match %r{RecaptchaOptions},                topic
+      assert_match %r{"theme":"red"},                   topic
     end
 
-    context "noscript" do
-      setup do
-        mock(helper_test.request.env).[]('recaptcha.msg').returns(nil)
-        helper_test.recaptcha_tag :noscript, :public_key => "hello_world_world", :language => :en
-      end
-
-      asserts_topic("iframe").matches %r{iframe}
-      asserts_topic("no script tag").matches %r{<noscript>}
-      asserts_topic("public key").matches %r{hello_world_world}
-      asserts_topic("has language").matches %r{hl=en}
-      denies_topic("has js").matches %r{recaptcha_ajax.js}
+    it "should render ajax without display" do
+      mock(helper_test.request.env).[]('recaptcha.msg').returns(nil)
+      topic = helper_test.recaptcha_tag(:ajax)
+
+      assert_match %r{recaptcha_ajax.js}, topic
+      assert_match %r{<div id="ajax_recaptcha"></div>}, topic
+      refute_match %r{RecaptchaOptions}, topic
+      refute_match %r{"theme":"red"}, topic
     end
 
-    context "challenge" do
-      setup do
-        mock(helper_test.request.env).[]('recaptcha.msg').returns(nil)
-        helper_test.recaptcha_tag(:challenge, :language => :en)
-      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}}
-      asserts_topic("has language").matches %r{hl=en}
+    it "should render noscript" do
+      mock(helper_test.request.env).[]('recaptcha.msg').returns(nil)
+      topic = helper_test.recaptcha_tag :noscript, :public_key => "hello_world_world", :language => :en
+
+      assert_match %r{iframe},            topic
+      assert_match %r{<noscript>},        topic
+      assert_match %r{hello_world_world}, topic
+      assert_match %r{hl=en},             topic
+      refute_match %r{recaptcha_ajax.js}, topic
     end
 
-    context "server" do
+    it "should render challenge" do
+      mock(helper_test.request.env).[]('recaptcha.msg').returns(nil)
+      topic = helper_test.recaptcha_tag(:challenge, :language => :en)
 
-      asserts("using ssl url") do
-        mock(helper_test.request.env).[]('recaptcha.msg').returns(nil)
-        helper_test.recaptcha_tag(:challenge, :ssl => true)
-      end.matches %r{#{Rack::Recaptcha::API_SECURE_URL}}
+      assert_match %r{script},            topic
+      assert_match %r{challenge},         topic
+      refute_match %r{recaptcha_ajax.js}, topic
+      refute_match %r{RecaptchaOptions},  topic
+      assert_match %r{#{'0'*40}},         topic
+      assert_match %r{hl=en},             topic
+    end
 
-      asserts("using non ssl url") do
-        mock(helper_test.request.env).[]('recaptcha.msg').returns(nil)
-        helper_test.recaptcha_tag(:ajax)
-      end.matches %r{#{Rack::Recaptcha::API_URL}}
+    it "should render script with SSL URL" do
+      mock(helper_test.request.env).[]('recaptcha.msg').returns(nil)
+      topic = helper_test.recaptcha_tag(:challenge, :ssl => true)
+      assert_match %r{#{Rack::Recaptcha::API_SECURE_URL}}, topic
     end
 
+    it "should render script with no SSL URL" do
+      mock(helper_test.request.env).[]('recaptcha.msg').returns(nil)
+      topic = helper_test.recaptcha_tag(:ajax)
+      assert_match %r{#{Rack::Recaptcha::API_URL}}, topic
+    end
   end
 
-  context "recaptcha_tag_errors" do
-    context "challenge with error" do
-      setup do
-        mock(helper_test.request.env).[]('recaptcha.msg').returns("Sample Error")
-        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}}
-      asserts_topic("has previous error").matches %r{Sample%20Error}
+  describe ".recaptcha_tag with errors" do
+    it "should render challenge with error" do
+      mock(helper_test.request.env).[]('recaptcha.msg').returns("Sample Error")
+      topic = helper_test.recaptcha_tag(:challenge)
+
+      assert_match %r{script},            topic
+      assert_match %r{challenge},         topic
+      refute_match %r{recaptcha_ajax.js}, topic
+      refute_match %r{RecaptchaOptions},  topic
+      assert_match %r{#{'0'*40}},         topic
+      assert_match %r{Sample%20Error},    topic
     end
 
-    context "noscript with error" do
-      setup do
-        mock(helper_test.request.env).[]('recaptcha.msg').returns("Sample Error")
-        helper_test.recaptcha_tag :noscript, :public_key => "hello_world_world"
-      end
-
-      asserts_topic("iframe").matches %r{iframe}
-      asserts_topic("no script tag").matches %r{<noscript>}
-      asserts_topic("public key").matches %r{hello_world_world}
-      denies_topic("has js").matches %r{recaptcha_ajax.js}
-      asserts_topic("has previous error").matches %r{Sample%20Error}
-    end
+    it "should render noscript with error" do
+      mock(helper_test.request.env).[]('recaptcha.msg').returns("Sample Error")
+      topic = helper_test.recaptcha_tag :noscript, :public_key => "hello_world_world"
 
+      assert_match %r{iframe},            topic
+      assert_match %r{<noscript>},        topic
+      assert_match %r{hello_world_world}, topic
+      refute_match %r{recaptcha_ajax.js}, topic
+      assert_match %r{Sample%20Error},    topic
+    end
   end
 
-  context "recaptcha_valid?" do
-
-    asserts "that it passes when recaptcha.valid is true" do
+  describe ".recaptcha_valid?" do
+    it "should assert 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?
+      assert helper_test.recaptcha_valid?
     end
 
-    denies "that it passes when recaptcha.valid is false" do
+    it "should refute 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?
+      refute helper_test.recaptcha_valid?
     end
 
-    asserts "that it passes when test mode set to pass" do
+    it "should assert that it passes when test mode set to pass" do
       Rack::Recaptcha.test_mode!
-      helper_test.recaptcha_valid?
+      assert helper_test.recaptcha_valid?
     end
 
-    denies "that it passes when test mode set to fail" do
+    it "should assert that it passes when test mode set to fail" do
       Rack::Recaptcha.test_mode! :return => false
-      helper_test.recaptcha_valid?
+      refute helper_test.recaptcha_valid?
     end
-
   end
-end
 
+  describe ".recaptcha_tag without request object" do
 
-context Rack::Recaptcha::Helpers do
-  helper(:helper_test) { HelperTestWithoutRequest.new }
-    context "request object not available.  Rack-recaptcha shouldn't die" do
-      setup do
-        helper_test.recaptcha_tag(:challenge)
-      end
+    it "should work without request object" do
+      topic = helper_test_without_request.recaptcha_tag(:challenge)
 
-      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}}
+      assert_match %r{script},            topic
+      assert_match %r{challenge},         topic
+      refute_match %r{recaptcha_ajax.js}, topic
+      refute_match %r{RecaptchaOptions},  topic
+      assert_match %r{#{'0'*40}},         topic
     end
+
+  end
+
 end

data/test/recaptcha_test.rb

@@ -1,55 +1,32 @@
-require File.expand_path '../teststrap', __FILE__
+require File.expand_path '../test_helper', __FILE__
 
-FakeWeb.allow_net_connect = false
-context "Rack::Recaptcha" do
-
-  context "basic request" do
-    setup { get("/") ; last_response }
-
-    asserts(:status).equals 200
-    asserts(:body).equals "Hello world"
-  end
-
-  context "exposes" do
-    setup { Rack::Recaptcha }
-
-    asserts(:private_key).equals PRIVATE_KEY
-    asserts(:public_key).equals PUBLIC_KEY
+describe Rack::Recaptcha do
+  before do
+    FakeWeb.allow_net_connect = false
   end
 
-  context "#test_mode!" do
-    setup { Rack::Recaptcha }
-
-    asserts "that it sets @@test_mode to be true" do
-      topic.test_mode!
-      topic.test_mode
+  describe "#test_mode!" do
+    it "should set test_mode to true" do
+      Rack::Recaptcha.test_mode!
+      assert Rack::Recaptcha.test_mode
     end
 
-    denies "that it sets @@test_mode to be true if option set to false" do
-      topic.test_mode! :return => false
-      topic.test_mode
+    it "should set test_mode to true" do
+      Rack::Recaptcha.test_mode! :return => false
+      refute Rack::Recaptcha.test_mode
     end
   end
 
-  context "login path" do
-
-    asserts "GET login" do
-      get '/login'
-      last_response.body
-    end.equals 'login'
-
-
-    asserts "POST login passes and" do
-      FakeWeb.register_uri(:post, Rack::Recaptcha::VERIFY_URL, :body => "true\nsuccess")
-      post("/login", 'recaptcha_challenge_field' => 'challenge', 'recaptcha_response_field' => 'response')
-      last_response.body
-    end.equals 'post login'
-
-    asserts "POST login fails and" do
-      FakeWeb.register_uri(:post, Rack::Recaptcha::VERIFY_URL, :body => "false\nfailed")
-      post("/login", 'recaptcha_challenge_field' => 'challenge', 'recaptcha_response_field' => 'response')
-      last_response.body
-    end.equals 'post fail'
+  it "should hit the login and pass" do
+    FakeWeb.register_uri(:post, Rack::Recaptcha::VERIFY_URL, :body => "true\nsuccess")
+    post("/login", 'recaptcha_challenge_field' => 'challenge', 'recaptcha_response_field' => 'response')
+    assert_equal 'post login', last_response.body
   end
 
+  it "should hit the login and fail" do
+    FakeWeb.register_uri(:post, Rack::Recaptcha::VERIFY_URL, :body => "false\nfailed")
+    post("/login", 'recaptcha_challenge_field' => 'challenge', 'recaptcha_response_field' => 'response')
+    assert_equal 'post fail', last_response.body
+  end
 end
+

data/test/{teststrap.rb → test_helper.rb}

@@ -1,20 +1,21 @@
 require 'rubygems'
+gem 'minitest'
+require 'minitest/autorun'
 require 'rack/test'
 require 'rack/mock'
 require 'rack/utils'
 require 'rack/session/cookie'
 require 'rack/builder'
-require 'rr'
-require 'riot'
-require 'riot/rr'
 require 'fakeweb'
+require 'rr'
 require File.expand_path '../../lib/rack/recaptcha', __FILE__
 
-PUBLIC_KEY = '0'*40
+PUBLIC_KEY  = '0'*40
 PRIVATE_KEY = 'X'*40
 
-class Riot::Situation
+class MiniTest::Spec
   include Rack::Test::Methods
+  include RR::Adapters::MiniTest
 
   def app
     main_app = lambda { |env|
@@ -40,6 +41,3 @@ class Riot::Situation
     builder.to_app
   end
 end
-
-class Riot::Context
-end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-recaptcha
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6
   prerelease: 
 platform: ruby
 authors:
@@ -44,13 +44,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.9.2
 - !ruby/object:Gem::Dependency
-  name: riot
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.12.3
+        version: '4.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.12.3
+        version: '4.6'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
@@ -125,7 +125,7 @@ files:
 - lib/rack/recaptcha.rb
 - test/helpers_test.rb
 - test/recaptcha_test.rb
-- test/teststrap.rb
+- test/test_helper.rb
 homepage: http://github.com/achiu/rack-recaptcha
 licenses: []
 post_install_message: 
@@ -147,11 +147,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Rack middleware for Recaptcha
 test_files:
 - test/helpers_test.rb
 - test/recaptcha_test.rb
-- test/teststrap.rb
+- test/test_helper.rb