acts_as_textcaptcha 3.0.3 → 3.0.4

data/.travis.yml

@@ -2,3 +2,4 @@ rvm:
   - 1.8.7
   - 1.9.2
   - ree
+  - rbx

data/README.rdoc

@@ -172,8 +172,9 @@ What do you need?
 * {Rails}[http://github.com/rails/rails] >= 2.3.2  (including Rails 3)
 * {Ruby}[http://ruby-lang.org/] >= 1.8.7 (also tested with REE and Ruby 1.9.2)
 * {bcrypt-ruby}[http://bcrypt-ruby.rubyforge.org/] gem (to securely encrypt spam answers)
-* {Text CAPTCHA API key}[http://textcaptcha.com/register] (_optional_, since you can define your own logic questions, see below for details)
+* {Text CAPTCHA API key}[http://textcaptcha.com/register] (_optional_, since you can define your own logic questions)
 * {MiniTest}[https://rubygems.org/gems/minitest] (_optional_ if you want to run the tests, built into Ruby 1.9)
+* {SimpleCov}[https://rubygems.org/gems/simplecov] (_optional_ if you want to run the tests with code coverage reporting)
 
 == Links
 

data/lib/acts_as_textcaptcha/textcaptcha.rb

@@ -92,12 +92,16 @@ module ActsAsTextcaptcha
             end
           end
 
-          # fall back to textcaptcha_config questions
+          # fall back to textcaptcha_config questions if they are configured correctly
           if textcaptcha_config[:questions]
-            random_question    = textcaptcha_config[:questions][rand(textcaptcha_config[:questions].size)].symbolize_keys!
-            self.spam_question = random_question[:question]
-            self.spam_answers  = encrypt_answers(random_question[:answers].split(',').map!{ |answer| md5_answer(answer) })
-          else
+            random_question = textcaptcha_config[:questions][rand(textcaptcha_config[:questions].size)].symbolize_keys!
+            if random_question[:question] && random_question[:answers]
+              self.spam_question = random_question[:question]
+              self.spam_answers  = encrypt_answers(random_question[:answers].split(',').map!{ |answer| md5_answer(answer) })
+            end
+          end
+
+          unless self.spam_question && self.spam_answers
             self.spam_question = 'ActsAsTextcaptcha >> no API key (or questions) set and/or the textcaptcha service is currently unavailable (answer ok to bypass)'
             self.spam_answers  = 'ok'
           end

data/lib/acts_as_textcaptcha/version.rb

@@ -1,3 +1,3 @@
 module ActsAsTextcaptcha
-  VERSION = "3.0.3"
+  VERSION = "3.0.4"
 end

data/test/schema.rb

@@ -12,6 +12,10 @@ ActiveRecord::Schema.define(:version => 0) do
     t.string :name
   end
 
+  create_table :movie_reviews, :force => true do |t|
+    t.string :name
+  end
+
   create_table :notes, :force => true do |t|
     t.string :name
   end

data/test/test_models.rb

@@ -20,6 +20,14 @@ class Review < ActiveRecord::Base
                       'questions'   => [{ 'question' => 'The green hat is what color?', 'answers' => 'green' }]
 end
 
+class MovieReview < ActiveRecord::Base
+  # inline options with all possible options
+  acts_as_textcaptcha 'api_key'     => '8u5ixtdnq9csc84cok0owswgo',
+                      'bcrypt_salt' => '$2a$10$j0bmycH.SVfD1b5mpEGPpe',
+                      'bcrypt_cost' => '3',
+                      'questions'   => [{ 'Question' => 'The green hat is what color?', 'answers' => nil }]
+end
+
 class Note < ActiveRecord::Base
   # inline options (string keys) with user defined questions only (no textcaptcha service)
   acts_as_textcaptcha 'questions'   => [{ 'question' => '1+1', 'answers' => '2,two' }],

data/test/textcaptcha_test.rb

@@ -178,6 +178,15 @@ describe 'Textcaptcha' do
       @comment.spam_question.must_equal 'ActsAsTextcaptcha >> no API key (or questions) set and/or the textcaptcha service is currently unavailable (answer ok to bypass)'
       @comment.spam_answers.must_equal 'ok'
     end
+
+    it 'should not generate any spam question or answer when user defined questions set incorrectly' do
+      @comment = MovieReview.new
+
+      FakeWeb.register_uri(:get, %r|http://textcaptcha\.com/api/|, :exception => SocketError)
+      @comment.textcaptcha
+      @comment.spam_question.must_equal 'ActsAsTextcaptcha >> no API key (or questions) set and/or the textcaptcha service is currently unavailable (answer ok to bypass)'
+      @comment.spam_answers.must_equal 'ok'
+    end
   end
 
   describe 'configuration' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_textcaptcha
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-07 00:00:00.000000000 +01:00
-default_executable: 
+date: 2011-10-06 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
-  requirement: &2168642840 !ruby/object:Gem::Requirement
+  requirement: &2165789020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +21,10 @@ dependencies:
         version: 2.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *2168642840
+  version_requirements: *2165789020
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2168779000 !ruby/object:Gem::Requirement
+  requirement: &2165788600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168779000
+  version_requirements: *2165788600
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2168781360 !ruby/object:Gem::Requirement
+  requirement: &2165788140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168781360
+  version_requirements: *2165788140
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &2168783060 !ruby/object:Gem::Requirement
+  requirement: &2165787720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168783060
+  version_requirements: *2165787720
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2168798920 !ruby/object:Gem::Requirement
+  requirement: &2165787300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168798920
+  version_requirements: *2165787300
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2168801820 !ruby/object:Gem::Requirement
+  requirement: &2165786880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168801820
+  version_requirements: *2165786880
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2168797720 !ruby/object:Gem::Requirement
+  requirement: &2165786460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168797720
+  version_requirements: *2165786460
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &2168797300 !ruby/object:Gem::Requirement
+  requirement: &2165786040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168797300
+  version_requirements: *2165786040
 description: ! "Simple question/answer based spam protection for your Rails models.\n
   \ You can define your own logic questions and/or fetch questions from the textcaptcha.com
   API.\n  The questions involve human logic and are tough for spam bots to crack.\n
@@ -133,7 +132,6 @@ files:
 - test/test_models.rb
 - test/textcaptcha_helper_test.rb
 - test/textcaptcha_test.rb
-has_rdoc: true
 homepage: http://github.com/matthutchinson/acts_as_textcaptcha
 licenses: []
 post_install_message: 
@@ -154,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.7
 signing_key: 
 specification_version: 3
 summary: Spam protection for your models via logic questions and the textcaptcha.com