recaptcha 0.2.2 → 0.2.3

data/README.rdoc

@@ -25,6 +25,14 @@ Or, as a standard rails plugin:
 
   script/plugin install git://github.com/ambethia/recaptcha.git
 
+== Merb Installation
+
+reCAPTCHA can also be used in a Merb application when installed as a gem:
+
+  dependency "alm-recaptcha", ">=0.2.2.1", :require_as => "recaptcha/merb"
+
+Initial Merb compatability funded by ALM Labs.
+
 == Setting up your API Keys
 
 There are two ways to setup your reCAPTCHA API keys once you {obtain}[http://recaptcha.net/whyrecaptcha.html]

data/Rakefile

@@ -6,11 +6,12 @@ begin
     gem.name           = "recaptcha"
     gem.description    = "This plugin adds helpers for the reCAPTCHA API "
     gem.summary        = "Helpers for the reCAPTCHA API"
-    gem.homepage       = "http://github.com/ambethia/recaptcha"
+    gem.homepage       = "http://ambethia.com/recaptcha"
     gem.authors        = ["Jason L. Perry"]
     gem.email          = "jasper@ambethia.com"
     gem.files.reject! { |fn| fn.include? ".gitignore" }
   end
+  Jeweler::GemcutterTasks.new
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
 end

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/init.rb

@@ -1,4 +1,6 @@
 # Rails plugin initialization.
 # You can also install it as a gem:
 #   config.gem "ambethia-recaptcha", :lib => "recaptcha/rails", :source => "http://gems.github.com"
+
+require 'net/http'
 require 'recaptcha/rails'

data/lib/recaptcha.rb

@@ -6,8 +6,9 @@ module Recaptcha
     MAJOR = 0
     MINOR = 2
     TINY  = 2
+    PATCH = 1
 
-    STRING = [MAJOR, MINOR, TINY].join('.')
+    STRING = [MAJOR, MINOR, TINY, PATCH].join('.')
   end
 
   

data/lib/recaptcha/client_helper.rb

@@ -5,7 +5,8 @@ module Recaptcha
     def recaptcha_tags(options = {})
       # Default options
       key   = options[:public_key] ||= ENV['RECAPTCHA_PUBLIC_KEY']
-      error = options[:error] ||= session[:recaptcha_error]
+      raise RecaptchaError, "No public key specified." unless key
+      error = options[:error] ||= (defined? flash ? flash[:recaptcha_error] : "")
       uri   = options[:ssl] ? RECAPTCHA_API_SECURE_SERVER : RECAPTCHA_API_SERVER
       html  = ""
       if options[:display]
@@ -17,7 +18,7 @@ module Recaptcha
         html << %{<div id="dynamic_recaptcha"></div>}
         html << %{<script type="text/javascript" src="#{uri}/js/recaptcha_ajax.js"></script>\n}
         html << %{<script type="text/javascript">\n}
-        html << %{  Recaptcha.create('#{key}', document.getElementById('dynamic_recaptcha')#{options[:display] ? '' : ',RecaptchaOptions'});}
+        html << %{  Recaptcha.create('#{key}', document.getElementById('dynamic_recaptcha')#{options[:display] ? ',RecaptchaOptions' : ''});}
         html << %{</script>\n}
       else
         html << %{<script type="text/javascript" src="#{uri}/challenge?k=#{key}}
@@ -35,8 +36,7 @@ module Recaptcha
           html << %{</noscript>\n}
         end
       end
-      raise RecaptchaError, "No public key specified." unless key
       return html
     end # recaptcha_tags
   end # ClientHelper
-end # Recaptcha
+end # Recaptcha

data/lib/recaptcha/merb.rb

@@ -0,0 +1,4 @@
+require 'recaptcha'
+
+Merb::GlobalHelpers.send(:include, Recaptcha::ClientHelper)
+Merb::Controller.send(:include, Recaptcha::Verify)

data/lib/recaptcha/verify.rb

@@ -3,11 +3,16 @@ module Recaptcha
     # Your private API can be specified in the +options+ hash or preferably
     # the environment variable +RECAPTCHA_PUBLIC_KEY+.
     def verify_recaptcha(options = {})
-      return true if SKIP_VERIFY_ENV.include? ENV['RAILS_ENV']
-      model = options.is_a?(Hash)? options[:model] : options
-      private_key = options[:private_key] if options.is_a?(Hash)
-      private_key ||= ENV['RECAPTCHA_PRIVATE_KEY']
+      if !options.is_a? Hash
+        options = {:model => options}
+      end
+      
+      env = options[:env] || ENV['RAILS_ENV']
+      return true if SKIP_VERIFY_ENV.include? env
+      model = options[:model]
+      private_key = options[:private_key] || ENV['RECAPTCHA_PRIVATE_KEY']
       raise RecaptchaError, "No private key specified." unless private_key
+      
       begin
         recaptcha = nil
         Timeout::timeout(options[:timeout] || 3) do
@@ -20,21 +25,21 @@ module Recaptcha
         end
         answer, error = recaptcha.body.split.map { |s| s.chomp }
         unless answer == 'true'
-          session[:recaptcha_error] = error
+          flash[:recaptcha_error] = error
           if model
             model.valid?
-            model.errors.add :base, options[:message] || "Captcha response is incorrect, please try again."
+            model.errors.add :base, options[:message] || "Word verification response is incorrect, please try again."
           end
           return false
         else
-          session[:recaptcha_error] = nil
+          flash[:recaptcha_error] = nil
           return true
         end
       rescue Timeout::Error 
-        session[:recaptcha_error] = "recaptcha-not-reachable"
+        flash[:recaptcha_error] = "recaptcha-not-reachable"
         if model
           model.valid?
-          model.errors.add :base, options[:message] || "Oops, we failed to validate your Captcha. Please try again."
+          model.errors.add :base, options[:message] || "Oops, we failed to validate your word verification response. Please try again."
         end
         return false
       rescue Exception => e

data/recaptcha.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{recaptcha}
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jason L. Perry"]
-  s.date = %q{2009-10-14}
+  s.date = %q{2009-10-23}
   s.description = %q{This plugin adds helpers for the reCAPTCHA API }
   s.email = %q{jasper@ambethia.com}
   s.extra_rdoc_files = [
@@ -25,6 +25,7 @@ Gem::Specification.new do |s|
      "init.rb",
      "lib/recaptcha.rb",
      "lib/recaptcha/client_helper.rb",
+     "lib/recaptcha/merb.rb",
      "lib/recaptcha/rails.rb",
      "lib/recaptcha/verify.rb",
      "recaptcha.gemspec",
@@ -32,7 +33,7 @@ Gem::Specification.new do |s|
      "test/recaptcha_test.rb",
      "test/verify_recaptcha_test.rb"
   ]
-  s.homepage = %q{http://github.com/ambethia/recaptcha}
+  s.homepage = %q{http://ambethia.com/recaptcha}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.5}
@@ -52,3 +53,4 @@ Gem::Specification.new do |s|
   else
   end
 end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: recaptcha
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors: 
 - Jason L. Perry
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-14 00:00:00 -04:00
+date: 2009-10-23 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -31,6 +31,7 @@ files:
 - init.rb
 - lib/recaptcha.rb
 - lib/recaptcha/client_helper.rb
+- lib/recaptcha/merb.rb
 - lib/recaptcha/rails.rb
 - lib/recaptcha/verify.rb
 - recaptcha.gemspec
@@ -38,7 +39,7 @@ files:
 - test/recaptcha_test.rb
 - test/verify_recaptcha_test.rb
 has_rdoc: true
-homepage: http://github.com/ambethia/recaptcha
+homepage: http://ambethia.com/recaptcha
 licenses: []
 
 post_install_message: