acts_as_textcaptcha 1.1.1 → 1.1.2

data/README.rdoc

@@ -42,7 +42,7 @@ Next configure your models to be spam protected like so; (this is the most basic
     acts_as_textcaptcha({'api_key' => 'your_textcaptcha_api_key'})
   end          
                
-Next in your controller *new* and *create* actions you'll want to _spamify_ your model like so.  This generates a new spam question on the model;
+Next in your controller *new* and *create* actions you'll want to _spamify_ your model and merge the answers. Like so;
 
   def new
     @comment = Comment.new
@@ -50,12 +50,12 @@ Next in your controller *new* and *create* actions you'll want to _spamify_ your
   end                                                                                
 
   def create
-    @comment = Comment.new(params[:comment])
+    @comment = Comment.new(params[:comment].merge(:possible_answers => session[:possible_answers]))
     if @comment.save
       ...
     else
       spamify(@comment)
-       render :action => 'new'
+      render :action => 'new'
     end
   end       
       

data/VERSION

@@ -1 +1 @@
-1.1.1
+1.1.2

data/acts_as_textcaptcha.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{acts_as_textcaptcha}
-  s.version = "1.1.1"
+  s.version = "1.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matthew Hutchinson"]

data/lib/acts_as_textcaptcha.rb

@@ -37,7 +37,8 @@ module ActsAsTextcaptcha #:nodoc:
     # if returning false model.validate will always be false with errors on base
     def allowed?; true end
 
-    def validate     
+    def validate 
+      super
       if new_record?
         if allowed?
           if possible_answers && perform_spam_check? && !validate_spam_answer
@@ -49,11 +50,11 @@ module ActsAsTextcaptcha #:nodoc:
           return false
         end
       end
-      super
+      true
     end     
     
     def validate_spam_answer
-      spam_answer ? possible_answers.include?(encrypt_answer(Digest::MD5.hexdigest(spam_answer.strip.downcase.to_s))) : false
+      (spam_answer && possible_answers) ? possible_answers.include?(encrypt_answer(Digest::MD5.hexdigest(spam_answer.strip.downcase.to_s))) : false
     end
      
     def encrypt_answers(answers)   

data/spec/acts_as_textcaptcha_spec.rb

@@ -91,7 +91,7 @@ describe 'ActsAsTextcaptcha' do
     it 'should always be valid if skip_spam_check? is true' do
       @comment.generate_spam_question
       @comment.validate.should be_false
-      @comment.stub!(:skip_spam_check?).and_return(true)
+      @comment.stub!(:perform_spam_check?).and_return(false)
       @comment.validate.should be_true
       @comment.should be_valid
     end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 1
-  - 1
-  version: 1.1.1
+  - 2
+  version: 1.1.2
 platform: ruby
 authors: 
 - Matthew Hutchinson