panmind-recaptcha 1.0 → 1.0.1

data/README.md

@@ -30,7 +30,7 @@ Via RubyGems:
 
 Or via Rails Plugin:
 
-    script/plugin install git://github.com/Panmind/recaptcha.git
+    rails plugin install git://github.com/Panmind/recaptcha.git
 
 Usage
 -----
@@ -140,5 +140,5 @@ there is no way to bypass the captcha when AJAX validation is enabled.
 Compatibility
 -------------
 
-Tested with Rails 2.3.8 with the `rails_xss` plugin installed,
+Tested with Rails 3.0.3 running under Ruby 1.9.2p0.
 running under Ruby 1.9.1-p378.

data/Rakefile

@@ -1,7 +1,7 @@
 require 'rake'
 require 'rake/rdoctask'
 
-require 'lib/panmind/recaptcha'
+require './lib/panmind/recaptcha'
 
 begin
   require 'jeweler'
@@ -14,8 +14,8 @@ begin
                                'with the HTTP API for captcha verification, a DSL to generate a '  \
                                'before_filter and the code to implement AJAX captcha validation.'
 
-    gemspec.authors          = ['Marcello Barnaba']
-    gemspec.email            = 'vjt@openssl.it'
+    gemspec.authors          = ['Marcello Barnaba', 'Panmind staff']
+    gemspec.email            = ['vjt@openssl.it', 'info@panmind.com']
     gemspec.homepage         = 'http://github.com/Panmind/recaptcha'
 
     gemspec.files            = %w( README.md Rakefile rails/init.rb ) + Dir['lib/**/*']
@@ -23,11 +23,11 @@ begin
     gemspec.has_rdoc         = true
 
     gemspec.version          = Panmind::Recaptcha::Version
-    gemspec.date             = '2010-11-17'
+    gemspec.date             = '2011-09-20'
 
     gemspec.require_path     = 'lib'
 
-    gemspec.add_dependency('rails', '~> 2.3.8')
+    gemspec.add_dependency 'rails', '~> 3.0'
   end
 rescue LoadError
   puts 'Jeweler not available. Install it with: gem install jeweler'

data/lib/panmind/recaptcha/railtie.rb

@@ -0,0 +1,25 @@
+require 'panmind/recaptcha'
+
+module Panmind
+  module Recaptcha
+
+    if defined? Rails::Railtie
+      class Railtie < Rails::Railtie
+        initializer 'panmind.recaptcha.insert_into_action_controller' do
+          ActiveSupport.on_load :action_controller do
+            Panmind::Recaptcha::Railtie.insert
+          end
+        end
+      end
+    end
+
+    class Railtie
+      def self.insert
+        ActionView::Base.instance_eval { include Helpers }
+        ActionController::Base.instance_eval { include Controller }
+        ActionController::TestCase.instance_eval { include TestHelpers } if Rails.env.test?
+      end
+    end
+
+  end
+end

data/lib/panmind/recaptcha.rb

@@ -1,16 +1,18 @@
 require 'timeout'
 
-if defined?(Rails) && Rails.env.test?
+if defined?(Rails)
+  require 'panmind/recaptcha/railtie'
+
   begin
     require 'mocha'
   rescue LoadError
     print "\n!!\n!! ReCaptcha: to use the test helpers you should gem install mocha\n!!\n\n"
-  end
+  end if Rails.env.test?
 end
 
 module Panmind
   module Recaptcha
-    Version = 1.0
+    Version = '1.0.1'
 
     class << self
       attr_accessor :private_key, :public_key, :request_timeout
@@ -25,7 +27,7 @@ module Panmind
       end
 
       def enabled?
-        Rails.env.production?
+        Rails.env.production? || Rails.env.development?
       end
     end # << self
 
@@ -81,8 +83,9 @@ module Panmind
           return res.first == 'true'
 
         rescue Timeout::Error
-          # Let it go...
-          true
+          # If ever a timeout error happens during the connection with 
+          # the service, then return false. It should happen rarely.
+          false
         end
 
         def invalid_captcha

data/rails/init.rb

@@ -1,7 +1,2 @@
 require 'panmind/recaptcha'
-
-module Panmind::Recaptcha
-  ActionView::Base.instance_eval { include Helpers }
-  ActionController::Base.instance_eval { include Controller }
-  ActionController::TestCase.instance_eval { include TestHelpers } if Rails.env.test?
-end
+Panmind::Recaptcha::Railtie.insert

metadata

@@ -1,84 +1,69 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: panmind-recaptcha
-version: !ruby/object:Gem::Version 
-  hash: 15
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  version: "1.0"
+version: !ruby/object:Gem::Version
+  version: 1.0.1
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Marcello Barnaba
+- Panmind staff
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-11-17 00:00:00 +01:00
+date: 2011-09-20 00:00:00.000000000 +02:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rails
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2152506860 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 2
-        - 3
-        - 8
-        version: 2.3.8
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
-  version_requirements: *id001
-description: ReCaptcha implements view helpers to generate ReCaptcha code, with the noscript counterpart, required methods that interface with the HTTP API for captcha verification, a DSL to generate a before_filter and the code to implement AJAX captcha validation.
-email: vjt@openssl.it
+  prerelease: false
+  version_requirements: *2152506860
+description: ReCaptcha implements view helpers to generate ReCaptcha code, with the
+  noscript counterpart, required methods that interface with the HTTP API for captcha
+  verification, a DSL to generate a before_filter and the code to implement AJAX captcha
+  validation.
+email:
+- vjt@openssl.it
+- info@panmind.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
-files: 
+files:
 - README.md
 - Rakefile
 - lib/panmind/recaptcha.rb
+- lib/panmind/recaptcha/railtie.rb
 - rails/init.rb
 has_rdoc: true
 homepage: http://github.com/Panmind/recaptcha
 licenses: []
-
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
-require_paths: 
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: ReCaptcha for Rails - With AJAX Validation
 test_files: []
-