- update Gemfile

- rename method for better writing

Author: traxanos

Gemfile

@@ -1,5 +1,5 @@
 source "http://rubygems.org"
-gem "rails", ">= 3.0.0"
+gem "rails", "~> 3.0.0"
 gem "rmagick"
 
 group :development do

Gemfile.lock

@@ -2,33 +2,33 @@ GEM
   remote: http://rubygems.org/
   specs:
     abstract (1.0.0)
-    actionmailer (3.0.4)
-      actionpack (= 3.0.4)
+    actionmailer (3.0.7)
+      actionpack (= 3.0.7)
       mail (~> 2.2.15)
-    actionpack (3.0.4)
-      activemodel (= 3.0.4)
-      activesupport (= 3.0.4)
+    actionpack (3.0.7)
+      activemodel (= 3.0.7)
+      activesupport (= 3.0.7)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
-      i18n (~> 0.4)
+      i18n (~> 0.5.0)
       rack (~> 1.2.1)
-      rack-mount (~> 0.6.13)
+      rack-mount (~> 0.6.14)
       rack-test (~> 0.5.7)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.4)
-      activesupport (= 3.0.4)
+    activemodel (3.0.7)
+      activesupport (= 3.0.7)
       builder (~> 2.1.2)
-      i18n (~> 0.4)
-    activerecord (3.0.4)
-      activemodel (= 3.0.4)
-      activesupport (= 3.0.4)
+      i18n (~> 0.5.0)
+    activerecord (3.0.7)
+      activemodel (= 3.0.7)
+      activesupport (= 3.0.7)
       arel (~> 2.0.2)
       tzinfo (~> 0.3.23)
-    activeresource (3.0.4)
-      activemodel (= 3.0.4)
-      activesupport (= 3.0.4)
-    activesupport (3.0.4)
-    arel (2.0.8)
+    activeresource (3.0.7)
+      activemodel (= 3.0.7)
+      activesupport (= 3.0.7)
+    activesupport (3.0.7)
+    arel (2.0.10)
     builder (2.1.2)
     diff-lcs (1.1.2)
     erubis (2.6.6)
@@ -39,32 +39,32 @@ GEM
       bundler (~> 1.0.0)
       git (>= 1.2.5)
       rake
-    mail (2.2.15)
+    mail (2.2.19)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.16)
     polyglot (0.3.1)
-    rack (1.2.1)
-    rack-mount (0.6.13)
+    rack (1.2.3)
+    rack-mount (0.6.14)
       rack (>= 1.0.0)
     rack-test (0.5.7)
       rack (>= 1.0)
-    rails (3.0.4)
-      actionmailer (= 3.0.4)
-      actionpack (= 3.0.4)
-      activerecord (= 3.0.4)
-      activeresource (= 3.0.4)
-      activesupport (= 3.0.4)
+    rails (3.0.7)
+      actionmailer (= 3.0.7)
+      actionpack (= 3.0.7)
+      activerecord (= 3.0.7)
+      activeresource (= 3.0.7)
+      activesupport (= 3.0.7)
       bundler (~> 1.0)
-      railties (= 3.0.4)
-    railties (3.0.4)
-      actionpack (= 3.0.4)
-      activesupport (= 3.0.4)
+      railties (= 3.0.7)
+    railties (3.0.7)
+      actionpack (= 3.0.7)
+      activesupport (= 3.0.7)
       rake (>= 0.8.7)
       thor (~> 0.14.4)
-    rake (0.8.7)
+    rake (0.9.2)
     rmagick (2.13.1)
     rspec (2.3.0)
       rspec-core (~> 2.3.0)
@@ -74,22 +74,22 @@ GEM
     rspec-expectations (2.3.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.3.0)
-    simplecov (0.4.0)
-      simplecov-html (~> 0.4.0)
-    simplecov-html (0.4.3)
+    simplecov (0.4.2)
+      simplecov-html (~> 0.4.4)
+    simplecov-html (0.4.5)
     thor (0.14.6)
     treetop (1.4.9)
       polyglot (>= 0.3.1)
-    tzinfo (0.3.24)
-    yard (0.6.4)
+    tzinfo (0.3.27)
+    yard (0.6.8)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bundler (~> 1.0.0)
   jeweler (~> 1.5.2)
-  rails (>= 3.0.0)
+  rails (~> 3.0.0)
   rmagick
   rspec (~> 2.3.0)
   simplecov (>= 0.3.8)

lib/easy_captcha/controller_helpers.rb

@@ -4,7 +4,7 @@ module ControllerHelpers
 
     def self.included(base) #:nodoc:
       base.class_eval do
-        helper_method :valid_captcha?
+        helper_method :valid_captcha?, :captcha_valid?
       end
     end
 
@@ -46,10 +46,11 @@ def generate_captcha_code
     end
 
     # validate given captcha code and re
-    def valid_captcha?(code)
+    def captcha_valid?(code)
       return false if session[:captcha].blank? or code.blank?
       session[:captcha].to_s.upcase == code.to_s.upcase
     end
+    alias_method :valid_captcha?, :captcha_valid?
 
     # reset the captcha code in session for security after each request
     def reset_last_captcha_code!

lib/easy_captcha/model_helpers.rb

@@ -20,9 +20,10 @@ def captcha  #:nodoc:
       end
 
       # validate captcha
-      def valid_captcha?
+      def captcha_valid?
         errors.add(:captcha, :invalid) if @captcha.blank? or @captcha_verification.blank? or @captcha.to_s.upcase != @captcha_verification.to_s.upcase 
       end
+      alias_method :valid_captcha?, :captcha_valid?
     end
   end
 end