Merge remote-tracking branch 'kopylovvlad/master' into kopylovvlad-pr-33

* kopylovvlad/master:
  Update README.rdoc
  Update README.rdoc
  update to rails 5

Ref: phatworx#33

Author: karlwilbur

README.rdoc

@@ -1,13 +1,13 @@
 = EasyCaptcha
-A simple captcha implementation for rails 3 based on rmagick
+A simple captcha implementation for rails based on rmagick.
 
-Tested with Rails 3.2.8
+It is a fork with rails 5 support.
 
 https://travis-ci.org/phatworx/easy_captcha.png
 
 == Installation
 add to Gemfile
-  gem 'easy_captcha'
+  gem 'easy_captcha', github: 'kopylovvlad/easy_captcha'
   gem 'rmagick'
 
 for java you can use

lib/easy_captcha/captcha_controller.rb

@@ -1,7 +1,7 @@
 module EasyCaptcha
   # captcha controller
   class CaptchaController < ActionController::Base
-    before_filter :overwrite_cache_control
+    before_action :overwrite_cache_control
     # captcha action send the generated image to browser
     def captcha
       if params[:format] == "wav" and EasyCaptcha.espeak?

lib/easy_captcha/routes.rb

@@ -3,8 +3,8 @@ module Routing #:nodoc:
     class Mapper #:nodoc:
       # call to add default captcha root
       def captcha_route
-        match 'captcha' => 'easy_captcha/captcha#captcha', :via => :get
+        get '/captcha' => 'easy_captcha/captcha#captcha'
       end
     end
   end
-end
+end