acts_as_textcaptcha 2.2.0 → 2.2.1

data/.gitignore

@@ -0,0 +1,8 @@
+*.*.db      
+*.db
+doc
+*.gem
+Gemfile.lock
+pkg/*
+coverage
+.rvmrc

data/Gemfile

@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in acts_as_textcaptcha.gemspec
+gemspec

data/README.rdoc

@@ -10,8 +10,8 @@ Text CAPTCHA's logic questions are aimed at a child's age of 7, so can be solved
   
 == Rails 3
 
-This gem is now fully Rails 3 compatible.
-  
+This gem is Rails 3 compatible.
+
 == Demo
 
 Here's a {fully working demo on heroku}[http://textcaptcha.heroku.com]!
@@ -136,8 +136,7 @@ For more details on the code please check the {documentation}[http://rdoc.info/p
 
 == Rake Tasks
 
-* rake rspec (run the rspec2 tests)
-* rake rcov (run tests showing coverage)
+* rake spec (run the rspec2 tests)
 * rake rdoc (generate docs)
 
 == Links
@@ -167,5 +166,6 @@ This code is currently used in a number of production websites and apps. It was
 * {matthewhutchinson.net}[http://matthewhutchinson.net]
 * {pmFAQtory.com}[http://pmfaqtory.com]
 * {The FAQtory}[http://faqtory.heroku.com]
+* {DPT Watch, San Francisco}[http://www.dptwatch.com]
 
-(if you're happily using acts_as_textcaptcha in production, let me know and I'll add you to this list)
+(if you're happily using acts_as_textcaptcha in production, let me know and I'll add you to this list)

data/Rakefile

@@ -0,0 +1,23 @@
+gem 'rdoc'
+
+require 'bundler'
+require 'rdoc/task'
+require 'rspec/core/rake_task'
+require 'rcov/rcovtask'
+
+# bundler tasks
+Bundler::GemHelper.install_tasks
+
+# rspec tasks
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.rspec_opts = "--color --format=doc"
+end
+
+# rdoc tasks
+RDoc::Task.new do |rd|
+  rd.main     = "README.rdoc"
+  rd.title    = 'acts_as_textcaptcha'
+  rd.rdoc_dir = 'doc'
+  rd.options  << "--all"
+  rd.rdoc_files.include("README.rdoc", "LICENSE", "lib/**/*.rb")
+end

data/acts_as_textcaptcha.gemspec

