rack-recaptcha 0.6.4 → 0.6.5

data/.gitignore

@@ -18,5 +18,6 @@ coverage
 rdoc
 pkg
 .rvmrc
+.rbx/
 
 ## PROJECT::SPECIFIC

data/README.md

@@ -1,5 +1,7 @@
 # rack-recaptcha [![](http://stillmaintained.com/achiu/rack-recaptcha.png)](http://stillmaintained.com/achiu/rack-recaptcha)
 
+[![Build Status](https://secure.travis-ci.org/achiu/rack-recaptcha.png)](http://travis-ci.org/achiu/rack-recaptcha)
+
 Drop this Rack middleware in your web application to enable CAPTCHA verification via Recaptcha API.
 
 ## How to Use
@@ -74,27 +76,60 @@ end
 
 The `Rack::Recaptcha::Helpers` module (for Sinatra, Rails, Padrino) adds these methods to your app:
 
-* `recaptcha_tag(type,options={})` -- generates the appropriate recaptcha scripts. must be included in a form_tag
-  - recaptcha\_tag(:challenge) => generates a recaptcha script
-  - recaptcha\_tag(:ajax) => generates an ajax recaptcha script
-    - if passed in a :display option, you can further alter the recaptcha\_tag
-      - recaptcha\_tag(:ajax, :display => {:theme => 'white'}) - recaptcha tag in white theme.
-  - recaptcha\_tag(:noscript) => generates a recaptcha noscript
-  - you can also pass in :public\_key manually as well.
-    - recaptcha\_tag(:challenge,:public\_key => 'PUBLIC')
+Return a javascript recaptcha form
+```ruby
+  recaptcha_tag :challenge
+```
+
+Return a non-javascript recaptcha form
+```ruby
+  recaptcha_tag :noscript
+```
+
+Return a ajax recaptcha form
+```ruby
+  recaptcha_tag :ajax
+```
+
+For ajax recaptcha's, you can pass additional options like:
+```ruby
+  recaptcha_tag :ajax, :display => { :theme => 'red'}
+```
+
+For non-ajax recaptcha's, you can pass additional options like:
+```ruby
+  # Overrides the key set in Middleware
+  recaptcha_tag :challenge, :public_key => KEY
+
+  # Adjust Height and/or Width
+  recaptcha_tag :noscript, :height => 300, :width => 500
 
-* `recaptcha_valid?` -- returns whether or not the verification passed.
+  # Adjust the rows and/or columns
+  recaptcha_tag :challenge, :row => 3, :cols => 5
+
+  # Set the language
+  recaptcha_tag :noscript, :language => :en
+```
+
+To test whether or not the verification passed, you can use:
+
+```ruby
+  recaptcha_valid?
+```
 
 The `recaptcha_valid?` helper can also be overloaded during tests. You
-can set its response to either true or false by doing the follow:
+can set its response to either true or false by doing the following:
 
-    Rack::Recaptcha.test_mode!
+```ruby
+ # Have recaptcha_valid? return true
+ Rack::Recaptcha.test_mode!
 
-will have the helper return true or
+ # Or have it return false
+ Rack::Recaptcha.test_mode! :return => false
+```
 
-    Rack::Recaptcha.test_mode! :return => false
 
-to have the helper always return false.
+For additional options and resources checkout the [customization page](https://developers.google.com/recaptcha/docs/customization)
 
 #### Example
 
@@ -149,6 +184,14 @@ Tobias Begalke - [elcamino](https://github.com/elcamino)
 
   * Added HTTP Proxy support
 
+Julik Tarkhanov - [julik](https://github.com/julik)
+
+  * Adding rack-recaptcha to travis-ci
+
+Rob Worley - [robworley](https://github.com/robworley)
+  
+  * Adding language setting for recaptcha form
+
 #### Note on Patches/Pull Requests
 
 * Fork the project.
@@ -161,4 +204,4 @@ Tobias Begalke - [elcamino](https://github.com/elcamino)
 
 #### Copyright
 
-Copyright (c) 2011 Arthur Chiu. See LICENSE for details.
+Copyright (c) 2010, 2011, 2012 Arthur Chiu. See LICENSE for details.

data/lib/rack/recaptcha/helpers.rb

@@ -29,13 +29,15 @@ module Rack
       #  :width      - Adjust the width of the form
       #  :row        - Adjust the rows for the challenge field
       #  :cols       - Adjust the column for the challenge field
+      #  :language   - Set the language
       def recaptcha_tag(type= :noscript, options={})
         options = DEFAULT.merge(options)
         options[:public_key] ||= Rack::Recaptcha.public_key
         path = options[:ssl] ? Rack::Recaptcha::API_SECURE_URL : Rack::Recaptcha::API_URL
         params = "k=#{options[:public_key]}"
+        params += "&hl=" + uri_parser.escape(options[:language].to_s) if options[:language]
         error_message = request.env['recaptcha.msg'] if defined?(request)
-        params += "&error=" + uri_parser.escape(error_message) unless error_message.nil? 
+        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}">

data/rack-recaptcha.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = %q{rack-recaptcha}
-  s.version = "0.6.4"
+  s.version = "0.6.5"
   s.required_rubygems_version = ">=1.3.6"
   s.authors = ["Arthur Chiu"]
   s.date = %q{2010-07-18}
@@ -15,6 +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 "rake",      "~> 0.9.2"
   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"

data/test/helpers_test.rb

@@ -46,6 +46,7 @@ context "Rack::Recaptcha::Helpers" do
         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)
@@ -62,19 +63,20 @@ context "Rack::Recaptcha::Helpers" do
     context "noscript" do
       setup do
         mock(helper_test.request.env).[]('recaptcha.msg').returns(nil)
-        helper_test.recaptcha_tag :noscript, :public_key => "hello_world_world"
+        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}
     end
 
     context "challenge" do
       setup do
         mock(helper_test.request.env).[]('recaptcha.msg').returns(nil)
-        helper_test.recaptcha_tag(:challenge)
+        helper_test.recaptcha_tag(:challenge, :language => :en)
       end
 
       asserts_topic("has script tag").matches %r{script}
@@ -82,6 +84,7 @@ context "Rack::Recaptcha::Helpers" do
       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}
     end
 
     context "server" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-recaptcha
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2010-07-18 00:00:00.000000000Z
+date: 2010-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2152329440 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,31 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152329440
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: riot
-  requirement: &2152328420 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +53,15 @@ dependencies:
         version: 0.12.3
   type: :development
   prerelease: false
-  version_requirements: *2152328420
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.12.3
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &2152327460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +69,15 @@ dependencies:
         version: 0.5.7
   type: :development
   prerelease: false
-  version_requirements: *2152327460
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.7
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &2152326360 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +85,15 @@ dependencies:
         version: 1.3.0
   type: :development
   prerelease: false
-  version_requirements: *2152326360
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &2152325500 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +101,12 @@ dependencies:
         version: 1.0.2
   type: :development
   prerelease: false
-  version_requirements: *2152325500
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.2
 description: Rack middleware Captcha verification using Recaptcha API.
 email: mr.arthur.chiu@gmail.com
 executables: []
@@ -106,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: Rack middleware for Recaptcha