acts_as_textcaptcha 2.1.5 → 2.2.0

data/README.rdoc

@@ -24,7 +24,7 @@ What do you need?
 * {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 the spam answers in your session)
 * {Text CAPTCHA api key}[http://textcaptcha.com/register] (_optional_, since you can define your own logic questions, see below for details)             
-* {Rspec}[http://rspec.info/] (_optional_ if you want to run the tests)
+* {Rspec2}[http://rspec.info/] (_optional_ if you want to run the tests, requires >= rspec2)
  
 == Installing            
 
@@ -136,7 +136,7 @@ For more details on the code please check the {documentation}[http://rdoc.info/p
 
 == Rake Tasks
 
-* rake spec (run the tests)
+* rake rspec (run the rspec2 tests)
 * rake rcov (run tests showing coverage)
 * rake rdoc (generate docs)
 

data/lib/acts_as_textcaptcha/textcaptcha.rb

@@ -30,10 +30,10 @@ module ActsAsTextcaptcha
       validate       :validate_textcaptcha
 
       if options.is_a?(Hash)
-        self.textcaptcha_config = options
+        self.textcaptcha_config = options.symbolize_keys!
       else
         begin
-          self.textcaptcha_config = YAML.load(File.read("#{Rails.root ? Rails.root.to_s : '.'}/config/textcaptcha.yml"))[Rails.env]
+          self.textcaptcha_config = YAML.load(File.read("#{Rails.root ? Rails.root.to_s : '.'}/config/textcaptcha.yml"))[Rails.env].symbolize_keys!
         rescue Errno::ENOENT
           raise('./config/textcaptcha.yml not found')
         end
@@ -77,14 +77,14 @@ module ActsAsTextcaptcha
       end
 
       def encrypt_answer(answer)
-        return answer unless(textcaptcha_config['bcrypt_salt'])
-        BCrypt::Engine.hash_secret(answer, textcaptcha_config['bcrypt_salt'], (textcaptcha_config['bcrypt_cost'].to_i || 10))
+        return answer unless(textcaptcha_config[:bcrypt_salt])
+        BCrypt::Engine.hash_secret(answer, textcaptcha_config[:bcrypt_salt], (textcaptcha_config[:bcrypt_cost].to_i || 10))
       end
 
       def generate_spam_question(use_textcaptcha = true)
-        if use_textcaptcha && textcaptcha_config && textcaptcha_config['api_key']
+        if use_textcaptcha && textcaptcha_config && textcaptcha_config[:api_key]
           begin
-            resp = Net::HTTP.get(URI.parse('http://textcaptcha.com/api/'+textcaptcha_config['api_key']))
+            resp = Net::HTTP.get(URI.parse('http://textcaptcha.com/api/'+textcaptcha_config[:api_key]))
             return [] if resp.empty?
 
             if defined?(ActiveSupport::XmlMini)
@@ -103,16 +103,16 @@ module ActsAsTextcaptcha
             return possible_answers if spam_question && !possible_answers.empty?
           rescue SocketError, Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError, Errno::ECONNREFUSED,
                  Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError, URI::InvalidURIError => e
-            log_textcaptcha("failed to load or parse textcaptcha with key '#{textcaptcha_config['api_key']}'; #{e}")
+            log_textcaptcha("failed to load or parse textcaptcha with key '#{textcaptcha_config[:api_key]}'; #{e}")
           end
         end
 
         # fall back to textcaptcha_config questions
-        if textcaptcha_config && textcaptcha_config['questions']
-          log_textcaptcha('falling back to random logic question from config') if textcaptcha_config['api_key']
-          random_question       = textcaptcha_config['questions'][rand(textcaptcha_config['questions'].size)]
-          self.spam_question    = random_question['question']
-          self.possible_answers = encrypt_answers(random_question['answers'].split(',').map!{|ans| Digest::MD5.hexdigest(ans)})
+        if textcaptcha_config && textcaptcha_config[:questions]
+          log_textcaptcha('falling back to random logic question from config') if textcaptcha_config[:api_key]
+          random_question       = textcaptcha_config[:questions][rand(textcaptcha_config[:questions].size)].symbolize_keys!
+          self.spam_question    = random_question[:question]
+          self.possible_answers = encrypt_answers(random_question[:answers].split(',').map!{|ans| Digest::MD5.hexdigest(ans)})
         end
         possible_answers
       end

data/spec/acts_as_textcaptcha_spec.rb

@@ -1,4 +1,5 @@
-require 'spec_helper'
+require 'rspec/core'
+require File.dirname(__FILE__) + '/spec_helper.rb'
 
 class Widget < ActiveRecord::Base
   # uses textcaptcha.yml file for configuration
@@ -30,7 +31,7 @@ class Contact
   include ActiveModel::Validations
   include ActiveModel::Conversion
   extend ActsAsTextcaptcha::Textcaptcha 
-  acts_as_textcaptcha('questions' => [{'question' => '1+1', 'answers' => '2,two'}]) 
+  acts_as_textcaptcha(:questions => [{:question => '1+1', :answers => '2,two'}]) 
 end
 
 
@@ -138,13 +139,15 @@ describe 'ActsAsTextcaptcha' do
 
   describe 'with inline options hash' do
 
-    it 'should be configurable from inline options' do
-      @comment.textcaptcha_config.should eql({'api_key' => '8u5ixtdnq9csc84cok0owswgo'})
-      @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', 'api_key'=>'8u5ixtdnq9csc84cok0owswgo'})
-      @note.textcaptcha_config.should    eql({'questions'=>[{'question'=>'1+1', 'answers'=>'2,two'}]})
+    it 'should be configurable from inline options with keys as symbols' do
+      @comment.textcaptcha_config.should eql({:api_key => '8u5ixtdnq9csc84cok0owswgo'})
+      @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', 
+                                                                  :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'}]})
     end
 
     it 'should generate spam question from textcaptcha service' do
@@ -190,10 +193,10 @@ describe 'ActsAsTextcaptcha' do
     end
 
     it 'should be configurable from config/textcaptcha.yml file' do
-      @widget.textcaptcha_config['api_key'].should eql('8u5ixtdnq9csc84cok0owswgo')
-      @widget.textcaptcha_config['bcrypt_salt'].should eql('$2a$10$j0bmycH.SVfD1b5mpEGPpe')
-      @widget.textcaptcha_config['bcrypt_cost'].should eql(10)
-      @widget.textcaptcha_config['questions'].length.should eql(10)
+      @widget.textcaptcha_config[:api_key].should eql('8u5ixtdnq9csc84cok0owswgo')
+      @widget.textcaptcha_config[:bcrypt_salt].should eql('$2a$10$j0bmycH.SVfD1b5mpEGPpe')
+      @widget.textcaptcha_config[:bcrypt_cost].should eql(10)
+      @widget.textcaptcha_config[:questions].length.should eql(10)
     end
 
     it 'should generate spam question' do

data/spec/spec_helper.rb

@@ -2,9 +2,7 @@ ENV["RAILS_ENV"] ||= 'test'
 
 require 'rubygems'
 require 'active_record'
-require 'rails' 
-require 'spec'
-require 'spec/autorun'   
+require 'rails'
 
 require File.dirname(__FILE__) + '/../lib/acts_as_textcaptcha'
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: acts_as_textcaptcha
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 7
   prerelease: false
   segments: 
   - 2
-  - 1
-  - 5
-  version: 2.1.5
+  - 2
+  - 0
+  version: 2.2.0
 platform: ruby
 authors: 
 - Matthew Hutchinson
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-20 00:00:00 +01:00
+date: 2010-12-01 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency