acts_as_textcaptcha 4.0.0 → 4.1.0

data/CHANGELOG

@@ -0,0 +1,11 @@
+4.1.0 (2 January 2014)
+  * Dropping support for Rails 2
+  * README updated
+  * CHANGELOG (this file) added
+
+4.0.0 (1 January 2014)
+  * Using a cache store to persist answers between requests
+  * README updated
+  * Test coverage improved
+
+(no change log available for older releases)

data/README.rdoc

@@ -1,10 +1,10 @@
 == ActAsTextcaptcha
 
-{<img src="https://secure.travis-ci.org/matthutchinson/acts_as_textcaptcha.png" alt="Travis Build Status" align="absmiddle"/>}[https://travis-ci.org/matthutchinson/acts_as_textcaptcha] {<img src="https://coveralls.io/repos/matthutchinson/acts_as_textcaptcha/badge.png" alt="Coverage Status" align="absmiddle" />}[https://coveralls.io/r/matthutchinson/acts_as_textcaptcha] {<img src="https://codeclimate.com/badge.png" align="absmiddle" alt="Code Climate Stats" />}[https://codeclimate.com/github/matthutchinson/acts_as_textcaptcha]
+{<img src="https://secure.travis-ci.org/matthutchinson/acts_as_textcaptcha.png" alt="Travis Build Status" align="absmiddle"/>}[https://travis-ci.org/matthutchinson/acts_as_textcaptcha] {<img src="https://coveralls.io/repos/matthutchinson/acts_as_textcaptcha/badge.png" alt="Coverage Status" align="absmiddle" />}[https://coveralls.io/r/matthutchinson/acts_as_textcaptcha] {<img align="absmiddle" src="https://codeclimate.com/github/matthutchinson/acts_as_textcaptcha.png" />}[https://codeclimate.com/github/matthutchinson/acts_as_textcaptcha]
 
 ActsAsTextcaptcha provides spam protection for your Rails models using logic questions from the excellent {Text CAPTCHA}[http://textcaptcha.com/] web service (by {Rob Tuley}[http://openknot.com/me/] of {Openknot}[http://openknot.com/]).  It is also possible to configure your own text captcha questions (instead, or as a fall back in the event of any remote API issues).
 
-This gem is actively maintained, has good test coverage and is compatible with Rails >= 2.3.8 (including Rails 3 and 4).  If you have any issues {please report them here}[https://github.com/matthutchinson/acts_as_textcaptcha/issues/new].
+This gem is actively maintained, has good test coverage and is compatible with Rails >= 3.0.0 (including Rails 4). If you have any issues {please report them here}[https://github.com/matthutchinson/acts_as_textcaptcha/issues/new].
 
 Logic questions from the web service are aimed at a child's age of 7, so they can be solved easily by even the most cognitively impaired users. As they involve human logic, questions cannot be solved by a robot. There are both advantages and disadvantages for using logic questions over image based captchas, {find out more at Text CAPTCHA}[http://textcaptcha.com/why].
 
@@ -14,31 +14,13 @@ Try a {working demo here}[http://textcaptcha.heroku.com]!
 
 == Installing
 
-=== Rails
+*NOTE:* The steps to configure your app changed with the v4.0.* release. If you are having problems please carefully check the steps or {upgrade instructions}[https://github.com/matthutchinson/acts_as_textcaptcha#upgrading-from-3010] below.
 
-Just add the following to your Gemfile, then `bundle install`;
+First add the following to your Gemfile, then `bundle install`;
 
   gem 'acts_as_textcaptcha'
 
-=== Rails 2.3.*
-
-Add this to your environment.rb file, then `gem install acts_as_textcaptcha`;
-
-  config.gem 'acts_as_textcaptcha'
-
-=== Or as a plugin (pre Rails 4)
-
-Install with rails or script/rails as follows;
-
-  rails plugin install git@github.com:matthutchinson/acts_as_textcaptcha.git
-  OR
-  script/plugin install git@github.com:matthutchinson/acts_as_textcaptcha.git
-
-== Setting up
-
-*NOTE:* The steps to configure your app changed with the v4.0.* release. If you are having problems please carefully check the steps or {upgrade instructions}[https://github.com/matthutchinson/acts_as_textcaptcha#upgrading-from-3010] below.
-
-First {grab an API key for your website}[http://textcaptcha.com/api]. Next add the following code to any models you would like to protect;
+Next {grab an API key for your website}[http://textcaptcha.com/api], then add the following code to models you would like to protect;
 
   class Comment < ActiveRecord::Base
     # (this is the simplest way to configure the gem, with an API key only)
@@ -54,7 +36,6 @@ Next in your controller's *new* action you'll want to generate and assign the lo
 
 Finally, in your form view add the textcaptcha question and answer fields using the textcaptcha_fields helper.  Feel free to arrange the HTML within this block as you like;
 
-  # for Rails 2.3.* change <%= to <% on the next line
   <%= textcaptcha_fields(f) do %>
     <div class="field">
       <%= f.label :textcaptcha_answer, @comment.textcaptcha_question %><br/>
@@ -78,15 +59,15 @@ Due to a relatively {large hole}[https://github.com/matthutchinson/acts_as_textc
 === Toggling Textcaptcha
 
 You can toggle textcaptcha on/off for your models by overriding the `perform_textcaptcha?` method. If it returns false, no questions will be fetched from
-the web service and textcaptcha validation is disabled. 
+the web service and textcaptcha validation is disabled.
 
-This is useful for writing your own custom logic for toggling spam protection on/off e.g. for logged in users. By default the `perform_textcaptcha?` method {checks if the form object is a new (unsaved) record}[https://github.com/matthutchinson/acts_as_textcaptcha/blob/master/lib/acts_as_textcaptcha/textcaptcha.rb#L54].  
+This is useful for writing your own custom logic for toggling spam protection on/off e.g. for logged in users. By default the `perform_textcaptcha?` method {checks if the form object is a new (unsaved) record}[https://github.com/matthutchinson/acts_as_textcaptcha/blob/master/lib/acts_as_textcaptcha/textcaptcha.rb#L54].
 
 So out of the box, spam protection is only enabled for creating new records (not updating).  Here is a typical example showing how to overwrite the `perform_textcaptcha?` method, while maintaining the new record check.
 
   class Comment < ActiveRecord::Base
     acts_as_textcaptcha :api_key => 'YOUR_TEXTCAPTCHA_API_KEY'
-    
+
     def perform_textcaptcha?
       super && user.admin?
     end
@@ -119,18 +100,13 @@ The gem can be configured for models individually (as shown above) or with a con
 
   rake textcaptcha:config
 
-*NOTE:* For Rails 2.3.*, you'll have to add the following to your Rakefile to reveal this task;
-
-  # load textcaptcha rake tasks
-  Dir["#{Gem.searcher.find('acts_as_textcaptcha').full_gem_path}/lib/tasks/**/*.rake"].each { |ext| load ext } if Gem.searcher.find('acts_as_textcaptcha')
-
 === Confguring _without_ the TextCAPTCHA web service
 
 To use only your own logic questions, simply ommit the api_key from the configuration and define at least 1 logic question and answer (see above).
 
 == Translations
 
-The gem uses the standard Rails I18n translation approach for error messages, with a fall-back to English.  Unfortunately in some versions of Rails 2.3.* this translation fall-back fails.  For this case (and when translating) setup your own locale file with this hierarchy (assuming your model is Comment);
+The gem uses the standard Rails I18n translation approach (with a fall-back to English). Unfortunately at present, the Text CAPTCHA web service only provides logic questions in English.
 
   en:
     activerecord:
@@ -146,8 +122,6 @@ The gem uses the standard Rails I18n translation approach for error messages, wi
         comment:
           textcaptcha_answer: "Textcaptcha answer"
 
-*NOTE:* currently the Text CAPTCHA API web service only offers logic questions in English.
-
 == Without Rails or ActiveRecord
 
 Although this gem has been built with Rails in mind, is entirely possible to use it without ActiveRecord, or Rails.  As an example, take a look at the {Contact}[https://github.com/matthutchinson/acts_as_textcaptcha/blob/master/test/test_models.rb#L44] model used in the test suite {here}[https://github.com/matthutchinson/acts_as_textcaptcha/blob/master/test/test_models.rb#L44].
@@ -180,7 +154,7 @@ For more details on the code please check the {documentation}[http://rdoc.info/p
 
 What do you need?
 
-* {Rails}[http://github.com/rails/rails] >= 2.3.8  (including Rails 3 and 4)
+* {Rails}[http://github.com/rails/rails] >= 3.0.0  (including Rails 4)
 * {Rails.cache}[http://api.rubyonrails.org/classes/ActiveSupport/Cache/Store.html] - some basic cache configuration is nessecary
 * {Ruby}[http://ruby-lang.org/] >= 1.8.7 (also tested with REE, 1.9.2, 1.9.3, 2.0.0, 2.1.0)
 * {Text CAPTCHA API key}[http://textcaptcha.com/register] (_optional_, since you can define your own logic questions)
@@ -189,6 +163,18 @@ What do you need?
 
 *Note*: The built-in {TextcaptchaCache}[https://github.com/matthutchinson/acts_as_textcaptcha/blob/master/lib/acts_as_textcaptcha/textcaptcha_cache.rb] class directly wraps the {Rails.cache}[http://api.rubyonrails.org/classes/ActiveSupport/Cache/Store.html] object.
 
+== Rails 2 support
+
+Support for Rails 2 was dropped with the release of v4.1.0. If you would like to continue to use this gem with an older version of Rails (>= 2.3.8), please lock the version to `4.0.0`. Like so;
+
+    # in your Gemfile
+    gem 'acts_as_textcaptcha', '=4.0.0'
+
+    # or in environment.rb
+    config.gem 'acts_as_textcaptcha', :version => '=4.0.0'
+
+Check out the {README}[https://github.com/matthutchinson/acts_as_textcaptcha/tree/v4.0.0] for this release for more information.
+
 == Links
 
 * {Demo}[http://textcaptcha.heroku.com]
@@ -219,10 +205,6 @@ After doing this, you should be able to install the gem with;
     # or with Bundler, specify the HighSecurity trust policy
     bundle install --trust-policy HighSecurity
 
-== Todo
-
-* Remove support for Rails 2.3.* in a future gem release (clean code and tests for this)
-
 == Usage
 
 This gem is used in a number of production websites and apps. It was originally extracted from code developed for {Bugle}[http://bugleblogs.com].  If you're happily using acts_as_textcaptcha in production, let me know and I'll add you to this list!

data/lib/acts_as_textcaptcha.rb

@@ -1,3 +1,3 @@
 require 'acts_as_textcaptcha/textcaptcha'
 require 'acts_as_textcaptcha/textcaptcha_helper'
-require "acts_as_textcaptcha/framework/rails#{Rails::VERSION::MAJOR < 3 ? 2 : nil}" if defined?(Rails)
+require 'acts_as_textcaptcha/framework/rails' if defined?(Rails)

data/lib/acts_as_textcaptcha/textcaptcha.rb

@@ -6,16 +6,6 @@ require 'acts_as_textcaptcha/textcaptcha_api'
 
 module ActsAsTextcaptcha
 
-  # dont use Railtie if Rails < 3
-  unless Rails::VERSION::MAJOR < 3
-    class Railtie < ::Rails::Railtie
-      rake_tasks do
-        load "tasks/textcaptcha.rake"
-      end
-    end
-  end
-
-
   module Textcaptcha #:nodoc:
 
     def acts_as_textcaptcha(options = nil)

data/lib/acts_as_textcaptcha/textcaptcha_helper.rb

@@ -16,12 +16,7 @@ module ActsAsTextcaptcha
         end
       end
 
-      # Rails 2 compatability
-      if Rails::VERSION::MAJOR < 3
-        concat captcha_html, &block.binding
-      else
-        captcha_html.html_safe
-      end
+      captcha_html.html_safe
     end
   end
 end

data/lib/acts_as_textcaptcha/version.rb

@@ -1,3 +1,3 @@
 module ActsAsTextcaptcha
-  VERSION = "4.0.0"
+  VERSION = "4.1.0"
 end

data/test/test_helper.rb

@@ -27,8 +27,6 @@ require 'rails/all'
 I18n.config.enforce_available_locales = true
 
 require 'acts_as_textcaptcha'
-require 'textcaptcha_cache'
-require 'textcaptcha_api'
 require './test/test_models'
 
 # load and initialize test db schema

metadata

@@ -1,186 +1,197 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: acts_as_textcaptcha
-version: !ruby/object:Gem::Version
-  version: 4.0.0
+version: !ruby/object:Gem::Version 
+  hash: 59
+  prerelease: 
+  segments: 
+  - 4
+  - 1
+  - 0
+  version: 4.1.0
 platform: ruby
-authors:
+authors: 
 - Matthew Hutchinson
 autorequire: 
 bindir: bin
-cert_chain:
+cert_chain: 
 - gem-public_cert.pem
-date: 2014-01-01 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+date: 2014-01-02 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: mime-types
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 113
+        segments: 
+        - 1
+        - 25
+        - 1
         version: 1.25.1
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.25.1
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
+  name: rails
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
+  name: bundler
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
+  requirement: *id003
+- !ruby/object:Gem::Dependency 
+  name: minitest
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
+  requirement: *id004
+- !ruby/object:Gem::Dependency 
+  name: simplecov
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
+  requirement: *id005
+- !ruby/object:Gem::Dependency 
+  name: rdoc
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
+  requirement: *id006
+- !ruby/object:Gem::Dependency 
+  name: sqlite3
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: fakeweb
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
+  requirement: *id007
+- !ruby/object:Gem::Dependency 
+  name: fakeweb
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: strong_parameters
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
+  requirement: *id008
+- !ruby/object:Gem::Dependency 
+  name: strong_parameters
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: coveralls
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
+  requirement: *id009
+- !ruby/object:Gem::Dependency 
+  name: coveralls
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
+  requirement: *id010
+- !ruby/object:Gem::Dependency 
+  name: pry
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+  type: :development
+  requirement: *id011
 description: |-
   Simple question/answer based spam protection for your Rails models.
     You can define your own logic questions and/or fetch questions from the textcaptcha.com API.
     The questions involve human logic and are tough for spam bots to crack.
     For more reasons on why logic questions are a good idea visit; http://textcaptcha.com/why
-email:
+email: 
 - matt@hiddenloop.com
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - README.rdoc
 - LICENSE
-files:
-- ".coveralls.yml"
-- ".gitignore"
-- ".travis.yml"
+files: 
+- .coveralls.yml
+- .gitignore
+- .travis.yml
+- CHANGELOG
 - Gemfile
 - LICENSE
 - README.rdoc
@@ -191,7 +202,6 @@ files:
 - init.rb
 - lib/acts_as_textcaptcha.rb
 - lib/acts_as_textcaptcha/framework/rails.rb
-- lib/acts_as_textcaptcha/framework/rails2.rb
 - lib/acts_as_textcaptcha/textcaptcha.rb
 - lib/acts_as_textcaptcha/textcaptcha_api.rb
 - lib/acts_as_textcaptcha/textcaptcha_cache.rb
@@ -207,26 +217,36 @@ files:
 - test/textcaptcha_test.rb
 homepage: http://github.com/matthutchinson/acts_as_textcaptcha
 licenses: []
-metadata: {}
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
+required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
   - - ">="
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
   - - ">="
-    - !ruby/object:Gem::Version
-      version: '0'
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
-summary: Spam protection for your models via logic questions and the textcaptcha.com
-  API
+specification_version: 3
+summary: Spam protection for your models via logic questions and the textcaptcha.com API
 test_files: []
+

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 98ad0396a537ab06e540f42880d1fcd24993f59c
-  data.tar.gz: 57ee900760402ed0cc2e22c609efe2d550b841c4
-SHA512:
-  metadata.gz: aa692657b0f23e1fc0410cfa5c8f996c6465148b09fa0f4ab17d47f1f1008b2db5fe3c42f5f2a777d729645589f6e5883d9dd25c7f03a49396e5de79ec20b1a4
-  data.tar.gz: 2e53ec3dc94736c4ccaeba1fa5670b6e79d0c74e8e191d25b8bf7e0643493293999253d05aa60b73176b8e44fc20d3f9e7ef901fe934ed9a7f274e83f079978d

data/lib/acts_as_textcaptcha/framework/rails2.rb

@@ -1,2 +0,0 @@
-ActiveRecord::Base.extend ActsAsTextcaptcha::Textcaptcha
-ActionView::Base.send(:include, ActsAsTextcaptcha::TextcaptchaHelper)