lib/recaptcha/merb.rb @@ -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] README.rdoc @@ -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 lib/recaptcha.rb @@ -5,7 +5,8 @@ module Recaptcha def recaptcha_tags(options = {}) # Default options key = options[:public_key] ||= ENV['RECAPTCHA_PUBLIC_KEY'] - error = options[:error] ||= flash[: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] @@ -35,7 +36,6 @@ module Recaptcha html << %{</noscript>\n} end end - raise RecaptchaError, "No public key specified." unless key return html end # recaptcha_tags end # ClientHelper lib/recaptcha/client_helper.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 lib/recaptcha/verify.rb @@ -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.2.1" 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-20} 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 + recaptcha.gemspec c3bc7c49daf68365a0155c10f24eeabcf78b2867 Jamie Macey jamie@almlabs.com http://github.com/almlabs/recaptcha/commit/92097b788ce52f2def1b31b3a514c8a2caa0c747 92097b788ce52f2def1b31b3a514c8a2caa0c747 2009-10-23T13:15:21-07:00 2009-10-20T07:13:46-07:00 Port merb support from jamie-recaptcha onto latest trunk. a5efd508df7060a0279654b20f03025e45c7d920 Jason L Perry jasper@ambethia.com