@@ -0,0 +1,32 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "acts_as_textcaptcha/version"
+
+Gem::Specification.new do |s|
+  s.name        = "acts_as_textcaptcha"
+  s.version     = ActsAsTextcaptcha::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Matthew Hutchinson"]
+  s.email       = ["matt@hiddenloop.com"]
+  s.homepage    = "http://github.com/matthutchinson/acts_as_textcaptcha"
+  s.summary     = %q{Spam protection for your models via logic questions and the excellent textcaptcha.com api}
+  s.description = %q{Spam protection for your ActiveRecord models using logic questions and the excellent textcaptcha api. See textcaptcha.com for more details and to get your api key.
+  The logic questions are aimed at a child's age of 7, so can be solved easily by all but the most cognitively impaired users. As they involve human logic, such questions cannot be solved by a robot.
+  For more reasons on why logic questions are useful, see here; http://textcaptcha.com/why}
+
+  s.extra_rdoc_files = ['README.rdoc', 'LICENSE']
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+  
+  s.add_dependency('rails')
+  s.add_dependency('activerecord')
+  s.add_dependency('bcrypt-ruby', '~> 2.1.2')
+  
+  s.add_development_dependency('rspec', '~> 2.5.0')
+  s.add_development_dependency('rcov', '~> 0.9.9')
+  s.add_development_dependency('rdoc', '~> 3.5.3')
+  s.add_development_dependency('sqlite3')
+end

data/init.rb

@@ -0,0 +1,2 @@
+# init.rb, not included in gemspec files, but required to work as a rails plugin
+require './vendor/plugins/acts_as_textcaptcha/lib/acts_as_textcaptcha'

data/lib/acts_as_textcaptcha/textcaptcha.rb

@@ -57,11 +57,11 @@ module ActsAsTextcaptcha
         if !respond_to?('new_record?') || new_record?
           if allowed?
             if possible_answers && perform_spam_check? && !validate_spam_answer
-              errors.add(:spam_answer, 'is incorrect, try another question instead')
+              errors.add(:spam_answer, :incorrect_answer, :message => "is incorrect, try another question instead")
               return false
             end
           else
-            errors.add(:base, "Sorry, #{self.class.name.pluralize.downcase} are currently disabled")
+            errors.add(:base, :disabled, :message => "Sorry, adding a %{model} is currently disabled")
             return false
           end
         end
@@ -124,4 +124,4 @@ module ActsAsTextcaptcha
       end
     end
   end
-end
+end

data/lib/acts_as_textcaptcha/version.rb

@@ -0,0 +1,3 @@
+module ActsAsTextcaptcha
+  VERSION = "2.2.1"
+end

data/spec/acts_as_textcaptcha_spec.rb

@@ -1,5 +1,4 @@
-require 'rspec/core'
-require File.dirname(__FILE__) + '/spec_helper.rb'
+require 'spec_helper'
 
 class Widget < ActiveRecord::Base
   # uses textcaptcha.yml file for configuration
@@ -24,14 +23,14 @@ end
 class Note < ActiveRecord::Base
   # inline options with user defined questions only (no textcaptcha service)
   acts_as_textcaptcha('questions' => [{'question' => '1+1', 'answers' => '2,two'}])
-end  
+end
 
 class Contact
-  # non active record object         
+  # non active record object
   include ActiveModel::Validations
   include ActiveModel::Conversion
-  extend ActsAsTextcaptcha::Textcaptcha 
-  acts_as_textcaptcha(:questions => [{:question => '1+1', :answers => '2,two'}]) 
+  extend ActsAsTextcaptcha::Textcaptcha
+  acts_as_textcaptcha(:questions => [{:question => '1+1', :answers => '2,two'}])
 end
 
 
@@ -40,8 +39,8 @@ describe 'ActsAsTextcaptcha' do
   before(:each) do
     @comment = Comment.new
     @review  = Review.new
-    @note    = Note.new   
-    @contact = Contact.new 
+    @note    = Note.new
+    @contact = Contact.new
   end
 
   describe 'validations' do
@@ -50,14 +49,14 @@ describe 'ActsAsTextcaptcha' do
       @note.generate_spam_question
       @note.validate_textcaptcha.should be_false
       @note.should_not be_valid
-    end  
-    
+    end
+
     it "should validate non ActiveRecord object" do
       @contact.generate_spam_question
       @contact.spam_answer = 'wrong'
       @contact.validate_textcaptcha.should be_false
       @contact.should_not be_valid
-      
+
       @contact.spam_answer = 'two'
       @contact.validate_textcaptcha.should be_true
       @contact.should be_valid
@@ -74,6 +73,7 @@ describe 'ActsAsTextcaptcha' do
 
       @note.spam_answer = 'wrong'
       @note.validate_textcaptcha.should be_false
+      @note.errors[:spam_answer].should eql(['is incorrect, try another question instead'])
       @note.should_not be_valid
     end
 
@@ -132,7 +132,7 @@ describe 'ActsAsTextcaptcha' do
       @comment.stub!(:allowed?).and_return(false)
 
       @comment.validate_textcaptcha.should be_false
-      @comment.errors[:base].should eql(['Sorry, comments are currently disabled'])
+      @comment.errors[:base].should eql(['Sorry, adding a Comment is currently disabled'])
       @comment.should_not be_valid
     end
   end
@@ -144,7 +144,7 @@ describe 'ActsAsTextcaptcha' do
       @review.textcaptcha_config.should  eql({:bcrypt_cost =>'3', :questions   => [{'question' => '1+1', 'answers' => '2,two'},
                                                                                    {'question' => 'The green hat is what color?', 'answers' => 'green'},
                                                                                    {'question' => 'Which is bigger: 67, 14 or 6', 'answers' => '67,sixtyseven,sixty seven,sixty-seven'}],
-                                                                  :bcrypt_salt => '$2a$10$j0bmycH.SVfD1b5mpEGPpe', 
+                                                                  :bcrypt_salt => '$2a$10$j0bmycH.SVfD1b5mpEGPpe',
                                                                   :api_key     => '8u5ixtdnq9csc84cok0owswgo'})
       @note.textcaptcha_config.should    eql({:questions => [{:question => '1+1', :answers => '2,two'}]})
       @contact.textcaptcha_config.should eql({:questions => [{:question => '1+1', :answers => '2,two'}]})
@@ -224,4 +224,4 @@ describe 'ActsAsTextcaptcha' do
       end
     end
   end
-end
+end

data/spec/database.yml

@@ -0,0 +1,21 @@
+sqlite:
+  :adapter: sqlite
+  :database: acts_as_textcaptcha.sqlite.db
+
+sqlite3:
+  :adapter: sqlite3
+  :database: acts_as_textcaptcha.sqlite3.db
+
+postgresql:
+  :adapter: postgresql
+  :username: postgres
+  :password: postgres
+  :database: acts_as_textcaptcha_test
+  :min_messages: ERROR
+
+mysql:
+  :adapter: mysql
+  :host: localhost
+  :username: root
+  :password:
+  :database: acts_as_textcaptcha_test

data/spec/spec.opts

@@ -0,0 +1,2 @@
+-cfs
+--loadby mtime

data/spec/spec_helper.rb

@@ -1,11 +1,8 @@
-ENV["RAILS_ENV"] ||= 'test'
-
-require 'rubygems'
+require 'bundler'
 require 'active_record'
 require 'rails'
+require 'acts_as_textcaptcha'
 
-require File.dirname(__FILE__) + '/../lib/acts_as_textcaptcha'
-
+# setup db
 ActiveRecord::Base.establish_connection(YAML::load(IO.read(File.dirname(__FILE__) + '/database.yml'))[ENV['DB'] || 'sqlite3'])
-
-load(File.dirname(__FILE__) + "/schema.rb")
+load(File.dirname(__FILE__) + "/schema.rb")

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: acts_as_textcaptcha
 version: !ruby/object:Gem::Version 
-  hash: 7
-  prerelease: false
-  segments: 
-  - 2
-  - 2
-  - 0
-  version: 2.2.0
+  prerelease: 
+  version: 2.2.1
 platform: ruby
 authors: 
 - Matthew Hutchinson
@@ -15,57 +10,125 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-01 00:00:00 +00:00
-default_executable: 
+date: 2011-06-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: bcrypt-ruby
+  name: rails
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: activerecord
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: bcrypt-ruby
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 1
-        - 2
         version: 2.1.2
   type: :runtime
-  version_requirements: *id001
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 2.5.0
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rcov
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.9.9
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: rdoc
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 3.5.3
+  type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: sqlite3
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id007
 description: |-
   Spam protection for your ActiveRecord models using logic questions and the excellent textcaptcha api. See textcaptcha.com for more details and to get your api key.
     The logic questions are aimed at a child's age of 7, so can be solved easily by all but the most cognitively impaired users. As they involve human logic, such questions cannot be solved by a robot.
     For more reasons on why logic questions are useful, see here; http://textcaptcha.com/why
-email: matt@hiddenloop.com
+email: 
+- matt@hiddenloop.com
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
-- LICENSE
 - README.rdoc
+- LICENSE
 files: 
+- .gitignore
+- Gemfile
+- LICENSE
+- README.rdoc
+- Rakefile
+- acts_as_textcaptcha.gemspec
 - config/textcaptcha.yml
+- init.rb
 - lib/acts_as_textcaptcha.rb
 - lib/acts_as_textcaptcha/framework/rails2.rb
 - lib/acts_as_textcaptcha/framework/rails3.rb
 - lib/acts_as_textcaptcha/textcaptcha.rb
 - lib/acts_as_textcaptcha/textcaptcha_helper.rb
+- lib/acts_as_textcaptcha/version.rb
 - lib/tasks/textcaptcha.rake
-- LICENSE
-- README.rdoc
 - spec/acts_as_textcaptcha_spec.rb
+- spec/database.yml
 - spec/schema.rb
+- spec/spec.opts
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/matthutchinson/acts_as_textcaptcha
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -73,27 +136,23 @@ required_ruby_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 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Spam protection for your models via logic questions and the excellent textcaptcha.com api
 test_files: 
 - spec/acts_as_textcaptcha_spec.rb
+- spec/database.yml
 - spec/schema.rb
+- spec/spec.opts
 - spec/spec_helper.rb