From 01f3ef72f5102cf2e722f62f11a54c9236d27c05 Mon Sep 17 00:00:00 2001
From: Azdaroth <azdaroth@gmail.com>
Date: Thu, 23 May 2013 10:15:51 +0200
Subject: [PATCH 001/115] remove support for set_table_name, attr_accesible,
 dynamic finders, changed version

---
 lib/simple_captcha/form_builder.rb        |  4 ++--
 lib/simple_captcha/simple_captcha_data.rb | 16 +++-------------
 lib/simple_captcha/version.rb             |  2 +-
 3 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/lib/simple_captcha/form_builder.rb b/lib/simple_captcha/form_builder.rb
index b4323d8..fbae3fb 100644
--- a/lib/simple_captcha/form_builder.rb
+++ b/lib/simple_captcha/form_builder.rb
@@ -4,8 +4,8 @@ def self.included(base)
       base.send(:include, SimpleCaptcha::ViewHelper)
       base.send(:include, SimpleCaptcha::FormBuilder::ClassMethods)
       base.send(:include, ActionView::Helpers)
-      base.send(:include, Sprockets::Helpers::RailsHelper)
-      base.send(:include, Sprockets::Helpers::IsolatedHelper)
+      base.send(:include, Sprockets::Rails::Helpers::RailsHelper)
+      base.send(:include, Sprockets::Rails::Helpers::IsolatedHelper)
       
       base.delegate :render, :session, :to => :template
     end
diff --git a/lib/simple_captcha/simple_captcha_data.rb b/lib/simple_captcha/simple_captcha_data.rb
index 374e698..0fd4ef8 100644
--- a/lib/simple_captcha/simple_captcha_data.rb
+++ b/lib/simple_captcha/simple_captcha_data.rb
@@ -1,22 +1,12 @@
 module SimpleCaptcha
   class SimpleCaptchaData < ::ActiveRecord::Base
-    def self.rails3?
-      ::ActiveRecord::VERSION::MAJOR == 3
-    end
-
-    if rails3?
-      # Fixes deprecation warning in Rails 3.2:
-      # DEPRECATION WARNING: Calling set_table_name is deprecated. Please use `self.table_name = 'the_name'` instead.
-      self.table_name = "simple_captcha_data"
-    else
-      set_table_name "simple_captcha_data"
-    end
+  
+    self.table_name = "simple_captcha_data"
     
-    attr_accessible :key, :value
     
     class << self
       def get_data(key)
-        data = find_by_key(key) || new(:key => key)
+        data = where(key: key).first || new(key: key)
       end
       
       def remove_data(key)
diff --git a/lib/simple_captcha/version.rb b/lib/simple_captcha/version.rb
index 33b2189..7b7571a 100644
--- a/lib/simple_captcha/version.rb
+++ b/lib/simple_captcha/version.rb
@@ -1,3 +1,3 @@
 module SimpleCaptcha
-  VERSION = "0.1.5".freeze
+  VERSION = "0.1.6".freeze
 end

From 2457d1913e1dfb26fb3f0c93e4fe5158f36b5868 Mon Sep 17 00:00:00 2001
From: Azdaroth <azdaroth@gmail.com>
Date: Thu, 23 May 2013 10:21:09 +0200
Subject: [PATCH 002/115] fix including rails helpers

---
 lib/simple_captcha/form_builder.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/simple_captcha/form_builder.rb b/lib/simple_captcha/form_builder.rb
index fbae3fb..6f3a43d 100644
--- a/lib/simple_captcha/form_builder.rb
+++ b/lib/simple_captcha/form_builder.rb
@@ -4,8 +4,8 @@ def self.included(base)
       base.send(:include, SimpleCaptcha::ViewHelper)
       base.send(:include, SimpleCaptcha::FormBuilder::ClassMethods)
       base.send(:include, ActionView::Helpers)
-      base.send(:include, Sprockets::Rails::Helpers::RailsHelper)
-      base.send(:include, Sprockets::Rails::Helpers::IsolatedHelper)
+      base.send(:include, Sprockets::Rails::Helper::RailsHelper)
+      base.send(:include, Sprockets::Rails::Helper::IsolatedHelper)
       
       base.delegate :render, :session, :to => :template
     end

From 4ff33a74eda8d4c44d2a1326e1b217f1e7ade389 Mon Sep 17 00:00:00 2001
From: Azdaroth <azdaroth@gmail.com>
Date: Thu, 23 May 2013 10:28:56 +0200
Subject: [PATCH 003/115] beack to previous version with rails sprockets

---
 lib/simple_captcha/form_builder.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/simple_captcha/form_builder.rb b/lib/simple_captcha/form_builder.rb
index 6f3a43d..fbae3fb 100644
--- a/lib/simple_captcha/form_builder.rb
+++ b/lib/simple_captcha/form_builder.rb
@@ -4,8 +4,8 @@ def self.included(base)
       base.send(:include, SimpleCaptcha::ViewHelper)
       base.send(:include, SimpleCaptcha::FormBuilder::ClassMethods)
       base.send(:include, ActionView::Helpers)
-      base.send(:include, Sprockets::Rails::Helper::RailsHelper)
-      base.send(:include, Sprockets::Rails::Helper::IsolatedHelper)
+      base.send(:include, Sprockets::Rails::Helpers::RailsHelper)
+      base.send(:include, Sprockets::Rails::Helpers::IsolatedHelper)
       
       base.delegate :render, :session, :to => :template
     end

From 4791570204b460150581e803fdf25c0aed03db26 Mon Sep 17 00:00:00 2001
From: Azdaroth <azdaroth@gmail.com>
Date: Thu, 23 May 2013 10:32:08 +0200
Subject: [PATCH 004/115] confusing change with rails 4 sprockets

---
 lib/simple_captcha/form_builder.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/simple_captcha/form_builder.rb b/lib/simple_captcha/form_builder.rb
index fbae3fb..6f3a43d 100644
--- a/lib/simple_captcha/form_builder.rb
+++ b/lib/simple_captcha/form_builder.rb
@@ -4,8 +4,8 @@ def self.included(base)
       base.send(:include, SimpleCaptcha::ViewHelper)
       base.send(:include, SimpleCaptcha::FormBuilder::ClassMethods)
       base.send(:include, ActionView::Helpers)
-      base.send(:include, Sprockets::Rails::Helpers::RailsHelper)
-      base.send(:include, Sprockets::Rails::Helpers::IsolatedHelper)
+      base.send(:include, Sprockets::Rails::Helper::RailsHelper)
+      base.send(:include, Sprockets::Rails::Helper::IsolatedHelper)
       
       base.delegate :render, :session, :to => :template
     end

From 02b9c4c7893febae1310864b7f3ca6d65fb53f91 Mon Sep 17 00:00:00 2001
From: Azdaroth <azdaroth@gmail.com>
Date: Thu, 23 May 2013 10:39:13 +0200
Subject: [PATCH 005/115] lucky try with sprockets

---
 lib/simple_captcha/form_builder.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/simple_captcha/form_builder.rb b/lib/simple_captcha/form_builder.rb
index 6f3a43d..9c8693e 100644
--- a/lib/simple_captcha/form_builder.rb
+++ b/lib/simple_captcha/form_builder.rb
@@ -4,8 +4,7 @@ def self.included(base)
       base.send(:include, SimpleCaptcha::ViewHelper)
       base.send(:include, SimpleCaptcha::FormBuilder::ClassMethods)
       base.send(:include, ActionView::Helpers)
-      base.send(:include, Sprockets::Rails::Helper::RailsHelper)
-      base.send(:include, Sprockets::Rails::Helper::IsolatedHelper)
+      base.send(:include, Sprockets::Rails::Helper)
       
       base.delegate :render, :session, :to => :template
     end

From 486e29672a347c70e0e9d7fe585787b3ab041aa4 Mon Sep 17 00:00:00 2001
From: Vincent Thelang <vincent.thelang@pludoni.de>
Date: Mon, 24 Jun 2013 15:05:14 +0200
Subject: [PATCH 006/115] fixed ActiveRecord Naming reference for Rails
 4.0.0rc2

---
 lib/simple_captcha/active_record.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/simple_captcha/active_record.rb b/lib/simple_captcha/active_record.rb
index 9a6427e..e864c15 100644
--- a/lib/simple_captcha/active_record.rb
+++ b/lib/simple_captcha/active_record.rb
@@ -60,7 +60,7 @@ def is_captcha_valid?
           SimpleCaptcha::Utils::simple_captcha_passed!(captcha_key)
           return true
         else
-          message = simple_captcha_options[:message] || I18n.t(self.class.model_name.downcase, :scope => [:simple_captcha, :message], :default => :default)
+          message = simple_captcha_options[:message] || I18n.t(self.class.model_name.to_s.downcase, :scope => [:simple_captcha, :message], :default => :default)
           simple_captcha_options[:add_to_base] ? errors.add(:base, message) : errors.add(:captcha, message)
           return false
         end

From 16decf3b1bfe628f0800bbc1d8e177091ae1d44c Mon Sep 17 00:00:00 2001
From: Stefan Wienert <stefan.wienert@pludoni.de>
Date: Mon, 4 Nov 2013 11:57:08 +0100
Subject: [PATCH 007/115] Dummyapp and integration tests added;
 SimpleCaptcha.always_pass = Rails.env.test? extracted

---
 .gitignore                                    |  23 ++---
 Gemfile                                       |   4 +
 README.rdoc                                   |   5 +-
 Rakefile                                      |  43 ++++++----
 lib/simple_captcha.rb                         |   4 +
 lib/simple_captcha/active_record.rb           |  24 +++---
 lib/simple_captcha/controller.rb              |   6 +-
 lib/simple_captcha/form_builder.rb            |   2 +-
 lib/simple_captcha/version.rb                 |   2 +-
 simple_captcha.gemspec                        |  13 ++-
 test/dummy/README.rdoc                        |  28 ++++++
 test/dummy/Rakefile                           |   6 ++
 test/dummy/app/assets/images/.keep            |   0
 .../app/assets/javascripts/application.js     |  13 +++
 .../app/assets/stylesheets/application.css    |  13 +++
 .../app/controllers/application_controller.rb |   6 ++
 test/dummy/app/controllers/concerns/.keep     |   0
 .../dummy/app/controllers/pages_controller.rb |  12 +++
 test/dummy/app/helpers/application_helper.rb  |   2 +
 test/dummy/app/mailers/.keep                  |   0
 test/dummy/app/models/.keep                   |   0
 test/dummy/app/models/concerns/.keep          |   0
 .../app/views/layouts/application.html.erb    |  14 +++
 test/dummy/app/views/pages/form_tag.html.erb  |   7 ++
 .../views/simple_captcha/_simple_captcha.erb  |  37 ++++++++
 test/dummy/bin/bundle                         |   3 +
 test/dummy/bin/rails                          |   4 +
 test/dummy/bin/rake                           |   4 +
 test/dummy/config.ru                          |   4 +
 test/dummy/config/application.rb              |  23 +++++
 test/dummy/config/boot.rb                     |   5 ++
 test/dummy/config/database.yml                |  25 ++++++
 test/dummy/config/environment.rb              |   5 ++
 test/dummy/config/environments/development.rb |  29 +++++++
 test/dummy/config/environments/production.rb  |  80 ++++++++++++++++++
 test/dummy/config/environments/test.rb        |  36 ++++++++
 .../initializers/backtrace_silencers.rb       |   7 ++
 .../initializers/filter_parameter_logging.rb  |   4 +
 test/dummy/config/initializers/inflections.rb |  16 ++++
 test/dummy/config/initializers/mime_types.rb  |   5 ++
 .../dummy/config/initializers/secret_token.rb |  12 +++
 .../config/initializers/session_store.rb      |   3 +
 .../config/initializers/wrap_parameters.rb    |  14 +++
 test/dummy/config/locales/en.yml              |  23 +++++
 test/dummy/config/routes.rb                   |   6 ++
 test/dummy/db/development.sqlite3             | Bin 0 -> 6144 bytes
 ...131104112427_create_simple_captcha_data.rb |  15 ++++
 test/dummy/db/schema.rb                       |  25 ++++++
 test/dummy/db/test.sqlite3                    | Bin 0 -> 6144 bytes
 test/dummy/lib/assets/.keep                   |   0
 test/dummy/log/.keep                          |   0
 test/dummy/public/404.html                    |  58 +++++++++++++
 test/dummy/public/422.html                    |  58 +++++++++++++
 test/dummy/public/500.html                    |  57 +++++++++++++
 test/dummy/public/favicon.ico                 |   0
 test/features/form_helper_test.rb             |  25 ++++++
 test/simple_captcha_test.rb                   |   8 --
 test/test_helper.rb                           |  18 ++++
 58 files changed, 770 insertions(+), 66 deletions(-)
 create mode 100644 Gemfile
 create mode 100644 test/dummy/README.rdoc
 create mode 100644 test/dummy/Rakefile
 create mode 100644 test/dummy/app/assets/images/.keep
 create mode 100644 test/dummy/app/assets/javascripts/application.js
 create mode 100644 test/dummy/app/assets/stylesheets/application.css
 create mode 100644 test/dummy/app/controllers/application_controller.rb
 create mode 100644 test/dummy/app/controllers/concerns/.keep
 create mode 100644 test/dummy/app/controllers/pages_controller.rb
 create mode 100644 test/dummy/app/helpers/application_helper.rb
 create mode 100644 test/dummy/app/mailers/.keep
 create mode 100644 test/dummy/app/models/.keep
 create mode 100644 test/dummy/app/models/concerns/.keep
 create mode 100644 test/dummy/app/views/layouts/application.html.erb
 create mode 100644 test/dummy/app/views/pages/form_tag.html.erb
 create mode 100644 test/dummy/app/views/simple_captcha/_simple_captcha.erb
 create mode 100755 test/dummy/bin/bundle
 create mode 100755 test/dummy/bin/rails
 create mode 100755 test/dummy/bin/rake
 create mode 100644 test/dummy/config.ru
 create mode 100644 test/dummy/config/application.rb
 create mode 100644 test/dummy/config/boot.rb
 create mode 100644 test/dummy/config/database.yml
 create mode 100644 test/dummy/config/environment.rb
 create mode 100644 test/dummy/config/environments/development.rb
 create mode 100644 test/dummy/config/environments/production.rb
 create mode 100644 test/dummy/config/environments/test.rb
 create mode 100644 test/dummy/config/initializers/backtrace_silencers.rb
 create mode 100644 test/dummy/config/initializers/filter_parameter_logging.rb
 create mode 100644 test/dummy/config/initializers/inflections.rb
 create mode 100644 test/dummy/config/initializers/mime_types.rb
 create mode 100644 test/dummy/config/initializers/secret_token.rb
 create mode 100644 test/dummy/config/initializers/session_store.rb
 create mode 100644 test/dummy/config/initializers/wrap_parameters.rb
 create mode 100644 test/dummy/config/locales/en.yml
 create mode 100644 test/dummy/config/routes.rb
 create mode 100644 test/dummy/db/development.sqlite3
 create mode 100644 test/dummy/db/migrate/20131104112427_create_simple_captcha_data.rb
 create mode 100644 test/dummy/db/schema.rb
 create mode 100644 test/dummy/db/test.sqlite3
 create mode 100644 test/dummy/lib/assets/.keep
 create mode 100644 test/dummy/log/.keep
 create mode 100644 test/dummy/public/404.html
 create mode 100644 test/dummy/public/422.html
 create mode 100644 test/dummy/public/500.html
 create mode 100644 test/dummy/public/favicon.ico
 create mode 100644 test/features/form_helper_test.rb
 delete mode 100644 test/simple_captcha_test.rb
 create mode 100644 test/test_helper.rb

diff --git a/.gitignore b/.gitignore
index a2f6bf5..0c95927 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,21 +1,8 @@
 pkg/
 Gemfile.lock
 .rspec
-spec/tmp
-spec/dummy/log/*.log
-spec/dummy/tmp/
-spec/dummy/config/*.yml
-spec/dummy/config/*.conf
-spec/dummy/config/logrotate-config
-spec/dummy/config/nginx-config
-spec/dummy/db/schema.rb
-spec/dummy/db/sphinx/
-spec/dummy/public/cache/
-spec/dummy/public/assets/
-spec/dummy/public/ckeditor_assets/
-spec/dummy/public/uploads/
-spec/dummy/vendor/bundle/
-spec/dummy/app/helpers/manage
-spec/dummy/config/database.yml
-spec/dummy/log/development.log
-.svn
\ No newline at end of file
+test/tmp
+test/dummy/log/*.log
+test/dummy/tmp/
+test/dummy/db/*sqlite
+.svn
diff --git a/Gemfile b/Gemfile
new file mode 100644
index 0000000..f68a903
--- /dev/null
+++ b/Gemfile
@@ -0,0 +1,4 @@
+source "https://rubygems.org"
+
+gemspec
+
diff --git a/README.rdoc b/README.rdoc
index ad4ca02..854656c 100644
--- a/README.rdoc
+++ b/README.rdoc
@@ -24,11 +24,8 @@ backward compatibility with previous versions of Rails.
 
 ==Installation
 
-  gem "galetahub-simple_captcha", :require => "simple_captcha"
 
-or
-
-  gem 'simple_captcha', :git => 'git://github.com/galetahub/simple-captcha.git'
+  gem 'simple_captcha', :git => 'git://github.com/pludoni/simple-captcha.git'
 
 ==Setup
 
diff --git a/Rakefile b/Rakefile
index 7901e39..7dbf1a6 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,22 +1,35 @@
-require 'rake'
-require 'rake/testtask'
-require 'rake/rdoctask'
+begin
+  require 'bundler/setup'
+rescue LoadError
+  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
+end
+
+require 'rdoc/task'
+
+RDoc::Task.new(:rdoc) do |rdoc|
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title    = 'SimpleCaptcha'
+  rdoc.options << '--line-numbers'
+  rdoc.rdoc_files.include('README.rdoc')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end
+
+APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
+load 'rails/tasks/engine.rake'
+
 
-desc 'Default: run unit tests.'
-task :default => :test
 
-desc 'Test the simple_captcha plugin.'
+Bundler::GemHelper.install_tasks
+
+require 'rake/testtask'
+
 Rake::TestTask.new(:test) do |t|
   t.libs << 'lib'
+  t.libs << 'test'
   t.pattern = 'test/**/*_test.rb'
-  t.verbose = true
+  t.verbose = false
 end
 
-desc 'Generate documentation for the simple_captcha plugin.'
-Rake::RDocTask.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'SimpleCaptcha'
-  rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+
+task default: :test
+
diff --git a/lib/simple_captcha.rb b/lib/simple_captcha.rb
index 995ee1a..cf45462 100644
--- a/lib/simple_captcha.rb
+++ b/lib/simple_captcha.rb
@@ -1,6 +1,10 @@
 # encoding: utf-8
 
 module SimpleCaptcha
+  class << self
+    attr_accessor :always_pass
+  end
+  self.always_pass = Rails.env.test?
   autoload :Utils,             'simple_captcha/utils'
 
   autoload :ImageHelpers,      'simple_captcha/image'
diff --git a/lib/simple_captcha/active_record.rb b/lib/simple_captcha/active_record.rb
index e864c15..5695a36 100644
--- a/lib/simple_captcha/active_record.rb
+++ b/lib/simple_captcha/active_record.rb
@@ -3,7 +3,7 @@ module ModelHelpers #:nodoc
     def self.included(base)
       base.extend(SingletonMethods)
     end
-    
+
     # To implement model based simple captcha use this method in the model as...
     #
     #  class User < ActiveRecord::Base
@@ -12,13 +12,13 @@ def self.included(base)
     #
     #  end
     #
-    # Customize the error message by using :message, the default message is "Captcha did not match". 
+    # Customize the error message by using :message, the default message is "Captcha did not match".
     # As in the applications captcha is needed with a very few cases like signing up the new user, but
     # not every time you need to authenticate the captcha with @user.save. So as to maintain simplicity
     # here we have the explicit method to save the instace with captcha validation as...
     #
     # * to validate the instance
-    #  
+    #
     #  @user.valid_with_captcha?  # whene captcha validation is required.
     #
     #  @user.valid?               # when captcha validation is not required.
@@ -31,30 +31,30 @@ def self.included(base)
     module SingletonMethods
       def apply_simple_captcha(options = {})
         options = { :add_to_base => false }.merge(options)
-                  
+
         class_attribute :simple_captcha_options
         self.simple_captcha_options = options
-        
+
         unless self.is_a?(ClassMethods)
           include InstanceMethods
           extend ClassMethods
-          
+
           attr_accessor :captcha, :captcha_key
         end
       end
     end
-    
+
     module ClassMethods
     end
-    
+
     module InstanceMethods
-    
+
       def valid_with_captcha?
         [valid?, is_captcha_valid?].all?
       end
-      
+
       def is_captcha_valid?
-        return true if Rails.env.test?
+        return true if SimpleCaptcha.always_pass
 
         if captcha && captcha.upcase.delete(" ") == SimpleCaptcha::Utils::simple_captcha_value(captcha_key)
           SimpleCaptcha::Utils::simple_captcha_passed!(captcha_key)
@@ -65,7 +65,7 @@ def is_captcha_valid?
           return false
         end
       end
-      
+
       def save_with_captcha
         valid_with_captcha? && save(:validate => false)
       end
diff --git a/lib/simple_captcha/controller.rb b/lib/simple_captcha/controller.rb
index 4000f86..f7fb2ff 100644
--- a/lib/simple_captcha/controller.rb
+++ b/lib/simple_captcha/controller.rb
@@ -1,4 +1,4 @@
-module SimpleCaptcha #:nodoc 
+module SimpleCaptcha #:nodoc
   module ControllerHelpers #:nodoc
     # This method is to validate the simple captcha in controller.
     # It means when the captcha is controller based i.e. :object has not been passed to the method show_simple_captcha.
@@ -14,8 +14,8 @@ module ControllerHelpers #:nodoc
     #   redirect_to :action => "myaction"
     #  end
     def simple_captcha_valid?
-      return true if Rails.env.test?
-      
+      return true if SimpleCaptcha.always_pass
+
       if params[:captcha]
         data = SimpleCaptcha::Utils::simple_captcha_value(params[:captcha_key] || session[:captcha])
         result = data == params[:captcha].delete(" ").upcase
diff --git a/lib/simple_captcha/form_builder.rb b/lib/simple_captcha/form_builder.rb
index c16ccca..e7e34fd 100644
--- a/lib/simple_captcha/form_builder.rb
+++ b/lib/simple_captcha/form_builder.rb
@@ -4,7 +4,7 @@ def self.included(base)
       base.send(:include, SimpleCaptcha::ViewHelper)
       base.send(:include, SimpleCaptcha::FormBuilder::ClassMethods)
       base.send(:include, ActionView::Helpers)
-      if defined? Sprockets
+      if defined? Sprockets::Helpers
         base.send(:include, Sprockets::Helpers::RailsHelper)
         base.send(:include, Sprockets::Helpers::IsolatedHelper)
       end
diff --git a/lib/simple_captcha/version.rb b/lib/simple_captcha/version.rb
index 7b7571a..a8508da 100644
--- a/lib/simple_captcha/version.rb
+++ b/lib/simple_captcha/version.rb
@@ -1,3 +1,3 @@
 module SimpleCaptcha
-  VERSION = "0.1.6".freeze
+  VERSION = "0.2.0".freeze
 end
diff --git a/simple_captcha.gemspec b/simple_captcha.gemspec
index 9e7d123..1c59250 100644
--- a/simple_captcha.gemspec
+++ b/simple_captcha.gemspec
@@ -5,15 +5,20 @@ require "simple_captcha/version"
 Gem::Specification.new do |s|
   s.name = "simple_captcha"
   s.version = SimpleCaptcha::VERSION.dup
-  s.platform = Gem::Platform::RUBY 
+  s.platform = Gem::Platform::RUBY
   s.summary = "SimpleCaptcha is the simplest and a robust captcha plugin."
   s.description = "SimpleCaptcha is available to be used with Rails 3 or above and also it provides the backward compatibility with previous versions of Rails."
-  s.authors = ["Pavlo Galeta", "Igor Galeta"]
+  s.authors = ["Pavlo Galeta", "Igor Galeta", 'Stefan Wienert']
   s.email = "galeta.igor@gmail.com"
   s.homepage = "http://github.com/izzm/simple-captcha"
-  
+
   s.files = Dir["{lib}/**/*"] + ["Rakefile", "README.rdoc"]
-  s.test_files = Dir["{test}/**/*"]
   s.extra_rdoc_files = ["README.rdoc"]
   s.require_paths = ["lib"]
+
+  s.add_dependency 'rails', '>= 3.1'
+  s.add_development_dependency "sqlite3"
+  s.add_development_dependency "capybara-mechanize"
+  s.add_development_dependency "pry"
+
 end
diff --git a/test/dummy/README.rdoc b/test/dummy/README.rdoc
new file mode 100644
index 0000000..dd4e97e
--- /dev/null
+++ b/test/dummy/README.rdoc
@@ -0,0 +1,28 @@
+== README
+
+This README would normally document whatever steps are necessary to get the
+application up and running.
+
+Things you may want to cover:
+
+* Ruby version
+
+* System dependencies
+
+* Configuration
+
+* Database creation
+
+* Database initialization
+
+* How to run the test suite
+
+* Services (job queues, cache servers, search engines, etc.)
+
+* Deployment instructions
+
+* ...
+
+
+Please feel free to use a different markup language if you do not plan to run
+<tt>rake doc:app</tt>.
diff --git a/test/dummy/Rakefile b/test/dummy/Rakefile
new file mode 100644
index 0000000..4135d7a
--- /dev/null
+++ b/test/dummy/Rakefile
@@ -0,0 +1,6 @@
+# Add your own tasks in files placed in lib/tasks ending in .rake,
+# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
+
+require File.expand_path('../config/application', __FILE__)
+
+Dummy::Application.load_tasks
diff --git a/test/dummy/app/assets/images/.keep b/test/dummy/app/assets/images/.keep
new file mode 100644
index 0000000..e69de29
diff --git a/test/dummy/app/assets/javascripts/application.js b/test/dummy/app/assets/javascripts/application.js
new file mode 100644
index 0000000..5bc2e1c
--- /dev/null
+++ b/test/dummy/app/assets/javascripts/application.js
@@ -0,0 +1,13 @@
+// This is a manifest file that'll be compiled into application.js, which will include all the files
+// listed below.
+//
+// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
+// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
+//
+// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+// compiled file.
+//
+// Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
+// about supported directives.
+//
+//= require_tree .
diff --git a/test/dummy/app/assets/stylesheets/application.css b/test/dummy/app/assets/stylesheets/application.css
new file mode 100644
index 0000000..3192ec8
--- /dev/null
+++ b/test/dummy/app/assets/stylesheets/application.css
@@ -0,0 +1,13 @@
+/*
+ * This is a manifest file that'll be compiled into application.css, which will include all the files
+ * listed below.
+ *
+ * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
+ * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
+ *
+ * You're free to add application-wide styles to this file and they'll appear at the top of the
+ * compiled file, but it's generally better to create a new file per style scope.
+ *
+ *= require_self
+ *= require_tree .
+ */
diff --git a/test/dummy/app/controllers/application_controller.rb b/test/dummy/app/controllers/application_controller.rb
new file mode 100644
index 0000000..6c1698d
--- /dev/null
+++ b/test/dummy/app/controllers/application_controller.rb
@@ -0,0 +1,6 @@
+class ApplicationController < ActionController::Base
+  # Prevent CSRF attacks by raising an exception.
+  # For APIs, you may want to use :null_session instead.
+  protect_from_forgery with: :exception
+  include SimpleCaptcha::ControllerHelpers
+end
diff --git a/test/dummy/app/controllers/concerns/.keep b/test/dummy/app/controllers/concerns/.keep
new file mode 100644
index 0000000..e69de29
diff --git a/test/dummy/app/controllers/pages_controller.rb b/test/dummy/app/controllers/pages_controller.rb
new file mode 100644
index 0000000..59360a1
--- /dev/null
+++ b/test/dummy/app/controllers/pages_controller.rb
@@ -0,0 +1,12 @@
+class PagesController < ApplicationController
+  def form_tag
+  end
+
+  def form_tag_submit
+    if simple_captcha_valid?
+      render text: 'captcha valid!'
+    else
+      render text: 'captcha not valid!'
+    end
+  end
+end
diff --git a/test/dummy/app/helpers/application_helper.rb b/test/dummy/app/helpers/application_helper.rb
new file mode 100644
index 0000000..de6be79
--- /dev/null
+++ b/test/dummy/app/helpers/application_helper.rb
@@ -0,0 +1,2 @@
+module ApplicationHelper
+end
diff --git a/test/dummy/app/mailers/.keep b/test/dummy/app/mailers/.keep
new file mode 100644
index 0000000..e69de29
diff --git a/test/dummy/app/models/.keep b/test/dummy/app/models/.keep
new file mode 100644
index 0000000..e69de29
diff --git a/test/dummy/app/models/concerns/.keep b/test/dummy/app/models/concerns/.keep
new file mode 100644
index 0000000..e69de29
diff --git a/test/dummy/app/views/layouts/application.html.erb b/test/dummy/app/views/layouts/application.html.erb
new file mode 100644
index 0000000..670d187
--- /dev/null
+++ b/test/dummy/app/views/layouts/application.html.erb
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Dummy</title>
+  <%= stylesheet_link_tag    "application", media: "all", "data-turbolinks-track" => true %>
+  <%= javascript_include_tag "application", "data-turbolinks-track" => true %>
+  <%= csrf_meta_tags %>
+</head>
+<body>
+
+<%= yield %>
+
+</body>
+</html>
diff --git a/test/dummy/app/views/pages/form_tag.html.erb b/test/dummy/app/views/pages/form_tag.html.erb
new file mode 100644
index 0000000..6af13b5
--- /dev/null
+++ b/test/dummy/app/views/pages/form_tag.html.erb
@@ -0,0 +1,7 @@
+<h1>Pages#index</h1>
+
+<%= form_tag '', :method => :post do |f| %>
+  <%= show_simple_captcha %>
+  <%= submit_tag %>
+<% end %>
+
diff --git a/test/dummy/app/views/simple_captcha/_simple_captcha.erb b/test/dummy/app/views/simple_captcha/_simple_captcha.erb
new file mode 100644
index 0000000..9968910
--- /dev/null
+++ b/test/dummy/app/views/simple_captcha/_simple_captcha.erb
@@ -0,0 +1,37 @@
+<style type="text/CSS">
+  .simple_captcha{border: 1px solid #ccc; padding: 5px !important;}
+  .simple_captcha,
+  .simple_captcha div{display: table;}
+  .simple_captcha .simple_captcha_field,
+  .simple_captcha .simple_captcha_image{
+    border: 1px solid #ccc;
+    margin: 0px 0px 2px 0px !important;
+    padding: 0px !important;
+  }
+  .simple_captcha .simple_captcha_image img{
+    margin: 0px !important;
+    padding: 0px !important;
+    width: 110px !important;
+  }
+  .simple_captcha .simple_captcha_label{font-size: 12px;}
+  .simple_captcha .simple_captcha_field input{
+    width: 150px !important;
+    font-size: 16px;
+    border: none;
+    background-color: #efefef;
+  }
+</style>
+
+<div class='simple_captcha'>
+  <div class='simple_captcha_image'>
+    <%= simple_captcha_options[:image] %>
+  </div>
+  
+  <div class='simple_captcha_field'>
+    <%= simple_captcha_options[:field] %>
+  </div>
+  
+  <div class='simple_captcha_label'>
+    <%= simple_captcha_options[:label] %>
+  </div>
+</div>
diff --git a/test/dummy/bin/bundle b/test/dummy/bin/bundle
new file mode 100755
index 0000000..66e9889
--- /dev/null
+++ b/test/dummy/bin/bundle
@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+load Gem.bin_path('bundler', 'bundle')
diff --git a/test/dummy/bin/rails b/test/dummy/bin/rails
new file mode 100755
index 0000000..728cd85
--- /dev/null
+++ b/test/dummy/bin/rails
@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+APP_PATH = File.expand_path('../../config/application',  __FILE__)
+require_relative '../config/boot'
+require 'rails/commands'
diff --git a/test/dummy/bin/rake b/test/dummy/bin/rake
new file mode 100755
index 0000000..1724048
--- /dev/null
+++ b/test/dummy/bin/rake
@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+require_relative '../config/boot'
+require 'rake'
+Rake.application.run
diff --git a/test/dummy/config.ru b/test/dummy/config.ru
new file mode 100644
index 0000000..5bc2a61
--- /dev/null
+++ b/test/dummy/config.ru
@@ -0,0 +1,4 @@
+# This file is used by Rack-based servers to start the application.
+
+require ::File.expand_path('../config/environment',  __FILE__)
+run Rails.application
diff --git a/test/dummy/config/application.rb b/test/dummy/config/application.rb
new file mode 100644
index 0000000..6fe074b
--- /dev/null
+++ b/test/dummy/config/application.rb
@@ -0,0 +1,23 @@
+require File.expand_path('../boot', __FILE__)
+
+require 'rails/all'
+
+Bundler.require(*Rails.groups)
+require "simple_captcha"
+
+module Dummy
+  class Application < Rails::Application
+    # Settings in config/environments/* take precedence over those specified here.
+    # Application configuration should go into files in config/initializers
+    # -- all .rb files in that directory are automatically loaded.
+
+    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
+    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
+    # config.time_zone = 'Central Time (US & Canada)'
+
+    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
+    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
+    # config.i18n.default_locale = :de
+  end
+end
+
diff --git a/test/dummy/config/boot.rb b/test/dummy/config/boot.rb
new file mode 100644
index 0000000..ef36047
--- /dev/null
+++ b/test/dummy/config/boot.rb
@@ -0,0 +1,5 @@
+# Set up gems listed in the Gemfile.
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../../Gemfile', __FILE__)
+
+require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
+$LOAD_PATH.unshift File.expand_path('../../../../lib', __FILE__)
diff --git a/test/dummy/config/database.yml b/test/dummy/config/database.yml
new file mode 100644
index 0000000..51a4dd4
--- /dev/null
+++ b/test/dummy/config/database.yml
@@ -0,0 +1,25 @@
+# SQLite version 3.x
+#   gem install sqlite3
+#
+#   Ensure the SQLite 3 gem is defined in your Gemfile
+#   gem 'sqlite3'
+development:
+  adapter: sqlite3
+  database: db/development.sqlite3
+  pool: 5
+  timeout: 5000
+
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
+# Do not set this db to the same as development or production.
+test:
+  adapter: sqlite3
+  database: db/test.sqlite3
+  pool: 5
+  timeout: 5000
+
+production:
+  adapter: sqlite3
+  database: db/production.sqlite3
+  pool: 5
+  timeout: 5000
diff --git a/test/dummy/config/environment.rb b/test/dummy/config/environment.rb
new file mode 100644
index 0000000..10e0cad
--- /dev/null
+++ b/test/dummy/config/environment.rb
@@ -0,0 +1,5 @@
+# Load the Rails application.
+require File.expand_path('../application', __FILE__)
+
+# Initialize the Rails application.
+Dummy::Application.initialize!
diff --git a/test/dummy/config/environments/development.rb b/test/dummy/config/environments/development.rb
new file mode 100644
index 0000000..9d26e12
--- /dev/null
+++ b/test/dummy/config/environments/development.rb
@@ -0,0 +1,29 @@
+Dummy::Application.configure do
+  # Settings specified here will take precedence over those in config/application.rb.
+
+  # In the development environment your application's code is reloaded on
+  # every request. This slows down response time but is perfect for development
+  # since you don't have to restart the web server when you make code changes.
+  config.cache_classes = false
+
+  # Do not eager load code on boot.
+  config.eager_load = false
+
+  # Show full error reports and disable caching.
+  config.consider_all_requests_local       = true
+  config.action_controller.perform_caching = false
+
+  # Don't care if the mailer can't send.
+  config.action_mailer.raise_delivery_errors = false
+
+  # Print deprecation notices to the Rails logger.
+  config.active_support.deprecation = :log
+
+  # Raise an error on page load if there are pending migrations
+  config.active_record.migration_error = :page_load
+
+  # Debug mode disables concatenation and preprocessing of assets.
+  # This option may cause significant delays in view rendering with a large
+  # number of complex assets.
+  config.assets.debug = true
+end
diff --git a/test/dummy/config/environments/production.rb b/test/dummy/config/environments/production.rb
new file mode 100644
index 0000000..b690b1c
--- /dev/null
+++ b/test/dummy/config/environments/production.rb
@@ -0,0 +1,80 @@
+Dummy::Application.configure do
+  # Settings specified here will take precedence over those in config/application.rb.
+
+  # Code is not reloaded between requests.
+  config.cache_classes = true
+
+  # Eager load code on boot. This eager loads most of Rails and
+  # your application in memory, allowing both thread web servers
+  # and those relying on copy on write to perform better.
+  # Rake tasks automatically ignore this option for performance.
+  config.eager_load = true
+
+  # Full error reports are disabled and caching is turned on.
+  config.consider_all_requests_local       = false
+  config.action_controller.perform_caching = true
+
+  # Enable Rack::Cache to put a simple HTTP cache in front of your application
+  # Add `rack-cache` to your Gemfile before enabling this.
+  # For large-scale production use, consider using a caching reverse proxy like nginx, varnish or squid.
+  # config.action_dispatch.rack_cache = true
+
+  # Disable Rails's static asset server (Apache or nginx will already do this).
+  config.serve_static_assets = false
+
+  # Compress JavaScripts and CSS.
+  config.assets.js_compressor = :uglifier
+  # config.assets.css_compressor = :sass
+
+  # Do not fallback to assets pipeline if a precompiled asset is missed.
+  config.assets.compile = false
+
+  # Generate digests for assets URLs.
+  config.assets.digest = true
+
+  # Version of your assets, change this if you want to expire all your assets.
+  config.assets.version = '1.0'
+
+  # Specifies the header that your server uses for sending files.
+  # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
+  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
+
+  # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
+  # config.force_ssl = true
+
+  # Set to :debug to see everything in the log.
+  config.log_level = :info
+
+  # Prepend all log lines with the following tags.
+  # config.log_tags = [ :subdomain, :uuid ]
+
+  # Use a different logger for distributed setups.
+  # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
+
+  # Use a different cache store in production.
+  # config.cache_store = :mem_cache_store
+
+  # Enable serving of images, stylesheets, and JavaScripts from an asset server.
+  # config.action_controller.asset_host = "http://assets.example.com"
+
+  # Precompile additional assets.
+  # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
+  # config.assets.precompile += %w( search.js )
+
+  # Ignore bad email addresses and do not raise email delivery errors.
+  # Set this to true and configure the email server for immediate delivery to raise delivery errors.
+  # config.action_mailer.raise_delivery_errors = false
+
+  # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
+  # the I18n.default_locale when a translation can not be found).
+  config.i18n.fallbacks = true
+
+  # Send deprecation notices to registered listeners.
+  config.active_support.deprecation = :notify
+
+  # Disable automatic flushing of the log to improve performance.
+  # config.autoflush_log = false
+
+  # Use default logging formatter so that PID and timestamp are not suppressed.
+  config.log_formatter = ::Logger::Formatter.new
+end
diff --git a/test/dummy/config/environments/test.rb b/test/dummy/config/environments/test.rb
new file mode 100644
index 0000000..afbc0ae
--- /dev/null
+++ b/test/dummy/config/environments/test.rb
@@ -0,0 +1,36 @@
+Dummy::Application.configure do
+  # Settings specified here will take precedence over those in config/application.rb.
+
+  # The test environment is used exclusively to run your application's
+  # test suite. You never need to work with it otherwise. Remember that
+  # your test database is "scratch space" for the test suite and is wiped
+  # and recreated between test runs. Don't rely on the data there!
+  config.cache_classes = true
+
+  # Do not eager load code on boot. This avoids loading your whole application
+  # just for the purpose of running a single test. If you are using a tool that
+  # preloads Rails for running tests, you may have to set it to true.
+  config.eager_load = false
+
+  # Configure static asset server for tests with Cache-Control for performance.
+  config.serve_static_assets  = true
+  config.static_cache_control = "public, max-age=3600"
+
+  # Show full error reports and disable caching.
+  config.consider_all_requests_local       = true
+  config.action_controller.perform_caching = false
+
+  # Raise exceptions instead of rendering exception templates.
+  config.action_dispatch.show_exceptions = false
+
+  # Disable request forgery protection in test environment.
+  config.action_controller.allow_forgery_protection = false
+
+  # Tell Action Mailer not to deliver emails to the real world.
+  # The :test delivery method accumulates sent emails in the
+  # ActionMailer::Base.deliveries array.
+  config.action_mailer.delivery_method = :test
+
+  # Print deprecation notices to the stderr.
+  config.active_support.deprecation = :stderr
+end
diff --git a/test/dummy/config/initializers/backtrace_silencers.rb b/test/dummy/config/initializers/backtrace_silencers.rb
new file mode 100644
index 0000000..59385cd
--- /dev/null
+++ b/test/dummy/config/initializers/backtrace_silencers.rb
@@ -0,0 +1,7 @@
+# Be sure to restart your server when you modify this file.
+
+# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces.
+# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ }
+
+# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code.
+# Rails.backtrace_cleaner.remove_silencers!
diff --git a/test/dummy/config/initializers/filter_parameter_logging.rb b/test/dummy/config/initializers/filter_parameter_logging.rb
new file mode 100644
index 0000000..4a994e1
--- /dev/null
+++ b/test/dummy/config/initializers/filter_parameter_logging.rb
@@ -0,0 +1,4 @@
+# Be sure to restart your server when you modify this file.
+
+# Configure sensitive parameters which will be filtered from the log file.
+Rails.application.config.filter_parameters += [:password]
diff --git a/test/dummy/config/initializers/inflections.rb b/test/dummy/config/initializers/inflections.rb
new file mode 100644
index 0000000..ac033bf
--- /dev/null
+++ b/test/dummy/config/initializers/inflections.rb
@@ -0,0 +1,16 @@
+# Be sure to restart your server when you modify this file.
+
+# Add new inflection rules using the following format. Inflections
+# are locale specific, and you may define rules for as many different
+# locales as you wish. All of these examples are active by default:
+# ActiveSupport::Inflector.inflections(:en) do |inflect|
+#   inflect.plural /^(ox)$/i, '\1en'
+#   inflect.singular /^(ox)en/i, '\1'
+#   inflect.irregular 'person', 'people'
+#   inflect.uncountable %w( fish sheep )
+# end
+
+# These inflection rules are supported but not enabled by default:
+# ActiveSupport::Inflector.inflections(:en) do |inflect|
+#   inflect.acronym 'RESTful'
+# end
diff --git a/test/dummy/config/initializers/mime_types.rb b/test/dummy/config/initializers/mime_types.rb
new file mode 100644
index 0000000..72aca7e
--- /dev/null
+++ b/test/dummy/config/initializers/mime_types.rb
@@ -0,0 +1,5 @@
+# Be sure to restart your server when you modify this file.
+
+# Add new mime types for use in respond_to blocks:
+# Mime::Type.register "text/richtext", :rtf
+# Mime::Type.register_alias "text/html", :iphone
diff --git a/test/dummy/config/initializers/secret_token.rb b/test/dummy/config/initializers/secret_token.rb
new file mode 100644
index 0000000..6578b84
--- /dev/null
+++ b/test/dummy/config/initializers/secret_token.rb
@@ -0,0 +1,12 @@
+# Be sure to restart your server when you modify this file.
+
+# Your secret key is used for verifying the integrity of signed cookies.
+# If you change this key, all old signed cookies will become invalid!
+
+# Make sure the secret is at least 30 characters and all random,
+# no regular words or you'll be exposed to dictionary attacks.
+# You can use `rake secret` to generate a secure secret key.
+
+# Make sure your secret_key_base is kept private
+# if you're sharing your code publicly.
+Dummy::Application.config.secret_key_base = 'dc42d1e5f6b46ed4067ca613f3ed86c2235a3fe6131553d25f475d7007768154310479912a5847dd18a65ea0f5672ee662359001d6f7fa25a42382a02e948310'
diff --git a/test/dummy/config/initializers/session_store.rb b/test/dummy/config/initializers/session_store.rb
new file mode 100644
index 0000000..155f7b0
--- /dev/null
+++ b/test/dummy/config/initializers/session_store.rb
@@ -0,0 +1,3 @@
+# Be sure to restart your server when you modify this file.
+
+Dummy::Application.config.session_store :cookie_store, key: '_dummy_session'
diff --git a/test/dummy/config/initializers/wrap_parameters.rb b/test/dummy/config/initializers/wrap_parameters.rb
new file mode 100644
index 0000000..33725e9
--- /dev/null
+++ b/test/dummy/config/initializers/wrap_parameters.rb
@@ -0,0 +1,14 @@
+# Be sure to restart your server when you modify this file.
+
+# This file contains settings for ActionController::ParamsWrapper which
+# is enabled by default.
+
+# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
+ActiveSupport.on_load(:action_controller) do
+  wrap_parameters format: [:json] if respond_to?(:wrap_parameters)
+end
+
+# To enable root element in JSON for ActiveRecord objects.
+# ActiveSupport.on_load(:active_record) do
+#  self.include_root_in_json = true
+# end
diff --git a/test/dummy/config/locales/en.yml b/test/dummy/config/locales/en.yml
new file mode 100644
index 0000000..0653957
--- /dev/null
+++ b/test/dummy/config/locales/en.yml
@@ -0,0 +1,23 @@
+# Files in the config/locales directory are used for internationalization
+# and are automatically loaded by Rails. If you want to use locales other
+# than English, add the necessary files in this directory.
+#
+# To use the locales, use `I18n.t`:
+#
+#     I18n.t 'hello'
+#
+# In views, this is aliased to just `t`:
+#
+#     <%= t('hello') %>
+#
+# To use a different locale, set it with `I18n.locale`:
+#
+#     I18n.locale = :es
+#
+# This would use the information in config/locales/es.yml.
+#
+# To learn more, please read the Rails Internationalization guide
+# available at http://guides.rubyonrails.org/i18n.html.
+
+en:
+  hello: "Hello world"
diff --git a/test/dummy/config/routes.rb b/test/dummy/config/routes.rb
new file mode 100644
index 0000000..7eb13cd
--- /dev/null
+++ b/test/dummy/config/routes.rb
@@ -0,0 +1,6 @@
+Rails.application.routes.draw do
+
+  get "pages/form_tag"
+  post "pages/form_tag" => 'pages#form_tag_submit'
+  mount SimpleCaptcha::Engine => "/simple_captcha"
+end
diff --git a/test/dummy/db/development.sqlite3 b/test/dummy/db/development.sqlite3
new file mode 100644
index 0000000000000000000000000000000000000000..c3790a4ea756dc54ebf38d438b08365ce749b008
GIT binary patch
literal 6144
zcmeH}UvJYe5Wwxae<UO%;3W^d7>kEm8*0;Z@PtHx2vv0HR#J&dpvWX1vuLt5ajPMo
z$~#|<kH9;81}<Axt?Bj!R-a<&d^(@+eizIBa6C|2(v!0^7MeP!iZDj6C`AYn7<Cv|
zQUwKHO-lMT^M*>$vp-MngQ<oyM1B!cd5V97y36vpR<|BI_=id&d9I@K;G6uOsdzS(
zK`3TAJQYDCw5Y!sxjo;deebRNk+Q;((V<7#4epFK83bbds9Lx7_V7fDFH@P#r_kOY
zlk<g4!t%6MY~lA_4_sREZ6+d?`>>L)K9PpyIQVC98FM?=8}g}c#J(+K6)`B#ci*`q
zdNk@E_C^!>-ks3i*dO*i2yy6oKJ|t$#)H8=y(p0`MGBPCX1C43v=q~YWNYK|+!m%%
zXc+}UGYT-JR!|FNi&;L|H1k!X(y(5(@Tzsukwu~aR*;3KG8RFszNSK}vn1OxkfOq|
z*FPSw`*hp#qH*P@dE1sU&0q({=eS|DAd!ccoXfsj8B|J)%L}dtU-Ri49Pl+!o}W!j
z{vr5`7y^dCohI-AS9qswJGR~K+IFYgd2tWw#pEx7&xj#l2;5}?j|j(`#~<hSKRo)4
h7y^dC4iYfue+QdxN;U)v0{Q#j-2dixFa&m!z<>Cd?<fEO

literal 0
HcmV?d00001

diff --git a/test/dummy/db/migrate/20131104112427_create_simple_captcha_data.rb b/test/dummy/db/migrate/20131104112427_create_simple_captcha_data.rb
new file mode 100644
index 0000000..4573b20
--- /dev/null
+++ b/test/dummy/db/migrate/20131104112427_create_simple_captcha_data.rb
@@ -0,0 +1,15 @@
+class CreateSimpleCaptchaData < ActiveRecord::Migration
+  def self.up
+    create_table :simple_captcha_data do |t|
+      t.string :key, :limit => 40
+      t.string :value, :limit => 6
+      t.timestamps
+    end
+    
+    add_index :simple_captcha_data, :key, :name => "idx_key"
+  end
+
+  def self.down
+    drop_table :simple_captcha_data
+  end
+end
diff --git a/test/dummy/db/schema.rb b/test/dummy/db/schema.rb
new file mode 100644
index 0000000..5aae878
--- /dev/null
+++ b/test/dummy/db/schema.rb
@@ -0,0 +1,25 @@
+# encoding: UTF-8
+# This file is auto-generated from the current state of the database. Instead
+# of editing this file, please use the migrations feature of Active Record to
+# incrementally modify your database, and then regenerate this schema definition.
+#
+# Note that this schema.rb definition is the authoritative source for your
+# database schema. If you need to create the application database on another
+# system, you should be using db:schema:load, not running all the migrations
+# from scratch. The latter is a flawed and unsustainable approach (the more migrations
+# you'll amass, the slower it'll run and the greater likelihood for issues).
+#
+# It's strongly recommended that you check this file into your version control system.
+
+ActiveRecord::Schema.define(version: 20131104112427) do
+
+  create_table "simple_captcha_data", force: true do |t|
+    t.string   "key",        limit: 40
+    t.string   "value",      limit: 6
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "simple_captcha_data", ["key"], name: "idx_key"
+
+end
diff --git a/test/dummy/db/test.sqlite3 b/test/dummy/db/test.sqlite3
new file mode 100644
index 0000000000000000000000000000000000000000..55e4ed313e7ae1fa8e7b7581e8cca40c973acdc7
GIT binary patch
literal 6144
zcmeH|L2uJA6vyqPX(c2i;F1Fu&!<KkYSVOZLZWOIs_4?Kq!N`tkx2}*XtFkOt07M1
z3-TSf!#6<UWy>bA3~^umWGnWI{p|nGe)5}>kyL_wJj)WUh=&>oWAuU$gpdWb3H8bv
z(7;!n8|}Z`m8ONB{Mfk<E(_<#+%diz3;Y|J+iaVb)v}*=@TMcvSe&m?xm<}bk4{Cx
z!$f|{xRPgSUUM`LCTtKeGWCZiQ$~jVA$v>czot_%_6e;8p`=aMBFkX~>MR>Ay8|0}
zsQ8DusEw^Tta1mz;N^(@CpcO2EIQ>`ySKmZ5PuvHe>xgD@6D$D*u!5hq|5j`{4BoY
zGFi+;81aRI8DY#7Z<H&QBFllLruy(g6$GNrvC*`5ck%2}&~grUJIn>}O(T(4yJkhq
zji2q5Ct?p~I-7U6WqTg}7GB1zFMiARjY@2K%ZOsfGNy2f0ei(J<ajbX8cb&7HJg#a
zG#C$k2yw)Gz*eH$BNq~{x%RsbxYm5W67<^nwD3il;7Y_HSCjxup(JR5o3bc6Rku^*
zCM3N!O+XXaLIOJfxA4%lWKEzXaIg64_g~)!O<*et6z@Mae<3K^GyzTEP7`>54X4+2
iJ=g8_UANcoJuBXSZ2m-0v}ppGz+EQr$aHWu{qY}iLhu3r

literal 0
HcmV?d00001

diff --git a/test/dummy/lib/assets/.keep b/test/dummy/lib/assets/.keep
new file mode 100644
index 0000000..e69de29
diff --git a/test/dummy/log/.keep b/test/dummy/log/.keep
new file mode 100644
index 0000000..e69de29
diff --git a/test/dummy/public/404.html b/test/dummy/public/404.html
new file mode 100644
index 0000000..a0daa0c
--- /dev/null
+++ b/test/dummy/public/404.html
@@ -0,0 +1,58 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>The page you were looking for doesn't exist (404)</title>
+  <style>
+  body {
+    background-color: #EFEFEF;
+    color: #2E2F30;
+    text-align: center;
+    font-family: arial, sans-serif;
+  }
+
+  div.dialog {
+    width: 25em;
+    margin: 4em auto 0 auto;
+    border: 1px solid #CCC;
+    border-right-color: #999;
+    border-left-color: #999;
+    border-bottom-color: #BBB;
+    border-top: #B00100 solid 4px;
+    border-top-left-radius: 9px;
+    border-top-right-radius: 9px;
+    background-color: white;
+    padding: 7px 4em 0 4em;
+  }
+
+  h1 {
+    font-size: 100%;
+    color: #730E15;
+    line-height: 1.5em;
+  }
+
+  body > p {
+    width: 33em;
+    margin: 0 auto 1em;
+    padding: 1em 0;
+    background-color: #F7F7F7;
+    border: 1px solid #CCC;
+    border-right-color: #999;
+    border-bottom-color: #999;
+    border-bottom-left-radius: 4px;
+    border-bottom-right-radius: 4px;
+    border-top-color: #DADADA;
+    color: #666;
+    box-shadow:0 3px 8px rgba(50, 50, 50, 0.17);
+  }
+  </style>
+</head>
+
+<body>
+  <!-- This file lives in public/404.html -->
+  <div class="dialog">
+    <h1>The page you were looking for doesn't exist.</h1>
+    <p>You may have mistyped the address or the page may have moved.</p>
+  </div>
+  <p>If you are the application owner check the logs for more information.</p>
+</body>
+</html>
diff --git a/test/dummy/public/422.html b/test/dummy/public/422.html
new file mode 100644
index 0000000..fbb4b84
--- /dev/null
+++ b/test/dummy/public/422.html
@@ -0,0 +1,58 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>The change you wanted was rejected (422)</title>
+  <style>
+  body {
+    background-color: #EFEFEF;
+    color: #2E2F30;
+    text-align: center;
+    font-family: arial, sans-serif;
+  }
+
+  div.dialog {
+    width: 25em;
+    margin: 4em auto 0 auto;
+    border: 1px solid #CCC;
+    border-right-color: #999;
+    border-left-color: #999;
+    border-bottom-color: #BBB;
+    border-top: #B00100 solid 4px;
+    border-top-left-radius: 9px;
+    border-top-right-radius: 9px;
+    background-color: white;
+    padding: 7px 4em 0 4em;
+  }
+
+  h1 {
+    font-size: 100%;
+    color: #730E15;
+    line-height: 1.5em;
+  }
+
+  body > p {
+    width: 33em;
+    margin: 0 auto 1em;
+    padding: 1em 0;
+    background-color: #F7F7F7;
+    border: 1px solid #CCC;
+    border-right-color: #999;
+    border-bottom-color: #999;
+    border-bottom-left-radius: 4px;
+    border-bottom-right-radius: 4px;
+    border-top-color: #DADADA;
+    color: #666;
+    box-shadow:0 3px 8px rgba(50, 50, 50, 0.17);
+  }
+  </style>
+</head>
+
+<body>
+  <!-- This file lives in public/422.html -->
+  <div class="dialog">
+    <h1>The change you wanted was rejected.</h1>
+    <p>Maybe you tried to change something you didn't have access to.</p>
+  </div>
+  <p>If you are the application owner check the logs for more information.</p>
+</body>
+</html>
diff --git a/test/dummy/public/500.html b/test/dummy/public/500.html
new file mode 100644
index 0000000..e9052d3
--- /dev/null
+++ b/test/dummy/public/500.html
@@ -0,0 +1,57 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>We're sorry, but something went wrong (500)</title>
+  <style>
+  body {
+    background-color: #EFEFEF;
+    color: #2E2F30;
+    text-align: center;
+    font-family: arial, sans-serif;
+  }
+
+  div.dialog {
+    width: 25em;
+    margin: 4em auto 0 auto;
+    border: 1px solid #CCC;
+    border-right-color: #999;
+    border-left-color: #999;
+    border-bottom-color: #BBB;
+    border-top: #B00100 solid 4px;
+    border-top-left-radius: 9px;
+    border-top-right-radius: 9px;
+    background-color: white;
+    padding: 7px 4em 0 4em;
+  }
+
+  h1 {
+    font-size: 100%;
+    color: #730E15;
+    line-height: 1.5em;
+  }
+
+  body > p {
+    width: 33em;
+    margin: 0 auto 1em;
+    padding: 1em 0;
+    background-color: #F7F7F7;
+    border: 1px solid #CCC;
+    border-right-color: #999;
+    border-bottom-color: #999;
+    border-bottom-left-radius: 4px;
+    border-bottom-right-radius: 4px;
+    border-top-color: #DADADA;
+    color: #666;
+    box-shadow:0 3px 8px rgba(50, 50, 50, 0.17);
+  }
+  </style>
+</head>
+
+<body>
+  <!-- This file lives in public/500.html -->
+  <div class="dialog">
+    <h1>We're sorry, but something went wrong.</h1>
+  </div>
+  <p>If you are the application owner check the logs for more information.</p>
+</body>
+</html>
diff --git a/test/dummy/public/favicon.ico b/test/dummy/public/favicon.ico
new file mode 100644
index 0000000..e69de29
diff --git a/test/features/form_helper_test.rb b/test/features/form_helper_test.rb
new file mode 100644
index 0000000..aedbb4b
--- /dev/null
+++ b/test/features/form_helper_test.rb
@@ -0,0 +1,25 @@
+require 'test_helper'
+
+class FormHelperTest  < ActionDispatch::IntegrationTest
+  include Capybara::DSL
+
+  setup do
+    SimpleCaptcha.always_pass = false
+  end
+
+  test 'displays captcha and passes' do
+    visit '/pages/form_tag'
+    assert_equal 1, SimpleCaptcha::SimpleCaptchaData.count
+    fill_in 'captcha', with: SimpleCaptcha::SimpleCaptchaData.first.value
+    click_on 'Save changes'
+    assert page.has_content? 'captcha valid'
+  end
+
+  test 'captcha fails' do
+    visit '/pages/form_tag'
+    assert_equal 1, SimpleCaptcha::SimpleCaptchaData.count
+    fill_in 'captcha', with: 'something else'
+    click_on 'Save changes'
+    assert page.has_content? 'captcha not valid'
+  end
+end
diff --git a/test/simple_captcha_test.rb b/test/simple_captcha_test.rb
deleted file mode 100644
index ec88ad1..0000000
--- a/test/simple_captcha_test.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-require 'test/unit'
-
-class SimpleCaptchaTest < Test::Unit::TestCase
-  # Replace this with your real tests.
-  def test_this_plugin
-    flunk
-  end
-end
diff --git a/test/test_helper.rb b/test/test_helper.rb
new file mode 100644
index 0000000..04e8888
--- /dev/null
+++ b/test/test_helper.rb
@@ -0,0 +1,18 @@
+# Configure Rails Environment
+ENV["RAILS_ENV"] = "test"
+
+require File.expand_path("../dummy/config/environment.rb",  __FILE__)
+require "rails/test_help"
+
+require 'capybara/rails'
+require 'pry'
+Rails.backtrace_cleaner.remove_silencers!
+
+# Load support files
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
+
+# Load fixtures from the engine
+if ActiveSupport::TestCase.method_defined?(:fixture_path=)
+  ActiveSupport::TestCase.fixture_path = File.expand_path("../fixtures", __FILE__)
+end
+

From 014243bdd48af85b2a2c72783a967ae297a1b6d1 Mon Sep 17 00:00:00 2001
From: Stefan Wienert <stefan.wienert@pludoni.de>
Date: Mon, 4 Nov 2013 12:12:58 +0100
Subject: [PATCH 008/115] additional test with model based methods

---
 .../dummy/app/controllers/pages_controller.rb | 13 ++++++++++++
 test/dummy/app/models/user.rb                 |  0
 test/dummy/app/views/pages/model_tag.html.erb |  8 +++++++
 test/dummy/config/routes.rb                   |  3 ++-
 test/features/form_helper_test.rb             | 21 +++++++++++++++++++
 5 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 test/dummy/app/models/user.rb
 create mode 100644 test/dummy/app/views/pages/model_tag.html.erb

diff --git a/test/dummy/app/controllers/pages_controller.rb b/test/dummy/app/controllers/pages_controller.rb
index 59360a1..814f4dd 100644
--- a/test/dummy/app/controllers/pages_controller.rb
+++ b/test/dummy/app/controllers/pages_controller.rb
@@ -9,4 +9,17 @@ def form_tag_submit
       render text: 'captcha not valid!'
     end
   end
+
+  def model_tag
+    @user = User.new
+  end
+
+  def model_tag_submit
+    @model = User.new(params[:user])
+    if @model.valid_with_captcha?
+      render text: 'captcha valid!'
+    else
+      render text: 'captcha not valid!'
+    end
+  end
 end
diff --git a/test/dummy/app/models/user.rb b/test/dummy/app/models/user.rb
new file mode 100644
index 0000000..e69de29
diff --git a/test/dummy/app/views/pages/model_tag.html.erb b/test/dummy/app/views/pages/model_tag.html.erb
new file mode 100644
index 0000000..f0bf787
--- /dev/null
+++ b/test/dummy/app/views/pages/model_tag.html.erb
@@ -0,0 +1,8 @@
+<h1>Pages#index</h1>
+
+<%= form_for @user, :url => '', :method => :post do |f| %>
+  <%=f.simple_captcha :label => 'Captcha' %>
+  <%= submit_tag %>
+<% end %>
+
+
diff --git a/test/dummy/config/routes.rb b/test/dummy/config/routes.rb
index 7eb13cd..30c4aee 100644
--- a/test/dummy/config/routes.rb
+++ b/test/dummy/config/routes.rb
@@ -2,5 +2,6 @@
 
   get "pages/form_tag"
   post "pages/form_tag" => 'pages#form_tag_submit'
-  mount SimpleCaptcha::Engine => "/simple_captcha"
+  get "pages/model_tag"
+  post "pages/model_tag" => 'pages#model_tag_submit'
 end
diff --git a/test/features/form_helper_test.rb b/test/features/form_helper_test.rb
index aedbb4b..365aa13 100644
--- a/test/features/form_helper_test.rb
+++ b/test/features/form_helper_test.rb
@@ -1,5 +1,11 @@
 require 'test_helper'
 
+class User
+  include ActiveModel::Model
+  include SimpleCaptcha::ModelHelpers
+  apply_simple_captcha
+end
+
 class FormHelperTest  < ActionDispatch::IntegrationTest
   include Capybara::DSL
 
@@ -22,4 +28,19 @@ class FormHelperTest  < ActionDispatch::IntegrationTest
     click_on 'Save changes'
     assert page.has_content? 'captcha not valid'
   end
+
+  test 'also works with model based' do
+    visit '/pages/model_tag'
+    assert_equal 1, SimpleCaptcha::SimpleCaptchaData.count
+    fill_in 'user[captcha]', with: SimpleCaptcha::SimpleCaptchaData.first.value
+    click_on 'Save changes'
+    assert page.has_content? 'captcha valid'
+  end
+  test 'model based failure' do
+    visit '/pages/model_tag'
+    assert_equal 1, SimpleCaptcha::SimpleCaptchaData.count
+    fill_in 'user[captcha]', with: 'wrong captcha'
+    click_on 'Save changes'
+    assert page.has_content? 'captcha not valid'
+  end
 end

From fcc38b258e50a084462cb77d522118fa90e42cb9 Mon Sep 17 00:00:00 2001
From: Stefan Wienert <stefan.wienert@pludoni.de>
Date: Mon, 4 Nov 2013 12:20:41 +0100
Subject: [PATCH 009/115] travis.ci first try

---
 .travis.yml | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..e470abd
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,8 @@
+---
+language: ruby
+script:
+    - 'cd test/dummy && rake db:migrate db:test:prepare'
+    - rake test
+rvm:
+  - '1.9.2'
+  - '2.0.0'

From 35e4444ef7fce84e29676b7bcb40c90daa319e12 Mon Sep 17 00:00:00 2001
From: Stefan Wienert <stefan.wienert@pludoni.de>
Date: Mon, 4 Nov 2013 12:22:39 +0100
Subject: [PATCH 010/115] ruby 1.9.3

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index e470abd..8a7ae77 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,5 +4,5 @@ script:
     - 'cd test/dummy && rake db:migrate db:test:prepare'
     - rake test
 rvm:
-  - '1.9.2'
+  - '1.9.3'
   - '2.0.0'

From f77b7e2b055ccfcf45f8f5cf459c426f954e6b0b Mon Sep 17 00:00:00 2001
From: Stefan Wienert <stefan.wienert@pludoni.de>
Date: Mon, 4 Nov 2013 12:28:29 +0100
Subject: [PATCH 011/115] Also added pg and mysql to test spec

---
 .travis.yml                    |  9 +++++++
 Gemfile                        |  3 +++
 test/dummy/config/database.yml | 44 ++++++++++++++++++----------------
 3 files changed, 36 insertions(+), 20 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8a7ae77..40d50bc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,3 +6,12 @@ script:
 rvm:
   - '1.9.3'
   - '2.0.0'
+
+env:
+  - DB=sqlite
+  - DB=mysql
+  - DB=postgresql
+
+before_script:
+  - mysql -e 'create database myapp_test'
+  - psql -c 'create database myapp_test' -U postgres
diff --git a/Gemfile b/Gemfile
index f68a903..b5c92ab 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,3 +2,6 @@ source "https://rubygems.org"
 
 gemspec
 
+gem 'mysql'
+gem 'pg'
+gem 'sqlite3'
diff --git a/test/dummy/config/database.yml b/test/dummy/config/database.yml
index 51a4dd4..72a0482 100644
--- a/test/dummy/config/database.yml
+++ b/test/dummy/config/database.yml
@@ -1,25 +1,29 @@
-# SQLite version 3.x
-#   gem install sqlite3
-#
-#   Ensure the SQLite 3 gem is defined in your Gemfile
-#   gem 'sqlite3'
-development:
-  adapter: sqlite3
-  database: db/development.sqlite3
-  pool: 5
-  timeout: 5000
 
-# Warning: The database defined as "test" will be erased and
-# re-generated from your development database when you run "rake".
-# Do not set this db to the same as development or production.
-test:
+sqlite: &sqlite
   adapter: sqlite3
-  database: db/test.sqlite3
-  pool: 5
-  timeout: 5000
+  database: db/<%= Rails.env %>.sqlite3
 
-production:
-  adapter: sqlite3
-  database: db/production.sqlite3
+mysql: &mysql
+  adapter: mysql2
+  username: root
+  password:
+  database: myapp_<%= Rails.env %>
+
+postgresql: &postgresql
+  adapter: postgresql
+  username: postgres
+  password:
+  database: myapp_<%= Rails.env %>
+  min_messages: ERROR
+
+defaults: &defaults
   pool: 5
   timeout: 5000
+  host: localhost
+  <<: *<%= ENV['DB'] || "sqlite" %>
+
+development:
+  <<: *defaults
+
+test:
+  <<: *defaults

From 9751cb47d231cb2316e183509fea904cb64dc055 Mon Sep 17 00:00:00 2001
From: Stefan Wienert <stefan.wienert@pludoni.de>
Date: Mon, 4 Nov 2013 12:39:33 +0100
Subject: [PATCH 012/115] mysql2 instead of mysql

---
 Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index b5c92ab..c848148 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,6 +2,6 @@ source "https://rubygems.org"
 
 gemspec
 
-gem 'mysql'
+gem 'mysql2'
 gem 'pg'
 gem 'sqlite3'

From 943815180f965ccbf16eaac2c3984f0f50859195 Mon Sep 17 00:00:00 2001
From: Stefan Wienert <stefan.wienert@pludoni.de>
Date: Mon, 4 Nov 2013 21:12:29 +0100
Subject: [PATCH 013/115] Dummy app not static anymore: rake task for dynamic
 generation of dummy app

---
 .gitignore                                    |   5 +-
 .travis.yml                                   |  14 +++-
 Rakefile                                      |  14 +++-
 gemfiles/Gemfile.default                      |   8 ++
 gemfiles/Gemfile.rails32                      |   6 ++
 simple_captcha.gemspec                        |   6 +-
 test/dummy/app/assets/images/.keep            |   0
 .../app/assets/javascripts/application.js     |  13 ---
 .../app/assets/stylesheets/application.css    |  13 ---
 test/dummy/app/controllers/concerns/.keep     |   0
 test/dummy/app/helpers/application_helper.rb  |   2 -
 test/dummy/app/mailers/.keep                  |   0
 test/dummy/app/models/.keep                   |   0
 test/dummy/app/models/concerns/.keep          |   0
 test/dummy/app/models/user.rb                 |   0
 test/dummy/config/application.rb              |   6 +-
 test/dummy/config/boot.rb                     |   3 +-
 .../dummy/config/initializers/secret_token.rb |   2 +-
 test/dummy/config/routes.rb                   |  59 ++++++++++++--
 test/dummy/db/development.sqlite3             | Bin 6144 -> 0 bytes
 ...131104112427_create_simple_captcha_data.rb |  15 ----
 test/dummy/db/schema.rb                       |  25 ------
 test/dummy/db/test.sqlite3                    | Bin 6144 -> 0 bytes
 .../simple_captcha/dummy/dummy_generator.rb   |  75 ++++++++++++++++++
 .../app/controllers/application_controller.rb |   6 ++
 .../app/controllers/pages_controller.rb       |  25 ++++++
 .../views}/views/layouts/application.html.erb |   0
 .../app/views}/views/pages/form_tag.html.erb  |   0
 .../app/views}/views/pages/model_tag.html.erb |   0
 .../views/simple_captcha/_simple_captcha.erb  |   0
 .../dummy/templates/config/database.yml       |  29 +++++++
 .../dummy/templates/config/routes.rb          |   6 ++
 32 files changed, 243 insertions(+), 89 deletions(-)
 create mode 100644 gemfiles/Gemfile.default
 create mode 100644 gemfiles/Gemfile.rails32
 delete mode 100644 test/dummy/app/assets/images/.keep
 delete mode 100644 test/dummy/app/assets/javascripts/application.js
 delete mode 100644 test/dummy/app/assets/stylesheets/application.css
 delete mode 100644 test/dummy/app/controllers/concerns/.keep
 delete mode 100644 test/dummy/app/helpers/application_helper.rb
 delete mode 100644 test/dummy/app/mailers/.keep
 delete mode 100644 test/dummy/app/models/.keep
 delete mode 100644 test/dummy/app/models/concerns/.keep
 delete mode 100644 test/dummy/app/models/user.rb
 delete mode 100644 test/dummy/db/development.sqlite3
 delete mode 100644 test/dummy/db/migrate/20131104112427_create_simple_captcha_data.rb
 delete mode 100644 test/dummy/db/schema.rb
 delete mode 100644 test/dummy/db/test.sqlite3
 create mode 100644 test/lib/generators/simple_captcha/dummy/dummy_generator.rb
 create mode 100644 test/lib/generators/simple_captcha/dummy/templates/app/controllers/application_controller.rb
 create mode 100644 test/lib/generators/simple_captcha/dummy/templates/app/controllers/pages_controller.rb
 rename test/{dummy/app => lib/generators/simple_captcha/dummy/templates/app/views}/views/layouts/application.html.erb (100%)
 rename test/{dummy/app => lib/generators/simple_captcha/dummy/templates/app/views}/views/pages/form_tag.html.erb (100%)
 rename test/{dummy/app => lib/generators/simple_captcha/dummy/templates/app/views}/views/pages/model_tag.html.erb (100%)
 rename test/{dummy/app => lib/generators/simple_captcha/dummy/templates/app/views}/views/simple_captcha/_simple_captcha.erb (100%)
 create mode 100644 test/lib/generators/simple_captcha/dummy/templates/config/database.yml
 create mode 100644 test/lib/generators/simple_captcha/dummy/templates/config/routes.rb

diff --git a/.gitignore b/.gitignore
index 0c95927..56813f6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,5 @@
 pkg/
 Gemfile.lock
 .rspec
-test/tmp
-test/dummy/log/*.log
-test/dummy/tmp/
-test/dummy/db/*sqlite
+test/dummy
 .svn
diff --git a/.travis.yml b/.travis.yml
index 40d50bc..f4a672e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,10 +7,20 @@ rvm:
   - '1.9.3'
   - '2.0.0'
 
+gemfile:
+  - gemfiles/Gemfile.default
+  - gemfiles/Gemfile.rails32
+
 env:
   - DB=sqlite
-  - DB=mysql
-  - DB=postgresql
+  # - DB=mysql
+  # - DB=postgresql
+
+matrix:
+  exclude:
+    - rvm: 1.9.3
+      gemfile: gemfiles/Gemfile.rails32
+      env: DB=sqlite
 
 before_script:
   - mysql -e 'create database myapp_test'
diff --git a/Rakefile b/Rakefile
index 7dbf1a6..896ae61 100644
--- a/Rakefile
+++ b/Rakefile
@@ -15,7 +15,19 @@ RDoc::Task.new(:rdoc) do |rdoc|
 end
 
 APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
-load 'rails/tasks/engine.rake'
+if File.exists? APP_RAKEFILE
+  load 'rails/tasks/engine.rake'
+end
+
+
+desc 'Setup dummy Rails app for test purpose'
+task :setup_dummy_app do
+  require 'rails'
+  require 'simple_captcha'
+  require File.expand_path('../test/lib/generators/simple_captcha/dummy/dummy_generator', __FILE__)
+
+  SimpleCaptcha::DummyGenerator.start %w(--quiet)
+end
 
 
 
diff --git a/gemfiles/Gemfile.default b/gemfiles/Gemfile.default
new file mode 100644
index 0000000..4e52ac6
--- /dev/null
+++ b/gemfiles/Gemfile.default
@@ -0,0 +1,8 @@
+source "https://rubygems.org"
+
+gemspec :path => '../'
+
+gem 'mysql2'
+gem 'pg'
+gem 'sqlite3'
+gem 'rails', '~> 4.0'
diff --git a/gemfiles/Gemfile.rails32 b/gemfiles/Gemfile.rails32
new file mode 100644
index 0000000..e6373b8
--- /dev/null
+++ b/gemfiles/Gemfile.rails32
@@ -0,0 +1,6 @@
+source "https://rubygems.org"
+
+gemspec :path => '../'
+
+gem 'sqlite3'
+gem 'rails', '~> 3.2'
diff --git a/simple_captcha.gemspec b/simple_captcha.gemspec
index 1c59250..501d66a 100644
--- a/simple_captcha.gemspec
+++ b/simple_captcha.gemspec
@@ -7,10 +7,10 @@ Gem::Specification.new do |s|
   s.version = SimpleCaptcha::VERSION.dup
   s.platform = Gem::Platform::RUBY
   s.summary = "SimpleCaptcha is the simplest and a robust captcha plugin."
-  s.description = "SimpleCaptcha is available to be used with Rails 3 or above and also it provides the backward compatibility with previous versions of Rails."
+  s.description = "SimpleCaptcha is available to be used with Rails 3 + 4 or above and also it provides the backward compatibility with previous versions of Rails."
   s.authors = ["Pavlo Galeta", "Igor Galeta", 'Stefan Wienert']
-  s.email = "galeta.igor@gmail.com"
-  s.homepage = "http://github.com/izzm/simple-captcha"
+  s.email = "stwienert@gmail.com"
+  s.homepage = "http://github.com/pludoni/simple-captcha"
 
   s.files = Dir["{lib}/**/*"] + ["Rakefile", "README.rdoc"]
   s.extra_rdoc_files = ["README.rdoc"]
diff --git a/test/dummy/app/assets/images/.keep b/test/dummy/app/assets/images/.keep
deleted file mode 100644
index e69de29..0000000
diff --git a/test/dummy/app/assets/javascripts/application.js b/test/dummy/app/assets/javascripts/application.js
deleted file mode 100644
index 5bc2e1c..0000000
--- a/test/dummy/app/assets/javascripts/application.js
+++ /dev/null
@@ -1,13 +0,0 @@
-// This is a manifest file that'll be compiled into application.js, which will include all the files
-// listed below.
-//
-// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
-// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
-//
-// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// compiled file.
-//
-// Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
-// about supported directives.
-//
-//= require_tree .
diff --git a/test/dummy/app/assets/stylesheets/application.css b/test/dummy/app/assets/stylesheets/application.css
deleted file mode 100644
index 3192ec8..0000000
--- a/test/dummy/app/assets/stylesheets/application.css
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * This is a manifest file that'll be compiled into application.css, which will include all the files
- * listed below.
- *
- * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
- * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
- *
- * You're free to add application-wide styles to this file and they'll appear at the top of the
- * compiled file, but it's generally better to create a new file per style scope.
- *
- *= require_self
- *= require_tree .
- */
diff --git a/test/dummy/app/controllers/concerns/.keep b/test/dummy/app/controllers/concerns/.keep
deleted file mode 100644
index e69de29..0000000
diff --git a/test/dummy/app/helpers/application_helper.rb b/test/dummy/app/helpers/application_helper.rb
deleted file mode 100644
index de6be79..0000000
--- a/test/dummy/app/helpers/application_helper.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-module ApplicationHelper
-end
diff --git a/test/dummy/app/mailers/.keep b/test/dummy/app/mailers/.keep
deleted file mode 100644
index e69de29..0000000
diff --git a/test/dummy/app/models/.keep b/test/dummy/app/models/.keep
deleted file mode 100644
index e69de29..0000000
diff --git a/test/dummy/app/models/concerns/.keep b/test/dummy/app/models/concerns/.keep
deleted file mode 100644
index e69de29..0000000
diff --git a/test/dummy/app/models/user.rb b/test/dummy/app/models/user.rb
deleted file mode 100644
index e69de29..0000000
diff --git a/test/dummy/config/application.rb b/test/dummy/config/application.rb
index 6fe074b..4cd6683 100644
--- a/test/dummy/config/application.rb
+++ b/test/dummy/config/application.rb
@@ -2,8 +2,9 @@
 
 require 'rails/all'
 
-Bundler.require(*Rails.groups)
-require "simple_captcha"
+# Require the gems listed in Gemfile, including any gems
+# you've limited to :test, :development, or :production.
+Bundler.require(:default, Rails.env)
 
 module Dummy
   class Application < Rails::Application
@@ -20,4 +21,3 @@ class Application < Rails::Application
     # config.i18n.default_locale = :de
   end
 end
-
diff --git a/test/dummy/config/boot.rb b/test/dummy/config/boot.rb
index ef36047..3596736 100644
--- a/test/dummy/config/boot.rb
+++ b/test/dummy/config/boot.rb
@@ -1,5 +1,4 @@
 # Set up gems listed in the Gemfile.
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../../Gemfile', __FILE__)
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
 
 require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
-$LOAD_PATH.unshift File.expand_path('../../../../lib', __FILE__)
diff --git a/test/dummy/config/initializers/secret_token.rb b/test/dummy/config/initializers/secret_token.rb
index 6578b84..7ccb405 100644
--- a/test/dummy/config/initializers/secret_token.rb
+++ b/test/dummy/config/initializers/secret_token.rb
@@ -9,4 +9,4 @@
 
 # Make sure your secret_key_base is kept private
 # if you're sharing your code publicly.
-Dummy::Application.config.secret_key_base = 'dc42d1e5f6b46ed4067ca613f3ed86c2235a3fe6131553d25f475d7007768154310479912a5847dd18a65ea0f5672ee662359001d6f7fa25a42382a02e948310'
+Dummy::Application.config.secret_key_base = '3148ae1cfa150b3aa3c294c988dfda9e1f34df4726ce8141c73cfda1b71a139ab8b1a0068f8ec195e74ae076c60b5bbbcfeb3b7d208cfac775edf8b48ed43f32'
diff --git a/test/dummy/config/routes.rb b/test/dummy/config/routes.rb
index 30c4aee..268779b 100644
--- a/test/dummy/config/routes.rb
+++ b/test/dummy/config/routes.rb
@@ -1,7 +1,56 @@
-Rails.application.routes.draw do
+Dummy::Application.routes.draw do
+  # The priority is based upon order of creation: first created -> highest priority.
+  # See how all your routes lay out with "rake routes".
 
-  get "pages/form_tag"
-  post "pages/form_tag" => 'pages#form_tag_submit'
-  get "pages/model_tag"
-  post "pages/model_tag" => 'pages#model_tag_submit'
+  # You can have the root of your site routed with "root"
+  # root 'welcome#index'
+
+  # Example of regular route:
+  #   get 'products/:id' => 'catalog#view'
+
+  # Example of named route that can be invoked with purchase_url(id: product.id)
+  #   get 'products/:id/purchase' => 'catalog#purchase', as: :purchase
+
+  # Example resource route (maps HTTP verbs to controller actions automatically):
+  #   resources :products
+
+  # Example resource route with options:
+  #   resources :products do
+  #     member do
+  #       get 'short'
+  #       post 'toggle'
+  #     end
+  #
+  #     collection do
+  #       get 'sold'
+  #     end
+  #   end
+
+  # Example resource route with sub-resources:
+  #   resources :products do
+  #     resources :comments, :sales
+  #     resource :seller
+  #   end
+
+  # Example resource route with more complex sub-resources:
+  #   resources :products do
+  #     resources :comments
+  #     resources :sales do
+  #       get 'recent', on: :collection
+  #     end
+  #   end
+
+  # Example resource route with concerns:
+  #   concern :toggleable do
+  #     post 'toggle'
+  #   end
+  #   resources :posts, concerns: :toggleable
+  #   resources :photos, concerns: :toggleable
+
+  # Example resource route within a namespace:
+  #   namespace :admin do
+  #     # Directs /admin/products/* to Admin::ProductsController
+  #     # (app/controllers/admin/products_controller.rb)
+  #     resources :products
+  #   end
 end
diff --git a/test/dummy/db/development.sqlite3 b/test/dummy/db/development.sqlite3
deleted file mode 100644
index c3790a4ea756dc54ebf38d438b08365ce749b008..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6144
zcmeH}UvJYe5Wwxae<UO%;3W^d7>kEm8*0;Z@PtHx2vv0HR#J&dpvWX1vuLt5ajPMo
z$~#|<kH9;81}<Axt?Bj!R-a<&d^(@+eizIBa6C|2(v!0^7MeP!iZDj6C`AYn7<Cv|
zQUwKHO-lMT^M*>$vp-MngQ<oyM1B!cd5V97y36vpR<|BI_=id&d9I@K;G6uOsdzS(
zK`3TAJQYDCw5Y!sxjo;deebRNk+Q;((V<7#4epFK83bbds9Lx7_V7fDFH@P#r_kOY
zlk<g4!t%6MY~lA_4_sREZ6+d?`>>L)K9PpyIQVC98FM?=8}g}c#J(+K6)`B#ci*`q
zdNk@E_C^!>-ks3i*dO*i2yy6oKJ|t$#)H8=y(p0`MGBPCX1C43v=q~YWNYK|+!m%%
zXc+}UGYT-JR!|FNi&;L|H1k!X(y(5(@Tzsukwu~aR*;3KG8RFszNSK}vn1OxkfOq|
z*FPSw`*hp#qH*P@dE1sU&0q({=eS|DAd!ccoXfsj8B|J)%L}dtU-Ri49Pl+!o}W!j
z{vr5`7y^dCohI-AS9qswJGR~K+IFYgd2tWw#pEx7&xj#l2;5}?j|j(`#~<hSKRo)4
h7y^dC4iYfue+QdxN;U)v0{Q#j-2dixFa&m!z<>Cd?<fEO

diff --git a/test/dummy/db/migrate/20131104112427_create_simple_captcha_data.rb b/test/dummy/db/migrate/20131104112427_create_simple_captcha_data.rb
deleted file mode 100644
index 4573b20..0000000
--- a/test/dummy/db/migrate/20131104112427_create_simple_captcha_data.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-class CreateSimpleCaptchaData < ActiveRecord::Migration
-  def self.up
-    create_table :simple_captcha_data do |t|
-      t.string :key, :limit => 40
-      t.string :value, :limit => 6
-      t.timestamps
-    end
-    
-    add_index :simple_captcha_data, :key, :name => "idx_key"
-  end
-
-  def self.down
-    drop_table :simple_captcha_data
-  end
-end
diff --git a/test/dummy/db/schema.rb b/test/dummy/db/schema.rb
deleted file mode 100644
index 5aae878..0000000
--- a/test/dummy/db/schema.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-# encoding: UTF-8
-# This file is auto-generated from the current state of the database. Instead
-# of editing this file, please use the migrations feature of Active Record to
-# incrementally modify your database, and then regenerate this schema definition.
-#
-# Note that this schema.rb definition is the authoritative source for your
-# database schema. If you need to create the application database on another
-# system, you should be using db:schema:load, not running all the migrations
-# from scratch. The latter is a flawed and unsustainable approach (the more migrations
-# you'll amass, the slower it'll run and the greater likelihood for issues).
-#
-# It's strongly recommended that you check this file into your version control system.
-
-ActiveRecord::Schema.define(version: 20131104112427) do
-
-  create_table "simple_captcha_data", force: true do |t|
-    t.string   "key",        limit: 40
-    t.string   "value",      limit: 6
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "simple_captcha_data", ["key"], name: "idx_key"
-
-end
diff --git a/test/dummy/db/test.sqlite3 b/test/dummy/db/test.sqlite3
deleted file mode 100644
index 55e4ed313e7ae1fa8e7b7581e8cca40c973acdc7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6144
zcmeH|L2uJA6vyqPX(c2i;F1Fu&!<KkYSVOZLZWOIs_4?Kq!N`tkx2}*XtFkOt07M1
z3-TSf!#6<UWy>bA3~^umWGnWI{p|nGe)5}>kyL_wJj)WUh=&>oWAuU$gpdWb3H8bv
z(7;!n8|}Z`m8ONB{Mfk<E(_<#+%diz3;Y|J+iaVb)v}*=@TMcvSe&m?xm<}bk4{Cx
z!$f|{xRPgSUUM`LCTtKeGWCZiQ$~jVA$v>czot_%_6e;8p`=aMBFkX~>MR>Ay8|0}
zsQ8DusEw^Tta1mz;N^(@CpcO2EIQ>`ySKmZ5PuvHe>xgD@6D$D*u!5hq|5j`{4BoY
zGFi+;81aRI8DY#7Z<H&QBFllLruy(g6$GNrvC*`5ck%2}&~grUJIn>}O(T(4yJkhq
zji2q5Ct?p~I-7U6WqTg}7GB1zFMiARjY@2K%ZOsfGNy2f0ei(J<ajbX8cb&7HJg#a
zG#C$k2yw)Gz*eH$BNq~{x%RsbxYm5W67<^nwD3il;7Y_HSCjxup(JR5o3bc6Rku^*
zCM3N!O+XXaLIOJfxA4%lWKEzXaIg64_g~)!O<*et6z@Mae<3K^GyzTEP7`>54X4+2
iJ=g8_UANcoJuBXSZ2m-0v}ppGz+EQr$aHWu{qY}iLhu3r

diff --git a/test/lib/generators/simple_captcha/dummy/dummy_generator.rb b/test/lib/generators/simple_captcha/dummy/dummy_generator.rb
new file mode 100644
index 0000000..6acc2ff
--- /dev/null
+++ b/test/lib/generators/simple_captcha/dummy/dummy_generator.rb
@@ -0,0 +1,75 @@
+require 'rails/generators'
+require 'rails/generators/rails/app/app_generator'
+
+# stolen from https://github.com/radar/forem/blob/master/spec/lib/generators/forem/dummy/dummy_generator.rb
+module SimpleCaptcha
+  class DummyGenerator < Rails::Generators::Base
+    desc "Creates dummy test Rails application"
+
+    def self.source_paths
+      paths = self.superclass.source_paths
+      paths << File.expand_path('../templates', __FILE__)
+      paths.flatten
+    end
+
+    PASSTHROUGH_OPTIONS = [
+      :skip_active_record, :skip_javascript, :database, :javascript, :quiet, :pretend, :force, :skip
+    ]
+
+    def generate_test_dummy
+      opts = (options || {}).slice(*PASSTHROUGH_OPTIONS)
+      opts[:force] = true
+      opts[:skip_bundle] = true
+      opts[:old_style_hash] = true
+
+      invoke Rails::Generators::AppGenerator, [ File.expand_path(dummy_path, destination_root) ], opts
+      run "rails generate simple_captcha"
+    end
+
+    def test_dummy_clean
+      inside dummy_path do
+        remove_file ".gitignore"
+        remove_file "doc"
+        remove_file "Gemfile"
+        remove_file "lib/tasks"
+        remove_file "app"
+        remove_file "public/index.html"
+        remove_file "public/robots.txt"
+        remove_file "README"
+        remove_file "test"
+        remove_file "vendor"
+      end
+    end
+
+    def test_dummy_config
+      directory "app", "#{dummy_path}/app"
+      copy_file "config/database.yml", "#{dummy_path}/config/database.yml", :force => true
+      template "config/routes.rb", "#{dummy_path}/config/routes.rb", :force => true
+    end
+
+    protected
+
+      def dummy_path
+        'test/dummy'
+      end
+
+      def module_name
+        'Dummy'
+      end
+
+      def application_definition
+        @application_definition ||= begin
+          dummy_application_path = File.expand_path("#{dummy_path}/config/application.rb", destination_root)
+          unless options[:pretend] || !File.exists?(dummy_application_path)
+            contents = File.read(dummy_application_path)
+            contents[(contents.index("module #{module_name}"))..-1]
+          end
+        end
+      end
+      alias :store_application_definition! :application_definition
+
+      def gemfile_path
+        '../../../../Gemfile'
+      end
+  end
+end
diff --git a/test/lib/generators/simple_captcha/dummy/templates/app/controllers/application_controller.rb b/test/lib/generators/simple_captcha/dummy/templates/app/controllers/application_controller.rb
new file mode 100644
index 0000000..6c1698d
--- /dev/null
+++ b/test/lib/generators/simple_captcha/dummy/templates/app/controllers/application_controller.rb
@@ -0,0 +1,6 @@
+class ApplicationController < ActionController::Base
+  # Prevent CSRF attacks by raising an exception.
+  # For APIs, you may want to use :null_session instead.
+  protect_from_forgery with: :exception
+  include SimpleCaptcha::ControllerHelpers
+end
diff --git a/test/lib/generators/simple_captcha/dummy/templates/app/controllers/pages_controller.rb b/test/lib/generators/simple_captcha/dummy/templates/app/controllers/pages_controller.rb
new file mode 100644
index 0000000..814f4dd
--- /dev/null
+++ b/test/lib/generators/simple_captcha/dummy/templates/app/controllers/pages_controller.rb
@@ -0,0 +1,25 @@
+class PagesController < ApplicationController
+  def form_tag
+  end
+
+  def form_tag_submit
+    if simple_captcha_valid?
+      render text: 'captcha valid!'
+    else
+      render text: 'captcha not valid!'
+    end
+  end
+
+  def model_tag
+    @user = User.new
+  end
+
+  def model_tag_submit
+    @model = User.new(params[:user])
+    if @model.valid_with_captcha?
+      render text: 'captcha valid!'
+    else
+      render text: 'captcha not valid!'
+    end
+  end
+end
diff --git a/test/dummy/app/views/layouts/application.html.erb b/test/lib/generators/simple_captcha/dummy/templates/app/views/views/layouts/application.html.erb
similarity index 100%
rename from test/dummy/app/views/layouts/application.html.erb
rename to test/lib/generators/simple_captcha/dummy/templates/app/views/views/layouts/application.html.erb
diff --git a/test/dummy/app/views/pages/form_tag.html.erb b/test/lib/generators/simple_captcha/dummy/templates/app/views/views/pages/form_tag.html.erb
similarity index 100%
rename from test/dummy/app/views/pages/form_tag.html.erb
rename to test/lib/generators/simple_captcha/dummy/templates/app/views/views/pages/form_tag.html.erb
diff --git a/test/dummy/app/views/pages/model_tag.html.erb b/test/lib/generators/simple_captcha/dummy/templates/app/views/views/pages/model_tag.html.erb
similarity index 100%
rename from test/dummy/app/views/pages/model_tag.html.erb
rename to test/lib/generators/simple_captcha/dummy/templates/app/views/views/pages/model_tag.html.erb
diff --git a/test/dummy/app/views/simple_captcha/_simple_captcha.erb b/test/lib/generators/simple_captcha/dummy/templates/app/views/views/simple_captcha/_simple_captcha.erb
similarity index 100%
rename from test/dummy/app/views/simple_captcha/_simple_captcha.erb
rename to test/lib/generators/simple_captcha/dummy/templates/app/views/views/simple_captcha/_simple_captcha.erb
diff --git a/test/lib/generators/simple_captcha/dummy/templates/config/database.yml b/test/lib/generators/simple_captcha/dummy/templates/config/database.yml
new file mode 100644
index 0000000..72a0482
--- /dev/null
+++ b/test/lib/generators/simple_captcha/dummy/templates/config/database.yml
@@ -0,0 +1,29 @@
+
+sqlite: &sqlite
+  adapter: sqlite3
+  database: db/<%= Rails.env %>.sqlite3
+
+mysql: &mysql
+  adapter: mysql2
+  username: root
+  password:
+  database: myapp_<%= Rails.env %>
+
+postgresql: &postgresql
+  adapter: postgresql
+  username: postgres
+  password:
+  database: myapp_<%= Rails.env %>
+  min_messages: ERROR
+
+defaults: &defaults
+  pool: 5
+  timeout: 5000
+  host: localhost
+  <<: *<%= ENV['DB'] || "sqlite" %>
+
+development:
+  <<: *defaults
+
+test:
+  <<: *defaults
diff --git a/test/lib/generators/simple_captcha/dummy/templates/config/routes.rb b/test/lib/generators/simple_captcha/dummy/templates/config/routes.rb
new file mode 100644
index 0000000..08eb576
--- /dev/null
+++ b/test/lib/generators/simple_captcha/dummy/templates/config/routes.rb
@@ -0,0 +1,6 @@
+Rails.application.routes.draw do
+  get "pages/form_tag"
+  post "pages/form_tag" => 'pages#form_tag_submit'
+  get "pages/model_tag"
+  post "pages/model_tag" => 'pages#model_tag_submit'
+end

From 3eddeb1b77fc9fca4a92070d534b1fbc5e377a9a Mon Sep 17 00:00:00 2001
From: Stefan Wienert <stefan.wienert@pludoni.de>
Date: Mon, 4 Nov 2013 21:22:16 +0100
Subject: [PATCH 014/115] removed dummy app from VCS

---
 test/dummy/README.rdoc                        | 28 -------
 test/dummy/Rakefile                           |  6 --
 .../app/controllers/application_controller.rb |  6 --
 .../dummy/app/controllers/pages_controller.rb | 25 ------
 test/dummy/bin/bundle                         |  3 -
 test/dummy/bin/rails                          |  4 -
 test/dummy/bin/rake                           |  4 -
 test/dummy/config.ru                          |  4 -
 test/dummy/config/application.rb              | 23 ------
 test/dummy/config/boot.rb                     |  4 -
 test/dummy/config/database.yml                | 29 -------
 test/dummy/config/environment.rb              |  5 --
 test/dummy/config/environments/development.rb | 29 -------
 test/dummy/config/environments/production.rb  | 80 -------------------
 test/dummy/config/environments/test.rb        | 36 ---------
 .../initializers/backtrace_silencers.rb       |  7 --
 .../initializers/filter_parameter_logging.rb  |  4 -
 test/dummy/config/initializers/inflections.rb | 16 ----
 test/dummy/config/initializers/mime_types.rb  |  5 --
 .../dummy/config/initializers/secret_token.rb | 12 ---
 .../config/initializers/session_store.rb      |  3 -
 .../config/initializers/wrap_parameters.rb    | 14 ----
 test/dummy/config/locales/en.yml              | 23 ------
 test/dummy/config/routes.rb                   | 56 -------------
 test/dummy/lib/assets/.keep                   |  0
 test/dummy/log/.keep                          |  0
 test/dummy/public/404.html                    | 58 --------------
 test/dummy/public/422.html                    | 58 --------------
 test/dummy/public/500.html                    | 57 -------------
 test/dummy/public/favicon.ico                 |  0
 .../simple_captcha/dummy/dummy_generator.rb   | 38 ++++-----
 .../{views => }/layouts/application.html.erb  |  0
 .../views/{views => }/pages/form_tag.html.erb |  0
 .../{views => }/pages/model_tag.html.erb      |  0
 .../simple_captcha/_simple_captcha.erb        |  0
 35 files changed, 19 insertions(+), 618 deletions(-)
 delete mode 100644 test/dummy/README.rdoc
 delete mode 100644 test/dummy/Rakefile
 delete mode 100644 test/dummy/app/controllers/application_controller.rb
 delete mode 100644 test/dummy/app/controllers/pages_controller.rb
 delete mode 100755 test/dummy/bin/bundle
 delete mode 100755 test/dummy/bin/rails
 delete mode 100755 test/dummy/bin/rake
 delete mode 100644 test/dummy/config.ru
 delete mode 100644 test/dummy/config/application.rb
 delete mode 100644 test/dummy/config/boot.rb
 delete mode 100644 test/dummy/config/database.yml
 delete mode 100644 test/dummy/config/environment.rb
 delete mode 100644 test/dummy/config/environments/development.rb
 delete mode 100644 test/dummy/config/environments/production.rb
 delete mode 100644 test/dummy/config/environments/test.rb
 delete mode 100644 test/dummy/config/initializers/backtrace_silencers.rb
 delete mode 100644 test/dummy/config/initializers/filter_parameter_logging.rb
 delete mode 100644 test/dummy/config/initializers/inflections.rb
 delete mode 100644 test/dummy/config/initializers/mime_types.rb
 delete mode 100644 test/dummy/config/initializers/secret_token.rb
 delete mode 100644 test/dummy/config/initializers/session_store.rb
 delete mode 100644 test/dummy/config/initializers/wrap_parameters.rb
 delete mode 100644 test/dummy/config/locales/en.yml
 delete mode 100644 test/dummy/config/routes.rb
 delete mode 100644 test/dummy/lib/assets/.keep
 delete mode 100644 test/dummy/log/.keep
 delete mode 100644 test/dummy/public/404.html
 delete mode 100644 test/dummy/public/422.html
 delete mode 100644 test/dummy/public/500.html
 delete mode 100644 test/dummy/public/favicon.ico
 rename test/lib/generators/simple_captcha/dummy/templates/app/views/{views => }/layouts/application.html.erb (100%)
 rename test/lib/generators/simple_captcha/dummy/templates/app/views/{views => }/pages/form_tag.html.erb (100%)
 rename test/lib/generators/simple_captcha/dummy/templates/app/views/{views => }/pages/model_tag.html.erb (100%)
 rename test/lib/generators/simple_captcha/dummy/templates/app/views/{views => }/simple_captcha/_simple_captcha.erb (100%)

diff --git a/test/dummy/README.rdoc b/test/dummy/README.rdoc
deleted file mode 100644
index dd4e97e..0000000
--- a/test/dummy/README.rdoc
+++ /dev/null
@@ -1,28 +0,0 @@
-== README
-
-This README would normally document whatever steps are necessary to get the
-application up and running.
-
-Things you may want to cover:
-
-* Ruby version
-
-* System dependencies
-
-* Configuration
-
-* Database creation
-
-* Database initialization
-
-* How to run the test suite
-
-* Services (job queues, cache servers, search engines, etc.)
-
-* Deployment instructions
-
-* ...
-
-
-Please feel free to use a different markup language if you do not plan to run
-<tt>rake doc:app</tt>.
diff --git a/test/dummy/Rakefile b/test/dummy/Rakefile
deleted file mode 100644
index 4135d7a..0000000
--- a/test/dummy/Rakefile
+++ /dev/null
@@ -1,6 +0,0 @@
-# Add your own tasks in files placed in lib/tasks ending in .rake,
-# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
-
-require File.expand_path('../config/application', __FILE__)
-
-Dummy::Application.load_tasks
diff --git a/test/dummy/app/controllers/application_controller.rb b/test/dummy/app/controllers/application_controller.rb
deleted file mode 100644
index 6c1698d..0000000
--- a/test/dummy/app/controllers/application_controller.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-class ApplicationController < ActionController::Base
-  # Prevent CSRF attacks by raising an exception.
-  # For APIs, you may want to use :null_session instead.
-  protect_from_forgery with: :exception
-  include SimpleCaptcha::ControllerHelpers
-end
diff --git a/test/dummy/app/controllers/pages_controller.rb b/test/dummy/app/controllers/pages_controller.rb
deleted file mode 100644
index 814f4dd..0000000
--- a/test/dummy/app/controllers/pages_controller.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-class PagesController < ApplicationController
-  def form_tag
-  end
-
-  def form_tag_submit
-    if simple_captcha_valid?
-      render text: 'captcha valid!'
-    else
-      render text: 'captcha not valid!'
-    end
-  end
-
-  def model_tag
-    @user = User.new
-  end
-
-  def model_tag_submit
-    @model = User.new(params[:user])
-    if @model.valid_with_captcha?
-      render text: 'captcha valid!'
-    else
-      render text: 'captcha not valid!'
-    end
-  end
-end
diff --git a/test/dummy/bin/bundle b/test/dummy/bin/bundle
deleted file mode 100755
index 66e9889..0000000
--- a/test/dummy/bin/bundle
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env ruby
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
-load Gem.bin_path('bundler', 'bundle')
diff --git a/test/dummy/bin/rails b/test/dummy/bin/rails
deleted file mode 100755
index 728cd85..0000000
--- a/test/dummy/bin/rails
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env ruby
-APP_PATH = File.expand_path('../../config/application',  __FILE__)
-require_relative '../config/boot'
-require 'rails/commands'
diff --git a/test/dummy/bin/rake b/test/dummy/bin/rake
deleted file mode 100755
index 1724048..0000000
--- a/test/dummy/bin/rake
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env ruby
-require_relative '../config/boot'
-require 'rake'
-Rake.application.run
diff --git a/test/dummy/config.ru b/test/dummy/config.ru
deleted file mode 100644
index 5bc2a61..0000000
--- a/test/dummy/config.ru
+++ /dev/null
@@ -1,4 +0,0 @@
-# This file is used by Rack-based servers to start the application.
-
-require ::File.expand_path('../config/environment',  __FILE__)
-run Rails.application
diff --git a/test/dummy/config/application.rb b/test/dummy/config/application.rb
deleted file mode 100644
index 4cd6683..0000000
--- a/test/dummy/config/application.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-require File.expand_path('../boot', __FILE__)
-
-require 'rails/all'
-
-# Require the gems listed in Gemfile, including any gems
-# you've limited to :test, :development, or :production.
-Bundler.require(:default, Rails.env)
-
-module Dummy
-  class Application < Rails::Application
-    # Settings in config/environments/* take precedence over those specified here.
-    # Application configuration should go into files in config/initializers
-    # -- all .rb files in that directory are automatically loaded.
-
-    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
-    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
-    # config.time_zone = 'Central Time (US & Canada)'
-
-    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
-    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
-    # config.i18n.default_locale = :de
-  end
-end
diff --git a/test/dummy/config/boot.rb b/test/dummy/config/boot.rb
deleted file mode 100644
index 3596736..0000000
--- a/test/dummy/config/boot.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-# Set up gems listed in the Gemfile.
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
-
-require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
diff --git a/test/dummy/config/database.yml b/test/dummy/config/database.yml
deleted file mode 100644
index 72a0482..0000000
--- a/test/dummy/config/database.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-sqlite: &sqlite
-  adapter: sqlite3
-  database: db/<%= Rails.env %>.sqlite3
-
-mysql: &mysql
-  adapter: mysql2
-  username: root
-  password:
-  database: myapp_<%= Rails.env %>
-
-postgresql: &postgresql
-  adapter: postgresql
-  username: postgres
-  password:
-  database: myapp_<%= Rails.env %>
-  min_messages: ERROR
-
-defaults: &defaults
-  pool: 5
-  timeout: 5000
-  host: localhost
-  <<: *<%= ENV['DB'] || "sqlite" %>
-
-development:
-  <<: *defaults
-
-test:
-  <<: *defaults
diff --git a/test/dummy/config/environment.rb b/test/dummy/config/environment.rb
deleted file mode 100644
index 10e0cad..0000000
--- a/test/dummy/config/environment.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-# Load the Rails application.
-require File.expand_path('../application', __FILE__)
-
-# Initialize the Rails application.
-Dummy::Application.initialize!
diff --git a/test/dummy/config/environments/development.rb b/test/dummy/config/environments/development.rb
deleted file mode 100644
index 9d26e12..0000000
--- a/test/dummy/config/environments/development.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-Dummy::Application.configure do
-  # Settings specified here will take precedence over those in config/application.rb.
-
-  # In the development environment your application's code is reloaded on
-  # every request. This slows down response time but is perfect for development
-  # since you don't have to restart the web server when you make code changes.
-  config.cache_classes = false
-
-  # Do not eager load code on boot.
-  config.eager_load = false
-
-  # Show full error reports and disable caching.
-  config.consider_all_requests_local       = true
-  config.action_controller.perform_caching = false
-
-  # Don't care if the mailer can't send.
-  config.action_mailer.raise_delivery_errors = false
-
-  # Print deprecation notices to the Rails logger.
-  config.active_support.deprecation = :log
-
-  # Raise an error on page load if there are pending migrations
-  config.active_record.migration_error = :page_load
-
-  # Debug mode disables concatenation and preprocessing of assets.
-  # This option may cause significant delays in view rendering with a large
-  # number of complex assets.
-  config.assets.debug = true
-end
diff --git a/test/dummy/config/environments/production.rb b/test/dummy/config/environments/production.rb
deleted file mode 100644
index b690b1c..0000000
--- a/test/dummy/config/environments/production.rb
+++ /dev/null
@@ -1,80 +0,0 @@
-Dummy::Application.configure do
-  # Settings specified here will take precedence over those in config/application.rb.
-
-  # Code is not reloaded between requests.
-  config.cache_classes = true
-
-  # Eager load code on boot. This eager loads most of Rails and
-  # your application in memory, allowing both thread web servers
-  # and those relying on copy on write to perform better.
-  # Rake tasks automatically ignore this option for performance.
-  config.eager_load = true
-
-  # Full error reports are disabled and caching is turned on.
-  config.consider_all_requests_local       = false
-  config.action_controller.perform_caching = true
-
-  # Enable Rack::Cache to put a simple HTTP cache in front of your application
-  # Add `rack-cache` to your Gemfile before enabling this.
-  # For large-scale production use, consider using a caching reverse proxy like nginx, varnish or squid.
-  # config.action_dispatch.rack_cache = true
-
-  # Disable Rails's static asset server (Apache or nginx will already do this).
-  config.serve_static_assets = false
-
-  # Compress JavaScripts and CSS.
-  config.assets.js_compressor = :uglifier
-  # config.assets.css_compressor = :sass
-
-  # Do not fallback to assets pipeline if a precompiled asset is missed.
-  config.assets.compile = false
-
-  # Generate digests for assets URLs.
-  config.assets.digest = true
-
-  # Version of your assets, change this if you want to expire all your assets.
-  config.assets.version = '1.0'
-
-  # Specifies the header that your server uses for sending files.
-  # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
-  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
-
-  # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
-  # config.force_ssl = true
-
-  # Set to :debug to see everything in the log.
-  config.log_level = :info
-
-  # Prepend all log lines with the following tags.
-  # config.log_tags = [ :subdomain, :uuid ]
-
-  # Use a different logger for distributed setups.
-  # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
-
-  # Use a different cache store in production.
-  # config.cache_store = :mem_cache_store
-
-  # Enable serving of images, stylesheets, and JavaScripts from an asset server.
-  # config.action_controller.asset_host = "http://assets.example.com"
-
-  # Precompile additional assets.
-  # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
-  # config.assets.precompile += %w( search.js )
-
-  # Ignore bad email addresses and do not raise email delivery errors.
-  # Set this to true and configure the email server for immediate delivery to raise delivery errors.
-  # config.action_mailer.raise_delivery_errors = false
-
-  # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
-  # the I18n.default_locale when a translation can not be found).
-  config.i18n.fallbacks = true
-
-  # Send deprecation notices to registered listeners.
-  config.active_support.deprecation = :notify
-
-  # Disable automatic flushing of the log to improve performance.
-  # config.autoflush_log = false
-
-  # Use default logging formatter so that PID and timestamp are not suppressed.
-  config.log_formatter = ::Logger::Formatter.new
-end
diff --git a/test/dummy/config/environments/test.rb b/test/dummy/config/environments/test.rb
deleted file mode 100644
index afbc0ae..0000000
--- a/test/dummy/config/environments/test.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-Dummy::Application.configure do
-  # Settings specified here will take precedence over those in config/application.rb.
-
-  # The test environment is used exclusively to run your application's
-  # test suite. You never need to work with it otherwise. Remember that
-  # your test database is "scratch space" for the test suite and is wiped
-  # and recreated between test runs. Don't rely on the data there!
-  config.cache_classes = true
-
-  # Do not eager load code on boot. This avoids loading your whole application
-  # just for the purpose of running a single test. If you are using a tool that
-  # preloads Rails for running tests, you may have to set it to true.
-  config.eager_load = false
-
-  # Configure static asset server for tests with Cache-Control for performance.
-  config.serve_static_assets  = true
-  config.static_cache_control = "public, max-age=3600"
-
-  # Show full error reports and disable caching.
-  config.consider_all_requests_local       = true
-  config.action_controller.perform_caching = false
-
-  # Raise exceptions instead of rendering exception templates.
-  config.action_dispatch.show_exceptions = false
-
-  # Disable request forgery protection in test environment.
-  config.action_controller.allow_forgery_protection = false
-
-  # Tell Action Mailer not to deliver emails to the real world.
-  # The :test delivery method accumulates sent emails in the
-  # ActionMailer::Base.deliveries array.
-  config.action_mailer.delivery_method = :test
-
-  # Print deprecation notices to the stderr.
-  config.active_support.deprecation = :stderr
-end
diff --git a/test/dummy/config/initializers/backtrace_silencers.rb b/test/dummy/config/initializers/backtrace_silencers.rb
deleted file mode 100644
index 59385cd..0000000
--- a/test/dummy/config/initializers/backtrace_silencers.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-# Be sure to restart your server when you modify this file.
-
-# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces.
-# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ }
-
-# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code.
-# Rails.backtrace_cleaner.remove_silencers!
diff --git a/test/dummy/config/initializers/filter_parameter_logging.rb b/test/dummy/config/initializers/filter_parameter_logging.rb
deleted file mode 100644
index 4a994e1..0000000
--- a/test/dummy/config/initializers/filter_parameter_logging.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-# Be sure to restart your server when you modify this file.
-
-# Configure sensitive parameters which will be filtered from the log file.
-Rails.application.config.filter_parameters += [:password]
diff --git a/test/dummy/config/initializers/inflections.rb b/test/dummy/config/initializers/inflections.rb
deleted file mode 100644
index ac033bf..0000000
--- a/test/dummy/config/initializers/inflections.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-# Be sure to restart your server when you modify this file.
-
-# Add new inflection rules using the following format. Inflections
-# are locale specific, and you may define rules for as many different
-# locales as you wish. All of these examples are active by default:
-# ActiveSupport::Inflector.inflections(:en) do |inflect|
-#   inflect.plural /^(ox)$/i, '\1en'
-#   inflect.singular /^(ox)en/i, '\1'
-#   inflect.irregular 'person', 'people'
-#   inflect.uncountable %w( fish sheep )
-# end
-
-# These inflection rules are supported but not enabled by default:
-# ActiveSupport::Inflector.inflections(:en) do |inflect|
-#   inflect.acronym 'RESTful'
-# end
diff --git a/test/dummy/config/initializers/mime_types.rb b/test/dummy/config/initializers/mime_types.rb
deleted file mode 100644
index 72aca7e..0000000
--- a/test/dummy/config/initializers/mime_types.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-# Be sure to restart your server when you modify this file.
-
-# Add new mime types for use in respond_to blocks:
-# Mime::Type.register "text/richtext", :rtf
-# Mime::Type.register_alias "text/html", :iphone
diff --git a/test/dummy/config/initializers/secret_token.rb b/test/dummy/config/initializers/secret_token.rb
deleted file mode 100644
index 7ccb405..0000000
--- a/test/dummy/config/initializers/secret_token.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-# Be sure to restart your server when you modify this file.
-
-# Your secret key is used for verifying the integrity of signed cookies.
-# If you change this key, all old signed cookies will become invalid!
-
-# Make sure the secret is at least 30 characters and all random,
-# no regular words or you'll be exposed to dictionary attacks.
-# You can use `rake secret` to generate a secure secret key.
-
-# Make sure your secret_key_base is kept private
-# if you're sharing your code publicly.
-Dummy::Application.config.secret_key_base = '3148ae1cfa150b3aa3c294c988dfda9e1f34df4726ce8141c73cfda1b71a139ab8b1a0068f8ec195e74ae076c60b5bbbcfeb3b7d208cfac775edf8b48ed43f32'
diff --git a/test/dummy/config/initializers/session_store.rb b/test/dummy/config/initializers/session_store.rb
deleted file mode 100644
index 155f7b0..0000000
--- a/test/dummy/config/initializers/session_store.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-# Be sure to restart your server when you modify this file.
-
-Dummy::Application.config.session_store :cookie_store, key: '_dummy_session'
diff --git a/test/dummy/config/initializers/wrap_parameters.rb b/test/dummy/config/initializers/wrap_parameters.rb
deleted file mode 100644
index 33725e9..0000000
--- a/test/dummy/config/initializers/wrap_parameters.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-# Be sure to restart your server when you modify this file.
-
-# This file contains settings for ActionController::ParamsWrapper which
-# is enabled by default.
-
-# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
-ActiveSupport.on_load(:action_controller) do
-  wrap_parameters format: [:json] if respond_to?(:wrap_parameters)
-end
-
-# To enable root element in JSON for ActiveRecord objects.
-# ActiveSupport.on_load(:active_record) do
-#  self.include_root_in_json = true
-# end
diff --git a/test/dummy/config/locales/en.yml b/test/dummy/config/locales/en.yml
deleted file mode 100644
index 0653957..0000000
--- a/test/dummy/config/locales/en.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-# Files in the config/locales directory are used for internationalization
-# and are automatically loaded by Rails. If you want to use locales other
-# than English, add the necessary files in this directory.
-#
-# To use the locales, use `I18n.t`:
-#
-#     I18n.t 'hello'
-#
-# In views, this is aliased to just `t`:
-#
-#     <%= t('hello') %>
-#
-# To use a different locale, set it with `I18n.locale`:
-#
-#     I18n.locale = :es
-#
-# This would use the information in config/locales/es.yml.
-#
-# To learn more, please read the Rails Internationalization guide
-# available at http://guides.rubyonrails.org/i18n.html.
-
-en:
-  hello: "Hello world"
diff --git a/test/dummy/config/routes.rb b/test/dummy/config/routes.rb
deleted file mode 100644
index 268779b..0000000
--- a/test/dummy/config/routes.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-Dummy::Application.routes.draw do
-  # The priority is based upon order of creation: first created -> highest priority.
-  # See how all your routes lay out with "rake routes".
-
-  # You can have the root of your site routed with "root"
-  # root 'welcome#index'
-
-  # Example of regular route:
-  #   get 'products/:id' => 'catalog#view'
-
-  # Example of named route that can be invoked with purchase_url(id: product.id)
-  #   get 'products/:id/purchase' => 'catalog#purchase', as: :purchase
-
-  # Example resource route (maps HTTP verbs to controller actions automatically):
-  #   resources :products
-
-  # Example resource route with options:
-  #   resources :products do
-  #     member do
-  #       get 'short'
-  #       post 'toggle'
-  #     end
-  #
-  #     collection do
-  #       get 'sold'
-  #     end
-  #   end
-
-  # Example resource route with sub-resources:
-  #   resources :products do
-  #     resources :comments, :sales
-  #     resource :seller
-  #   end
-
-  # Example resource route with more complex sub-resources:
-  #   resources :products do
-  #     resources :comments
-  #     resources :sales do
-  #       get 'recent', on: :collection
-  #     end
-  #   end
-
-  # Example resource route with concerns:
-  #   concern :toggleable do
-  #     post 'toggle'
-  #   end
-  #   resources :posts, concerns: :toggleable
-  #   resources :photos, concerns: :toggleable
-
-  # Example resource route within a namespace:
-  #   namespace :admin do
-  #     # Directs /admin/products/* to Admin::ProductsController
-  #     # (app/controllers/admin/products_controller.rb)
-  #     resources :products
-  #   end
-end
diff --git a/test/dummy/lib/assets/.keep b/test/dummy/lib/assets/.keep
deleted file mode 100644
index e69de29..0000000
diff --git a/test/dummy/log/.keep b/test/dummy/log/.keep
deleted file mode 100644
index e69de29..0000000
diff --git a/test/dummy/public/404.html b/test/dummy/public/404.html
deleted file mode 100644
index a0daa0c..0000000
--- a/test/dummy/public/404.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title>The page you were looking for doesn't exist (404)</title>
-  <style>
-  body {
-    background-color: #EFEFEF;
-    color: #2E2F30;
-    text-align: center;
-    font-family: arial, sans-serif;
-  }
-
-  div.dialog {
-    width: 25em;
-    margin: 4em auto 0 auto;
-    border: 1px solid #CCC;
-    border-right-color: #999;
-    border-left-color: #999;
-    border-bottom-color: #BBB;
-    border-top: #B00100 solid 4px;
-    border-top-left-radius: 9px;
-    border-top-right-radius: 9px;
-    background-color: white;
-    padding: 7px 4em 0 4em;
-  }
-
-  h1 {
-    font-size: 100%;
-    color: #730E15;
-    line-height: 1.5em;
-  }
-
-  body > p {
-    width: 33em;
-    margin: 0 auto 1em;
-    padding: 1em 0;
-    background-color: #F7F7F7;
-    border: 1px solid #CCC;
-    border-right-color: #999;
-    border-bottom-color: #999;
-    border-bottom-left-radius: 4px;
-    border-bottom-right-radius: 4px;
-    border-top-color: #DADADA;
-    color: #666;
-    box-shadow:0 3px 8px rgba(50, 50, 50, 0.17);
-  }
-  </style>
-</head>
-
-<body>
-  <!-- This file lives in public/404.html -->
-  <div class="dialog">
-    <h1>The page you were looking for doesn't exist.</h1>
-    <p>You may have mistyped the address or the page may have moved.</p>
-  </div>
-  <p>If you are the application owner check the logs for more information.</p>
-</body>
-</html>
diff --git a/test/dummy/public/422.html b/test/dummy/public/422.html
deleted file mode 100644
index fbb4b84..0000000
--- a/test/dummy/public/422.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title>The change you wanted was rejected (422)</title>
-  <style>
-  body {
-    background-color: #EFEFEF;
-    color: #2E2F30;
-    text-align: center;
-    font-family: arial, sans-serif;
-  }
-
-  div.dialog {
-    width: 25em;
-    margin: 4em auto 0 auto;
-    border: 1px solid #CCC;
-    border-right-color: #999;
-    border-left-color: #999;
-    border-bottom-color: #BBB;
-    border-top: #B00100 solid 4px;
-    border-top-left-radius: 9px;
-    border-top-right-radius: 9px;
-    background-color: white;
-    padding: 7px 4em 0 4em;
-  }
-
-  h1 {
-    font-size: 100%;
-    color: #730E15;
-    line-height: 1.5em;
-  }
-
-  body > p {
-    width: 33em;
-    margin: 0 auto 1em;
-    padding: 1em 0;
-    background-color: #F7F7F7;
-    border: 1px solid #CCC;
-    border-right-color: #999;
-    border-bottom-color: #999;
-    border-bottom-left-radius: 4px;
-    border-bottom-right-radius: 4px;
-    border-top-color: #DADADA;
-    color: #666;
-    box-shadow:0 3px 8px rgba(50, 50, 50, 0.17);
-  }
-  </style>
-</head>
-
-<body>
-  <!-- This file lives in public/422.html -->
-  <div class="dialog">
-    <h1>The change you wanted was rejected.</h1>
-    <p>Maybe you tried to change something you didn't have access to.</p>
-  </div>
-  <p>If you are the application owner check the logs for more information.</p>
-</body>
-</html>
diff --git a/test/dummy/public/500.html b/test/dummy/public/500.html
deleted file mode 100644
index e9052d3..0000000
--- a/test/dummy/public/500.html
+++ /dev/null
@@ -1,57 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title>We're sorry, but something went wrong (500)</title>
-  <style>
-  body {
-    background-color: #EFEFEF;
-    color: #2E2F30;
-    text-align: center;
-    font-family: arial, sans-serif;
-  }
-
-  div.dialog {
-    width: 25em;
-    margin: 4em auto 0 auto;
-    border: 1px solid #CCC;
-    border-right-color: #999;
-    border-left-color: #999;
-    border-bottom-color: #BBB;
-    border-top: #B00100 solid 4px;
-    border-top-left-radius: 9px;
-    border-top-right-radius: 9px;
-    background-color: white;
-    padding: 7px 4em 0 4em;
-  }
-
-  h1 {
-    font-size: 100%;
-    color: #730E15;
-    line-height: 1.5em;
-  }
-
-  body > p {
-    width: 33em;
-    margin: 0 auto 1em;
-    padding: 1em 0;
-    background-color: #F7F7F7;
-    border: 1px solid #CCC;
-    border-right-color: #999;
-    border-bottom-color: #999;
-    border-bottom-left-radius: 4px;
-    border-bottom-right-radius: 4px;
-    border-top-color: #DADADA;
-    color: #666;
-    box-shadow:0 3px 8px rgba(50, 50, 50, 0.17);
-  }
-  </style>
-</head>
-
-<body>
-  <!-- This file lives in public/500.html -->
-  <div class="dialog">
-    <h1>We're sorry, but something went wrong.</h1>
-  </div>
-  <p>If you are the application owner check the logs for more information.</p>
-</body>
-</html>
diff --git a/test/dummy/public/favicon.ico b/test/dummy/public/favicon.ico
deleted file mode 100644
index e69de29..0000000
diff --git a/test/lib/generators/simple_captcha/dummy/dummy_generator.rb b/test/lib/generators/simple_captcha/dummy/dummy_generator.rb
index 6acc2ff..e6819b4 100644
--- a/test/lib/generators/simple_captcha/dummy/dummy_generator.rb
+++ b/test/lib/generators/simple_captcha/dummy/dummy_generator.rb
@@ -49,27 +49,27 @@ def test_dummy_config
 
     protected
 
-      def dummy_path
-        'test/dummy'
-      end
+    def dummy_path
+      'test/dummy'
+    end
 
-      def module_name
-        'Dummy'
-      end
+    def module_name
+      'Dummy'
+    end
 
-      def application_definition
-        @application_definition ||= begin
-          dummy_application_path = File.expand_path("#{dummy_path}/config/application.rb", destination_root)
-          unless options[:pretend] || !File.exists?(dummy_application_path)
-            contents = File.read(dummy_application_path)
-            contents[(contents.index("module #{module_name}"))..-1]
-          end
-        end
-      end
-      alias :store_application_definition! :application_definition
+    def application_definition
+      @application_definition ||= begin
+                                    dummy_application_path = File.expand_path("#{dummy_path}/config/application.rb", destination_root)
+                                    unless options[:pretend] || !File.exists?(dummy_application_path)
+                                      contents = File.read(dummy_application_path)
+                                      contents[(contents.index("module #{module_name}"))..-1]
+                                    end
+                                  end
+    end
+    alias :store_application_definition! :application_definition
 
-      def gemfile_path
-        '../../../../Gemfile'
-      end
+    def gemfile_path
+      '../../../../Gemfile'
+    end
   end
 end
diff --git a/test/lib/generators/simple_captcha/dummy/templates/app/views/views/layouts/application.html.erb b/test/lib/generators/simple_captcha/dummy/templates/app/views/layouts/application.html.erb
similarity index 100%
rename from test/lib/generators/simple_captcha/dummy/templates/app/views/views/layouts/application.html.erb
rename to test/lib/generators/simple_captcha/dummy/templates/app/views/layouts/application.html.erb
diff --git a/test/lib/generators/simple_captcha/dummy/templates/app/views/views/pages/form_tag.html.erb b/test/lib/generators/simple_captcha/dummy/templates/app/views/pages/form_tag.html.erb
similarity index 100%
rename from test/lib/generators/simple_captcha/dummy/templates/app/views/views/pages/form_tag.html.erb
rename to test/lib/generators/simple_captcha/dummy/templates/app/views/pages/form_tag.html.erb
diff --git a/test/lib/generators/simple_captcha/dummy/templates/app/views/views/pages/model_tag.html.erb b/test/lib/generators/simple_captcha/dummy/templates/app/views/pages/model_tag.html.erb
similarity index 100%
rename from test/lib/generators/simple_captcha/dummy/templates/app/views/views/pages/model_tag.html.erb
rename to test/lib/generators/simple_captcha/dummy/templates/app/views/pages/model_tag.html.erb
diff --git a/test/lib/generators/simple_captcha/dummy/templates/app/views/views/simple_captcha/_simple_captcha.erb b/test/lib/generators/simple_captcha/dummy/templates/app/views/simple_captcha/_simple_captcha.erb
similarity index 100%
rename from test/lib/generators/simple_captcha/dummy/templates/app/views/views/simple_captcha/_simple_captcha.erb
rename to test/lib/generators/simple_captcha/dummy/templates/app/views/simple_captcha/_simple_captcha.erb

From 264db563b39fac112dfa7a3a28ffaef77df80770 Mon Sep 17 00:00:00 2001
From: Stefan Wienert <stefan.wienert@pludoni.de>
Date: Mon, 4 Nov 2013 21:25:41 +0100
Subject: [PATCH 015/115] finalized dummy rake task and travis build command

---
 .travis.yml |  3 +++
 Rakefile    | 21 ++++++++++++++-------
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f4a672e..d055dff 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,3 +25,6 @@ matrix:
 before_script:
   - mysql -e 'create database myapp_test'
   - psql -c 'create database myapp_test' -U postgres
+  - rake dummy:setup
+  - rake app:db:migrate
+  - rake app:db:migrate RAILS_ENV=test
diff --git a/Rakefile b/Rakefile
index 896ae61..2232273 100644
--- a/Rakefile
+++ b/Rakefile
@@ -19,18 +19,25 @@ if File.exists? APP_RAKEFILE
   load 'rails/tasks/engine.rake'
 end
 
+namespace :dummy do
+  desc 'Setup dummy Rails app for test purpose'
+  task :setup do
+    require 'rails'
+    require 'simple_captcha'
+    require File.expand_path('../test/lib/generators/simple_captcha/dummy/dummy_generator', __FILE__)
+    SimpleCaptcha::DummyGenerator.start %w(--quiet)
+  end
+
+  desc 'destroy dummy Rails app under test/dummy'
+  task :destroy do
+    FileUtils.rm_rf "test/dummy" if File.exists?("test/dummy")
+  end
 
-desc 'Setup dummy Rails app for test purpose'
-task :setup_dummy_app do
-  require 'rails'
-  require 'simple_captcha'
-  require File.expand_path('../test/lib/generators/simple_captcha/dummy/dummy_generator', __FILE__)
-
-  SimpleCaptcha::DummyGenerator.start %w(--quiet)
 end
 
 
 
+
 Bundler::GemHelper.install_tasks
 
 require 'rake/testtask'

From e70d34d25e77292b713831c709bbd80220ac001e Mon Sep 17 00:00:00 2001
From: Stefan Wienert <stefan.wienert@pludoni.de>
Date: Mon, 4 Nov 2013 22:28:36 +0100
Subject: [PATCH 016/115] Formtastic version 2.2 and Rails 3.2 tested and
 supported with new custom input.

---
 .travis.yml                                   | 16 +++---------
 Gemfile                                       |  7 +++--
 gemfiles/Gemfile.default                      |  8 ------
 gemfiles/Gemfile.rails32                      |  6 -----
 lib/simple_captcha/engine.rb                  |  6 +----
 lib/simple_captcha/formtastic.rb              | 16 +++++++-----
 lib/simple_captcha/simple_captcha_data.rb     |  5 +++-
 test/features/form_helper_test.rb             |  6 -----
 test/features/formtastic_test.rb              | 26 +++++++++++++++++++
 .../simple_captcha/dummy/dummy_generator.rb   |  2 +-
 .../app/controllers/pages_controller.rb       | 13 ++++++++++
 .../app/views/pages/formtastic_tag.html.erb   |  8 ++++++
 .../dummy/templates/config/routes.rb          |  2 ++
 test/model.rb                                 | 24 +++++++++++++++++
 test/test_helper.rb                           |  1 +
 15 files changed, 99 insertions(+), 47 deletions(-)
 delete mode 100644 gemfiles/Gemfile.default
 delete mode 100644 gemfiles/Gemfile.rails32
 create mode 100644 test/features/formtastic_test.rb
 create mode 100644 test/lib/generators/simple_captcha/dummy/templates/app/views/pages/formtastic_tag.html.erb
 create mode 100644 test/model.rb

diff --git a/.travis.yml b/.travis.yml
index d055dff..0a9dd00 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,20 +7,12 @@ rvm:
   - '1.9.3'
   - '2.0.0'
 
-gemfile:
-  - gemfiles/Gemfile.default
-  - gemfiles/Gemfile.rails32
-
 env:
-  - DB=sqlite
-  # - DB=mysql
-  # - DB=postgresql
+  - DB=sqlite                     RAILS='~> 4.0'
+  - DB=mysql                      RAILS='~> 4.0'
+  - DB=sqlite FORMTASTIC='~> 2.2' RAILS='~> 3.2'
+  - DB=sqlite FORMTASTIC='~> 2.2' RAILS='~> 4.0'
 
-matrix:
-  exclude:
-    - rvm: 1.9.3
-      gemfile: gemfiles/Gemfile.rails32
-      env: DB=sqlite
 
 before_script:
   - mysql -e 'create database myapp_test'
diff --git a/Gemfile b/Gemfile
index c848148..b50716b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,6 +2,9 @@ source "https://rubygems.org"
 
 gemspec
 
-gem 'mysql2'
-gem 'pg'
 gem 'sqlite3'
+gem 'rails', ENV['RAILS'] || '~> 4.0'
+
+if ENV['FORMTASTIC']
+  gem 'formtastic', ENV['FORMTASTIC']
+end
diff --git a/gemfiles/Gemfile.default b/gemfiles/Gemfile.default
deleted file mode 100644
index 4e52ac6..0000000
--- a/gemfiles/Gemfile.default
+++ /dev/null
@@ -1,8 +0,0 @@
-source "https://rubygems.org"
-
-gemspec :path => '../'
-
-gem 'mysql2'
-gem 'pg'
-gem 'sqlite3'
-gem 'rails', '~> 4.0'
diff --git a/gemfiles/Gemfile.rails32 b/gemfiles/Gemfile.rails32
deleted file mode 100644
index e6373b8..0000000
--- a/gemfiles/Gemfile.rails32
+++ /dev/null
@@ -1,6 +0,0 @@
-source "https://rubygems.org"
-
-gemspec :path => '../'
-
-gem 'sqlite3'
-gem 'rails', '~> 3.2'
diff --git a/lib/simple_captcha/engine.rb b/lib/simple_captcha/engine.rb
index 7a7ecfd..5f1382c 100644
--- a/lib/simple_captcha/engine.rb
+++ b/lib/simple_captcha/engine.rb
@@ -15,11 +15,7 @@ class Engine < ::Rails::Engine
       ActionView::Helpers::FormBuilder.send(:include, SimpleCaptcha::FormBuilder)
 
       if Object.const_defined?("Formtastic")
-        if Formtastic.const_defined?("Helpers")
-          Formtastic::Helpers::FormHelper.builder = SimpleCaptcha::CustomFormBuilder
-        else
-          Formtastic::SemanticFormHelper.builder = SimpleCaptcha::CustomFormBuilder
-        end
+        require 'simple_captcha/formtastic'
       end
     end
 
diff --git a/lib/simple_captcha/formtastic.rb b/lib/simple_captcha/formtastic.rb
index a149ca9..1f4efd6 100644
--- a/lib/simple_captcha/formtastic.rb
+++ b/lib/simple_captcha/formtastic.rb
@@ -1,11 +1,15 @@
-module SimpleCaptcha
-  class CustomFormBuilder < (defined?(::Formtastic::FormBuilder) ? Formtastic::FormBuilder : ::Formtastic::SemanticFormBuilder)
-
-    private
+if defined? Formtastic
+  require 'formtastic/version'
+  if Formtastic::VERSION < '2.2'
+    raise 'Only Formtastic Version 2.2 or greater is supported by SimpleCaptcha'
+  end
 
-    def simple_captcha_input(method, options)
+  class SimpleCaptchaInput
+    include Formtastic::Inputs::Base
+    def to_html
       options.update :object => sanitized_object_name
-      self.send(:show_simple_captcha, options)
+      builder.send(:show_simple_captcha, options)
     end
   end
+
 end
diff --git a/lib/simple_captcha/simple_captcha_data.rb b/lib/simple_captcha/simple_captcha_data.rb
index 37b5b28..12bf89f 100644
--- a/lib/simple_captcha/simple_captcha_data.rb
+++ b/lib/simple_captcha/simple_captcha_data.rb
@@ -8,11 +8,14 @@ class SimpleCaptchaData < ::ActiveRecord::Base
     else
       set_table_name "simple_captcha_data"
     end
+    if defined? attr_protected
+      attr_protected
+    end
 
 
     class << self
       def get_data(key)
-        data = where(key: key).first || new(key: key)
+        where(key: key).first || new(key: key)
       end
 
       def remove_data(key)
diff --git a/test/features/form_helper_test.rb b/test/features/form_helper_test.rb
index 365aa13..d9e3b4f 100644
--- a/test/features/form_helper_test.rb
+++ b/test/features/form_helper_test.rb
@@ -1,11 +1,5 @@
 require 'test_helper'
 
-class User
-  include ActiveModel::Model
-  include SimpleCaptcha::ModelHelpers
-  apply_simple_captcha
-end
-
 class FormHelperTest  < ActionDispatch::IntegrationTest
   include Capybara::DSL
 
diff --git a/test/features/formtastic_test.rb b/test/features/formtastic_test.rb
new file mode 100644
index 0000000..e824538
--- /dev/null
+++ b/test/features/formtastic_test.rb
@@ -0,0 +1,26 @@
+if defined? Formtastic
+  require 'test_helper'
+  class FormtasticTest  < ActionDispatch::IntegrationTest
+    include Capybara::DSL
+
+    setup do
+      SimpleCaptcha.always_pass = false
+    end
+
+    test 'displays captcha and passes' do
+      visit '/pages/formtastic_tag'
+      assert_equal 1, SimpleCaptcha::SimpleCaptchaData.count
+      fill_in 'user[captcha]', with: SimpleCaptcha::SimpleCaptchaData.first.value
+      find('input[type=submit]').click
+      assert page.has_content? 'captcha valid'
+    end
+
+    test 'captcha fails' do
+      visit '/pages/formtastic_tag'
+      assert_equal 1, SimpleCaptcha::SimpleCaptchaData.count
+      fill_in 'user[captcha]', with: 'something else'
+      find('input[type=submit]').click
+      assert page.has_no_content? 'captcha not valid'
+    end
+  end
+end
diff --git a/test/lib/generators/simple_captcha/dummy/dummy_generator.rb b/test/lib/generators/simple_captcha/dummy/dummy_generator.rb
index e6819b4..d753485 100644
--- a/test/lib/generators/simple_captcha/dummy/dummy_generator.rb
+++ b/test/lib/generators/simple_captcha/dummy/dummy_generator.rb
@@ -17,7 +17,7 @@ def self.source_paths
     ]
 
     def generate_test_dummy
-      opts = (options || {}).slice(*PASSTHROUGH_OPTIONS)
+      opts = (options || {}).slice(*PASSTHROUGH_OPTIONS) || {} # rails 3.2 ? -> slice is nil
       opts[:force] = true
       opts[:skip_bundle] = true
       opts[:old_style_hash] = true
diff --git a/test/lib/generators/simple_captcha/dummy/templates/app/controllers/pages_controller.rb b/test/lib/generators/simple_captcha/dummy/templates/app/controllers/pages_controller.rb
index 814f4dd..7824f56 100644
--- a/test/lib/generators/simple_captcha/dummy/templates/app/controllers/pages_controller.rb
+++ b/test/lib/generators/simple_captcha/dummy/templates/app/controllers/pages_controller.rb
@@ -22,4 +22,17 @@ def model_tag_submit
       render text: 'captcha not valid!'
     end
   end
+
+  def formtastic_tag
+    @user = User.new
+  end
+
+  def formtastic_tag_submit
+    @user = User.new(params[:user])
+    if @user.valid_with_captcha?
+      render text: 'captcha valid!'
+    else
+      render :formtastic_tag
+    end
+  end
 end
diff --git a/test/lib/generators/simple_captcha/dummy/templates/app/views/pages/formtastic_tag.html.erb b/test/lib/generators/simple_captcha/dummy/templates/app/views/pages/formtastic_tag.html.erb
new file mode 100644
index 0000000..d688478
--- /dev/null
+++ b/test/lib/generators/simple_captcha/dummy/templates/app/views/pages/formtastic_tag.html.erb
@@ -0,0 +1,8 @@
+
+<h1>Pages#index</h1>
+
+<%= semantic_form_for @user, url: '', :method => :post do |f| %>
+  <%= f.input :capcha, as: :simple_captcha %>
+  <%= f.submit %>
+<% end %>
+
diff --git a/test/lib/generators/simple_captcha/dummy/templates/config/routes.rb b/test/lib/generators/simple_captcha/dummy/templates/config/routes.rb
index 08eb576..c77c724 100644
--- a/test/lib/generators/simple_captcha/dummy/templates/config/routes.rb
+++ b/test/lib/generators/simple_captcha/dummy/templates/config/routes.rb
@@ -3,4 +3,6 @@
   post "pages/form_tag" => 'pages#form_tag_submit'
   get "pages/model_tag"
   post "pages/model_tag" => 'pages#model_tag_submit'
+  get "pages/formtastic_tag"
+  post "pages/formtastic_tag" => 'pages#formtastic_tag_submit'
 end
diff --git a/test/model.rb b/test/model.rb
new file mode 100644
index 0000000..90aad13
--- /dev/null
+++ b/test/model.rb
@@ -0,0 +1,24 @@
+
+if Rails.version > '4.0'
+  class User
+    include ActiveModel::Model
+    include SimpleCaptcha::ModelHelpers
+    apply_simple_captcha
+  end
+else
+  class User
+    include ActiveModel::Validations
+    include ActiveModel::Conversion
+    extend ActiveModel::Naming
+    include SimpleCaptcha::ModelHelpers
+    include ActiveModel::MassAssignmentSecurity
+    apply_simple_captcha
+    attr_accessible :key
+    def persisted?; false; end
+    def initialize(params={})
+      params.each do |attr, value|
+        self.public_send("#{attr}=", value)
+      end if params
+    end
+  end
+end
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 04e8888..26b9e35 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -6,6 +6,7 @@
 
 require 'capybara/rails'
 require 'pry'
+require 'model'
 Rails.backtrace_cleaner.remove_silencers!
 
 # Load support files

From 03f99e73046f6bde0da03d9e2b02623768336c80 Mon Sep 17 00:00:00 2001
From: Stefan Wienert <stefan.wienert@pludoni.de>
Date: Mon, 4 Nov 2013 22:32:10 +0100
Subject: [PATCH 017/115] attr_protected only for Rails 3

---
 README.rdoc                               | 11 +++++++++++
 lib/simple_captcha/simple_captcha_data.rb |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/README.rdoc b/README.rdoc
index 854656c..35e6fc5 100644
--- a/README.rdoc
+++ b/README.rdoc
@@ -211,6 +211,17 @@ You can change the CSS of the SimpleCaptcha DOM elements as per your need in thi
       default: "Secret Code did not match with the Image"
       user: "The secret Image and code were different"
 
+==Contributing
+
+For testing, generate a temporary Rails dummy app inside test:
+
+  rake dummy:setup
+  rake app:db:migrate
+  rake app:db:migrate RAILS_ENV=test
+  rake test
+
+Please add test cases when adding new functionality. I started with some basic example integration tests for a very basic coverage.
+
 ==Who's who?
 
 Enjoy the simplest captcha implementation.
diff --git a/lib/simple_captcha/simple_captcha_data.rb b/lib/simple_captcha/simple_captcha_data.rb
index 12bf89f..703d130 100644
--- a/lib/simple_captcha/simple_captcha_data.rb
+++ b/lib/simple_captcha/simple_captcha_data.rb
@@ -8,7 +8,7 @@ class SimpleCaptchaData < ::ActiveRecord::Base
     else
       set_table_name "simple_captcha_data"
     end
-    if defined? attr_protected
+    if ::ActiveRecord::VERSION::MAJOR == 3 and defined? attr_protected
       attr_protected
     end
 

From 133946578053123b73ddf33831a847657e413951 Mon Sep 17 00:00:00 2001
From: Stefan Wienert <stefan.wienert@pludoni.de>
Date: Mon, 4 Nov 2013 22:54:42 +0100
Subject: [PATCH 018/115] mysql support

---
 .travis.yml | 7 +++++++
 Gemfile     | 4 ++++
 2 files changed, 11 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 0a9dd00..59d0354 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,6 +13,13 @@ env:
   - DB=sqlite FORMTASTIC='~> 2.2' RAILS='~> 3.2'
   - DB=sqlite FORMTASTIC='~> 2.2' RAILS='~> 4.0'
 
+matrix:
+  exclude:
+    - rvm: 1.9.3
+      env: DB=mysql RAILS='~> 4.0'
+    - rvm: 1.9.3
+      env: DB=sqlite FORMTASTIC='~> 2.2' RAILS='~> 4.0'
+
 
 before_script:
   - mysql -e 'create database myapp_test'
diff --git a/Gemfile b/Gemfile
index b50716b..4c59138 100644
--- a/Gemfile
+++ b/Gemfile
@@ -5,6 +5,10 @@ gemspec
 gem 'sqlite3'
 gem 'rails', ENV['RAILS'] || '~> 4.0'
 
+if ENV['DB'] and ENV['DB']['mysql']
+  gem 'mysql2'
+end
+
 if ENV['FORMTASTIC']
   gem 'formtastic', ENV['FORMTASTIC']
 end

From cc68800aa90ee077c3cc375f14681f9c16a53151 Mon Sep 17 00:00:00 2001
From: freemanoid <freemanoid321@gmail.com>
Date: Sat, 30 Nov 2013 23:40:55 +0300
Subject: [PATCH 019/115] Add refresh button

---
 README.rdoc                          |  1 +
 lib/generators/templates/partial.erb |  4 +++
 lib/simple_captcha/middleware.rb     | 40 ++++++++++++++++++++++------
 lib/simple_captcha/view.rb           | 35 +++++++++++++++++-------
 4 files changed, 63 insertions(+), 17 deletions(-)

diff --git a/README.rdoc b/README.rdoc
index 35e6fc5..c19e4b3 100644
--- a/README.rdoc
+++ b/README.rdoc
@@ -14,6 +14,7 @@ backward compatibility with previous versions of Rails.
 * Implementation is as easy as just writing a single line in your view. "<%= show_simple_captcha %>" within the 'form' tags.
 * Flexible DOM and CSS handling(There is a separate view partial for rednering SimpleCaptcha DOM elements).
 * Automated removal of 1 hour old unmatched simple_captcha data.
+* Refresh button to refresh captcha
 
 ==Requirements
 
diff --git a/lib/generators/templates/partial.erb b/lib/generators/templates/partial.erb
index 3ad8590..37bcd8a 100644
--- a/lib/generators/templates/partial.erb
+++ b/lib/generators/templates/partial.erb
@@ -34,4 +34,8 @@
   <div class='simple_captcha_label'>
     <%%= simple_captcha_options[:label] %>
   </div>
+
+  <div class='simple_captcha_refresh_button'>
+    <%%= simple_captcha_options[:refresh_button] %>
+  </div>
 </div>
diff --git a/lib/simple_captcha/middleware.rb b/lib/simple_captcha/middleware.rb
index cd10455..7430505 100644
--- a/lib/simple_captcha/middleware.rb
+++ b/lib/simple_captcha/middleware.rb
@@ -2,7 +2,8 @@
 module SimpleCaptcha
   class Middleware
     include SimpleCaptcha::ImageHelpers
-    
+    include SimpleCaptcha::ViewHelper
+
     DEFAULT_SEND_FILE_OPTIONS = {
       :type         => 'application/octet-stream'.freeze,
       :disposition  => 'attachment'.freeze,
@@ -15,7 +16,12 @@ def initialize(app, options={})
     
     def call(env) # :nodoc:
       if env["REQUEST_METHOD"] == "GET" && captcha_path?(env['PATH_INFO'])
-        make_image(env)
+        request = Rack::Request.new(env)
+        if request.params.present? && request.params['code'].present?
+          make_image(env)
+        else
+          refresh_code(env)
+        end
       else
         @app.call(env)
       end
@@ -26,17 +32,17 @@ def make_image(env, headers = {}, status = 404)
         request = Rack::Request.new(env)
         code = request.params["code"]
         body = []
-        
-        if !code.blank? && Utils::simple_captcha_value(code)
+
+        if Utils::simple_captcha_value(code)
           #status, headers, body = @app.call(env)
           #status = 200
           #body = generate_simple_captcha_image(code)
           #headers['Content-Type'] = 'image/jpeg'
-          
-          return send_file(generate_simple_captcha_image(code), :type => 'image/jpeg', :disposition => 'inline', :filename =>  'simple_captcha.jpg')
+
+          send_file(generate_simple_captcha_image(code), :type => 'image/jpeg', :disposition => 'inline', :filename =>  'simple_captcha.jpg')
+        else
+          [status, headers, body]
         end
-        
-        [status, headers, body]
       end
       
       def captcha_path?(request_path)
@@ -54,5 +60,23 @@ def send_file(path, options = {})
         
         [status, headers, response_body]
       end
+
+      def refresh_code(env)
+        request = Rack::Request.new(env)
+
+        request.session.delete :captcha
+        key = simple_captcha_key(nil, request)
+        options = {}
+        options[:field_value] = set_simple_captcha_data(key, options)
+        url = simple_captcha_image_url(key, options)
+
+        status = 200
+        body = %Q{
+                    $("#captcha_image").attr('src', '#{url}');
+                    $("#captcha_key").attr('value', '#{key}');
+                  }
+        headers = {'Content-Type' => 'text/javascript; charset=utf-8', "Content-Disposition" => "inline; filename='captcha.js'", "Content-Length" => body.length.to_s}
+        [status, headers, [body]]
+      end
   end
 end
diff --git a/lib/simple_captcha/view.rb b/lib/simple_captcha/view.rb
index fc57080..0363d85 100644
--- a/lib/simple_captcha/view.rb
+++ b/lib/simple_captcha/view.rb
@@ -49,7 +49,8 @@ def show_simple_captcha(options={})
       defaults = {
          :image => simple_captcha_image(key, options),
          :label => options[:label] || I18n.t('simple_captcha.label'),
-         :field => simple_captcha_field(options)
+         :field => simple_captcha_field(options),
+         :refresh_button => simple_captcha_refresh_button(options)
          }
          
       render :partial => 'simple_captcha/simple_captcha', :locals => { :simple_captcha_options => defaults }
@@ -63,10 +64,18 @@ def simple_captcha_image(simple_captcha_key, options = {})
         
         query = defaults.collect{ |key, value| "#{key}=#{value}" }.join('&')
         url = "#{ENV['RAILS_RELATIVE_URL_ROOT']}/simple_captcha?code=#{simple_captcha_key}&#{query}"
-        
-        tag('img', :src => url, :alt => 'captcha')
+
+        tag('img', :src => url, :alt => 'captcha', :id => 'captcha_image')
       end
-      
+
+      def simple_captcha_image_url(simple_captcha_key, options = {})
+        defaults = {}
+        defaults[:time] = options[:time] || Time.now.to_i
+
+        query = defaults.collect{ |key, value| "#{key}=#{value}" }.join('&')
+        "#{ENV['RAILS_RELATIVE_URL_ROOT']}/simple_captcha?code=#{simple_captcha_key}&#{query}"
+      end
+
       def simple_captcha_field(options={})
         html = {:autocomplete => 'off', :required => 'required'}
         html.merge!(options[:input_html] || {})
@@ -81,6 +90,14 @@ def simple_captcha_field(options={})
         end
       end
 
+      def simple_captcha_refresh_button(options={})
+        html = {remote: true}
+        html.merge!(options[:refresh_button_html] || {})
+        text = options[:refresh_button_text] || :refresh
+
+        link_to(text, "#{ENV['RAILS_RELATIVE_URL_ROOT']}/simple_captcha", html)
+      end
+
       def set_simple_captcha_data(key, options={})
         code_type = options[:code_type]
         
@@ -103,13 +120,13 @@ def generate_simple_captcha_data(code)
         
         return value
       end
-      
-      def simple_captcha_key(key_name = nil)
+
+      def simple_captcha_key(key_name = nil, request = request)
         if key_name.nil?
-          session[:captcha] ||= SimpleCaptcha::Utils.generate_key(session[:id].to_s, 'captcha')
+          request.session[:captcha] ||= SimpleCaptcha::Utils.generate_key(request.session[:id].to_s, 'captcha')
         else
-          SimpleCaptcha::Utils.generate_key(session[:id].to_s, key_name)
+          SimpleCaptcha::Utils.generate_key(request.session[:id].to_s, key_name)
         end
-      end 
+      end
   end
 end

From 1b396cd371563fe127575653a18890c8b12edba4 Mon Sep 17 00:00:00 2001
From: Alexandr Elhovenko <freemanoid321@gmail.com>
Date: Sun, 1 Dec 2013 14:32:51 +0200
Subject: [PATCH 020/115] Correct contributing part of README according to
 travis config

As I can see we _always_ need to use dummy app for testing.
---
 README.rdoc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.rdoc b/README.rdoc
index 35e6fc5..868c30c 100644
--- a/README.rdoc
+++ b/README.rdoc
@@ -218,6 +218,8 @@ For testing, generate a temporary Rails dummy app inside test:
   rake dummy:setup
   rake app:db:migrate
   rake app:db:migrate RAILS_ENV=test
+  export BUNDLE_GEMFILE=$PWD/Gemfile
+  cd test/dummy && rake db:migrate db:test:prepare
   rake test
 
 Please add test cases when adding new functionality. I started with some basic example integration tests for a very basic coverage.

From 08f977c5f2b07958593f5dea67b03bdd7d307b89 Mon Sep 17 00:00:00 2001
From: freemanoid <freemanoid321@gmail.com>
Date: Sun, 1 Dec 2013 16:33:10 +0300
Subject: [PATCH 021/115] Add boot.rb with custom Gemfile path

---
 test/lib/generators/simple_captcha/dummy/dummy_generator.rb   | 1 +
 .../generators/simple_captcha/dummy/templates/config/boot.rb  | 4 ++++
 2 files changed, 5 insertions(+)
 create mode 100644 test/lib/generators/simple_captcha/dummy/templates/config/boot.rb

diff --git a/test/lib/generators/simple_captcha/dummy/dummy_generator.rb b/test/lib/generators/simple_captcha/dummy/dummy_generator.rb
index d753485..782221d 100644
--- a/test/lib/generators/simple_captcha/dummy/dummy_generator.rb
+++ b/test/lib/generators/simple_captcha/dummy/dummy_generator.rb
@@ -45,6 +45,7 @@ def test_dummy_config
       directory "app", "#{dummy_path}/app"
       copy_file "config/database.yml", "#{dummy_path}/config/database.yml", :force => true
       template "config/routes.rb", "#{dummy_path}/config/routes.rb", :force => true
+      copy_file "config/boot.rb", "#{dummy_path}/config/boot.rb", :force => true
     end
 
     protected
diff --git a/test/lib/generators/simple_captcha/dummy/templates/config/boot.rb b/test/lib/generators/simple_captcha/dummy/templates/config/boot.rb
new file mode 100644
index 0000000..acb11b9
--- /dev/null
+++ b/test/lib/generators/simple_captcha/dummy/templates/config/boot.rb
@@ -0,0 +1,4 @@
+# Set up gems listed in the Gemfile.
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../../Gemfile', __FILE__)
+
+require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])

From 161fe63562c84619ad43020f76d9180ebe14ce90 Mon Sep 17 00:00:00 2001
From: Stefan Wienert <stefan.wienert@pludoni.de>
Date: Mon, 2 Dec 2013 00:15:16 +0100
Subject: [PATCH 022/115] renamed gem to pludoni-simple_captcha for now

---
 Gemfile                        |  2 +-
 Rakefile                       |  2 +-
 pludoni-simple_captcha.gemspec | 24 ++++++++++++++++++++++++
 3 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 pludoni-simple_captcha.gemspec

diff --git a/Gemfile b/Gemfile
index 4c59138..1402fd8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gemspec
+gemspec :name => 'pludoni-simple_captcha'
 
 gem 'sqlite3'
 gem 'rails', ENV['RAILS'] || '~> 4.0'
diff --git a/Rakefile b/Rakefile
index 2232273..2c0a93c 100644
--- a/Rakefile
+++ b/Rakefile
@@ -38,7 +38,7 @@ end
 
 
 
-Bundler::GemHelper.install_tasks
+Bundler::GemHelper.install_tasks :name => 'pludoni-simple_captcha'
 
 require 'rake/testtask'
 
diff --git a/pludoni-simple_captcha.gemspec b/pludoni-simple_captcha.gemspec
new file mode 100644
index 0000000..b9cbb32
--- /dev/null
+++ b/pludoni-simple_captcha.gemspec
@@ -0,0 +1,24 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "simple_captcha/version"
+
+Gem::Specification.new do |s|
+  s.name = "pludoni-simple_captcha"
+  s.version = SimpleCaptcha::VERSION.dup
+  s.platform = Gem::Platform::RUBY
+  s.summary = "SimpleCaptcha is the simplest and a robust captcha plugin."
+  s.description = "SimpleCaptcha is available to be used with Rails 3 + 4 or above and also it provides the backward compatibility with previous versions of Rails."
+  s.authors = ["Pavlo Galeta", "Igor Galeta", 'Stefan Wienert']
+  s.email = "stwienert@gmail.com"
+  s.homepage = "http://github.com/pludoni/simple-captcha"
+
+  s.files = Dir["{lib}/**/*"] + ["Rakefile", "README.rdoc"]
+  s.extra_rdoc_files = ["README.rdoc"]
+  s.require_paths = ["lib"]
+
+  s.add_dependency 'rails', '>= 3.1'
+  s.add_development_dependency "sqlite3"
+  s.add_development_dependency "capybara-mechanize"
+  s.add_development_dependency "pry"
+
+end

From d0852427674136dcd69802e48e6f081c37adf060 Mon Sep 17 00:00:00 2001
From: Stefan Wienert <stefan.wienert@pludoni.de>
Date: Mon, 2 Dec 2013 00:25:55 +0100
Subject: [PATCH 023/115] renamed to simple_captcha2

---
 Gemfile                                           |  2 +-
 README.rdoc                                       | 15 +++++++++------
 Rakefile                                          |  2 +-
 ...ple_captcha.gemspec => simple_captcha2.gemspec |  2 +-
 4 files changed, 12 insertions(+), 9 deletions(-)
 rename pludoni-simple_captcha.gemspec => simple_captcha2.gemspec (96%)

diff --git a/Gemfile b/Gemfile
index 1402fd8..850ef6b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gemspec :name => 'pludoni-simple_captcha'
+gemspec :name => 'simple_captcha2'
 
 gem 'sqlite3'
 gem 'rails', ENV['RAILS'] || '~> 4.0'
diff --git a/README.rdoc b/README.rdoc
index 868c30c..1193da4 100644
--- a/README.rdoc
+++ b/README.rdoc
@@ -1,18 +1,18 @@
-=SimpleCaptcha
+=SimpleCaptcha2
 
-SimpleCaptcha is the simplest and a robust captcha plugin. Its implementation requires
+SimpleCaptcha(2) is the simplest and a robust captcha plugin. Its implementation requires
 adding up a single line in views and in controllers/models.
-SimpleCaptcha is available to be used with Rails 3 or above and also it provides the
-backward compatibility with previous versions of Rails.
+SimpleCaptcha2 is available to be used with Rails 3 + 4.
+This is a fork of the popular Rubygem simple_captcha which got abandoned.
 
 ==Features
 
-* Zero FileSystem usage(secret code moved to db-store and image storage removed).
+* Zero FileSystem usage (secret code moved to db-store and image storage removed).
 * Provides various image styles.
 * Provides three level of complexity of images.
 * Works absolutely fine in distributed environment(session and db based implementation works fine in distributed environment).
 * Implementation is as easy as just writing a single line in your view. "<%= show_simple_captcha %>" within the 'form' tags.
-* Flexible DOM and CSS handling(There is a separate view partial for rednering SimpleCaptcha DOM elements).
+* Flexible DOM and CSS handling(There is a separate view partial for rendering SimpleCaptcha DOM elements).
 * Automated removal of 1 hour old unmatched simple_captcha data.
 
 ==Requirements
@@ -24,6 +24,9 @@ backward compatibility with previous versions of Rails.
 
 ==Installation
 
+  gem 'simple_captcha2'
+
+  # OR
 
   gem 'simple_captcha', :git => 'git://github.com/pludoni/simple-captcha.git'
 
diff --git a/Rakefile b/Rakefile
index 2c0a93c..df1c7b4 100644
--- a/Rakefile
+++ b/Rakefile
@@ -38,7 +38,7 @@ end
 
 
 
-Bundler::GemHelper.install_tasks :name => 'pludoni-simple_captcha'
+Bundler::GemHelper.install_tasks :name => 'simple_captcha2'
 
 require 'rake/testtask'
 
diff --git a/pludoni-simple_captcha.gemspec b/simple_captcha2.gemspec
similarity index 96%
rename from pludoni-simple_captcha.gemspec
rename to simple_captcha2.gemspec
index b9cbb32..932ce19 100644
--- a/pludoni-simple_captcha.gemspec
+++ b/simple_captcha2.gemspec
@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 require "simple_captcha/version"
 
 Gem::Specification.new do |s|
-  s.name = "pludoni-simple_captcha"
+  s.name = "simple_captcha2"
   s.version = SimpleCaptcha::VERSION.dup
   s.platform = Gem::Platform::RUBY
   s.summary = "SimpleCaptcha is the simplest and a robust captcha plugin."

From 0ba9297bd3219ff81e2dc8b874db020d025ff3d6 Mon Sep 17 00:00:00 2001
From: Stefan Wienert <stefan.wienert@pludoni.de>
Date: Mon, 2 Dec 2013 00:27:48 +0100
Subject: [PATCH 024/115] drop Ruby 1.8.7

---
 README.rdoc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.rdoc b/README.rdoc
index 1193da4..eef8e00 100644
--- a/README.rdoc
+++ b/README.rdoc
@@ -17,8 +17,8 @@ This is a fork of the popular Rubygem simple_captcha which got abandoned.
 
 ==Requirements
 
-* {Ruby}[http://ruby-lang.org/] >= 1.8.7
-* {Rails}[http://github.com/rails/rails] >= 3
+* {Ruby}[http://ruby-lang.org/] >= 1.9.3
+* {Rails}[http://github.com/rails/rails] >= 3.2
 * ImageMagick should be installed on your machine to use this plugin.
   visit http://www.imagemagick.org/script/index.php for more details.
 
@@ -28,7 +28,7 @@ This is a fork of the popular Rubygem simple_captcha which got abandoned.
 
   # OR
 
-  gem 'simple_captcha', :git => 'git://github.com/pludoni/simple-captcha.git'
+  gem 'simple_captcha2', :git => 'git://github.com/pludoni/simple-captcha.git'
 
 ==Setup
 

From 251d423a2b8419de29b8ce7386f8e342eb80c908 Mon Sep 17 00:00:00 2001
From: Stefan Wienert <stefan.wienert@pludoni.de>
Date: Mon, 2 Dec 2013 00:46:50 +0100
Subject: [PATCH 025/115] converted README to markdown with syntax highlighting

---
 README.md   | 293 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 README.rdoc |   2 +
 2 files changed, 295 insertions(+)
 create mode 100644 README.md

diff --git a/README.md b/README.md
new file mode 100644
index 0000000..93e5016
--- /dev/null
+++ b/README.md
@@ -0,0 +1,293 @@
+#SimpleCaptcha2
+
+[![Build Status](https://travis-ci.org/pludoni/simple-captcha.png?branch=master)](https://travis-ci.org/pludoni/simple-captcha)
+
+SimpleCaptcha(2) is the simplest and a robust captcha plugin. Its implementation requires adding up a single line in views and in controllers/models.
+SimpleCaptcha2 is available to be used with Rails 3 + 4.
+This is a fork of the popular Rubygem ``simple_captcha`` which got abandoned.
+
+##Features
+
+* Zero FileSystem usage (secret code moved to db-store and image storage removed).
+* Provides various image styles.
+* Provides three level of complexity of images.
+* Works absolutely fine in distributed environment(session and db based implementation works fine in distributed environment).
+* Implementation is as easy as just writing a single line in your view. ```<%= show_simple_captcha %>``` within the 'form' tags.
+* Flexible DOM and CSS handling(There is a separate view partial for rendering SimpleCaptcha DOM elements).
+* Automated removal of 1 hour old unmatched simple_captcha data.
+
+##Requirements
+
+* Ruby >= 1.9.3
+* Rails >= 3.2
+* ImageMagick should be installed on your machine to use this plugin.
+  visit http://www.imagemagick.org/script/index.php for more details.
+
+##Installation
+
+Put this into your Gemfile
+
+```ruby
+gem 'simple_captcha2'
+```
+
+and run ``bundle install``.
+
+## Setup
+
+After installation, follow these simple steps to setup the plugin. The setup will depend on the version of rails your application is using.
+
+```bash
+rails generate simple_captcha
+rake db:migrate
+```
+
+## Usage
+
+There are two usage scenarios:
+
+### Controller Based
+
+Add the following line in the file "app/controllers/application.rb"
+
+```ruby
+ApplicationController < ActionController::Base
+  include SimpleCaptcha::ControllerHelpers
+end
+```
+
+In the view file within the form tags add this code
+
+```erb
+<%= show_simple_captcha %>
+```
+
+and in the controller's action authenticate it as
+
+```ruby
+if simple_captcha_valid?
+  do this
+else
+  do that
+end
+```
+
+### Model Based
+
+This is suggested, if you want to integrate the error message into the normal form validation flow.
+
+In the view file within the form tags write this code
+
+```erb
+<%= show_simple_captcha(:object=>"user") %>
+```
+
+and in the model class add this code
+
+```ruby
+class User < ActiveRecord::Base
+  apply_simple_captcha
+end
+```
+
+####Form-Builder helper
+
+```erb
+<%= form_for @user do |form| -%>
+  ...
+  <%= form.simple_captcha :label => "Enter numbers.." %>
+  ...
+<% end -%>
+```
+
+####Validating with captcha
+
+NOTE: @user.valid? will still work as it should, it will not validate the captcha code.
+
+```ruby
+@user.valid_with_captcha?
+```
+
+####Saving with captcha
+
+NOTE: @user.save will still work as it should, it will not validate the captcha code.
+
+```ruby
+@user.save_with_captcha
+```
+
+##=Formtastic integration
+
+SimpleCaptcha detects if you are using Formtastic:
+
+```erb
+<%= form.input :captcha, :as => :simple_captcha %>
+```
+
+##Options & Examples
+
+###View Options
+
+* ``:label`` - provides the custom text b/w the image and the text field, the default is "type the code from the image"
+* ``:object`` - the name of the object of the model class, to implement the model based captcha.
+* ``:code_type`` - return numeric only if set to 'numeric'
+
+###Global options
+
+* ``:image_style`` - provides the specific image style for the captcha image.
+There are eight different styles available with the plugin as...
+
+  1. simply_blue
+  2. simply_red
+  3. simply_green
+  4. charcoal_grey
+  5. embosed_silver
+  6. all_black
+  7. distorted_black
+  8. almost_invisible
+
+Default style is 'simply_blue'.
+You can also specify 'random' to select the random image style.
+
+* ``:distortion`` - handles the complexity of the image. The :distortion can be set to 'low', 'medium' or 'high'. Default is 'low'.
+
+Create "./config/initializers/simple_captcha.rb"
+
+```ruby
+SimpleCaptcha.setup do |sc|
+  # default: 100x28
+  sc.image_size = '120x40'
+
+  # default: 5
+  sc.length = 6
+
+  # default: simply_blue
+  # possible values:
+  # 'embosed_silver',
+  # 'simply_red',
+  # 'simply_green',
+  # 'simply_blue',
+  # 'distorted_black',
+  # 'all_black',
+  # 'charcoal_grey',
+  # 'almost_invisible'
+  # 'random'
+  sc.image_style = 'simply_green'
+
+  # default: low
+  # possible values: 'low', 'medium', 'high', 'random'
+  sc.distortion = 'medium'
+end
+```
+
+You can add your own style:
+
+```ruby
+SimpleCaptcha.setup do |sc|
+  sc.image_style = 'mycaptha'
+  sc.add_image_style('mycaptha', [
+      "-background '#F4F7F8'",
+      "-fill '#86818B'",
+      "-border 1",
+      "-bordercolor '#E0E2E3'"])
+end
+```
+
+You can provide the path where image_magick is installed as well:
+
+```ruby
+SimpleCaptcha.setup do |sc|
+  sc.image_magick_path = '/usr/bin' # you can check this from console by running: which convert
+end
+```
+
+You can provide the path where should be stored tmp files.
+It's usefull when you dont have acces to /tmp (default directory)
+
+```ruby
+SimpleCaptcha.setup do |sc|
+  sc.tmp_path = '/tmp' # or somewhere in project eg. Rails.root.join('tmp/simple_captcha').to_s, make shure directory exists
+end
+```
+
+
+### How to change the CSS for SimpleCaptcha DOM elements?
+
+You can change the CSS of the SimpleCaptcha DOM elements as per your need in this file.
+
+  ./app/views/simple_captcha/_simple_captcha.erb
+
+###View's Examples
+####Controller Based Example
+
+```erb
+<%= show_simple_captcha %>
+
+<%= show_simple_captcha(:label => "human authentication") %>
+```
+
+####Model Based Example
+
+```erb
+<%= show_simple_captcha(:object => 'user', :label => "human authentication") %>
+```
+
+####Model Options
+
+* ``:message`` - provides the custom message on failure of captcha authentication the default is "Secret Code did not match with the Image"
+
+* ``:add_to_base`` - if set to true, appends the error message to the base.
+
+####=Model's Example
+
+```ruby
+class User < ActiveRecord::Base
+  apply_simple_captcha
+end
+
+class User < ActiveRecord::Base
+  apply_simple_captcha :message => "The secret Image and code were different", :add_to_base => true
+end
+```
+
+
+##I18n
+
+```yaml
+en:
+  simple_captcha:
+    placeholder: "Enter the image value"
+    label: "Enter the code in the box:"
+    message:
+      default: "Secret Code did not match with the Image"
+      user: "The secret Image and code were different"
+```
+
+##Contributing
+
+For testing, generate a temporary Rails dummy app inside test:
+
+```bash
+rake dummy:setup
+rake app:db:migrate
+rake app:db:migrate RAILS_ENV=test
+export BUNDLE_GEMFILE=$PWD/Gemfile
+cd test/dummy && rake db:migrate db:test:prepare
+rake test
+```
+
+Please add test cases when adding new functionality. I started with some basic example integration tests for a very basic coverage.
+
+The tests will be run on [Travis-CI](https://travis-ci.org/pludoni/simple-captcha).
+
+##Who's who?
+
+Enjoy the simplest captcha implementation.
+
+Original Author of the Version for Rails 2:
+Author: Sur, Blog: http://expressica.com, Contact: sur.max@gmail.com
+Plugin Homepage: http://expressica.com/simple_captcha
+
+Plugin update for rails 3: http://github.com/galetahub
+
+update for Rails 4, tests and forked by Stefan Wienert (pludoni GmbH)
diff --git a/README.rdoc b/README.rdoc
index eef8e00..962f6b7 100644
--- a/README.rdoc
+++ b/README.rdoc
@@ -1,5 +1,7 @@
 =SimpleCaptcha2
 
+{<img src="https://travis-ci.org/pludoni/simple-captcha.png?branch=master" alt="Build Status" />}[https://travis-ci.org/pludoni/simple-captcha]
+
 SimpleCaptcha(2) is the simplest and a robust captcha plugin. Its implementation requires
 adding up a single line in views and in controllers/models.
 SimpleCaptcha2 is available to be used with Rails 3 + 4.

From b9774adc597a9d74da0942e0ad736a039b134884 Mon Sep 17 00:00:00 2001
From: Stefan Wienert <stefan.wienert@pludoni.de>
Date: Mon, 2 Dec 2013 00:48:25 +0100
Subject: [PATCH 026/115] deleted old README, fixed markdown formatting issues

---
 README.md   |  20 ++---
 README.rdoc | 246 ----------------------------------------------------
 2 files changed, 10 insertions(+), 256 deletions(-)
 delete mode 100644 README.rdoc

diff --git a/README.md b/README.md
index 93e5016..4edd57c 100644
--- a/README.md
+++ b/README.md
@@ -116,7 +116,7 @@ NOTE: @user.save will still work as it should, it will not validate the captcha
 @user.save_with_captcha
 ```
 
-##=Formtastic integration
+###Formtastic integration
 
 SimpleCaptcha detects if you are using Formtastic:
 
@@ -137,14 +137,14 @@ SimpleCaptcha detects if you are using Formtastic:
 * ``:image_style`` - provides the specific image style for the captcha image.
 There are eight different styles available with the plugin as...
 
-  1. simply_blue
-  2. simply_red
-  3. simply_green
-  4. charcoal_grey
-  5. embosed_silver
-  6. all_black
-  7. distorted_black
-  8. almost_invisible
+1. simply_blue
+2. simply_red
+3. simply_green
+4. charcoal_grey
+5. embosed_silver
+6. all_black
+7. distorted_black
+8. almost_invisible
 
 Default style is 'simply_blue'.
 You can also specify 'random' to select the random image style.
@@ -215,7 +215,7 @@ end
 
 You can change the CSS of the SimpleCaptcha DOM elements as per your need in this file.
 
-  ./app/views/simple_captcha/_simple_captcha.erb
+``app/views/simple_captcha/_simple_captcha.erb``
 
 ###View's Examples
 ####Controller Based Example
diff --git a/README.rdoc b/README.rdoc
deleted file mode 100644
index 962f6b7..0000000
--- a/README.rdoc
+++ /dev/null
@@ -1,246 +0,0 @@
-=SimpleCaptcha2
-
-{<img src="https://travis-ci.org/pludoni/simple-captcha.png?branch=master" alt="Build Status" />}[https://travis-ci.org/pludoni/simple-captcha]
-
-SimpleCaptcha(2) is the simplest and a robust captcha plugin. Its implementation requires
-adding up a single line in views and in controllers/models.
-SimpleCaptcha2 is available to be used with Rails 3 + 4.
-This is a fork of the popular Rubygem simple_captcha which got abandoned.
-
-==Features
-
-* Zero FileSystem usage (secret code moved to db-store and image storage removed).
-* Provides various image styles.
-* Provides three level of complexity of images.
-* Works absolutely fine in distributed environment(session and db based implementation works fine in distributed environment).
-* Implementation is as easy as just writing a single line in your view. "<%= show_simple_captcha %>" within the 'form' tags.
-* Flexible DOM and CSS handling(There is a separate view partial for rendering SimpleCaptcha DOM elements).
-* Automated removal of 1 hour old unmatched simple_captcha data.
-
-==Requirements
-
-* {Ruby}[http://ruby-lang.org/] >= 1.9.3
-* {Rails}[http://github.com/rails/rails] >= 3.2
-* ImageMagick should be installed on your machine to use this plugin.
-  visit http://www.imagemagick.org/script/index.php for more details.
-
-==Installation
-
-  gem 'simple_captcha2'
-
-  # OR
-
-  gem 'simple_captcha2', :git => 'git://github.com/pludoni/simple-captcha.git'
-
-==Setup
-
-After installation, follow these simple steps to setup the plugin. The setup will depend
-on the version of rails your application is using.
-
-  rails generate simple_captcha
-
-  rake db:migrate
-
-==Usage
-
-===Controller Based
-
-Add the following line in the file "app/controllers/application.rb"
-
-  ApplicationController < ActionController::Base
-    include SimpleCaptcha::ControllerHelpers
-  end
-
-In the view file within the form tags add this code
-
-  <%= show_simple_captcha %>
-
-and in the controller's action authenticate it as
-
-  if simple_captcha_valid?
-    do this
-  else
-    do that
-  end
-
-===Model Based
-
-In the view file within the form tags write this code
-
-  <%= show_simple_captcha(:object=>"user") %>
-
-and in the model class add this code
-
-  class User < ActiveRecord::Base
-    apply_simple_captcha
-  end
-
-====FormBuilder helper
-
-  <%= form_for @user do |form| -%>
-    ...
-    <%= form.simple_captcha :label => "Enter numbers.." %>
-    ...
-  <% end -%>
-
-====Validating with captcha
-NOTE: @user.valid? will still work as it should, it will not validate the captcha code.
-
-  @user.valid_with_captcha?
-
-====Saving with captcha
-NOTE: @user.save will still work as it should, it will not validate the captcha code.
-
-  @user.save_with_captcha
-
-===Formtastic integration
-SimpleCaptcha detects if your use Formtastic and appends "SimpleCaptcha::CustomFormBuilder".
-
-  <%= form.input :captcha, :as => :simple_captcha %>
-
-==Options & Examples
-===View Options
-
-* *label* - provides the custom text b/w the image and the text field, the default is "type the code from the image"
-
-* *object* - the name of the object of the model class, to implement the model based captcha.
-
-* *code_type* - return numeric only if set to 'numeric'
-
-===Global options
-
-* *image_style* - provides the specific image style for the captcha image.
-There are eight different styles available with the plugin as...
-  1) simply_blue
-  2) simply_red
-  3) simply_green
-  4) charcoal_grey
-  5) embosed_silver
-  6) all_black
-  7) distorted_black
-  8) almost_invisible
-Default style is 'simply_blue'.
-You can also specify 'random' to select the random image style.
-
-* *distortion* - handles the complexity of the image. The :distortion can be set to 'low', 'medium' or 'high'. Default is 'low'.
-
-Create "rails_root/config/initializers/simple_captcha.rb"
-
-  SimpleCaptcha.setup do |sc|
-    # default: 100x28
-    sc.image_size = '120x40'
-
-    # default: 5
-    sc.length = 6
-
-    # default: simply_blue
-    # possible values:
-    # 'embosed_silver',
-    # 'simply_red',
-    # 'simply_green',
-    # 'simply_blue',
-    # 'distorted_black',
-    # 'all_black',
-    # 'charcoal_grey',
-    # 'almost_invisible'
-    # 'random'
-    sc.image_style = 'simply_green'
-
-    # default: low
-    # possible values: 'low', 'medium', 'high', 'random'
-    sc.distortion = 'medium'
-  end
-
-You can add your own style:
-
-  SimpleCaptcha.setup do |sc|
-    sc.image_style = 'mycaptha'
-    sc.add_image_style('mycaptha', [
-        "-background '#F4F7F8'",
-        "-fill '#86818B'",
-        "-border 1",
-        "-bordercolor '#E0E2E3'"])
-  end
-
-You can provide the path where image_magick is installed as well:
-
-  SimpleCaptcha.setup do |sc|
-    sc.image_magick_path = '/usr/bin' # you can check this from console by running: which convert
-  end
-
-You can provide the path where should be stored tmp files.
-It's usefull when you dont have acces to /tmp (default directory)
-
-  SimpleCaptcha.setup do |sc|
-    sc.tmp_path = '/tmp' # or somewhere in project eg. Rails.root.join('tmp/simple_captcha').to_s, make shure directory exists
-  end
-
-
-===How to change the CSS for SimpleCaptcha DOM elements?
-You can change the CSS of the SimpleCaptcha DOM elements as per your need in this file.
-  /app/views/simple_captcha/_simple_captcha.erb
-
-===View's Examples
-====Controller Based Example
-
-  <%= show_simple_captcha %>
-
-  <%= show_simple_captcha(:label => "human authentication") %>
-
-====Model Based Example
-
-  <%= show_simple_captcha(:object => 'user', :label => "human authentication") %>
-
-====Model Options
-
-* *message* - provides the custom message on failure of captcha authentication the default is "Secret Code did not match with the Image"
-
-* *add_to_base* - if set to true, appends the error message to the base.
-
-=====Model's Example
-
-  class User < ActiveRecord::Base
-    apply_simple_captcha
-  end
-
-  class User < ActiveRecord::Base
-    apply_simple_captcha :message => "The secret Image and code were different", :add_to_base => true
-  end
-
-==I18n
-
-  simple_captcha:
-    placeholder: "Enter the image value"
-    label: "Enter the code in the box:"
-    message:
-      default: "Secret Code did not match with the Image"
-      user: "The secret Image and code were different"
-
-==Contributing
-
-For testing, generate a temporary Rails dummy app inside test:
-
-  rake dummy:setup
-  rake app:db:migrate
-  rake app:db:migrate RAILS_ENV=test
-  export BUNDLE_GEMFILE=$PWD/Gemfile
-  cd test/dummy && rake db:migrate db:test:prepare
-  rake test
-
-Please add test cases when adding new functionality. I started with some basic example integration tests for a very basic coverage.
-
-==Who's who?
-
-Enjoy the simplest captcha implementation.
-
-Author: Sur
-
-Blog: http://expressica.com
-
-Contact: sur.max@gmail.com
-
-Plugin Homepage: http://expressica.com/simple_captcha
-
-Plugin update for rails 3: http://github.com/galetahub
-
-Any feedback/comment/issue/donation is welcome!

From 24015a5359cb380175f0fc5637767e485b6d3722 Mon Sep 17 00:00:00 2001
From: Stefan Wienert <stefan.wienert@pludoni.de>
Date: Mon, 2 Dec 2013 00:48:58 +0100
Subject: [PATCH 027/115] ...

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 4edd57c..e9379e7 100644
--- a/README.md
+++ b/README.md
@@ -238,7 +238,7 @@ You can change the CSS of the SimpleCaptcha DOM elements as per your need in thi
 
 * ``:add_to_base`` - if set to true, appends the error message to the base.
 
-####=Model's Example
+#####Model's Example
 
 ```ruby
 class User < ActiveRecord::Base

From 2ea465adca144e63e3f8895326dd935b9d20e09c Mon Sep 17 00:00:00 2001
From: Stefan Wienert <stefan.wienert@pludoni.de>
Date: Tue, 3 Dec 2013 16:48:23 +0100
Subject: [PATCH 028/115] clarification: needs to require simple_captcha for
 now

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e9379e7..47a74c1 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@ This is a fork of the popular Rubygem ``simple_captcha`` which got abandoned.
 Put this into your Gemfile
 
 ```ruby
-gem 'simple_captcha2'
+gem 'simple_captcha2', require: 'simple_captcha'
 ```
 
 and run ``bundle install``.

From fb6d99c47d95b60d48a4c4c15c938c8c415e5362 Mon Sep 17 00:00:00 2001
From: Stefan Wienert <stefan.wienert@pludoni.de>
Date: Tue, 3 Dec 2013 16:53:53 +0100
Subject: [PATCH 029/115] test usage

---
 README.md | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/README.md b/README.md
index 47a74c1..d2dad6e 100644
--- a/README.md
+++ b/README.md
@@ -124,6 +124,22 @@ SimpleCaptcha detects if you are using Formtastic:
 <%= form.input :captcha, :as => :simple_captcha %>
 ```
 
+### Tests
+
+You can make the Captcha always pass with a initializer file: config/initializers/simple_captcha.rb
+
+```ruby
+SimpleCaptcha.always_pass = Rails.env.test?
+```
+
+You can also ask for the value, e.g. Acceptance Tests/Features:
+
+```ruby
+visit '/pages/form_tag'
+assert_equal 1, SimpleCaptcha::SimpleCaptchaData.count
+fill_in 'captcha', with: SimpleCaptcha::SimpleCaptchaData.first.value
+```
+
 ##Options & Examples
 
 ###View Options

From d78bae06cceba34d129316460c5ea06c516aaecb Mon Sep 17 00:00:00 2001
From: Stefan Wienert <info@stefanwienert.de>
Date: Sat, 14 Dec 2013 11:44:08 +0100
Subject: [PATCH 030/115] Update README.md

---
 README.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/README.md b/README.md
index d2dad6e..8dfe4d8 100644
--- a/README.md
+++ b/README.md
@@ -23,6 +23,12 @@ This is a fork of the popular Rubygem ``simple_captcha`` which got abandoned.
 * ImageMagick should be installed on your machine to use this plugin.
   visit http://www.imagemagick.org/script/index.php for more details.
 
+You might need to install Ghostscript on a Mac-System:
+
+```
+brew install ghostscript
+```
+
 ##Installation
 
 Put this into your Gemfile

From a023d284b9ac4574164e628c3456a0c89c602c9f Mon Sep 17 00:00:00 2001
From: Stefan Wienert <stefan.wienert@pludoni.de>
Date: Sun, 29 Dec 2013 15:06:08 +0100
Subject: [PATCH 031/115] gemspec warning fixed; travis.yml now with ruby 2.1
 and rails 4.1beta

---
 .travis.yml             | 3 +++
 simple_captcha.gemspec  | 4 ++--
 simple_captcha2.gemspec | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 59d0354..0eb2b6d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,6 +14,9 @@ env:
   - DB=sqlite FORMTASTIC='~> 2.2' RAILS='~> 4.0'
 
 matrix:
+  include:
+    - rvm: 2.1.0
+      env: DB=mysql RAILS='4.1.0.beta1'
   exclude:
     - rvm: 1.9.3
       env: DB=mysql RAILS='~> 4.0'
diff --git a/simple_captcha.gemspec b/simple_captcha.gemspec
index 501d66a..feb347b 100644
--- a/simple_captcha.gemspec
+++ b/simple_captcha.gemspec
@@ -12,8 +12,8 @@ Gem::Specification.new do |s|
   s.email = "stwienert@gmail.com"
   s.homepage = "http://github.com/pludoni/simple-captcha"
 
-  s.files = Dir["{lib}/**/*"] + ["Rakefile", "README.rdoc"]
-  s.extra_rdoc_files = ["README.rdoc"]
+  s.files = Dir["{lib}/**/*"] + ["Rakefile", "README.md"]
+  s.extra_rdoc_files = ["README.md"]
   s.require_paths = ["lib"]
 
   s.add_dependency 'rails', '>= 3.1'
diff --git a/simple_captcha2.gemspec b/simple_captcha2.gemspec
index 932ce19..d49f91a 100644
--- a/simple_captcha2.gemspec
+++ b/simple_captcha2.gemspec
@@ -12,8 +12,8 @@ Gem::Specification.new do |s|
   s.email = "stwienert@gmail.com"
   s.homepage = "http://github.com/pludoni/simple-captcha"
 
-  s.files = Dir["{lib}/**/*"] + ["Rakefile", "README.rdoc"]
-  s.extra_rdoc_files = ["README.rdoc"]
+  s.files = Dir["{lib}/**/*"] + ["Rakefile", "README.md"]
+  s.extra_rdoc_files = ["README.md"]
   s.require_paths = ["lib"]
 
   s.add_dependency 'rails', '>= 3.1'

From 5b83cab718016b6fe1a5b33c85c4e31457fc4f19 Mon Sep 17 00:00:00 2001
From: Stefan Wienert <stefan.wienert@pludoni.de>
Date: Sun, 29 Dec 2013 15:10:15 +0100
Subject: [PATCH 032/115] tests now work

---
 .travis.yml   | 1 -
 test/model.rb | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0eb2b6d..85871c5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,6 @@
 ---
 language: ruby
 script:
-    - 'cd test/dummy && rake db:migrate db:test:prepare'
     - rake test
 rvm:
   - '1.9.3'
diff --git a/test/model.rb b/test/model.rb
index 90aad13..7c67ed9 100644
--- a/test/model.rb
+++ b/test/model.rb
@@ -1,4 +1,4 @@
-
+require 'simple_captcha'
 if Rails.version > '4.0'
   class User
     include ActiveModel::Model

From c03d99338c40ecdc6dbbb7dd96148853b00ede92 Mon Sep 17 00:00:00 2001
From: Stefan Wienert <stefan.wienert@pludoni.de>
Date: Sun, 29 Dec 2013 15:14:59 +0100
Subject: [PATCH 033/115] v.0.2.1: fixed bundle warning, missing README.rdoc

---
 lib/simple_captcha/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/simple_captcha/version.rb b/lib/simple_captcha/version.rb
index a8508da..ad91e69 100644
--- a/lib/simple_captcha/version.rb
+++ b/lib/simple_captcha/version.rb
@@ -1,3 +1,3 @@
 module SimpleCaptcha
-  VERSION = "0.2.0".freeze
+  VERSION = "0.2.1".freeze
 end

From 7e713fc3a1b0df1b333c0047a83b6e3398a170b3 Mon Sep 17 00:00:00 2001
From: Stefan Wienert <stefan.wienert@pludoni.de>
Date: Thu, 2 Jan 2014 10:14:19 +0100
Subject: [PATCH 034/115] maybe fix: uninitialized constant

---
 test/features/form_helper_test.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/features/form_helper_test.rb b/test/features/form_helper_test.rb
index d9e3b4f..eef25f8 100644
--- a/test/features/form_helper_test.rb
+++ b/test/features/form_helper_test.rb
@@ -1,4 +1,5 @@
 require 'test_helper'
+require 'simple_captcha/controller'
 
 class FormHelperTest  < ActionDispatch::IntegrationTest
   include Capybara::DSL

From 6ce88e6972bc022cdbfc33f8ea5c458faea0f679 Mon Sep 17 00:00:00 2001
From: Konstantin Papkovskiy <konstantin@papkovskiy.com>
Date: Thu, 16 Jan 2014 18:09:50 +0400
Subject: [PATCH 035/115] fix mass-assignment error when using
 protected_attributes

---
 lib/simple_captcha/simple_captcha_data.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/simple_captcha/simple_captcha_data.rb b/lib/simple_captcha/simple_captcha_data.rb
index 703d130..c01ba6a 100644
--- a/lib/simple_captcha/simple_captcha_data.rb
+++ b/lib/simple_captcha/simple_captcha_data.rb
@@ -15,7 +15,7 @@ class SimpleCaptchaData < ::ActiveRecord::Base
 
     class << self
       def get_data(key)
-        where(key: key).first || new(key: key)
+        where(key: key).first_or_initialize
       end
 
       def remove_data(key)

From 666fd2ee8a1af7f248262240699366d6a57e1ddb Mon Sep 17 00:00:00 2001
From: "fbiete@gmail.com" <fbiete@gmail.com>
Date: Tue, 4 Mar 2014 19:51:53 +0100
Subject: [PATCH 036/115] Support for using the same captcha in multiple forms
 of the same page

---
 README.md                  | 1 +
 lib/simple_captcha/view.rb | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 8dfe4d8..566b439 100644
--- a/README.md
+++ b/README.md
@@ -153,6 +153,7 @@ fill_in 'captcha', with: SimpleCaptcha::SimpleCaptchaData.first.value
 * ``:label`` - provides the custom text b/w the image and the text field, the default is "type the code from the image"
 * ``:object`` - the name of the object of the model class, to implement the model based captcha.
 * ``:code_type`` - return numeric only if set to 'numeric'
+* ``:multiple`` - allow to use the same captcha in multiple forms in one page. True for the first appaerance and false for the rest.
 
 ###Global options
 
diff --git a/lib/simple_captcha/view.rb b/lib/simple_captcha/view.rb
index fc57080..5e7e836 100644
--- a/lib/simple_captcha/view.rb
+++ b/lib/simple_captcha/view.rb
@@ -44,7 +44,13 @@ module ViewHelper #:nodoc
     # All Feedbacks/CommentS/Issues/Queries are welcome.
     def show_simple_captcha(options={})
       key = simple_captcha_key(options[:object])
-      options[:field_value] = set_simple_captcha_data(key, options)
+      if options[:multiple] === false
+        # It's not the first captcha, we only need to return the key
+        options[:field_value] = key
+      else
+        # It's the first captcha in the page, we generate a new key
+        options[:field_value] = set_simple_captcha_data(key, options)        
+      end
       
       defaults = {
          :image => simple_captcha_image(key, options),

From f0677ed6c11c9fdabe58031a7249b3645e4ba221 Mon Sep 17 00:00:00 2001
From: mzaharie <mzaharie@pitechnologies.ro>
Date: Tue, 29 Apr 2014 09:45:22 +0300
Subject: [PATCH 037/115] fix: avoid 'create_migration' method conflict

---
 lib/generators/simple_captcha_generator.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/generators/simple_captcha_generator.rb b/lib/generators/simple_captcha_generator.rb
index 89beb04..c719fa6 100644
--- a/lib/generators/simple_captcha_generator.rb
+++ b/lib/generators/simple_captcha_generator.rb
@@ -2,7 +2,7 @@
 
 class SimpleCaptchaGenerator < Rails::Generators::Base
   include Rails::Generators::Migration
-                          
+
   def self.source_root
     @source_root ||= File.expand_path(File.join(File.dirname(__FILE__), 'templates/'))
   end
@@ -10,12 +10,12 @@ def self.source_root
   def self.next_migration_number(dirname)
     Time.now.strftime("%Y%m%d%H%M%S")
   end
-  
+
   def create_partial
     template "partial.erb", File.join('app/views', 'simple_captcha', "_simple_captcha.erb")
   end
-  
-  def create_migration
+
+  def create_captcha_migration
     migration_template "migration.rb", File.join('db/migrate', "create_simple_captcha_data.rb")
   end
 end

From 3da3d8fba89956b05cbd27efbe48b95e8da61060 Mon Sep 17 00:00:00 2001
From: Stefan Wienert <stefan.wienert@pludoni.de>
Date: Sun, 4 May 2014 19:19:55 +0200
Subject: [PATCH 038/115] version 0.3.0 -> Rails 4.1 compatibility fixes

---
 lib/simple_captcha/version.rb | 2 +-
 simple_captcha2.gemspec       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/simple_captcha/version.rb b/lib/simple_captcha/version.rb
index ad91e69..d3d37a3 100644
--- a/lib/simple_captcha/version.rb
+++ b/lib/simple_captcha/version.rb
@@ -1,3 +1,3 @@
 module SimpleCaptcha
-  VERSION = "0.2.1".freeze
+  VERSION = "0.3.0".freeze
 end
diff --git a/simple_captcha2.gemspec b/simple_captcha2.gemspec
index d49f91a..3c6f1ff 100644
--- a/simple_captcha2.gemspec
+++ b/simple_captcha2.gemspec
@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.extra_rdoc_files = ["README.md"]
   s.require_paths = ["lib"]
 
-  s.add_dependency 'rails', '>= 3.1'
+  s.add_dependency 'rails', '>= 4.1'
   s.add_development_dependency "sqlite3"
   s.add_development_dependency "capybara-mechanize"
   s.add_development_dependency "pry"

From 12cbffca9e47d5656274e8df860ddb4b7c0be00b Mon Sep 17 00:00:00 2001
From: Stefan Wienert <stefan.wienert@pludoni.de>
Date: Sun, 4 May 2014 19:27:01 +0200
Subject: [PATCH 039/115] Travis.yml -> Ruby 2.1 and rails 4.1 preferred

---
 .travis.yml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 85871c5..58d85dd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,22 +5,22 @@ script:
 rvm:
   - '1.9.3'
   - '2.0.0'
+  - '2.1.0'
 
 env:
-  - DB=sqlite                     RAILS='~> 4.0'
-  - DB=mysql                      RAILS='~> 4.0'
-  - DB=sqlite FORMTASTIC='~> 2.2' RAILS='~> 3.2'
-  - DB=sqlite FORMTASTIC='~> 2.2' RAILS='~> 4.0'
+  - DB=sqlite                     RAILS='~> 4.1'
+  - DB=sqlite FORMTASTIC='~> 2.2' RAILS='~> 4.1'
 
 matrix:
   include:
     - rvm: 2.1.0
-      env: DB=mysql RAILS='4.1.0.beta1'
-  exclude:
-    - rvm: 1.9.3
-      env: DB=mysql RAILS='~> 4.0'
-    - rvm: 1.9.3
-      env: DB=sqlite FORMTASTIC='~> 2.2' RAILS='~> 4.0'
+      env: DB=mysql RAILS='4.1'
+  include:
+    - rvm: 2.1.0
+      env: DB=posgresql RAILS='4.1'
+  include:
+    - rvm: 2.1.0
+      env: DB=sqlite FORMTASTIC='~> 2.2' RAILS='~> 4.1'
 
 
 before_script:

From 974a88ee8347ece9b792d68860f34522aa3a67ee Mon Sep 17 00:00:00 2001
From: Stefan Wienert <stefan.wienert@pludoni.de>
Date: Sun, 4 May 2014 19:32:49 +0200
Subject: [PATCH 040/115] Ruby version 2.1.1

---
 .travis.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 58d85dd..7abc14e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,7 @@ script:
 rvm:
   - '1.9.3'
   - '2.0.0'
-  - '2.1.0'
+  - '2.1.1'
 
 env:
   - DB=sqlite                     RAILS='~> 4.1'
@@ -13,13 +13,13 @@ env:
 
 matrix:
   include:
-    - rvm: 2.1.0
+    - rvm: 2.1.1
       env: DB=mysql RAILS='4.1'
+  # include:
+  #   - rvm: 2.1.0
+  #     env: DB=posgresql RAILS='4.1'
   include:
-    - rvm: 2.1.0
-      env: DB=posgresql RAILS='4.1'
-  include:
-    - rvm: 2.1.0
+    - rvm: 2.1.1
       env: DB=sqlite FORMTASTIC='~> 2.2' RAILS='~> 4.1'
 
 

From da9f3773cf82fc5c05021de7bcd42bfe0642dd64 Mon Sep 17 00:00:00 2001
From: Stefan Wienert <stefan.wienert@pludoni.de>
Date: Sat, 24 May 2014 20:42:14 +0200
Subject: [PATCH 041/115] simple_captcha_valid? idempotent - saves last result;
 fixes #13

---
 Gemfile                                                  | 1 -
 Rakefile                                                 | 9 +++++++++
 lib/simple_captcha/controller.rb                         | 6 ++++--
 lib/simple_captcha/version.rb                            | 2 +-
 test/features/form_helper_test.rb                        | 2 ++
 .../dummy/templates/app/controllers/pages_controller.rb  | 1 +
 6 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index 850ef6b..7ed26ee 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,7 +2,6 @@ source "https://rubygems.org"
 
 gemspec :name => 'simple_captcha2'
 
-gem 'sqlite3'
 gem 'rails', ENV['RAILS'] || '~> 4.0'
 
 if ENV['DB'] and ENV['DB']['mysql']
diff --git a/Rakefile b/Rakefile
index df1c7b4..8177102 100644
--- a/Rakefile
+++ b/Rakefile
@@ -33,6 +33,15 @@ namespace :dummy do
     FileUtils.rm_rf "test/dummy" if File.exists?("test/dummy")
   end
 
+  desc 'redo'
+  task :redo do
+    sh 'rake dummy:destroy'
+    sh 'rake dummy:setup'
+    sh 'rake app:db:migrate'
+    sh 'rake app:db:migrate RAILS_ENV=test'
+  end
+
+
 end
 
 
diff --git a/lib/simple_captcha/controller.rb b/lib/simple_captcha/controller.rb
index f7fb2ff..3a8a20a 100644
--- a/lib/simple_captcha/controller.rb
+++ b/lib/simple_captcha/controller.rb
@@ -15,14 +15,16 @@ module ControllerHelpers #:nodoc
     #  end
     def simple_captcha_valid?
       return true if SimpleCaptcha.always_pass
+      return @_simple_captcha_result unless @_simple_captcha_result.nil?
 
       if params[:captcha]
         data = SimpleCaptcha::Utils::simple_captcha_value(params[:captcha_key] || session[:captcha])
         result = data == params[:captcha].delete(" ").upcase
         SimpleCaptcha::Utils::simple_captcha_passed!(session[:captcha]) if result
-        return result
+        @_simple_captcha_result = result
+        result
       else
-        return false
+        false
       end
     end
   end
diff --git a/lib/simple_captcha/version.rb b/lib/simple_captcha/version.rb
index d3d37a3..accbeab 100644
--- a/lib/simple_captcha/version.rb
+++ b/lib/simple_captcha/version.rb
@@ -1,3 +1,3 @@
 module SimpleCaptcha
-  VERSION = "0.3.0".freeze
+  VERSION = "0.3.1".freeze
 end
diff --git a/test/features/form_helper_test.rb b/test/features/form_helper_test.rb
index eef25f8..15cb4cc 100644
--- a/test/features/form_helper_test.rb
+++ b/test/features/form_helper_test.rb
@@ -31,6 +31,7 @@ class FormHelperTest  < ActionDispatch::IntegrationTest
     click_on 'Save changes'
     assert page.has_content? 'captcha valid'
   end
+
   test 'model based failure' do
     visit '/pages/model_tag'
     assert_equal 1, SimpleCaptcha::SimpleCaptchaData.count
@@ -38,4 +39,5 @@ class FormHelperTest  < ActionDispatch::IntegrationTest
     click_on 'Save changes'
     assert page.has_content? 'captcha not valid'
   end
+
 end
diff --git a/test/lib/generators/simple_captcha/dummy/templates/app/controllers/pages_controller.rb b/test/lib/generators/simple_captcha/dummy/templates/app/controllers/pages_controller.rb
index 7824f56..8dcfe92 100644
--- a/test/lib/generators/simple_captcha/dummy/templates/app/controllers/pages_controller.rb
+++ b/test/lib/generators/simple_captcha/dummy/templates/app/controllers/pages_controller.rb
@@ -3,6 +3,7 @@ def form_tag
   end
 
   def form_tag_submit
+    simple_captcha_valid? # idempotence
     if simple_captcha_valid?
       render text: 'captcha valid!'
     else

From 7ee803ca1177314931152a1b47e761507d2d5699 Mon Sep 17 00:00:00 2001
From: Stefan Wienert <stefan.wienert@pludoni.de>
Date: Sat, 24 May 2014 21:53:53 +0200
Subject: [PATCH 042/115] Refresh Button: Adjustments with generic id, at least
 for image, default text

---
 Gemfile                                       |  1 +
 lib/generators/templates/partial.erb          |  6 +--
 lib/simple_captcha/middleware.rb              | 16 ++++---
 lib/simple_captcha/view.rb                    | 47 +++++++++++--------
 lib/simple_captcha2.rb                        |  1 +
 simple_captcha2.gemspec                       |  1 +
 test/features/form_helper_test.rb             | 16 +++++++
 .../app/assets/javascripts/application.js     |  2 +
 .../views/simple_captcha/_simple_captcha.erb  | 10 ++--
 test/test_helper.rb                           |  7 +--
 10 files changed, 69 insertions(+), 38 deletions(-)
 create mode 100644 lib/simple_captcha2.rb
 create mode 100644 test/lib/generators/simple_captcha/dummy/templates/app/assets/javascripts/application.js

diff --git a/Gemfile b/Gemfile
index 7ed26ee..a0adcd0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,6 +3,7 @@ source "https://rubygems.org"
 gemspec :name => 'simple_captcha2'
 
 gem 'rails', ENV['RAILS'] || '~> 4.0'
+gem 'jquery-rails'
 
 if ENV['DB'] and ENV['DB']['mysql']
   gem 'mysql2'
diff --git a/lib/generators/templates/partial.erb b/lib/generators/templates/partial.erb
index 37bcd8a..6419e8f 100644
--- a/lib/generators/templates/partial.erb
+++ b/lib/generators/templates/partial.erb
@@ -1,4 +1,4 @@
-<style type="text/CSS">
+<style type="text/css">
   .simple_captcha{border: 1px solid #ccc; padding: 5px !important;}
   .simple_captcha,
   .simple_captcha div{display: table;}
@@ -26,11 +26,11 @@
   <div class='simple_captcha_image'>
     <%%= simple_captcha_options[:image] %>
   </div>
-  
+
   <div class='simple_captcha_field'>
     <%%= simple_captcha_options[:field] %>
   </div>
-  
+
   <div class='simple_captcha_label'>
     <%%= simple_captcha_options[:label] %>
   </div>
diff --git a/lib/simple_captcha/middleware.rb b/lib/simple_captcha/middleware.rb
index 7430505..82a69f2 100644
--- a/lib/simple_captcha/middleware.rb
+++ b/lib/simple_captcha/middleware.rb
@@ -8,12 +8,12 @@ class Middleware
       :type         => 'application/octet-stream'.freeze,
       :disposition  => 'attachment'.freeze,
     }.freeze
-    
+
     def initialize(app, options={})
       @app = app
       self
     end
-    
+
     def call(env) # :nodoc:
       if env["REQUEST_METHOD"] == "GET" && captcha_path?(env['PATH_INFO'])
         request = Rack::Request.new(env)
@@ -26,7 +26,7 @@ def call(env) # :nodoc:
         @app.call(env)
       end
     end
-    
+
     protected
       def make_image(env, headers = {}, status = 404)
         request = Rack::Request.new(env)
@@ -44,11 +44,11 @@ def make_image(env, headers = {}, status = 404)
           [status, headers, body]
         end
       end
-      
+
       def captcha_path?(request_path)
         request_path.include?('/simple_captcha')
       end
-      
+
       def send_file(path, options = {})
         raise MissingFile, "Cannot read file #{path}" unless File.file?(path) and File.readable?(path)
 
@@ -57,7 +57,7 @@ def send_file(path, options = {})
         status = options[:status] || 200
         headers = {"Content-Disposition" => "#{options[:disposition]}; filename='#{options[:filename]}'", "Content-Type" => options[:type], 'Content-Transfer-Encoding' => 'binary', 'Cache-Control' => 'private'}
         response_body = File.open(path, "rb")
-        
+
         [status, headers, response_body]
       end
 
@@ -71,8 +71,10 @@ def refresh_code(env)
         url = simple_captcha_image_url(key, options)
 
         status = 200
+        id = request.params['id']
+
         body = %Q{
-                    $("#captcha_image").attr('src', '#{url}');
+                    $("##{id}").attr('src', '#{url}');
                     $("#captcha_key").attr('value', '#{key}');
                   }
         headers = {'Content-Type' => 'text/javascript; charset=utf-8', "Content-Disposition" => "inline; filename='captcha.js'", "Content-Length" => body.length.to_s}
diff --git a/lib/simple_captcha/view.rb b/lib/simple_captcha/view.rb
index 88502bc..b5cc754 100644
--- a/lib/simple_captcha/view.rb
+++ b/lib/simple_captcha/view.rb
@@ -49,16 +49,16 @@ def show_simple_captcha(options={})
         options[:field_value] = key
       else
         # It's the first captcha in the page, we generate a new key
-        options[:field_value] = set_simple_captcha_data(key, options)        
+        options[:field_value] = set_simple_captcha_data(key, options)
       end
-      
+
       defaults = {
-         :image => simple_captcha_image(key, options),
-         :label => options[:label] || I18n.t('simple_captcha.label'),
-         :field => simple_captcha_field(options),
-         :refresh_button => simple_captcha_refresh_button(options)
-         }
-         
+        :image => simple_captcha_image(key, options),
+        :label => I18n.t('simple_captcha.label'),
+        :field => simple_captcha_field(options),
+        :refresh_button => simple_captcha_refresh_button(options),
+      }.merge(options)
+
       render :partial => 'simple_captcha/simple_captcha', :locals => { :simple_captcha_options => defaults }
     end
 
@@ -67,11 +67,12 @@ def show_simple_captcha(options={})
       def simple_captcha_image(simple_captcha_key, options = {})
         defaults = {}
         defaults[:time] = options[:time] || Time.now.to_i
-        
+
         query = defaults.collect{ |key, value| "#{key}=#{value}" }.join('&')
         url = "#{ENV['RAILS_RELATIVE_URL_ROOT']}/simple_captcha?code=#{simple_captcha_key}&#{query}"
 
-        tag('img', :src => url, :alt => 'captcha', :id => 'captcha_image')
+        id = simple_captcha_image_id(options)
+        tag('img', :src => url, :alt => 'captcha', :id => id)
       end
 
       def simple_captcha_image_url(simple_captcha_key, options = {})
@@ -86,7 +87,7 @@ def simple_captcha_field(options={})
         html = {:autocomplete => 'off', :required => 'required'}
         html.merge!(options[:input_html] || {})
         html[:placeholder] = options[:placeholder] || I18n.t('simple_captcha.placeholder')
-          
+
         if options[:object]
           text_field(options[:object], :captcha, html.merge(:value => '')) +
           hidden_field(options[:object], :captcha_key, {:value => options[:field_value]})
@@ -99,39 +100,45 @@ def simple_captcha_field(options={})
       def simple_captcha_refresh_button(options={})
         html = {remote: true}
         html.merge!(options[:refresh_button_html] || {})
-        text = options[:refresh_button_text] || :refresh
 
-        link_to(text, "#{ENV['RAILS_RELATIVE_URL_ROOT']}/simple_captcha", html)
+        text = options[:refresh_button_text] || I18n.t('simple_captcha.refresh_button_text', default: 'Refresh')
+
+        link_to(text, "#{ENV['RAILS_RELATIVE_URL_ROOT']}/simple_captcha?id=#{simple_captcha_image_id(options)}", html)
+      end
+
+      def simple_captcha_image_id(options={})
+        "simple_captcha-#{options[:field_value][0..10]}"
       end
 
       def set_simple_captcha_data(key, options={})
         code_type = options[:code_type]
-        
+
         value = generate_simple_captcha_data(code_type)
         data = SimpleCaptcha::SimpleCaptchaData.get_data(key)
         data.value = value
         data.save
         key
       end
-   
+
       def generate_simple_captcha_data(code)
         value = ''
-        
+
         case code
-          when 'numeric' then 
+          when 'numeric' then
             SimpleCaptcha.length.times{value << (48 + rand(10)).chr}
           else
             SimpleCaptcha.length.times{value << (65 + rand(26)).chr}
         end
-        
+
         return value
       end
 
       def simple_captcha_key(key_name = nil, request = request)
+        local_session = request.try(:session) || session
         if key_name.nil?
-          request.session[:captcha] ||= SimpleCaptcha::Utils.generate_key(request.session[:id].to_s, 'captcha')
+          local_session[:captcha] ||= SimpleCaptcha::Utils.generate_key(local_session[:id].to_s, 'captcha')
         else
-          SimpleCaptcha::Utils.generate_key(request.session[:id].to_s, key_name)
+          SimpleCaptcha::Utils.generate_key(local_session[:id].to_s, key_name)
         end
       end
   end
diff --git a/lib/simple_captcha2.rb b/lib/simple_captcha2.rb
new file mode 100644
index 0000000..a702bdb
--- /dev/null
+++ b/lib/simple_captcha2.rb
@@ -0,0 +1 @@
+require 'simple_captcha'
diff --git a/simple_captcha2.gemspec b/simple_captcha2.gemspec
index 3c6f1ff..d3c401a 100644
--- a/simple_captcha2.gemspec
+++ b/simple_captcha2.gemspec
@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'rails', '>= 4.1'
   s.add_development_dependency "sqlite3"
   s.add_development_dependency "capybara-mechanize"
+  s.add_development_dependency "poltergeist"
   s.add_development_dependency "pry"
 
 end
diff --git a/test/features/form_helper_test.rb b/test/features/form_helper_test.rb
index 15cb4cc..66d972d 100644
--- a/test/features/form_helper_test.rb
+++ b/test/features/form_helper_test.rb
@@ -3,9 +3,14 @@
 
 class FormHelperTest  < ActionDispatch::IntegrationTest
   include Capybara::DSL
+  self.use_transactional_fixtures = false
 
   setup do
     SimpleCaptcha.always_pass = false
+    Capybara.current_driver = Capybara.javascript_driver
+  end
+  teardown do
+    SimpleCaptcha::SimpleCaptchaData.delete_all
   end
 
   test 'displays captcha and passes' do
@@ -40,4 +45,15 @@ class FormHelperTest  < ActionDispatch::IntegrationTest
     assert page.has_content? 'captcha not valid'
   end
 
+  test 'Refresh Button' do
+    visit '/pages/form_tag'
+    # captcha= SimpleCaptcha::SimpleCaptchaData.first
+    img = find('img')['src']
+    click_on 'Refresh'
+
+    # assert_not_equal img, new_img
+    # fill_in 'captcha', with: new_captcha.value
+    # click_on 'Save changes'
+    # assert page.has_content? 'captcha valid'
+  end
 end
diff --git a/test/lib/generators/simple_captcha/dummy/templates/app/assets/javascripts/application.js b/test/lib/generators/simple_captcha/dummy/templates/app/assets/javascripts/application.js
new file mode 100644
index 0000000..31a96fd
--- /dev/null
+++ b/test/lib/generators/simple_captcha/dummy/templates/app/assets/javascripts/application.js
@@ -0,0 +1,2 @@
+//= require jquery
+//= require jquery_ujs
diff --git a/test/lib/generators/simple_captcha/dummy/templates/app/views/simple_captcha/_simple_captcha.erb b/test/lib/generators/simple_captcha/dummy/templates/app/views/simple_captcha/_simple_captcha.erb
index 9968910..3a346a4 100644
--- a/test/lib/generators/simple_captcha/dummy/templates/app/views/simple_captcha/_simple_captcha.erb
+++ b/test/lib/generators/simple_captcha/dummy/templates/app/views/simple_captcha/_simple_captcha.erb
@@ -1,4 +1,4 @@
-<style type="text/CSS">
+<style type="text/css">
   .simple_captcha{border: 1px solid #ccc; padding: 5px !important;}
   .simple_captcha,
   .simple_captcha div{display: table;}
@@ -26,12 +26,16 @@
   <div class='simple_captcha_image'>
     <%= simple_captcha_options[:image] %>
   </div>
-  
+
   <div class='simple_captcha_field'>
     <%= simple_captcha_options[:field] %>
   </div>
-  
+
   <div class='simple_captcha_label'>
     <%= simple_captcha_options[:label] %>
   </div>
+
+  <div class='simple_captcha_refresh_button'>
+    <%= simple_captcha_options[:refresh_button] %>
+  </div>
 </div>
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 26b9e35..eda647f 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -12,8 +12,5 @@
 # Load support files
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
-# Load fixtures from the engine
-if ActiveSupport::TestCase.method_defined?(:fixture_path=)
-  ActiveSupport::TestCase.fixture_path = File.expand_path("../fixtures", __FILE__)
-end
-
+require 'capybara/poltergeist'
+Capybara.javascript_driver = :poltergeist

From b473065ab9524b6bdf0a52f27f597ec901c07486 Mon Sep 17 00:00:00 2001
From: Stefan Wienert <stefan.wienert@pludoni.de>
Date: Sat, 24 May 2014 22:04:05 +0200
Subject: [PATCH 043/115] formtastic

---
 test/features/formtastic_test.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/test/features/formtastic_test.rb b/test/features/formtastic_test.rb
index e824538..75a503a 100644
--- a/test/features/formtastic_test.rb
+++ b/test/features/formtastic_test.rb
@@ -1,11 +1,15 @@
 if defined? Formtastic
   require 'test_helper'
   class FormtasticTest  < ActionDispatch::IntegrationTest
+    self.use_transactional_fixtures = false
     include Capybara::DSL
 
     setup do
       SimpleCaptcha.always_pass = false
     end
+    teardown do
+      SimpleCaptcha::SimpleCaptchaData.delete_all
+    end
 
     test 'displays captcha and passes' do
       visit '/pages/formtastic_tag'

From 8d201316c966b15217ad148f1c0e3468801e38fe Mon Sep 17 00:00:00 2001
From: Stefan Wienert <stefan.wienert@pludoni.de>
Date: Sat, 24 May 2014 23:10:02 +0200
Subject: [PATCH 044/115] travis test fix?

---
 test/features/form_helper_test.rb | 2 --
 test/features/formtastic_test.rb  | 2 --
 2 files changed, 4 deletions(-)

diff --git a/test/features/form_helper_test.rb b/test/features/form_helper_test.rb
index 66d972d..992d245 100644
--- a/test/features/form_helper_test.rb
+++ b/test/features/form_helper_test.rb
@@ -8,8 +8,6 @@ class FormHelperTest  < ActionDispatch::IntegrationTest
   setup do
     SimpleCaptcha.always_pass = false
     Capybara.current_driver = Capybara.javascript_driver
-  end
-  teardown do
     SimpleCaptcha::SimpleCaptchaData.delete_all
   end
 
diff --git a/test/features/formtastic_test.rb b/test/features/formtastic_test.rb
index 75a503a..7314abb 100644
--- a/test/features/formtastic_test.rb
+++ b/test/features/formtastic_test.rb
@@ -6,8 +6,6 @@ class FormtasticTest  < ActionDispatch::IntegrationTest
 
     setup do
       SimpleCaptcha.always_pass = false
-    end
-    teardown do
       SimpleCaptcha::SimpleCaptchaData.delete_all
     end
 

From 70b25189610f7c657be3f0fa7db41e26676bf220 Mon Sep 17 00:00:00 2001
From: Marcin Kalita <rubyconvict@gmail.com>
Date: Thu, 12 Jun 2014 19:32:36 +0200
Subject: [PATCH 045/115] Fixes #14 - undefined method 'apply_simple_captcha'
 (Mongoid)

---
 lib/simple_captcha.rb                                     | 3 ++-
 lib/simple_captcha/{active_record.rb => model_helpers.rb} | 0
 2 files changed, 2 insertions(+), 1 deletion(-)
 rename lib/simple_captcha/{active_record.rb => model_helpers.rb} (100%)

diff --git a/lib/simple_captcha.rb b/lib/simple_captcha.rb
index cf45462..eb789cb 100644
--- a/lib/simple_captcha.rb
+++ b/lib/simple_captcha.rb
@@ -14,8 +14,9 @@ class << self
   autoload :FormBuilder,       'simple_captcha/form_builder'
   autoload :CustomFormBuilder, 'simple_captcha/formtastic'
 
+  autoload :ModelHelpers,      'simple_captcha/model_helpers'
+
   if defined?(ActiveRecord)
-    autoload :ModelHelpers,      'simple_captcha/active_record'
     autoload :SimpleCaptchaData, 'simple_captcha/simple_captcha_data'
   else
     autoload :SimpleCaptchaData,      'simple_captcha/simple_captcha_data_mongoid.rb'
diff --git a/lib/simple_captcha/active_record.rb b/lib/simple_captcha/model_helpers.rb
similarity index 100%
rename from lib/simple_captcha/active_record.rb
rename to lib/simple_captcha/model_helpers.rb

From 1bbd4bb4158d6b4b3352e28a8b47bc7d66e36463 Mon Sep 17 00:00:00 2001
From: Stefan Wienert <stefan.wienert@pludoni.de>
Date: Thu, 12 Jun 2014 21:31:44 +0200
Subject: [PATCH 046/115] version bump

---
 lib/simple_captcha/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/simple_captcha/version.rb b/lib/simple_captcha/version.rb
index accbeab..9d931bb 100644
--- a/lib/simple_captcha/version.rb
+++ b/lib/simple_captcha/version.rb
@@ -1,3 +1,3 @@
 module SimpleCaptcha
-  VERSION = "0.3.1".freeze
+  VERSION = "0.3.2".freeze
 end

From 61a87a78c55aeb648d77588d244ff1cf6f560cca Mon Sep 17 00:00:00 2001
From: Marcin Kalita <rubyconvict@gmail.com>
Date: Fri, 13 Jun 2014 09:58:49 +0200
Subject: [PATCH 047/115] Updated README.md

---
 README.md | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 566b439..8e4af58 100644
--- a/README.md
+++ b/README.md
@@ -45,7 +45,7 @@ After installation, follow these simple steps to setup the plugin. The setup wil
 
 ```bash
 rails generate simple_captcha
-rake db:migrate
+rake db:migrate # Mongoid: skip this step and remove the migration
 ```
 
 ## Usage
@@ -96,6 +96,23 @@ class User < ActiveRecord::Base
 end
 ```
 
+Mongoid:
+
+```ruby
+class User
+  include SimpleCaptcha::ModelHelpers
+  apply_simple_captcha
+end
+```
+
+#### Strong parameters (Rails 4.x)
+
+Must add them:
+
+```ruby
+:captcha, :captcha_key
+```
+
 ####Form-Builder helper
 
 ```erb

From c786da5bb8eedeeadc7c7c5a29d4b8a89a90e8a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Patrik=20B=C3=B3na?= <patrik.bona@mrhead.sk>
Date: Tue, 15 Jul 2014 10:58:05 +0200
Subject: [PATCH 048/115] Add possibility to set `implode` valude for the
 generated image

---
 README.md                   | 6 ++++++
 lib/simple_captcha.rb       | 4 ++++
 lib/simple_captcha/image.rb | 9 ++++++++-
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 8e4af58..2f93469 100644
--- a/README.md
+++ b/README.md
@@ -191,6 +191,8 @@ You can also specify 'random' to select the random image style.
 
 * ``:distortion`` - handles the complexity of the image. The :distortion can be set to 'low', 'medium' or 'high'. Default is 'low'.
 
+* ``:implode`` - handles the complexity of the image. The :implode can be set to 'none', 'low', 'medium' or 'high'. Default is 'medium'.
+
 Create "./config/initializers/simple_captcha.rb"
 
 ```ruby
@@ -217,6 +219,10 @@ SimpleCaptcha.setup do |sc|
   # default: low
   # possible values: 'low', 'medium', 'high', 'random'
   sc.distortion = 'medium'
+
+  # default: medium
+  # possible values: 'none', 'low', 'medium', 'high'
+  sc.implode = 'low'
 end
 ```
 
diff --git a/lib/simple_captcha.rb b/lib/simple_captcha.rb
index eb789cb..b8b6e7c 100644
--- a/lib/simple_captcha.rb
+++ b/lib/simple_captcha.rb
@@ -47,6 +47,10 @@ class << self
   mattr_accessor :distortion
   @@distortion = 'low'
 
+  # 'none', 'low', 'medium', 'high'
+  mattr_accessor :implode
+  @@implode = SimpleCaptcha::ImageHelpers::DEFAULT_IMPLODE
+
   # command path
   mattr_accessor :image_magick_path
   @@image_magick_path = ''
diff --git a/lib/simple_captcha/image.rb b/lib/simple_captcha/image.rb
index cd55ada..3a1fc52 100755
--- a/lib/simple_captcha/image.rb
+++ b/lib/simple_captcha/image.rb
@@ -16,6 +16,9 @@ module ImageHelpers #:nodoc
 
     DISTORTIONS = ['low', 'medium', 'high']
 
+    IMPLODES = { 'none' => 0, 'low' => 0.1, 'medium' => 0.2, 'high' => 0.3 }
+    DEFAULT_IMPLODE = 'medium'
+
     class << self
 
       def image_params(key = 'simply_blue')
@@ -43,6 +46,10 @@ def distortion(key='low')
           when 'high' then return [4 + rand(2), 30 + rand(20)]
         end
       end
+
+      def implode
+        IMPLODES[SimpleCaptcha.implode] || IMPLODES[DEFAULT_IMPLODE]
+      end
     end
 
     if RUBY_VERSION < '1.9'
@@ -67,7 +74,7 @@ def generate_simple_captcha_image(simple_captcha_key) #:nodoc
         #params << "-gravity 'Center'"
         params << "-gravity \"Center\""
         params << "-pointsize 22"
-        params << "-implode 0.2"
+        params << "-implode #{ImageHelpers.implode}"
 
         dst = Tempfile.new(RUBY_VERSION < '1.9' ? 'simple_captcha.jpg' : ['simple_captcha', '.jpg'], SimpleCaptcha.tmp_path)
         dst.binmode

From fa1c0ef4b79949fc66a1e55c231c2a542780bac3 Mon Sep 17 00:00:00 2001
From: Feuda Nan <feuda.nan@gmail.com>
Date: Mon, 28 Jul 2014 16:34:53 +0800
Subject: [PATCH 049/115] add i18n example for refresh button text

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 2f93469..a533ad0 100644
--- a/README.md
+++ b/README.md
@@ -304,6 +304,7 @@ en:
   simple_captcha:
     placeholder: "Enter the image value"
     label: "Enter the code in the box:"
+    refresh_button_text: "Refresh"
     message:
       default: "Secret Code did not match with the Image"
       user: "The secret Image and code were different"

From 0452c8d93291cf9fd7ba92e5fb5eac9da90d8edc Mon Sep 17 00:00:00 2001
From: Lionello Lunesu <lio@lunesu.com>
Date: Thu, 14 Aug 2014 16:25:50 +0800
Subject: [PATCH 050/115] Using absolute URL for img src to support inclusion
 in non-rails pages

---
 lib/simple_captcha/view.rb | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/lib/simple_captcha/view.rb b/lib/simple_captcha/view.rb
index b5cc754..fdcd154 100644
--- a/lib/simple_captcha/view.rb
+++ b/lib/simple_captcha/view.rb
@@ -65,12 +65,7 @@ def show_simple_captcha(options={})
     private
 
       def simple_captcha_image(simple_captcha_key, options = {})
-        defaults = {}
-        defaults[:time] = options[:time] || Time.now.to_i
-
-        query = defaults.collect{ |key, value| "#{key}=#{value}" }.join('&')
-        url = "#{ENV['RAILS_RELATIVE_URL_ROOT']}/simple_captcha?code=#{simple_captcha_key}&#{query}"
-
+        url = simple_captcha_image_url simple_captcha_key, options: options
         id = simple_captcha_image_id(options)
         tag('img', :src => url, :alt => 'captcha', :id => id)
       end
@@ -80,7 +75,7 @@ def simple_captcha_image_url(simple_captcha_key, options = {})
         defaults[:time] = options[:time] || Time.now.to_i
 
         query = defaults.collect{ |key, value| "#{key}=#{value}" }.join('&')
-        "#{ENV['RAILS_RELATIVE_URL_ROOT']}/simple_captcha?code=#{simple_captcha_key}&#{query}"
+        "#{request.protocol}#{request.host_with_port}#{ENV['RAILS_RELATIVE_URL_ROOT']}/simple_captcha?code=#{simple_captcha_key}&#{query}"
       end
 
       def simple_captcha_field(options={})

From 240c2056d153e0c10cf343a768201505d423e05f Mon Sep 17 00:00:00 2001
From: Lionello Lunesu <lio@lunesu.com>
Date: Fri, 15 Aug 2014 14:46:02 +0800
Subject: [PATCH 051/115] Add noise to image

Conflicts:
	lib/simple_captcha/image.rb
---
 lib/simple_captcha.rb       | 4 ++++
 lib/simple_captcha/image.rb | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/simple_captcha.rb b/lib/simple_captcha.rb
index b8b6e7c..995fc1a 100644
--- a/lib/simple_captcha.rb
+++ b/lib/simple_captcha.rb
@@ -59,6 +59,10 @@ class << self
   mattr_accessor :tmp_path
   @@tmp_path = nil
 
+  # additive noise
+  mattr_accessor :noise
+  @@noise = 0
+
   def self.add_image_style(name, params = [])
     SimpleCaptcha::ImageHelpers.image_styles.update(name.to_s => params)
   end
diff --git a/lib/simple_captcha/image.rb b/lib/simple_captcha/image.rb
index 3a1fc52..287338c 100755
--- a/lib/simple_captcha/image.rb
+++ b/lib/simple_captcha/image.rb
@@ -80,7 +80,9 @@ def generate_simple_captcha_image(simple_captcha_key) #:nodoc
         dst.binmode
 
         #params << "label:#{text} '#{File.expand_path(dst.path)}'"
-        params << "label:#{text} \"#{File.expand_path(dst.path)}\""
+        params << "label:#{text}"
+        params << "-evaluate Uniform-noise #{SimpleCaptcha.noise}"
+        params << "\"#{File.expand_path(dst.path)}\""
 
         SimpleCaptcha::Utils::run("convert", params.join(' '))
 

From 7440c11eb8c59a0c4757f6b25d861377552b7882 Mon Sep 17 00:00:00 2001
From: Lionello Lunesu <lio@lunesu.com>
Date: Fri, 15 Aug 2014 14:39:57 +0800
Subject: [PATCH 052/115] Remove the need for tempfiles

---
 lib/simple_captcha/image.rb      | 15 ++-------------
 lib/simple_captcha/middleware.rb |  9 ++++++++-
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/lib/simple_captcha/image.rb b/lib/simple_captcha/image.rb
index 287338c..6a069c1 100755
--- a/lib/simple_captcha/image.rb
+++ b/lib/simple_captcha/image.rb
@@ -71,25 +71,14 @@ def generate_simple_captcha_image(simple_captcha_key) #:nodoc
         params = ImageHelpers.image_params(SimpleCaptcha.image_style).dup
         params << "-size #{SimpleCaptcha.image_size}"
         params << "-wave #{amplitude}x#{frequency}"
-        #params << "-gravity 'Center'"
-        params << "-gravity \"Center\""
+        params << "-gravity Center"
         params << "-pointsize 22"
         params << "-implode #{ImageHelpers.implode}"
-
-        dst = Tempfile.new(RUBY_VERSION < '1.9' ? 'simple_captcha.jpg' : ['simple_captcha', '.jpg'], SimpleCaptcha.tmp_path)
-        dst.binmode
-
-        #params << "label:#{text} '#{File.expand_path(dst.path)}'"
         params << "label:#{text}"
         params << "-evaluate Uniform-noise #{SimpleCaptcha.noise}"
-        params << "\"#{File.expand_path(dst.path)}\""
+        params << "jpeg:-"
 
         SimpleCaptcha::Utils::run("convert", params.join(' '))
-
-        dst.close
-
-        File.expand_path(dst.path)
-        #dst
       end
   end
 end
diff --git a/lib/simple_captcha/middleware.rb b/lib/simple_captcha/middleware.rb
index 82a69f2..e2732d6 100644
--- a/lib/simple_captcha/middleware.rb
+++ b/lib/simple_captcha/middleware.rb
@@ -39,7 +39,7 @@ def make_image(env, headers = {}, status = 404)
           #body = generate_simple_captcha_image(code)
           #headers['Content-Type'] = 'image/jpeg'
 
-          send_file(generate_simple_captcha_image(code), :type => 'image/jpeg', :disposition => 'inline', :filename =>  'simple_captcha.jpg')
+          send_data(generate_simple_captcha_image(code), :type => 'image/jpeg', :disposition => 'inline', :filename =>  'simple_captcha.jpg')
         else
           [status, headers, body]
         end
@@ -61,6 +61,13 @@ def send_file(path, options = {})
         [status, headers, response_body]
       end
 
+      def send_data(response_body, options = {})
+        status = options[:status] || 200
+        headers = {"Content-Disposition" => "#{options[:disposition]}; filename='#{options[:filename]}'", "Content-Type" => options[:type], 'Content-Transfer-Encoding' => 'binary', 'Cache-Control' => 'private'}
+
+        [status, headers, [response_body]]
+      end
+
       def refresh_code(env)
         request = Rack::Request.new(env)
 

From 88432dc31a2df54433926f62c58228eb56d1abff Mon Sep 17 00:00:00 2001
From: Alexander Logvinov <avl@logvinov.com>
Date: Mon, 17 Nov 2014 12:27:34 +0800
Subject: [PATCH 053/115] Remove the executable bit from image.rb

---
 lib/simple_captcha/image.rb | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 lib/simple_captcha/image.rb

diff --git a/lib/simple_captcha/image.rb b/lib/simple_captcha/image.rb
old mode 100755
new mode 100644

From 28ed36bfa279878aa610e4fee294bbc6ca7cafce Mon Sep 17 00:00:00 2001
From: Stefan Wienert <stefan.wienert@pludoni.de>
Date: Fri, 28 Nov 2014 18:07:00 +0100
Subject: [PATCH 054/115] made refresh button work - request is not defined

---
 lib/simple_captcha/view.rb | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/simple_captcha/view.rb b/lib/simple_captcha/view.rb
index fdcd154..4bdb200 100644
--- a/lib/simple_captcha/view.rb
+++ b/lib/simple_captcha/view.rb
@@ -74,8 +74,13 @@ def simple_captcha_image_url(simple_captcha_key, options = {})
         defaults = {}
         defaults[:time] = options[:time] || Time.now.to_i
 
-        query = defaults.collect{ |key, value| "#{key}=#{value}" }.join('&')
-        "#{request.protocol}#{request.host_with_port}#{ENV['RAILS_RELATIVE_URL_ROOT']}/simple_captcha?code=#{simple_captcha_key}&#{query}"
+        query = defaults.to_query
+        path = "/simple_captcha?code=#{simple_captcha_key}&#{query}"
+        if defined?(request)
+          "#{request.protocol}#{request.host_with_port}#{ENV['RAILS_RELATIVE_URL_ROOT']}#{path}"
+        else
+          "#{ENV['RAILS_RELATIVE_URL_ROOT']}#{path}"
+        end
       end
 
       def simple_captcha_field(options={})

From d3626045ae0e80a7bdf1f84a90de2f860e4e5849 Mon Sep 17 00:00:00 2001
From: "fbiete@gmail.com" <fbiete@gmail.com>
Date: Mon, 29 Dec 2014 11:29:24 +0100
Subject: [PATCH 055/115] Fix warning
 simple_captcha2-0.3.2/lib/simple_captcha/view.rb:136 warning: circular
 argument reference - request

---
 lib/simple_captcha/view.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/simple_captcha/view.rb b/lib/simple_captcha/view.rb
index 4bdb200..c6313fc 100644
--- a/lib/simple_captcha/view.rb
+++ b/lib/simple_captcha/view.rb
@@ -133,8 +133,8 @@ def generate_simple_captcha_data(code)
         return value
       end
 
-      def simple_captcha_key(key_name = nil, request = request)
-        local_session = request.try(:session) || session
+      def simple_captcha_key(key_name = nil, prequest = request)
+        local_session = prequest.try(:session) || session
         if key_name.nil?
           local_session[:captcha] ||= SimpleCaptcha::Utils.generate_key(local_session[:id].to_s, 'captcha')
         else

From 1d72d5ffd93398b0fae0c6fd25b05f9977fe8144 Mon Sep 17 00:00:00 2001
From: Alexander Logvinov <avl@logvinov.com>
Date: Wed, 31 Dec 2014 16:44:04 +0800
Subject: [PATCH 056/115] add additional check for request

---
 lib/simple_captcha/view.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/simple_captcha/view.rb b/lib/simple_captcha/view.rb
index c6313fc..71da05a 100644
--- a/lib/simple_captcha/view.rb
+++ b/lib/simple_captcha/view.rb
@@ -76,7 +76,7 @@ def simple_captcha_image_url(simple_captcha_key, options = {})
 
         query = defaults.to_query
         path = "/simple_captcha?code=#{simple_captcha_key}&#{query}"
-        if defined?(request)
+        if defined?(request) && request
           "#{request.protocol}#{request.host_with_port}#{ENV['RAILS_RELATIVE_URL_ROOT']}#{path}"
         else
           "#{ENV['RAILS_RELATIVE_URL_ROOT']}#{path}"

From 859d23d092dab32840bb6fb0ff14e36fe579bcf5 Mon Sep 17 00:00:00 2001
From: Kuldeep Aggarwal <kd.engineer@yahoo.co.in>
Date: Sun, 18 Jan 2015 00:22:37 +0530
Subject: [PATCH 057/115] allow user to add customised response headers
 customised partial_parth for captcha

---
 lib/simple_captcha.rb            | 6 ++++++
 lib/simple_captcha/middleware.rb | 2 +-
 lib/simple_captcha/view.rb       | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/simple_captcha.rb b/lib/simple_captcha.rb
index 995fc1a..95f60ca 100644
--- a/lib/simple_captcha.rb
+++ b/lib/simple_captcha.rb
@@ -63,6 +63,12 @@ class << self
   mattr_accessor :noise
   @@noise = 0
 
+  mattr_accessor :extra_response_headers
+  @@extra_response_headers = {}
+
+  mattr_accessor :partial_path
+  @@partial_path = 'simple_captcha/simple_captcha'
+
   def self.add_image_style(name, params = [])
     SimpleCaptcha::ImageHelpers.image_styles.update(name.to_s => params)
   end
diff --git a/lib/simple_captcha/middleware.rb b/lib/simple_captcha/middleware.rb
index e2732d6..50d9d13 100644
--- a/lib/simple_captcha/middleware.rb
+++ b/lib/simple_captcha/middleware.rb
@@ -84,7 +84,7 @@ def refresh_code(env)
                     $("##{id}").attr('src', '#{url}');
                     $("#captcha_key").attr('value', '#{key}');
                   }
-        headers = {'Content-Type' => 'text/javascript; charset=utf-8', "Content-Disposition" => "inline; filename='captcha.js'", "Content-Length" => body.length.to_s}
+        headers = {'Content-Type' => 'text/javascript; charset=utf-8', "Content-Disposition" => "inline; filename='captcha.js'", "Content-Length" => body.length.to_s}.merge(SimpleCaptcha.extra_response_headers)
         [status, headers, [body]]
       end
   end
diff --git a/lib/simple_captcha/view.rb b/lib/simple_captcha/view.rb
index 71da05a..9a0fb64 100644
--- a/lib/simple_captcha/view.rb
+++ b/lib/simple_captcha/view.rb
@@ -59,7 +59,7 @@ def show_simple_captcha(options={})
         :refresh_button => simple_captcha_refresh_button(options),
       }.merge(options)
 
-      render :partial => 'simple_captcha/simple_captcha', :locals => { :simple_captcha_options => defaults }
+      render :partial => SimpleCaptcha.partial_path, :locals => { :simple_captcha_options => defaults }
     end
 
     private

From 49fa6a248980225b43392fb9bdfe1a867ed9c692 Mon Sep 17 00:00:00 2001
From: Stefan Wienert <stefan.wienert@pludoni.de>
Date: Wed, 28 Jan 2015 11:52:47 +0100
Subject: [PATCH 058/115] 0.3.3

---
 lib/simple_captcha/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/simple_captcha/version.rb b/lib/simple_captcha/version.rb
index 9d931bb..efd6dd7 100644
--- a/lib/simple_captcha/version.rb
+++ b/lib/simple_captcha/version.rb
@@ -1,3 +1,3 @@
 module SimpleCaptcha
-  VERSION = "0.3.2".freeze
+  VERSION = "0.3.3".freeze
 end

From 6164816fd8dcb7863e0fe0c9b6871b1548806727 Mon Sep 17 00:00:00 2001
From: Kuldeep Aggarwal <kd.engineer@yahoo.co.in>
Date: Mon, 2 Feb 2015 13:22:15 +0530
Subject: [PATCH 059/115] fetching time to microseconds

---
 lib/simple_captcha/utils.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/simple_captcha/utils.rb b/lib/simple_captcha/utils.rb
index 5951f21..8427d31 100644
--- a/lib/simple_captcha/utils.rb
+++ b/lib/simple_captcha/utils.rb
@@ -29,7 +29,7 @@ def self.simple_captcha_passed!(key) #:nodoc
     end
 
     def self.generate_key(*args)
-      args << Time.now.to_s
+      args << (Time.now.to_f * 1_000_000_000).to_s
       Digest::SHA1.hexdigest(args.join)
     end
   end

From f1efa05a6fb8a2f43278d2d51df8c9cd1cbf5d8c Mon Sep 17 00:00:00 2001
From: Kuldeep Aggarwal <kd.engineer@yahoo.co.in>
Date: Mon, 2 Feb 2015 19:22:14 +0530
Subject: [PATCH 060/115] assign unique id to hidden captcha_key

---
 lib/simple_captcha/form_builder.rb | 2 +-
 lib/simple_captcha/middleware.rb   | 3 ++-
 lib/simple_captcha/view.rb         | 9 +++++++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/lib/simple_captcha/form_builder.rb b/lib/simple_captcha/form_builder.rb
index e7e34fd..c8da12d 100644
--- a/lib/simple_captcha/form_builder.rb
+++ b/lib/simple_captcha/form_builder.rb
@@ -36,7 +36,7 @@ def simple_captcha_field(options={})
           html[:placeholder] = options[:placeholder] || I18n.t('simple_captcha.placeholder')
 
           text_field(:captcha, html) +
-          hidden_field(:captcha_key, {:value => options[:field_value]})
+          hidden_field(:captcha_key, {:value => options[:field_value], :id => simple_captch_hidden_field_id(options)})
         end
     end
   end
diff --git a/lib/simple_captcha/middleware.rb b/lib/simple_captcha/middleware.rb
index 50d9d13..9e45572 100644
--- a/lib/simple_captcha/middleware.rb
+++ b/lib/simple_captcha/middleware.rb
@@ -79,10 +79,11 @@ def refresh_code(env)
 
         status = 200
         id = request.params['id']
+        captcha_hidden_field_id = simple_captch_hidden_field_id(id)
 
         body = %Q{
                     $("##{id}").attr('src', '#{url}');
-                    $("#captcha_key").attr('value', '#{key}');
+                    $("##{ captcha_hidden_field_id }").attr('value', '#{key}');
                   }
         headers = {'Content-Type' => 'text/javascript; charset=utf-8', "Content-Disposition" => "inline; filename='captcha.js'", "Content-Length" => body.length.to_s}.merge(SimpleCaptcha.extra_response_headers)
         [status, headers, [body]]
diff --git a/lib/simple_captcha/view.rb b/lib/simple_captcha/view.rb
index 9a0fb64..390893a 100644
--- a/lib/simple_captcha/view.rb
+++ b/lib/simple_captcha/view.rb
@@ -90,10 +90,10 @@ def simple_captcha_field(options={})
 
         if options[:object]
           text_field(options[:object], :captcha, html.merge(:value => '')) +
-          hidden_field(options[:object], :captcha_key, {:value => options[:field_value]})
+          hidden_field(options[:object], :captcha_key, {:value => options[:field_value], :id => simple_captch_hidden_field_id(options)})
         else
           text_field_tag(:captcha, nil, html) +
-          hidden_field_tag(:captcha_key, options[:field_value])
+          hidden_field_tag(:captcha_key, options[:field_value], :id => simple_captch_hidden_field_id(options))
         end
       end
 
@@ -110,6 +110,11 @@ def simple_captcha_image_id(options={})
         "simple_captcha-#{options[:field_value][0..10]}"
       end
 
+      def simple_captch_hidden_field_id(image_id)
+        image_id = simple_captcha_image_id(image_id) if image_id.is_a?(Hash)
+        "simple-captcha-hidden-field-#{ image_id }"
+      end
+
       def set_simple_captcha_data(key, options={})
         code_type = options[:code_type]
 

From bafa216c12c7045f9985a05aa39c6c31862b9fb8 Mon Sep 17 00:00:00 2001
From: Kuldeep Aggarwal <kd.engineer@yahoo.co.in>
Date: Wed, 4 Feb 2015 18:51:08 +0530
Subject: [PATCH 061/115] extract simple_captcha options in another helper

---
 lib/simple_captcha/view.rb | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/simple_captcha/view.rb b/lib/simple_captcha/view.rb
index 390893a..1db8413 100644
--- a/lib/simple_captcha/view.rb
+++ b/lib/simple_captcha/view.rb
@@ -42,7 +42,11 @@ module ViewHelper #:nodoc
     # Find more detailed examples with sample images here on my blog http://EXPRESSICA.com
     #
     # All Feedbacks/CommentS/Issues/Queries are welcome.
-    def show_simple_captcha(options={})
+    def show_simple_captcha(options = {})
+      render :partial => SimpleCaptcha.partial_path, :locals => { :simple_captcha_options => simple_captcha_options(options) }
+    end
+
+    def simple_captcha_options(options = {})
       key = simple_captcha_key(options[:object])
       if options[:multiple] === false
         # It's not the first captcha, we only need to return the key
@@ -58,8 +62,6 @@ def show_simple_captcha(options={})
         :field => simple_captcha_field(options),
         :refresh_button => simple_captcha_refresh_button(options),
       }.merge(options)
-
-      render :partial => SimpleCaptcha.partial_path, :locals => { :simple_captcha_options => defaults }
     end
 
     private

From d21143f98aee619024dd6a794d386aac946e24d0 Mon Sep 17 00:00:00 2001
From: Kuldeep Aggarwal <kd.engineer@yahoo.co.in>
Date: Thu, 5 Feb 2015 01:55:31 +0530
Subject: [PATCH 062/115] extract url creation logic

---
 lib/simple_captcha/view.rb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/simple_captcha/view.rb b/lib/simple_captcha/view.rb
index 1db8413..53d8f03 100644
--- a/lib/simple_captcha/view.rb
+++ b/lib/simple_captcha/view.rb
@@ -78,6 +78,10 @@ def simple_captcha_image_url(simple_captcha_key, options = {})
 
         query = defaults.to_query
         path = "/simple_captcha?code=#{simple_captcha_key}&#{query}"
+        build_url(options, path)
+      end
+
+      def build_url(options, path)
         if defined?(request) && request
           "#{request.protocol}#{request.host_with_port}#{ENV['RAILS_RELATIVE_URL_ROOT']}#{path}"
         else
@@ -105,7 +109,8 @@ def simple_captcha_refresh_button(options={})
 
         text = options[:refresh_button_text] || I18n.t('simple_captcha.refresh_button_text', default: 'Refresh')
 
-        link_to(text, "#{ENV['RAILS_RELATIVE_URL_ROOT']}/simple_captcha?id=#{simple_captcha_image_id(options)}", html)
+        url = build_url(options, "/simple_captcha?id=#{simple_captcha_image_id(options)}")
+        link_to(text, url, html)
       end
 
       def simple_captcha_image_id(options={})

From e0fbb20d5553bce2ba76c73e1a3069e9480b7d33 Mon Sep 17 00:00:00 2001
From: Stefan Wienert <stefan.wienert@pludoni.de>
Date: Thu, 5 Feb 2015 12:03:31 +0100
Subject: [PATCH 063/115] version 0.3.4

---
 lib/simple_captcha/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/simple_captcha/version.rb b/lib/simple_captcha/version.rb
index efd6dd7..80c9d72 100644
--- a/lib/simple_captcha/version.rb
+++ b/lib/simple_captcha/version.rb
@@ -1,3 +1,3 @@
 module SimpleCaptcha
-  VERSION = "0.3.3".freeze
+  VERSION = "0.3.4".freeze
 end

From d04b5821c0921b36e9a79e87d93f4cb5cce93876 Mon Sep 17 00:00:00 2001
From: Aliaksandr Buhayeu <aliaksandr.buhayeu@gmail.com>
Date: Thu, 12 Feb 2015 19:15:46 +0300
Subject: [PATCH 064/115] Add missing default application.css to make tests
 pass

---
 .../dummy/templates/app/assets/stylesheets/application.css   | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 test/lib/generators/simple_captcha/dummy/templates/app/assets/stylesheets/application.css

diff --git a/test/lib/generators/simple_captcha/dummy/templates/app/assets/stylesheets/application.css b/test/lib/generators/simple_captcha/dummy/templates/app/assets/stylesheets/application.css
new file mode 100644
index 0000000..89b8e68
--- /dev/null
+++ b/test/lib/generators/simple_captcha/dummy/templates/app/assets/stylesheets/application.css
@@ -0,0 +1,5 @@
+/*                                                                                                              
+*
+*= require_tree .                                                                                              
+*= require_self                                                                                                
+*/  
\ No newline at end of file

From 13839c52bdb1b96a0504cf958fccc16bbb5c6335 Mon Sep 17 00:00:00 2001
From: Aliaksandr Buhayeu <aliaksandr.buhayeu@gmail.com>
Date: Thu, 12 Feb 2015 20:24:36 +0300
Subject: [PATCH 065/115] Add optional possibility to generate captcha partial
 with HAML

---
 README.md                                  |  2 +-
 lib/generators/USAGE                       |  7 ++++--
 lib/generators/simple_captcha_generator.rb |  3 ++-
 lib/generators/templates/partial.haml      | 28 ++++++++++++++++++++++
 test/generators/run_generator_test.rb      | 18 ++++++++++++++
 5 files changed, 54 insertions(+), 4 deletions(-)
 create mode 100644 lib/generators/templates/partial.haml
 create mode 100644 test/generators/run_generator_test.rb

diff --git a/README.md b/README.md
index a533ad0..12bffdd 100644
--- a/README.md
+++ b/README.md
@@ -44,7 +44,7 @@ and run ``bundle install``.
 After installation, follow these simple steps to setup the plugin. The setup will depend on the version of rails your application is using.
 
 ```bash
-rails generate simple_captcha
+rails generate simple_captcha [template_format] # Available options erb, haml. Default: erb
 rake db:migrate # Mongoid: skip this step and remove the migration
 ```
 
diff --git a/lib/generators/USAGE b/lib/generators/USAGE
index b36fdc0..53c0e84 100644
--- a/lib/generators/USAGE
+++ b/lib/generators/USAGE
@@ -1,4 +1,7 @@
-SimplaCaptcha
+SimpleCaptcha
 =============
 # Generate migration and copy view partial
-  rails generate simple_captcha
+  rails generate simple_captcha [template_format]
+  template_format               Sets template format to be generated
+                                Available options: erb, haml
+                                Default: erb
diff --git a/lib/generators/simple_captcha_generator.rb b/lib/generators/simple_captcha_generator.rb
index c719fa6..fd2ec0a 100644
--- a/lib/generators/simple_captcha_generator.rb
+++ b/lib/generators/simple_captcha_generator.rb
@@ -1,6 +1,7 @@
 require 'rails/generators'
 
 class SimpleCaptchaGenerator < Rails::Generators::Base
+  argument :template_format, :type => :string, :default => 'erb'
   include Rails::Generators::Migration
 
   def self.source_root
@@ -12,7 +13,7 @@ def self.next_migration_number(dirname)
   end
 
   def create_partial
-    template "partial.erb", File.join('app/views', 'simple_captcha', "_simple_captcha.erb")
+    template "partial.#{template_format}", File.join('app/views', 'simple_captcha', "_simple_captcha.#{template_format}")
   end
 
   def create_captcha_migration
diff --git a/lib/generators/templates/partial.haml b/lib/generators/templates/partial.haml
new file mode 100644
index 0000000..0676da1
--- /dev/null
+++ b/lib/generators/templates/partial.haml
@@ -0,0 +1,28 @@
+:css
+  .simple_captcha{border: 1px solid #ccc; padding: 5px !important;}
+  .simple_captcha,
+  .simple_captcha div{display: table;}
+  .simple_captcha .simple_captcha_field,
+  .simple_captcha .simple_captcha_image{
+    border: 1px solid #ccc;
+    margin: 0px 0px 2px 0px !important;
+    padding: 0px !important;
+  }
+  .simple_captcha .simple_captcha_image img{
+    margin: 0px !important;
+    padding: 0px !important;
+    width: 110px !important;
+  }
+  .simple_captcha .simple_captcha_label{font-size: 12px;}
+  .simple_captcha .simple_captcha_field input{
+    width: 150px !important;
+    font-size: 16px;
+    border: none;
+    background-color: #efefef;
+  }
+
+.simple_captcha
+  .simple_captcha_image= simple_captcha_options[:image]
+  .simple_captcha_field= simple_captcha_options[:field]
+  .simple_captcha_label= simple_captcha_options[:label]
+  .simple_captcha_refresh_button= simple_captcha_options[:refresh_button]
\ No newline at end of file
diff --git a/test/generators/run_generator_test.rb b/test/generators/run_generator_test.rb
new file mode 100644
index 0000000..b813b62
--- /dev/null
+++ b/test/generators/run_generator_test.rb
@@ -0,0 +1,18 @@
+require 'test_helper'
+require 'generators/simple_captcha_generator'
+
+class RunGeneratorTest < Rails::Generators::TestCase
+  tests SimpleCaptchaGenerator
+  destination File.expand_path('../dummy')
+  setup :prepare_destination
+
+  test 'generates default partial with ERB format' do
+    run_generator
+    assert_file 'app/views/simple_captcha/_simple_captcha.erb'
+  end
+
+  test 'generates partial with HAML format if specified' do
+    run_generator ['haml']
+    assert_file 'app/views/simple_captcha/_simple_captcha.haml'
+  end
+end

From 7c7a88acbcdc9f1bcbc9a5ed219a4f117da4a511 Mon Sep 17 00:00:00 2001
From: Aliaksandr Buhayeu <aliaksandr.buhayeu@gmail.com>
Date: Thu, 12 Feb 2015 20:29:54 +0300
Subject: [PATCH 066/115] Add missed newlines at the end of files

---
 lib/generators/templates/partial.haml                     | 2 +-
 .../templates/app/assets/stylesheets/application.css      | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/generators/templates/partial.haml b/lib/generators/templates/partial.haml
index 0676da1..8db64b9 100644
--- a/lib/generators/templates/partial.haml
+++ b/lib/generators/templates/partial.haml
@@ -25,4 +25,4 @@
   .simple_captcha_image= simple_captcha_options[:image]
   .simple_captcha_field= simple_captcha_options[:field]
   .simple_captcha_label= simple_captcha_options[:label]
-  .simple_captcha_refresh_button= simple_captcha_options[:refresh_button]
\ No newline at end of file
+  .simple_captcha_refresh_button= simple_captcha_options[:refresh_button]
diff --git a/test/lib/generators/simple_captcha/dummy/templates/app/assets/stylesheets/application.css b/test/lib/generators/simple_captcha/dummy/templates/app/assets/stylesheets/application.css
index 89b8e68..03a1876 100644
--- a/test/lib/generators/simple_captcha/dummy/templates/app/assets/stylesheets/application.css
+++ b/test/lib/generators/simple_captcha/dummy/templates/app/assets/stylesheets/application.css
@@ -1,5 +1,5 @@
-/*                                                                                                              
+/*
 *
-*= require_tree .                                                                                              
-*= require_self                                                                                                
-*/  
\ No newline at end of file
+*= require_tree .
+*= require_self
+*/

From efd3aa5562fc365cedaea076b990fb1588b226dd Mon Sep 17 00:00:00 2001
From: Marcin Kalita <rubyconvict@gmail.com>
Date: Sat, 21 Feb 2015 11:52:17 +0100
Subject: [PATCH 067/115] Remove obsolete info from README.md

---
 README.md | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/README.md b/README.md
index 12bffdd..f452db7 100644
--- a/README.md
+++ b/README.md
@@ -247,15 +247,6 @@ SimpleCaptcha.setup do |sc|
 end
 ```
 
-You can provide the path where should be stored tmp files.
-It's usefull when you dont have acces to /tmp (default directory)
-
-```ruby
-SimpleCaptcha.setup do |sc|
-  sc.tmp_path = '/tmp' # or somewhere in project eg. Rails.root.join('tmp/simple_captcha').to_s, make shure directory exists
-end
-```
-
 
 ### How to change the CSS for SimpleCaptcha DOM elements?
 

From dab9823b842f7965adeff86f02438a5d4c97dc0a Mon Sep 17 00:00:00 2001
From: bevis <i@bevis.me>
Date: Mon, 26 Oct 2015 20:01:19 +0800
Subject: [PATCH 068/115] fix no session request(api etc) will never delete
 expired captcha data

---
 lib/simple_captcha/controller.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/simple_captcha/controller.rb b/lib/simple_captcha/controller.rb
index 3a8a20a..4414fc4 100644
--- a/lib/simple_captcha/controller.rb
+++ b/lib/simple_captcha/controller.rb
@@ -18,9 +18,10 @@ def simple_captcha_valid?
       return @_simple_captcha_result unless @_simple_captcha_result.nil?
 
       if params[:captcha]
-        data = SimpleCaptcha::Utils::simple_captcha_value(params[:captcha_key] || session[:captcha])
+        captcha_key = params[:captcha_key] || session[:captcha]
+        data = SimpleCaptcha::Utils::simple_captcha_value(captcha_key)
         result = data == params[:captcha].delete(" ").upcase
-        SimpleCaptcha::Utils::simple_captcha_passed!(session[:captcha]) if result
+        SimpleCaptcha::Utils::simple_captcha_passed!(captcha_key) if result
         @_simple_captcha_result = result
         result
       else

From 09d1e1a4684ee7abc3b5e5c932c004b502fe1372 Mon Sep 17 00:00:00 2001
From: Grigory Lutkov <Friend.LGA@gmail.com>
Date: Tue, 22 Dec 2015 22:12:36 +0300
Subject: [PATCH 069/115] Add autocorrect = 'off' and autocapitalize = 'off'
 for iPhone/iPad

---
 lib/simple_captcha/form_builder.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/simple_captcha/form_builder.rb b/lib/simple_captcha/form_builder.rb
index c8da12d..03b1045 100644
--- a/lib/simple_captcha/form_builder.rb
+++ b/lib/simple_captcha/form_builder.rb
@@ -31,7 +31,7 @@ def template
         end
 
         def simple_captcha_field(options={})
-          html = {:autocomplete => 'off', :required => 'required', :value => ''}
+          html = {:autocomplete => 'off', autocorrect: 'off', autocapitalize: 'off', :required => 'required', :value => ''}
           html.merge!(options[:input_html] || {})
           html[:placeholder] = options[:placeholder] || I18n.t('simple_captcha.placeholder')
 

From b83b9c57ec342e651aa2495feaf9d37c8fd84035 Mon Sep 17 00:00:00 2001
From: Grigory Lutkov <Friend.LGA@gmail.com>
Date: Tue, 22 Dec 2015 22:16:19 +0300
Subject: [PATCH 070/115] Add autocorrect = 'off' and autocapitalize = 'off'
 for iPhone/iPad

---
 lib/simple_captcha/view.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/simple_captcha/view.rb b/lib/simple_captcha/view.rb
index 53d8f03..ee17c58 100644
--- a/lib/simple_captcha/view.rb
+++ b/lib/simple_captcha/view.rb
@@ -90,7 +90,7 @@ def build_url(options, path)
       end
 
       def simple_captcha_field(options={})
-        html = {:autocomplete => 'off', :required => 'required'}
+        html = {:autocomplete => 'off', autocorrect: 'off', autocapitalize: 'off', :required => 'required'}
         html.merge!(options[:input_html] || {})
         html[:placeholder] = options[:placeholder] || I18n.t('simple_captcha.placeholder')
 

From 637d1bc62e57611efddf8e571850dfcba24b657a Mon Sep 17 00:00:00 2001
From: Stefan Wienert <stefan.wienert@pludoni.de>
Date: Tue, 29 Dec 2015 20:21:03 +0100
Subject: [PATCH 071/115] Travis: migrate to docker

---
 .travis.yml | 44 +++++++++++++++++++++++++-------------------
 1 file changed, 25 insertions(+), 19 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7abc14e..c8b95aa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,31 +1,37 @@
 ---
 language: ruby
-script:
-    - rake test
+sudo: false
+cache: bundler
+
 rvm:
   - '1.9.3'
-  - '2.0.0'
-  - '2.1.1'
+  - '2.1'
+  - '2.2.3'
+  - 'ruby-head'
 
 env:
-  - DB=sqlite                     RAILS='~> 4.1'
-  - DB=sqlite FORMTASTIC='~> 2.2' RAILS='~> 4.1'
+  - DB=sqlite                     RAILS='~> 4.2'
+  - DB=sqlite FORMTASTIC='~> 2.2' RAILS='~> 4.2'
 
 matrix:
   include:
-    - rvm: 2.1.1
-      env: DB=mysql RAILS='4.1'
-  # include:
-  #   - rvm: 2.1.0
-  #     env: DB=posgresql RAILS='4.1'
+    - rvm: 2.2.3
+      env: DB=mysql RAILS='4.2'
   include:
-    - rvm: 2.1.1
-      env: DB=sqlite FORMTASTIC='~> 2.2' RAILS='~> 4.1'
-
+    - rvm: 2.1.0
+      env: DB=posgresql RAILS='4.1'
+  include:
+    - rvm: 2.2.3
+      env: DB=sqlite FORMTASTIC='~> 2.2' RAILS='~> 4.2'
 
 before_script:
-  - mysql -e 'create database myapp_test'
-  - psql -c 'create database myapp_test' -U postgres
-  - rake dummy:setup
-  - rake app:db:migrate
-  - rake app:db:migrate RAILS_ENV=test
+  # - mysql -e 'create database myapp_test'
+  # - psql -c 'create database myapp_test' -U postgres
+  - bundle exec rake dummy:setup
+  - bundle exec rake app:db:create
+  - bundle exec rake app:db:migrate
+  - bundle exec rake app:db:migrate RAILS_ENV=test
+
+script:
+  - bundle exec rake test
+

From 271d6c92d2969f37b2a52abb39ccf6c00c13df1c Mon Sep 17 00:00:00 2001
From: Stefan Wienert <stefan.wienert@pludoni.de>
Date: Tue, 29 Dec 2015 20:34:51 +0100
Subject: [PATCH 072/115] Added Changelog

---
 CHANGELOG.md | 100 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 100 insertions(+)
 create mode 100644 CHANGELOG.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..c49f754
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,100 @@
+# Change Log
+
+## [Unreleased](https://github.com/pludoni/simple-captcha/tree/HEAD)
+
+[Full Changelog](https://github.com/pludoni/simple-captcha/compare/v0.3.4...HEAD)
+
+**Merged pull requests:**
+
+- fix no session request\(api etc\) will never delete expired captcha data [\#46](https://github.com/pludoni/simple-captcha/pull/46) ([beviz](https://github.com/beviz))
+- Remove obsolete info from README.md [\#41](https://github.com/pludoni/simple-captcha/pull/41) ([rubyconvict](https://github.com/rubyconvict))
+- Add optional possibility to generate captcha partial with HAML [\#40](https://github.com/pludoni/simple-captcha/pull/40) ([aliaksandrb](https://github.com/aliaksandrb))
+
+## [v0.3.4](https://github.com/pludoni/simple-captcha/tree/v0.3.4) (2015-02-05)
+[Full Changelog](https://github.com/pludoni/simple-captcha/compare/v0.3.3...v0.3.4)
+
+**Closed issues:**
+
+- Refresh on "Model Based" does not work because of prefixed id on captcha key field [\#29](https://github.com/pludoni/simple-captcha/issues/29)
+
+**Merged pull requests:**
+
+- Little improvements [\#39](https://github.com/pludoni/simple-captcha/pull/39) ([kuldeepaggarwal](https://github.com/kuldeepaggarwal))
+
+## [v0.3.3](https://github.com/pludoni/simple-captcha/tree/v0.3.3) (2015-01-28)
+[Full Changelog](https://github.com/pludoni/simple-captcha/compare/v0.3.2...v0.3.3)
+
+**Closed issues:**
+
+- Integration with Devise [\#32](https://github.com/pludoni/simple-captcha/issues/32)
+- 404 when image URL is not loaded from rails page [\#24](https://github.com/pludoni/simple-captcha/issues/24)
+- Add a class to the text field [\#21](https://github.com/pludoni/simple-captcha/issues/21)
+- when i run rails generate simple\_captcha i get "simple\_captcha\_generator.rb:18:in `create\_migration': wrong number of arguments \(3 for 0\) \(ArgumentError\)" [\#18](https://github.com/pludoni/simple-captcha/issues/18)
+
+**Merged pull requests:**
+
+- Add additional check for request [\#36](https://github.com/pludoni/simple-captcha/pull/36) ([incubus](https://github.com/incubus))
+- Ruby 2.2.0: Fix warning [\#35](https://github.com/pludoni/simple-captcha/pull/35) ([fmbiete](https://github.com/fmbiete))
+- Remove the executable bit from image.rb [\#31](https://github.com/pludoni/simple-captcha/pull/31) ([incubus](https://github.com/incubus))
+- Add noise to image [\#28](https://github.com/pludoni/simple-captcha/pull/28) ([lionello](https://github.com/lionello))
+- Remove the need for tempfiles [\#27](https://github.com/pludoni/simple-captcha/pull/27) ([lionello](https://github.com/lionello))
+- Using absolute URL for img src to support inclusion in non-rails pages [\#26](https://github.com/pludoni/simple-captcha/pull/26) ([lionello](https://github.com/lionello))
+- add i18n example for refresh button text [\#23](https://github.com/pludoni/simple-captcha/pull/23) ([Feuda](https://github.com/Feuda))
+- Add possibility to set `implode` valude for the generated image [\#20](https://github.com/pludoni/simple-captcha/pull/20) ([mrhead](https://github.com/mrhead))
+- Updated README.md [\#16](https://github.com/pludoni/simple-captcha/pull/16) ([rubyconvict](https://github.com/rubyconvict))
+
+## [v0.3.2](https://github.com/pludoni/simple-captcha/tree/v0.3.2) (2014-06-12)
+[Full Changelog](https://github.com/pludoni/simple-captcha/compare/v0.3.1...v0.3.2)
+
+**Closed issues:**
+
+- undefined method `apply\_simple\_captcha' for User:Class \(NoMethodError\) [\#14](https://github.com/pludoni/simple-captcha/issues/14)
+
+**Merged pull requests:**
+
+- Fixes \#14 - undefined method 'apply\_simple\_captcha' \(Mongoid\) [\#15](https://github.com/pludoni/simple-captcha/pull/15) ([rubyconvict](https://github.com/rubyconvict))
+
+## [v0.3.1](https://github.com/pludoni/simple-captcha/tree/v0.3.1) (2014-05-24)
+[Full Changelog](https://github.com/pludoni/simple-captcha/compare/v0.2.2...v0.3.1)
+
+**Closed issues:**
+
+- simple\_captcha\_valid? is self destructing or something? [\#13](https://github.com/pludoni/simple-captcha/issues/13)
+- Gem breaks when middleware placed after mobvious in middleware stack [\#9](https://github.com/pludoni/simple-captcha/issues/9)
+
+## [v0.2.2](https://github.com/pludoni/simple-captcha/tree/v0.2.2) (2014-05-04)
+[Full Changelog](https://github.com/pludoni/simple-captcha/compare/v0.3.0...v0.2.2)
+
+## [v0.3.0](https://github.com/pludoni/simple-captcha/tree/v0.3.0) (2014-05-04)
+[Full Changelog](https://github.com/pludoni/simple-captcha/compare/v0.2.1...v0.3.0)
+
+**Closed issues:**
+
+- Field key doesn't have a default value [\#7](https://github.com/pludoni/simple-captcha/issues/7)
+
+**Merged pull requests:**
+
+- fix: avoid 'create\_migration' method conflict [\#11](https://github.com/pludoni/simple-captcha/pull/11) ([mzaharie](https://github.com/mzaharie))
+- Support for using the same captcha in multiple forms of the same page [\#8](https://github.com/pludoni/simple-captcha/pull/8) ([fmbiete](https://github.com/fmbiete))
+
+## [v0.2.1](https://github.com/pludoni/simple-captcha/tree/v0.2.1) (2013-12-29)
+[Full Changelog](https://github.com/pludoni/simple-captcha/compare/v0.2.0...v0.2.1)
+
+**Closed issues:**
+
+- What about publishing a new gem? [\#6](https://github.com/pludoni/simple-captcha/issues/6)
+- Captcha image wont show up on Rails 4 [\#1](https://github.com/pludoni/simple-captcha/issues/1)
+
+## [v0.2.0](https://github.com/pludoni/simple-captcha/tree/v0.2.0) (2013-12-01)
+[Full Changelog](https://github.com/pludoni/simple-captcha/compare/v0.1.6...v0.2.0)
+
+**Merged pull requests:**
+
+- Fix default gemfile for dummy application [\#5](https://github.com/pludoni/simple-captcha/pull/5) ([freemanoid](https://github.com/freemanoid))
+- Correct contributing part of README according to travis config [\#4](https://github.com/pludoni/simple-captcha/pull/4) ([freemanoid](https://github.com/freemanoid))
+- Add refresh image button [\#3](https://github.com/pludoni/simple-captcha/pull/3) ([freemanoid](https://github.com/freemanoid))
+
+## [v0.1.6](https://github.com/pludoni/simple-captcha/tree/v0.1.6) (2013-06-24)
+
+
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

From 33365319a565334cf4b6915d7134f85d73922247 Mon Sep 17 00:00:00 2001
From: Stefan Wienert <stefan.wienert@pludoni.de>
Date: Tue, 29 Dec 2015 20:37:03 +0100
Subject: [PATCH 073/115] Added Rubygems Badge

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index f452db7..17d2a09 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,7 @@
 #SimpleCaptcha2
 
 [![Build Status](https://travis-ci.org/pludoni/simple-captcha.png?branch=master)](https://travis-ci.org/pludoni/simple-captcha)
+[![Gem Version](https://badge.fury.io/rb/simple_captcha2.svg)](https://badge.fury.io/rb/simple_captcha2)
 
 SimpleCaptcha(2) is the simplest and a robust captcha plugin. Its implementation requires adding up a single line in views and in controllers/models.
 SimpleCaptcha2 is available to be used with Rails 3 + 4.

From 66eadf30c1826d2f59ff17685ffe58d77e5a9834 Mon Sep 17 00:00:00 2001
From: Stefan Wienert <stefan.wienert@pludoni.de>
Date: Tue, 29 Dec 2015 20:41:36 +0100
Subject: [PATCH 074/115] matched project style for hash keys

---
 lib/simple_captcha/form_builder.rb | 18 +++++++++---------
 lib/simple_captcha/view.rb         |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/simple_captcha/form_builder.rb b/lib/simple_captcha/form_builder.rb
index 03b1045..42dd5d6 100644
--- a/lib/simple_captcha/form_builder.rb
+++ b/lib/simple_captcha/form_builder.rb
@@ -14,14 +14,14 @@ def self.included(base)
 
     module ClassMethods
       # Example:
-		  # <% form_for :post, :url => posts_path do |form| %>
-		  #   ...
-		  #   <%= form.simple_captcha :label => "Enter numbers.." %>
-		  # <% end %>
-		  #
-		  def simple_captcha(options = {})
-      	options.update :object => @object_name
-      	show_simple_captcha(objectify_options(options))
+      # <% form_for :post, :url => posts_path do |form| %>
+      #   ...
+      #   <%= form.simple_captcha :label => "Enter numbers.." %>
+      # <% end %>
+      #
+      def simple_captcha(options = {})
+        options.update :object => @object_name
+        show_simple_captcha(objectify_options(options))
       end
 
       private
@@ -31,7 +31,7 @@ def template
         end
 
         def simple_captcha_field(options={})
-          html = {:autocomplete => 'off', autocorrect: 'off', autocapitalize: 'off', :required => 'required', :value => ''}
+          html = {:autocomplete => 'off', :autocorrect => 'off', :autocapitalize => 'off', :required => 'required', :value => ''}
           html.merge!(options[:input_html] || {})
           html[:placeholder] = options[:placeholder] || I18n.t('simple_captcha.placeholder')
 
diff --git a/lib/simple_captcha/view.rb b/lib/simple_captcha/view.rb
index ee17c58..109e684 100644
--- a/lib/simple_captcha/view.rb
+++ b/lib/simple_captcha/view.rb
@@ -90,7 +90,7 @@ def build_url(options, path)
       end
 
       def simple_captcha_field(options={})
-        html = {:autocomplete => 'off', autocorrect: 'off', autocapitalize: 'off', :required => 'required'}
+        html = {:autocomplete => 'off', :autocorrect => 'off', :autocapitalize => 'off', :required => 'required'}
         html.merge!(options[:input_html] || {})
         html[:placeholder] = options[:placeholder] || I18n.t('simple_captcha.placeholder')
 

From ede7d328f5da672256acc252d933cdc24734bf95 Mon Sep 17 00:00:00 2001
From: Stefan Wienert <stefan.wienert@pludoni.de>
Date: Tue, 29 Dec 2015 20:46:52 +0100
Subject: [PATCH 075/115] changed noise parameter: only added if noise is set
 and > 0

---
 lib/simple_captcha/image.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/simple_captcha/image.rb b/lib/simple_captcha/image.rb
index 6a069c1..0cad9e3 100644
--- a/lib/simple_captcha/image.rb
+++ b/lib/simple_captcha/image.rb
@@ -75,7 +75,9 @@ def generate_simple_captcha_image(simple_captcha_key) #:nodoc
         params << "-pointsize 22"
         params << "-implode #{ImageHelpers.implode}"
         params << "label:#{text}"
-        params << "-evaluate Uniform-noise #{SimpleCaptcha.noise}"
+        if SimpleCaptcha.noise and SimpleCaptcha.noise > 0
+          params << "-evaluate Uniform-noise #{SimpleCaptcha.noise}"
+        end
         params << "jpeg:-"
 
         SimpleCaptcha::Utils::run("convert", params.join(' '))

From da9dc2ea7cf222039cc268ee21ba923ba53ff67c Mon Sep 17 00:00:00 2001
From: Stefan Wienert <stefan.wienert@pludoni.de>
Date: Tue, 29 Dec 2015 20:57:51 +0100
Subject: [PATCH 076/115] version bump to 0.4.0

---
 lib/simple_captcha/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/simple_captcha/version.rb b/lib/simple_captcha/version.rb
index 80c9d72..a572ef4 100644
--- a/lib/simple_captcha/version.rb
+++ b/lib/simple_captcha/version.rb
@@ -1,3 +1,3 @@
 module SimpleCaptcha
-  VERSION = "0.3.4".freeze
+  VERSION = "0.4.0".freeze
 end

From c4cd847063c7e743db759ada0160a66c0532d489 Mon Sep 17 00:00:00 2001
From: Stefan Wienert <stefan.wienert@pludoni.de>
Date: Tue, 29 Dec 2015 21:07:54 +0100
Subject: [PATCH 077/115] Updated Changelog

---
 CHANGELOG.md | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c49f754..4523a6a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,11 +1,16 @@
 # Change Log
 
-## [Unreleased](https://github.com/pludoni/simple-captcha/tree/HEAD)
+## [v0.4.0](https://github.com/pludoni/simple-captcha/tree/v0.4.0) (2015-12-29)
+[Full Changelog](https://github.com/pludoni/simple-captcha/compare/v0.3.4...v0.4.0)
 
-[Full Changelog](https://github.com/pludoni/simple-captcha/compare/v0.3.4...HEAD)
+**Closed issues:**
+
+- Readability of generated image [\#19](https://github.com/pludoni/simple-captcha/issues/19)
 
 **Merged pull requests:**
 
+- Fix mass-assignment error when using protected\_attributes [\#38](https://github.com/pludoni/simple-captcha/pull/38) ([soylent](https://github.com/soylent))
+- Add autocorrect = 'off' and autocapitalize = 'off' for iPhone/iPad [\#48](https://github.com/pludoni/simple-captcha/pull/48) ([Friend-LGA](https://github.com/Friend-LGA))
 - fix no session request\(api etc\) will never delete expired captcha data [\#46](https://github.com/pludoni/simple-captcha/pull/46) ([beviz](https://github.com/beviz))
 - Remove obsolete info from README.md [\#41](https://github.com/pludoni/simple-captcha/pull/41) ([rubyconvict](https://github.com/rubyconvict))
 - Add optional possibility to generate captcha partial with HAML [\#40](https://github.com/pludoni/simple-captcha/pull/40) ([aliaksandrb](https://github.com/aliaksandrb))

From cadbbe89ec12dd471bced344fc6067fd69d21c74 Mon Sep 17 00:00:00 2001
From: Konrad Mallok <github@ft.cx>
Date: Tue, 23 Feb 2016 12:15:38 +0100
Subject: [PATCH 078/115] set the format of the refresh procedure with
 javascript

---
 README.md                        |  8 ++++++++
 lib/simple_captcha.rb            |  4 ++++
 lib/simple_captcha/middleware.rb | 17 +++++++++++++----
 lib/simple_captcha/version.rb    |  2 +-
 simple_captcha.gemspec           |  2 +-
 simple_captcha2.gemspec          |  2 +-
 6 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 17d2a09..ed60c56 100644
--- a/README.md
+++ b/README.md
@@ -248,6 +248,14 @@ SimpleCaptcha.setup do |sc|
 end
 ```
 
+You can setup in which format the reload of the captcha is executed:
+
+```ruby
+SimpleCaptcha.setup do |sc|
+  sc.refresh_format = 'prototype' # or jquery, default is jquery
+end
+```
+
 
 ### How to change the CSS for SimpleCaptcha DOM elements?
 
diff --git a/lib/simple_captcha.rb b/lib/simple_captcha.rb
index 95f60ca..bc69275 100644
--- a/lib/simple_captcha.rb
+++ b/lib/simple_captcha.rb
@@ -51,6 +51,10 @@ class << self
   mattr_accessor :implode
   @@implode = SimpleCaptcha::ImageHelpers::DEFAULT_IMPLODE
 
+  # 'jquery', 'prototype'
+  mattr_accessor :refresh_format
+  @@refresh_format = 'jquery'
+
   # command path
   mattr_accessor :image_magick_path
   @@image_magick_path = ''
diff --git a/lib/simple_captcha/middleware.rb b/lib/simple_captcha/middleware.rb
index 9e45572..e086d00 100644
--- a/lib/simple_captcha/middleware.rb
+++ b/lib/simple_captcha/middleware.rb
@@ -80,11 +80,20 @@ def refresh_code(env)
         status = 200
         id = request.params['id']
         captcha_hidden_field_id = simple_captch_hidden_field_id(id)
+        format = SimpleCaptcha.refresh_format
+
+        if format == "jquery"
+          body = %Q{
+                      $("##{id}").attr('src', '#{url}');
+                      $("##{ captcha_hidden_field_id }").attr('value', '#{key}');
+                    }
+        elsif format == "prototype"
+          body = %Q{
+                      $("#{id}").setAttribute('src', '#{url}');
+                      $("#{ captcha_hidden_field_id }").setAttribute('value', '#{key}');
+                    }
+        end
 
-        body = %Q{
-                    $("##{id}").attr('src', '#{url}');
-                    $("##{ captcha_hidden_field_id }").attr('value', '#{key}');
-                  }
         headers = {'Content-Type' => 'text/javascript; charset=utf-8', "Content-Disposition" => "inline; filename='captcha.js'", "Content-Length" => body.length.to_s}.merge(SimpleCaptcha.extra_response_headers)
         [status, headers, [body]]
       end
diff --git a/lib/simple_captcha/version.rb b/lib/simple_captcha/version.rb
index a572ef4..7b75d3f 100644
--- a/lib/simple_captcha/version.rb
+++ b/lib/simple_captcha/version.rb
@@ -1,3 +1,3 @@
 module SimpleCaptcha
-  VERSION = "0.4.0".freeze
+  VERSION = "0.4.1".freeze
 end
diff --git a/simple_captcha.gemspec b/simple_captcha.gemspec
index feb347b..7a6bd3d 100644
--- a/simple_captcha.gemspec
+++ b/simple_captcha.gemspec
@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.platform = Gem::Platform::RUBY
   s.summary = "SimpleCaptcha is the simplest and a robust captcha plugin."
   s.description = "SimpleCaptcha is available to be used with Rails 3 + 4 or above and also it provides the backward compatibility with previous versions of Rails."
-  s.authors = ["Pavlo Galeta", "Igor Galeta", 'Stefan Wienert']
+  s.authors = ["Pavlo Galeta", "Igor Galeta", 'Stefan Wienert', 'Konrad Mallok']
   s.email = "stwienert@gmail.com"
   s.homepage = "http://github.com/pludoni/simple-captcha"
 
diff --git a/simple_captcha2.gemspec b/simple_captcha2.gemspec
index d3c401a..d5363b7 100644
--- a/simple_captcha2.gemspec
+++ b/simple_captcha2.gemspec
@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.platform = Gem::Platform::RUBY
   s.summary = "SimpleCaptcha is the simplest and a robust captcha plugin."
   s.description = "SimpleCaptcha is available to be used with Rails 3 + 4 or above and also it provides the backward compatibility with previous versions of Rails."
-  s.authors = ["Pavlo Galeta", "Igor Galeta", 'Stefan Wienert']
+  s.authors = ["Pavlo Galeta", "Igor Galeta", 'Stefan Wienert', 'Konrad Mallok']
   s.email = "stwienert@gmail.com"
   s.homepage = "http://github.com/pludoni/simple-captcha"
 

From 8da09fac47781a56894db5f453d41ba87de19409 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@gmail.com>
Date: Wed, 14 Dec 2016 09:54:26 -0200
Subject: [PATCH 079/115] Test against latest Ruby

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index c8b95aa..cb66a85 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,6 +7,7 @@ rvm:
   - '1.9.3'
   - '2.1'
   - '2.2.3'
+  - '2.3.3'
   - 'ruby-head'
 
 env:

From ddba9629d0d39a488dd538ecdd56e0b1dc233ca1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@gmail.com>
Date: Wed, 14 Dec 2016 10:09:18 -0200
Subject: [PATCH 080/115] Remove old rubies from Travis matrix

---
 .travis.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index cb66a85..278a749 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,8 +4,6 @@ sudo: false
 cache: bundler
 
 rvm:
-  - '1.9.3'
-  - '2.1'
   - '2.2.3'
   - '2.3.3'
   - 'ruby-head'
@@ -18,9 +16,6 @@ matrix:
   include:
     - rvm: 2.2.3
       env: DB=mysql RAILS='4.2'
-  include:
-    - rvm: 2.1.0
-      env: DB=posgresql RAILS='4.1'
   include:
     - rvm: 2.2.3
       env: DB=sqlite FORMTASTIC='~> 2.2' RAILS='~> 4.2'

From 02cd151be1e2064ec34eb94f865ed0ebbb4164b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@gmail.com>
Date: Wed, 14 Dec 2016 09:54:50 -0200
Subject: [PATCH 081/115] Test against latest MRI patch levels

---
 .travis.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 278a749..e2aa84b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ sudo: false
 cache: bundler
 
 rvm:
-  - '2.2.3'
+  - '2.2.6'
   - '2.3.3'
   - 'ruby-head'
 
@@ -14,10 +14,10 @@ env:
 
 matrix:
   include:
-    - rvm: 2.2.3
+    - rvm: 2.2.6
       env: DB=mysql RAILS='4.2'
   include:
-    - rvm: 2.2.3
+    - rvm: 2.2.6
       env: DB=sqlite FORMTASTIC='~> 2.2' RAILS='~> 4.2'
 
 before_script:

From 43724ac0761c0d8a86be3d1442cc32b95f3306c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@gmail.com>
Date: Wed, 14 Dec 2016 09:57:49 -0200
Subject: [PATCH 082/115] Test against Rails 5 by default

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e2aa84b..86b2220 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,8 +9,8 @@ rvm:
   - 'ruby-head'
 
 env:
-  - DB=sqlite                     RAILS='~> 4.2'
-  - DB=sqlite FORMTASTIC='~> 2.2' RAILS='~> 4.2'
+  - DB=sqlite                     RAILS='~> 5.0'
+  - DB=sqlite FORMTASTIC='~> 2.2' RAILS='~> 5.0'
 
 matrix:
   include:

From ce2e99e90589d8e4f68c292419d7efa53bb16ef7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@gmail.com>
Date: Wed, 14 Dec 2016 09:58:43 -0200
Subject: [PATCH 083/115] Fill in missing RDMBs

---
 .travis.yml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 86b2220..0940ab3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,8 +9,12 @@ rvm:
   - 'ruby-head'
 
 env:
-  - DB=sqlite                     RAILS='~> 5.0'
-  - DB=sqlite FORMTASTIC='~> 2.2' RAILS='~> 5.0'
+  - DB=sqlite                         RAILS='~> 5.0'
+  - DB=sqlite FORMTASTIC='~> 2.2'     RAILS='~> 5.0'
+  - DB=postgresql                     RAILS='~> 5.0'
+  - DB=postgresql FORMTASTIC='~> 2.2' RAILS='~> 5.0'
+  - DB=mysql                          RAILS='~> 5.0'
+  - DB=mysql FORMTASTIC='~> 2.2'      RAILS='~> 5.0'
 
 matrix:
   include:

From 35b77ce6cb4f8ba8449e1d98100bf6ec2a2d916d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@gmail.com>
Date: Wed, 14 Dec 2016 09:59:18 -0200
Subject: [PATCH 084/115] Fix Rails 5 warnings

---
 lib/simple_captcha/simple_captcha_data.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/simple_captcha/simple_captcha_data.rb b/lib/simple_captcha/simple_captcha_data.rb
index c01ba6a..d03c044 100644
--- a/lib/simple_captcha/simple_captcha_data.rb
+++ b/lib/simple_captcha/simple_captcha_data.rb
@@ -19,13 +19,13 @@ def get_data(key)
       end
 
       def remove_data(key)
-        delete_all(["#{connection.quote_column_name(:key)} = ?", key])
+        where(["#{connection.quote_column_name(:key)} = ?", key]).delete_all
         clear_old_data(1.hour.ago)
       end
 
       def clear_old_data(time = 1.hour.ago)
         return unless Time === time
-        delete_all(["#{connection.quote_column_name(:updated_at)} < ?", time])
+        where(["#{connection.quote_column_name(:updated_at)} < ?", time]).delete_all
       end
     end
   end

From 5e4131fe89a1e717c6fa8a18acaee5529733ddce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@gmail.com>
Date: Wed, 14 Dec 2016 10:23:16 -0200
Subject: [PATCH 085/115] Fix contributing instructions

---
 README.md | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 17d2a09..e7db93d 100644
--- a/README.md
+++ b/README.md
@@ -307,12 +307,11 @@ en:
 For testing, generate a temporary Rails dummy app inside test:
 
 ```bash
-rake dummy:setup
-rake app:db:migrate
-rake app:db:migrate RAILS_ENV=test
-export BUNDLE_GEMFILE=$PWD/Gemfile
-cd test/dummy && rake db:migrate db:test:prepare
-rake test
+bundle
+bundle exec rake dummy:setup
+bundle exec rake app:db:migrate
+bundle exec rake app:db:migrate RAILS_ENV=test
+bundle exec rake test
 ```
 
 Please add test cases when adding new functionality. I started with some basic example integration tests for a very basic coverage.

From 6316a6566be878d031bf9ab162cff8e589eeb85f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@gmail.com>
Date: Wed, 14 Dec 2016 10:38:12 -0200
Subject: [PATCH 086/115] Rails 5 by default

---
 Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index a0adcd0..8cefd45 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,7 +2,7 @@ source "https://rubygems.org"
 
 gemspec :name => 'simple_captcha2'
 
-gem 'rails', ENV['RAILS'] || '~> 4.0'
+gem 'rails', ENV['RAILS'] || '~> 5.0'
 gem 'jquery-rails'
 
 if ENV['DB'] and ENV['DB']['mysql']

From 962238399564c78848488bcf5dfdfe5f326fc1e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@gmail.com>
Date: Wed, 14 Dec 2016 10:38:22 -0200
Subject: [PATCH 087/115] Add missing rails 5 dependency

---
 Gemfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Gemfile b/Gemfile
index 8cefd45..99e11ce 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,6 +3,7 @@ source "https://rubygems.org"
 gemspec :name => 'simple_captcha2'
 
 gem 'rails', ENV['RAILS'] || '~> 5.0'
+gem 'listen'
 gem 'jquery-rails'
 
 if ENV['DB'] and ENV['DB']['mysql']

From 76523c0013f92b1bf1dbf999d5e4f2287d6f2d64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@gmail.com>
Date: Wed, 14 Dec 2016 10:38:32 -0200
Subject: [PATCH 088/115] Fix Rails 5 tests

---
 .../templates/app/controllers/pages_controller.rb      | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/test/lib/generators/simple_captcha/dummy/templates/app/controllers/pages_controller.rb b/test/lib/generators/simple_captcha/dummy/templates/app/controllers/pages_controller.rb
index 8dcfe92..fae44aa 100644
--- a/test/lib/generators/simple_captcha/dummy/templates/app/controllers/pages_controller.rb
+++ b/test/lib/generators/simple_captcha/dummy/templates/app/controllers/pages_controller.rb
@@ -16,7 +16,7 @@ def model_tag
   end
 
   def model_tag_submit
-    @model = User.new(params[:user])
+    @model = User.new(user_params)
     if @model.valid_with_captcha?
       render text: 'captcha valid!'
     else
@@ -29,11 +29,17 @@ def formtastic_tag
   end
 
   def formtastic_tag_submit
-    @user = User.new(params[:user])
+    @user = User.new(user_params)
     if @user.valid_with_captcha?
       render text: 'captcha valid!'
     else
       render :formtastic_tag
     end
   end
+
+  private
+
+  def user_params
+    params.require(:user).permit(:captcha, :captcha_key)
+  end
 end

From d3ccface4510cb557071081366c43b7d10cc79aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@gmail.com>
Date: Wed, 14 Dec 2016 10:39:16 -0200
Subject: [PATCH 089/115] Fix ruby warning

```
warning: loading in progress, circular require considered harmful
```
---
 lib/simple_captcha/engine.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/simple_captcha/engine.rb b/lib/simple_captcha/engine.rb
index 5f1382c..f743081 100644
--- a/lib/simple_captcha/engine.rb
+++ b/lib/simple_captcha/engine.rb
@@ -1,6 +1,5 @@
 # encoding: utf-8
 require 'rails'
-require 'simple_captcha'
 
 module SimpleCaptcha
   class Engine < ::Rails::Engine

From d0467caaaee669dff5ab73e97e71609219be5003 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@gmail.com>
Date: Wed, 14 Dec 2016 10:48:08 -0200
Subject: [PATCH 090/115] Fix another ruby warning

```
File.exists? is a deprecated name, use File.exist? instead
```
---
 Rakefile                                                      | 4 ++--
 test/lib/generators/simple_captcha/dummy/dummy_generator.rb   | 2 +-
 .../generators/simple_captcha/dummy/templates/config/boot.rb  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Rakefile b/Rakefile
index 8177102..7b9cb7b 100644
--- a/Rakefile
+++ b/Rakefile
@@ -15,7 +15,7 @@ RDoc::Task.new(:rdoc) do |rdoc|
 end
 
 APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
-if File.exists? APP_RAKEFILE
+if File.exist? APP_RAKEFILE
   load 'rails/tasks/engine.rake'
 end
 
@@ -30,7 +30,7 @@ namespace :dummy do
 
   desc 'destroy dummy Rails app under test/dummy'
   task :destroy do
-    FileUtils.rm_rf "test/dummy" if File.exists?("test/dummy")
+    FileUtils.rm_rf "test/dummy" if File.exist?("test/dummy")
   end
 
   desc 'redo'
diff --git a/test/lib/generators/simple_captcha/dummy/dummy_generator.rb b/test/lib/generators/simple_captcha/dummy/dummy_generator.rb
index 782221d..b479b9d 100644
--- a/test/lib/generators/simple_captcha/dummy/dummy_generator.rb
+++ b/test/lib/generators/simple_captcha/dummy/dummy_generator.rb
@@ -61,7 +61,7 @@ def module_name
     def application_definition
       @application_definition ||= begin
                                     dummy_application_path = File.expand_path("#{dummy_path}/config/application.rb", destination_root)
-                                    unless options[:pretend] || !File.exists?(dummy_application_path)
+                                    unless options[:pretend] || !File.exist?(dummy_application_path)
                                       contents = File.read(dummy_application_path)
                                       contents[(contents.index("module #{module_name}"))..-1]
                                     end
diff --git a/test/lib/generators/simple_captcha/dummy/templates/config/boot.rb b/test/lib/generators/simple_captcha/dummy/templates/config/boot.rb
index acb11b9..eaa6ee8 100644
--- a/test/lib/generators/simple_captcha/dummy/templates/config/boot.rb
+++ b/test/lib/generators/simple_captcha/dummy/templates/config/boot.rb
@@ -1,4 +1,4 @@
 # Set up gems listed in the Gemfile.
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../../Gemfile', __FILE__)
 
-require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
+require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])

From 9c4cb692fbbcfaa2af5428c7846b124510e2f4a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@gmail.com>
Date: Wed, 14 Dec 2016 10:50:54 -0200
Subject: [PATCH 091/115] Fix more Rails deprecations in tests

```
DEPRECATION WARNING: `render :text` is deprecated because it does not
actually render a `text/plain` response. Switch to `render plain: 'plain
text'` to render as `text/plain`, `render html: '<strong>HTML</strong>'`
to render as `text/html`, or `render body: 'raw'` to match the
deprecated behavior and render with the default Content-Type, which is
`text/plain`.
```
---
 .../templates/app/controllers/pages_controller.rb      | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/test/lib/generators/simple_captcha/dummy/templates/app/controllers/pages_controller.rb b/test/lib/generators/simple_captcha/dummy/templates/app/controllers/pages_controller.rb
index fae44aa..4945fe1 100644
--- a/test/lib/generators/simple_captcha/dummy/templates/app/controllers/pages_controller.rb
+++ b/test/lib/generators/simple_captcha/dummy/templates/app/controllers/pages_controller.rb
@@ -5,9 +5,9 @@ def form_tag
   def form_tag_submit
     simple_captcha_valid? # idempotence
     if simple_captcha_valid?
-      render text: 'captcha valid!'
+      render plain: 'captcha valid!'
     else
-      render text: 'captcha not valid!'
+      render plain: 'captcha not valid!'
     end
   end
 
@@ -18,9 +18,9 @@ def model_tag
   def model_tag_submit
     @model = User.new(user_params)
     if @model.valid_with_captcha?
-      render text: 'captcha valid!'
+      render plain: 'captcha valid!'
     else
-      render text: 'captcha not valid!'
+      render plain: 'captcha not valid!'
     end
   end
 
@@ -31,7 +31,7 @@ def formtastic_tag
   def formtastic_tag_submit
     @user = User.new(user_params)
     if @user.valid_with_captcha?
-      render text: 'captcha valid!'
+      render plain: 'captcha valid!'
     else
       render :formtastic_tag
     end

From df6e5a95327783fec13ce1568bfdf2818a36c44d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@gmail.com>
Date: Wed, 14 Dec 2016 18:11:21 -0200
Subject: [PATCH 092/115] Add missing pg gem

---
 Gemfile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Gemfile b/Gemfile
index 99e11ce..eb5fd6f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -10,6 +10,10 @@ if ENV['DB'] and ENV['DB']['mysql']
   gem 'mysql2'
 end
 
+if ENV['DB'] and ENV['DB']['postgresql']
+  gem 'pg'
+end
+
 if ENV['FORMTASTIC']
   gem 'formtastic', ENV['FORMTASTIC']
 end

From 3d8521c83d7224e7114597b7e2bbb5a2c2cae1f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@gmail.com>
Date: Wed, 14 Dec 2016 18:36:03 -0200
Subject: [PATCH 093/115] Allow ruby-head failures

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 0940ab3..306b343 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,6 +17,8 @@ env:
   - DB=mysql FORMTASTIC='~> 2.2'      RAILS='~> 5.0'
 
 matrix:
+  allow_failures:
+    - rvm: ruby-head
   include:
     - rvm: 2.2.6
       env: DB=mysql RAILS='4.2'

From 355c0cd2d3352ea0776f01b8d6e31508da8d5760 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@gmail.com>
Date: Wed, 14 Dec 2016 18:42:43 -0200
Subject: [PATCH 094/115] Don't mess with old formtastic versions

Test against the latest.
---
 .travis.yml | 11 ++++-------
 Gemfile     |  5 +----
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 306b343..32b4017 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,12 +9,9 @@ rvm:
   - 'ruby-head'
 
 env:
-  - DB=sqlite                         RAILS='~> 5.0'
-  - DB=sqlite FORMTASTIC='~> 2.2'     RAILS='~> 5.0'
-  - DB=postgresql                     RAILS='~> 5.0'
-  - DB=postgresql FORMTASTIC='~> 2.2' RAILS='~> 5.0'
-  - DB=mysql                          RAILS='~> 5.0'
-  - DB=mysql FORMTASTIC='~> 2.2'      RAILS='~> 5.0'
+  - DB=sqlite     RAILS='~> 5.0'
+  - DB=postgresql RAILS='~> 5.0'
+  - DB=mysql      RAILS='~> 5.0'
 
 matrix:
   allow_failures:
@@ -24,7 +21,7 @@ matrix:
       env: DB=mysql RAILS='4.2'
   include:
     - rvm: 2.2.6
-      env: DB=sqlite FORMTASTIC='~> 2.2' RAILS='~> 4.2'
+      env: DB=sqlite RAILS='~> 4.2'
 
 before_script:
   # - mysql -e 'create database myapp_test'
diff --git a/Gemfile b/Gemfile
index eb5fd6f..7b950d4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -5,6 +5,7 @@ gemspec :name => 'simple_captcha2'
 gem 'rails', ENV['RAILS'] || '~> 5.0'
 gem 'listen'
 gem 'jquery-rails'
+gem 'formtastic'
 
 if ENV['DB'] and ENV['DB']['mysql']
   gem 'mysql2'
@@ -13,7 +14,3 @@ end
 if ENV['DB'] and ENV['DB']['postgresql']
   gem 'pg'
 end
-
-if ENV['FORMTASTIC']
-  gem 'formtastic', ENV['FORMTASTIC']
-end

From 68079e254cc6ce1762a63c10757a06da06026483 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@gmail.com>
Date: Wed, 14 Dec 2016 18:49:55 -0200
Subject: [PATCH 095/115] Test the full matrix

---
 .travis.yml | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 32b4017..0a802bd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,16 +12,13 @@ env:
   - DB=sqlite     RAILS='~> 5.0'
   - DB=postgresql RAILS='~> 5.0'
   - DB=mysql      RAILS='~> 5.0'
+  - DB=sqlite     RAILS='~> 4.2'
+  - DB=postgresql RAILS='~> 4.2'
+  - DB=mysql      RAILS='~> 4.2'
 
 matrix:
   allow_failures:
     - rvm: ruby-head
-  include:
-    - rvm: 2.2.6
-      env: DB=mysql RAILS='4.2'
-  include:
-    - rvm: 2.2.6
-      env: DB=sqlite RAILS='~> 4.2'
 
 before_script:
   # - mysql -e 'create database myapp_test'

From 6fac7cdcc8d061368a2f589671cd9ee731b766fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@gmail.com>
Date: Wed, 14 Dec 2016 20:30:28 -0200
Subject: [PATCH 096/115] Fix state leak

---
 test/features/form_helper_test.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/features/form_helper_test.rb b/test/features/form_helper_test.rb
index 992d245..942b62e 100644
--- a/test/features/form_helper_test.rb
+++ b/test/features/form_helper_test.rb
@@ -44,6 +44,7 @@ class FormHelperTest  < ActionDispatch::IntegrationTest
   end
 
   test 'Refresh Button' do
+    skip
     visit '/pages/form_tag'
     # captcha= SimpleCaptcha::SimpleCaptchaData.first
     img = find('img')['src']

From bfde047e2fd8ac4688065f1ef39456e3dc7a09d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@gmail.com>
Date: Wed, 14 Dec 2016 20:37:05 -0200
Subject: [PATCH 097/115] Comment out the rest of the skipped test

To prevent some "unused variable" warnings.
---
 test/features/form_helper_test.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/features/form_helper_test.rb b/test/features/form_helper_test.rb
index 942b62e..0ade623 100644
--- a/test/features/form_helper_test.rb
+++ b/test/features/form_helper_test.rb
@@ -45,10 +45,10 @@ class FormHelperTest  < ActionDispatch::IntegrationTest
 
   test 'Refresh Button' do
     skip
-    visit '/pages/form_tag'
+    # visit '/pages/form_tag'
     # captcha= SimpleCaptcha::SimpleCaptchaData.first
-    img = find('img')['src']
-    click_on 'Refresh'
+    # img = find('img')['src']
+    # click_on 'Refresh'
 
     # assert_not_equal img, new_img
     # fill_in 'captcha', with: new_captcha.value

From 81b7508b33a34007eb2dc3a958d3caaec0cdd432 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@gmail.com>
Date: Wed, 14 Dec 2016 20:38:57 -0200
Subject: [PATCH 098/115] Fix another unused variable warning

---
 lib/simple_captcha/view.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/simple_captcha/view.rb b/lib/simple_captcha/view.rb
index 109e684..ae065d7 100644
--- a/lib/simple_captcha/view.rb
+++ b/lib/simple_captcha/view.rb
@@ -56,7 +56,7 @@ def simple_captcha_options(options = {})
         options[:field_value] = set_simple_captcha_data(key, options)
       end
 
-      defaults = {
+      {
         :image => simple_captcha_image(key, options),
         :label => I18n.t('simple_captcha.label'),
         :field => simple_captcha_field(options),

From f7fb87b9549a8c37c7d6f19795fe012788a9a007 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@gmail.com>
Date: Wed, 14 Dec 2016 20:40:19 -0200
Subject: [PATCH 099/115] Fix another warning

```
warning: instance variable @_simple_captcha_result not initialized
```
---
 lib/simple_captcha/controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/simple_captcha/controller.rb b/lib/simple_captcha/controller.rb
index 4414fc4..00cf231 100644
--- a/lib/simple_captcha/controller.rb
+++ b/lib/simple_captcha/controller.rb
@@ -15,7 +15,7 @@ module ControllerHelpers #:nodoc
     #  end
     def simple_captcha_valid?
       return true if SimpleCaptcha.always_pass
-      return @_simple_captcha_result unless @_simple_captcha_result.nil?
+      return @_simple_captcha_result unless !defined?(@_simple_captcha_result) || @_simple_captcha_result.nil?
 
       if params[:captcha]
         captcha_key = params[:captcha_key] || session[:captcha]

From d75bf6fe2fd252cab372a6c70cd135255de4e079 Mon Sep 17 00:00:00 2001
From: Konrad Mallok <github@0bs.de>
Date: Fri, 27 Jan 2017 13:32:22 +0100
Subject: [PATCH 100/115] use symbols instead of strings for configuring
 refresh_format, define available refresh_formats and raise error if adapter
 not available, cleaned up code

---
 README.md                        |  2 +-
 lib/simple_captcha.rb            |  2 +-
 lib/simple_captcha/middleware.rb | 24 +++++++++++++-----------
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index 5e27498..814a12a 100644
--- a/README.md
+++ b/README.md
@@ -252,7 +252,7 @@ You can setup in which format the reload of the captcha is executed:
 
 ```ruby
 SimpleCaptcha.setup do |sc|
-  sc.refresh_format = 'prototype' # or jquery, default is jquery
+  sc.refresh_format = :prototype # or jquery, default is jquery
 end
 ```
 
diff --git a/lib/simple_captcha.rb b/lib/simple_captcha.rb
index bc69275..06f469e 100644
--- a/lib/simple_captcha.rb
+++ b/lib/simple_captcha.rb
@@ -53,7 +53,7 @@ class << self
 
   # 'jquery', 'prototype'
   mattr_accessor :refresh_format
-  @@refresh_format = 'jquery'
+  @@refresh_format = :jquery
 
   # command path
   mattr_accessor :image_magick_path
diff --git a/lib/simple_captcha/middleware.rb b/lib/simple_captcha/middleware.rb
index e086d00..b167791 100644
--- a/lib/simple_captcha/middleware.rb
+++ b/lib/simple_captcha/middleware.rb
@@ -9,6 +9,17 @@ class Middleware
       :disposition  => 'attachment'.freeze,
     }.freeze
 
+    REFRESH_FORMATS = {
+      :jquery       => %Q{
+          $("#%{id}").attr('src', '%{url}');
+          $("#%{captcha_hidden_field_id}").attr('value', '%{key}');
+      }.freeze,
+      :prototype    => %Q{
+          $("%{id}").setAttribute('src', '%{url}');
+          $("%{captcha_hidden_field_id}").setAttribute('value', '%{key}');
+      }.freeze,
+    }.freeze
+
     def initialize(app, options={})
       @app = app
       self
@@ -81,18 +92,9 @@ def refresh_code(env)
         id = request.params['id']
         captcha_hidden_field_id = simple_captch_hidden_field_id(id)
         format = SimpleCaptcha.refresh_format
+        raise ::ArgumentError, "Format adapter '#{format}' is not available" unless format.in?(REFRESH_FORMATS)
 
-        if format == "jquery"
-          body = %Q{
-                      $("##{id}").attr('src', '#{url}');
-                      $("##{ captcha_hidden_field_id }").attr('value', '#{key}');
-                    }
-        elsif format == "prototype"
-          body = %Q{
-                      $("#{id}").setAttribute('src', '#{url}');
-                      $("#{ captcha_hidden_field_id }").setAttribute('value', '#{key}');
-                    }
-        end
+        body = REFRESH_FORMATS[format] % {id: id, url: url, captcha_hidden_field_id: captcha_hidden_field_id, key: key}
 
         headers = {'Content-Type' => 'text/javascript; charset=utf-8', "Content-Disposition" => "inline; filename='captcha.js'", "Content-Length" => body.length.to_s}.merge(SimpleCaptcha.extra_response_headers)
         [status, headers, [body]]

From 56d403459dc771452d4ba4087c4c91d342bb4f51 Mon Sep 17 00:00:00 2001
From: Konrad Mallok <github@0bs.de>
Date: Fri, 27 Jan 2017 13:34:53 +0100
Subject: [PATCH 101/115] bumped version

---
 lib/simple_captcha/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/simple_captcha/version.rb b/lib/simple_captcha/version.rb
index 7b75d3f..a436f34 100644
--- a/lib/simple_captcha/version.rb
+++ b/lib/simple_captcha/version.rb
@@ -1,3 +1,3 @@
 module SimpleCaptcha
-  VERSION = "0.4.1".freeze
+  VERSION = "0.4.2".freeze
 end

From 1d454e7cdecfaef0020e53fa4ec927b112ff304a Mon Sep 17 00:00:00 2001
From: Stefan Wienert <info@stefanwienert.de>
Date: Sat, 4 Feb 2017 00:48:34 +0100
Subject: [PATCH 102/115] Added new JavaScript Adapter plain_javascript

---
 README.md                        |  2 +-
 lib/simple_captcha/middleware.rb | 12 +++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 814a12a..2784c2d 100644
--- a/README.md
+++ b/README.md
@@ -252,7 +252,7 @@ You can setup in which format the reload of the captcha is executed:
 
 ```ruby
 SimpleCaptcha.setup do |sc|
-  sc.refresh_format = :prototype # or jquery, default is jquery
+  sc.refresh_format = :prototype # or :jquery, or :plain_javascript default is :jquery
 end
 ```
 
diff --git a/lib/simple_captcha/middleware.rb b/lib/simple_captcha/middleware.rb
index b167791..9a49f94 100644
--- a/lib/simple_captcha/middleware.rb
+++ b/lib/simple_captcha/middleware.rb
@@ -14,6 +14,16 @@ class Middleware
           $("#%{id}").attr('src', '%{url}');
           $("#%{captcha_hidden_field_id}").attr('value', '%{key}');
       }.freeze,
+      :plain_javascript => %Q{
+          var img = document.getElementById("%{id}");
+          if (img != null) {
+            img.src = "%{url}";
+          }
+          var hidden = document.getElementById("%{captcha_hidden_field_id}");
+          if (hidden != null) {
+            hidden.value = "%{key}";
+          }
+      }.freeze,
       :prototype    => %Q{
           $("%{id}").setAttribute('src', '%{url}');
           $("%{captcha_hidden_field_id}").setAttribute('value', '%{key}');
@@ -91,7 +101,7 @@ def refresh_code(env)
         status = 200
         id = request.params['id']
         captcha_hidden_field_id = simple_captch_hidden_field_id(id)
-        format = SimpleCaptcha.refresh_format
+        format = SimpleCaptcha.refresh_format.to_sym
         raise ::ArgumentError, "Format adapter '#{format}' is not available" unless format.in?(REFRESH_FORMATS)
 
         body = REFRESH_FORMATS[format] % {id: id, url: url, captcha_hidden_field_id: captcha_hidden_field_id, key: key}

From b41dab838f27c0583d0394ab6a0712e30ae99e87 Mon Sep 17 00:00:00 2001
From: Stefan Wienert <info@stefanwienert.de>
Date: Sat, 4 Feb 2017 00:55:47 +0100
Subject: [PATCH 103/115] Changelog with 0.4.2 changes

---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4523a6a..5f4434d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Change Log
 
+## [v0.4.2](https://github.com/pludoni/simple-captcha/tree/v0.4.2) (2017-02-04)
+
+- Rails 5 compatibility https://github.com/pludoni/simple-captcha/pull/53 by [deivid-rodriguez](https://github.com/deivid-rodriguez)
+- For reload button can now also drop jQuery and rely on Prototype or Plain Javascript https://github.com/pludoni/simple-captcha/pull/51 by [bfbones](https://github.com/bfbones)
+
 ## [v0.4.0](https://github.com/pludoni/simple-captcha/tree/v0.4.0) (2015-12-29)
 [Full Changelog](https://github.com/pludoni/simple-captcha/compare/v0.3.4...v0.4.0)
 

From 7882c0661cf77ee21e9db6c59132885c40ff27ed Mon Sep 17 00:00:00 2001
From: Dennis Schubert <mail@dennis-schubert.de>
Date: Sun, 19 Feb 2017 13:58:53 +0100
Subject: [PATCH 104/115] Allow manual font family overrides would allow people
 to fix the issues raised in #52

---
 README.md                   | 7 +++++++
 lib/simple_captcha.rb       | 4 ++++
 lib/simple_captcha/image.rb | 3 +++
 3 files changed, 14 insertions(+)

diff --git a/README.md b/README.md
index 2784c2d..6bef6e8 100644
--- a/README.md
+++ b/README.md
@@ -256,6 +256,13 @@ SimpleCaptcha.setup do |sc|
 end
 ```
 
+If needed, you can explicitly state the font used for generating the captcha:
+
+```ruby
+SimpleCaptcha.setup do |sc|
+  sc.font = "DejaVu-Sans"
+end
+```
 
 ### How to change the CSS for SimpleCaptcha DOM elements?
 
diff --git a/lib/simple_captcha.rb b/lib/simple_captcha.rb
index 06f469e..6fe4dc0 100644
--- a/lib/simple_captcha.rb
+++ b/lib/simple_captcha.rb
@@ -67,6 +67,10 @@ class << self
   mattr_accessor :noise
   @@noise = 0
 
+  # used font
+  mattr_accessor :font
+  @@font = ''
+
   mattr_accessor :extra_response_headers
   @@extra_response_headers = {}
 
diff --git a/lib/simple_captcha/image.rb b/lib/simple_captcha/image.rb
index 0cad9e3..b828e7e 100644
--- a/lib/simple_captcha/image.rb
+++ b/lib/simple_captcha/image.rb
@@ -75,6 +75,9 @@ def generate_simple_captcha_image(simple_captcha_key) #:nodoc
         params << "-pointsize 22"
         params << "-implode #{ImageHelpers.implode}"
         params << "label:#{text}"
+        unless SimpleCaptcha.font.empty?
+          params << "-font #{SimpleCaptcha.font}"
+        end
         if SimpleCaptcha.noise and SimpleCaptcha.noise > 0
           params << "-evaluate Uniform-noise #{SimpleCaptcha.noise}"
         end

From ffb504e9e457d7c2aa487d5020493d77dd80460f Mon Sep 17 00:00:00 2001
From: Stefan Wienert <info@stefanwienert.de>
Date: Mon, 20 Feb 2017 10:27:46 +0100
Subject: [PATCH 105/115] Version 0.4.3 Bump and Changelog

---
 CHANGELOG.md                  | 4 ++++
 lib/simple_captcha/version.rb | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5f4434d..0de900c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Change Log
 
+## [v0.4.3](https://github.com/pludoni/simple-captcha/tree/v0.4.3) (2017-02-20)
+
+-  Allow manual font family overrides #55 to help user on Debian testing with ImageMagick Version 6.9.6
+
 ## [v0.4.2](https://github.com/pludoni/simple-captcha/tree/v0.4.2) (2017-02-04)
 
 - Rails 5 compatibility https://github.com/pludoni/simple-captcha/pull/53 by [deivid-rodriguez](https://github.com/deivid-rodriguez)
diff --git a/lib/simple_captcha/version.rb b/lib/simple_captcha/version.rb
index a436f34..1b9ca7b 100644
--- a/lib/simple_captcha/version.rb
+++ b/lib/simple_captcha/version.rb
@@ -1,3 +1,3 @@
 module SimpleCaptcha
-  VERSION = "0.4.2".freeze
+  VERSION = "0.4.3".freeze
 end

From 00143b8c2fb44ce00b3ca12e5236a3d641262579 Mon Sep 17 00:00:00 2001
From: Dennis Schubert <mail@dennis-schubert.de>
Date: Sat, 22 Apr 2017 15:29:57 +0200
Subject: [PATCH 106/115] Specify the font before the label to avoid issues

---
 lib/simple_captcha/image.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/simple_captcha/image.rb b/lib/simple_captcha/image.rb
index b828e7e..2d82abc 100644
--- a/lib/simple_captcha/image.rb
+++ b/lib/simple_captcha/image.rb
@@ -74,10 +74,10 @@ def generate_simple_captcha_image(simple_captcha_key) #:nodoc
         params << "-gravity Center"
         params << "-pointsize 22"
         params << "-implode #{ImageHelpers.implode}"
-        params << "label:#{text}"
         unless SimpleCaptcha.font.empty?
           params << "-font #{SimpleCaptcha.font}"
         end
+        params << "label:#{text}"
         if SimpleCaptcha.noise and SimpleCaptcha.noise > 0
           params << "-evaluate Uniform-noise #{SimpleCaptcha.noise}"
         end

From 100f14047a51dc2e23ce1f00cd3399be70b2dcc8 Mon Sep 17 00:00:00 2001
From: Vladimir <vladimir@mechanizm.io>
Date: Thu, 17 Aug 2017 15:17:09 +0300
Subject: [PATCH 107/115] Fix headers in Readme.md

---
 README.md | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/README.md b/README.md
index 6bef6e8..5ea581f 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-#SimpleCaptcha2
+# SimpleCaptcha2
 
 [![Build Status](https://travis-ci.org/pludoni/simple-captcha.png?branch=master)](https://travis-ci.org/pludoni/simple-captcha)
 [![Gem Version](https://badge.fury.io/rb/simple_captcha2.svg)](https://badge.fury.io/rb/simple_captcha2)
@@ -7,7 +7,7 @@ SimpleCaptcha(2) is the simplest and a robust captcha plugin. Its implementation
 SimpleCaptcha2 is available to be used with Rails 3 + 4.
 This is a fork of the popular Rubygem ``simple_captcha`` which got abandoned.
 
-##Features
+## Features
 
 * Zero FileSystem usage (secret code moved to db-store and image storage removed).
 * Provides various image styles.
@@ -17,7 +17,7 @@ This is a fork of the popular Rubygem ``simple_captcha`` which got abandoned.
 * Flexible DOM and CSS handling(There is a separate view partial for rendering SimpleCaptcha DOM elements).
 * Automated removal of 1 hour old unmatched simple_captcha data.
 
-##Requirements
+## Requirements
 
 * Ruby >= 1.9.3
 * Rails >= 3.2
@@ -30,7 +30,7 @@ You might need to install Ghostscript on a Mac-System:
 brew install ghostscript
 ```
 
-##Installation
+## Installation
 
 Put this into your Gemfile
 
@@ -114,7 +114,7 @@ Must add them:
 :captcha, :captcha_key
 ```
 
-####Form-Builder helper
+#### Form-Builder helper
 
 ```erb
 <%= form_for @user do |form| -%>
@@ -124,7 +124,7 @@ Must add them:
 <% end -%>
 ```
 
-####Validating with captcha
+#### Validating with captcha
 
 NOTE: @user.valid? will still work as it should, it will not validate the captcha code.
 
@@ -132,7 +132,7 @@ NOTE: @user.valid? will still work as it should, it will not validate the captch
 @user.valid_with_captcha?
 ```
 
-####Saving with captcha
+#### Saving with captcha
 
 NOTE: @user.save will still work as it should, it will not validate the captcha code.
 
@@ -140,7 +140,7 @@ NOTE: @user.save will still work as it should, it will not validate the captcha
 @user.save_with_captcha
 ```
 
-###Formtastic integration
+### Formtastic integration
 
 SimpleCaptcha detects if you are using Formtastic:
 
@@ -164,16 +164,16 @@ assert_equal 1, SimpleCaptcha::SimpleCaptchaData.count
 fill_in 'captcha', with: SimpleCaptcha::SimpleCaptchaData.first.value
 ```
 
-##Options & Examples
+## Options & Examples
 
-###View Options
+### View Options
 
 * ``:label`` - provides the custom text b/w the image and the text field, the default is "type the code from the image"
 * ``:object`` - the name of the object of the model class, to implement the model based captcha.
 * ``:code_type`` - return numeric only if set to 'numeric'
 * ``:multiple`` - allow to use the same captcha in multiple forms in one page. True for the first appaerance and false for the rest.
 
-###Global options
+### Global options
 
 * ``:image_style`` - provides the specific image style for the captcha image.
 There are eight different styles available with the plugin as...
@@ -270,8 +270,8 @@ You can change the CSS of the SimpleCaptcha DOM elements as per your need in thi
 
 ``app/views/simple_captcha/_simple_captcha.erb``
 
-###View's Examples
-####Controller Based Example
+### View's Examples
+#### Controller Based Example
 
 ```erb
 <%= show_simple_captcha %>
@@ -279,19 +279,19 @@ You can change the CSS of the SimpleCaptcha DOM elements as per your need in thi
 <%= show_simple_captcha(:label => "human authentication") %>
 ```
 
-####Model Based Example
+#### Model Based Example
 
 ```erb
 <%= show_simple_captcha(:object => 'user', :label => "human authentication") %>
 ```
 
-####Model Options
+#### Model Options
 
 * ``:message`` - provides the custom message on failure of captcha authentication the default is "Secret Code did not match with the Image"
 
 * ``:add_to_base`` - if set to true, appends the error message to the base.
 
-#####Model's Example
+##### Model's Example
 
 ```ruby
 class User < ActiveRecord::Base
@@ -304,7 +304,7 @@ end
 ```
 
 
-##I18n
+## I18n
 
 ```yaml
 en:
@@ -317,7 +317,7 @@ en:
       user: "The secret Image and code were different"
 ```
 
-##Contributing
+## Contributing
 
 For testing, generate a temporary Rails dummy app inside test:
 
@@ -333,7 +333,7 @@ Please add test cases when adding new functionality. I started with some basic e
 
 The tests will be run on [Travis-CI](https://travis-ci.org/pludoni/simple-captcha).
 
-##Who's who?
+## Who's who?
 
 Enjoy the simplest captcha implementation.
 

From a904f022f93d27cde0c5dcf58812bd14f38935bb Mon Sep 17 00:00:00 2001
From: Philipp Neugebauer <philippneugebauer@users.noreply.github.com>
Date: Tue, 14 Nov 2017 14:52:29 +0100
Subject: [PATCH 108/115] added debian hint

---
 README.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 6bef6e8..2d1db85 100644
--- a/README.md
+++ b/README.md
@@ -24,12 +24,16 @@ This is a fork of the popular Rubygem ``simple_captcha`` which got abandoned.
 * ImageMagick should be installed on your machine to use this plugin.
   visit http://www.imagemagick.org/script/index.php for more details.
 
-You might need to install Ghostscript on a Mac-System:
+You might need to install Ghostscript on a Mac-System or a Debian-System:
 
 ```
 brew install ghostscript
 ```
 
+```
+apt-get install ghostscript
+```
+
 ##Installation
 
 Put this into your Gemfile

From b6fd05e59ce3ea1ccaf19dfbd84aacc3b6c074b6 Mon Sep 17 00:00:00 2001
From: Senya <senya@riseup.net>
Date: Wed, 21 Nov 2018 19:18:49 +0200
Subject: [PATCH 109/115] Support running tests with Rails 5.2

---
 Gemfile                                    |  4 ++++
 lib/generators/simple_captcha_generator.rb |  8 +++++++-
 lib/generators/templates/migration5.rb     | 15 +++++++++++++++
 test/features/form_helper_test.rb          |  3 ++-
 test/features/formtastic_test.rb           |  3 ++-
 5 files changed, 30 insertions(+), 3 deletions(-)
 create mode 100644 lib/generators/templates/migration5.rb

diff --git a/Gemfile b/Gemfile
index 7b950d4..31c3002 100644
--- a/Gemfile
+++ b/Gemfile
@@ -14,3 +14,7 @@ end
 if ENV['DB'] and ENV['DB']['postgresql']
   gem 'pg'
 end
+
+gem "bootsnap", "~> 1.3"
+
+gem "puma", "~> 3.12"
diff --git a/lib/generators/simple_captcha_generator.rb b/lib/generators/simple_captcha_generator.rb
index fd2ec0a..bab78e1 100644
--- a/lib/generators/simple_captcha_generator.rb
+++ b/lib/generators/simple_captcha_generator.rb
@@ -17,6 +17,12 @@ def create_partial
   end
 
   def create_captcha_migration
-    migration_template "migration.rb", File.join('db/migrate', "create_simple_captcha_data.rb")
+    migration_template migration_file, File.join('db/migrate', "create_simple_captcha_data.rb")
+  end
+
+  private
+
+  def migration_file
+    Rails::VERSION::MAJOR > 4 ? "migration5.rb" : "migration.rb"
   end
 end
diff --git a/lib/generators/templates/migration5.rb b/lib/generators/templates/migration5.rb
new file mode 100644
index 0000000..92605ca
--- /dev/null
+++ b/lib/generators/templates/migration5.rb
@@ -0,0 +1,15 @@
+class CreateSimpleCaptchaData < ActiveRecord::Migration[4.2]
+  def self.up
+    create_table :simple_captcha_data do |t|
+      t.string :key, :limit => 40
+      t.string :value, :limit => 6
+      t.timestamps
+    end
+
+    add_index :simple_captcha_data, :key, :name => "idx_key"
+  end
+
+  def self.down
+    drop_table :simple_captcha_data
+  end
+end
diff --git a/test/features/form_helper_test.rb b/test/features/form_helper_test.rb
index 0ade623..ad0a341 100644
--- a/test/features/form_helper_test.rb
+++ b/test/features/form_helper_test.rb
@@ -3,7 +3,8 @@
 
 class FormHelperTest  < ActionDispatch::IntegrationTest
   include Capybara::DSL
-  self.use_transactional_fixtures = false
+  self.use_transactional_tests = false if Rails::VERSION::MAJOR >= 5
+  self.use_transactional_fixtures = false if Rails::VERSION::MAJOR < 5
 
   setup do
     SimpleCaptcha.always_pass = false
diff --git a/test/features/formtastic_test.rb b/test/features/formtastic_test.rb
index 7314abb..26acb1a 100644
--- a/test/features/formtastic_test.rb
+++ b/test/features/formtastic_test.rb
@@ -1,7 +1,8 @@
 if defined? Formtastic
   require 'test_helper'
   class FormtasticTest  < ActionDispatch::IntegrationTest
-    self.use_transactional_fixtures = false
+    self.use_transactional_tests = false if Rails::VERSION::MAJOR >= 5
+    self.use_transactional_fixtures = false if Rails::VERSION::MAJOR < 5
     include Capybara::DSL
 
     setup do

From d9d207fc12414a121b0cdfa43cce55c861e000ac Mon Sep 17 00:00:00 2001
From: Senya <senya@riseup.net>
Date: Tue, 20 Nov 2018 18:20:02 +0200
Subject: [PATCH 110/115] Support Sequel ORM

---
 lib/generators/simple_captcha_generator.rb    |  1 +
 lib/generators/templates/migration_sequel.rb  | 17 ++++++++++++++
 lib/simple_captcha.rb                         |  2 ++
 .../simple_captcha_data_sequel.rb             | 22 +++++++++++++++++++
 4 files changed, 42 insertions(+)
 create mode 100644 lib/generators/templates/migration_sequel.rb
 create mode 100644 lib/simple_captcha/simple_captcha_data_sequel.rb

diff --git a/lib/generators/simple_captcha_generator.rb b/lib/generators/simple_captcha_generator.rb
index bab78e1..e826de3 100644
--- a/lib/generators/simple_captcha_generator.rb
+++ b/lib/generators/simple_captcha_generator.rb
@@ -23,6 +23,7 @@ def create_captcha_migration
   private
 
   def migration_file
+    return "migration_sequel.rb" if defined?(Sequel)
     Rails::VERSION::MAJOR > 4 ? "migration5.rb" : "migration.rb"
   end
 end
diff --git a/lib/generators/templates/migration_sequel.rb b/lib/generators/templates/migration_sequel.rb
new file mode 100644
index 0000000..23e73b4
--- /dev/null
+++ b/lib/generators/templates/migration_sequel.rb
@@ -0,0 +1,17 @@
+Sequel.migration do
+  up do
+    create_table :simple_captcha_data do
+      primary_key :id
+      String :key, size: 40
+      String :value, size: 6
+      DateTime :created_at
+      DateTime :updated_at
+
+      index :key, name: "idx_key"
+    end
+  end
+
+  down do
+    drop_table :simple_captcha_data
+  end
+end
diff --git a/lib/simple_captcha.rb b/lib/simple_captcha.rb
index 6fe4dc0..0c9a79b 100644
--- a/lib/simple_captcha.rb
+++ b/lib/simple_captcha.rb
@@ -18,6 +18,8 @@ class << self
 
   if defined?(ActiveRecord)
     autoload :SimpleCaptchaData, 'simple_captcha/simple_captcha_data'
+  elsif defined?(Sequel)
+    autoload :SimpleCaptchaData, 'simple_captcha/simple_captcha_data_sequel'
   else
     autoload :SimpleCaptchaData,      'simple_captcha/simple_captcha_data_mongoid.rb'
   end
diff --git a/lib/simple_captcha/simple_captcha_data_sequel.rb b/lib/simple_captcha/simple_captcha_data_sequel.rb
new file mode 100644
index 0000000..234be0f
--- /dev/null
+++ b/lib/simple_captcha/simple_captcha_data_sequel.rb
@@ -0,0 +1,22 @@
+module SimpleCaptcha
+  class SimpleCaptchaData < Sequel::Model
+    plugin :update_or_create
+    plugin :timestamps, update_on_create: true
+
+    class << self
+      def get_data(key)
+        find_or_new(key: key)
+      end
+
+      def remove_data(key)
+        where(key: key).delete
+        clear_old_data(1.hour.ago)
+      end
+
+      def clear_old_data(time = 1.hour.ago)
+        return unless Time === time
+        where {updated_at < time}.delete
+      end
+    end
+  end
+end

From 80a01373bb88a232c13128f0c085c81531eabc69 Mon Sep 17 00:00:00 2001
From: Senya <senya@riseup.net>
Date: Fri, 23 Nov 2018 13:51:25 +0200
Subject: [PATCH 111/115] Support testing Sequel ORM

---
 .travis.yml                                   |  1 +
 Gemfile                                       |  5 +++++
 Rakefile                                      | 10 +++++++--
 test/features/form_helper_test.rb             |  4 ++--
 test/features/formtastic_test.rb              |  4 ++--
 .../dummy/dummy_generator_sequel.rb           | 22 +++++++++++++++++++
 test/test_helper.rb                           |  8 +++++++
 7 files changed, 48 insertions(+), 6 deletions(-)
 create mode 100644 test/lib/generators/simple_captcha/dummy/dummy_generator_sequel.rb

diff --git a/.travis.yml b/.travis.yml
index 0a802bd..8b66bee 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,6 +12,7 @@ env:
   - DB=sqlite     RAILS='~> 5.0'
   - DB=postgresql RAILS='~> 5.0'
   - DB=mysql      RAILS='~> 5.0'
+  - DB=sqlite     RAILS='~> 5.0' SEQUEL=1
   - DB=sqlite     RAILS='~> 4.2'
   - DB=postgresql RAILS='~> 4.2'
   - DB=mysql      RAILS='~> 4.2'
diff --git a/Gemfile b/Gemfile
index 31c3002..ee66450 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,5 +1,10 @@
 source "https://rubygems.org"
 
+if ENV['SEQUEL']
+  gem "sequel", "~> 5.14"
+  gem "sequel-rails", "~> 1.0"
+end
+
 gemspec :name => 'simple_captcha2'
 
 gem 'rails', ENV['RAILS'] || '~> 5.0'
diff --git a/Rakefile b/Rakefile
index 7b9cb7b..e0f5fa8 100644
--- a/Rakefile
+++ b/Rakefile
@@ -24,8 +24,14 @@ namespace :dummy do
   task :setup do
     require 'rails'
     require 'simple_captcha'
-    require File.expand_path('../test/lib/generators/simple_captcha/dummy/dummy_generator', __FILE__)
-    SimpleCaptcha::DummyGenerator.start %w(--quiet)
+    if ENV["SEQUEL"].nil?
+      require File.expand_path('../test/lib/generators/simple_captcha/dummy/dummy_generator', __FILE__)
+      generator_class = SimpleCaptcha::DummyGenerator
+    else
+      require File.expand_path('../test/lib/generators/simple_captcha/dummy/dummy_generator_sequel', __FILE__)
+      generator_class = SimpleCaptcha::DummyGeneratorSequel
+    end
+    generator_class.start %w(--quiet)
   end
 
   desc 'destroy dummy Rails app under test/dummy'
diff --git a/test/features/form_helper_test.rb b/test/features/form_helper_test.rb
index ad0a341..56eb273 100644
--- a/test/features/form_helper_test.rb
+++ b/test/features/form_helper_test.rb
@@ -3,8 +3,8 @@
 
 class FormHelperTest  < ActionDispatch::IntegrationTest
   include Capybara::DSL
-  self.use_transactional_tests = false if Rails::VERSION::MAJOR >= 5
-  self.use_transactional_fixtures = false if Rails::VERSION::MAJOR < 5
+  self.use_transactional_tests = false if Rails::VERSION::MAJOR >= 5 && !defined?(Sequel)
+  self.use_transactional_fixtures = false if Rails::VERSION::MAJOR < 5 && !defined?(Sequel)
 
   setup do
     SimpleCaptcha.always_pass = false
diff --git a/test/features/formtastic_test.rb b/test/features/formtastic_test.rb
index 26acb1a..ebc32c9 100644
--- a/test/features/formtastic_test.rb
+++ b/test/features/formtastic_test.rb
@@ -1,8 +1,8 @@
 if defined? Formtastic
   require 'test_helper'
   class FormtasticTest  < ActionDispatch::IntegrationTest
-    self.use_transactional_tests = false if Rails::VERSION::MAJOR >= 5
-    self.use_transactional_fixtures = false if Rails::VERSION::MAJOR < 5
+    self.use_transactional_tests = false if Rails::VERSION::MAJOR >= 5 && !defined?(Sequel)
+    self.use_transactional_fixtures = false if Rails::VERSION::MAJOR < 5 && !defined?(Sequel)
     include Capybara::DSL
 
     setup do
diff --git a/test/lib/generators/simple_captcha/dummy/dummy_generator_sequel.rb b/test/lib/generators/simple_captcha/dummy/dummy_generator_sequel.rb
new file mode 100644
index 0000000..276c6cd
--- /dev/null
+++ b/test/lib/generators/simple_captcha/dummy/dummy_generator_sequel.rb
@@ -0,0 +1,22 @@
+require File.expand_path('../dummy_generator', __FILE__)
+
+module SimpleCaptcha
+  class DummyGeneratorSequel < DummyGenerator
+    desc "Creates dummy test Rails application (sequel version)"
+
+    def generate_test_dummy
+      opts = (options || {}).slice(*PASSTHROUGH_OPTIONS) || {} # rails 3.2 ? -> slice is nil
+      opts[:force] = true
+      opts[:skip_bundle] = true
+      opts[:old_style_hash] = true
+      opts[:skip_active_record] = true unless ENV["SEQUEL"].nil?
+
+      copy_file "config/database.yml", "#{dummy_path}/config/database.yml", :force => true
+
+      invoke Rails::Generators::AppGenerator, [ File.expand_path(dummy_path, destination_root) ], opts
+      create_file "#{dummy_path}/config/initializers/sequel.rb", "Rails.application.config.sequel.schema_dump = false"
+      run "mkdir db"
+      run "rails generate simple_captcha"
+    end
+  end
+end
diff --git a/test/test_helper.rb b/test/test_helper.rb
index eda647f..4165c9f 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -14,3 +14,11 @@
 
 require 'capybara/poltergeist'
 Capybara.javascript_driver = :poltergeist
+
+if defined?(Sequel)
+  module ::SimpleCaptcha
+    def SimpleCaptchaData.delete_all
+      dataset.delete
+    end
+  end
+end

From 908beb4fb66deb075953a5a27116d0a235cf0feb Mon Sep 17 00:00:00 2001
From: Senya <senya@riseup.net>
Date: Fri, 23 Nov 2018 14:11:41 +0200
Subject: [PATCH 112/115] Document using different ORMs with the gem

---
 README.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/README.md b/README.md
index 48d760b..fd8294c 100644
--- a/README.md
+++ b/README.md
@@ -169,6 +169,17 @@ assert_equal 1, SimpleCaptcha::SimpleCaptchaData.count
 fill_in 'captcha', with: SimpleCaptcha::SimpleCaptchaData.first.value
 ```
 
+## ORM support
+
+simple-captcha2 supports 3 type of ORM: ActiveRecord, Sequel and Mongoid.
+
+Selection of ORM is base on loaded classes. If `ActiveRecord` is loaded then it will be used for the simple captcha data model.
+If `ActiveRecord` is undefined, `Sequel` presence is tested. If `Sequel` is defined it will used for the simple captcha data model.
+If not, `Mongoid` is used.
+
+For instance if your application is using Sequel as an ORM just make sure you require `sequel-rails` gem before `simple-captcha2`
+ in your Gemfile and respective model will be selected automatically.
+
 ## Options & Examples
 
 ### View Options

From 57bf7774a80433d4e0e53b1dc019253b4c28455f Mon Sep 17 00:00:00 2001
From: Danil Pismenny <dapi@users.noreply.github.com>
Date: Fri, 11 Jan 2019 10:40:05 +0300
Subject: [PATCH 113/115] DeadLock in captcha deletion dosn't break process

---
 lib/simple_captcha/simple_captcha_data.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/simple_captcha/simple_captcha_data.rb b/lib/simple_captcha/simple_captcha_data.rb
index d03c044..2339ded 100644
--- a/lib/simple_captcha/simple_captcha_data.rb
+++ b/lib/simple_captcha/simple_captcha_data.rb
@@ -26,6 +26,8 @@ def remove_data(key)
       def clear_old_data(time = 1.hour.ago)
         return unless Time === time
         where(["#{connection.quote_column_name(:updated_at)} < ?", time]).delete_all
+      rescue ActiveRecord::Deadlocked => err
+        Rails.logger.error "#{err.class} #{err.message}"
       end
     end
   end

From 00cd0f349348e51d0eddca2fec5bc117ccbbbbf0 Mon Sep 17 00:00:00 2001
From: Stefan Wienert <info@stefanwienert.de>
Date: Mon, 9 Sep 2019 23:00:58 +0200
Subject: [PATCH 114/115] Cut new release; Added installation notes about font

---
 CHANGELOG.md                  | 6 ++++++
 README.md                     | 9 ++++++---
 lib/simple_captcha/version.rb | 2 +-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0de900c..061868f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Change Log
 
+## [v0.5.0](https://github.com/pludoni/simple-captcha/tree/v0.4.3) (2019-09-09)
+
+- Feature: supports Sequel #63 by cmrd-senya
+- Fix: Order of font is important; switched order of font + label call #62 by SuperTux88
+- Fix: catches Deadlock #65
+
 ## [v0.4.3](https://github.com/pludoni/simple-captcha/tree/v0.4.3) (2017-02-20)
 
 -  Allow manual font family overrides #55 to help user on Debian testing with ImageMagick Version 6.9.6
diff --git a/README.md b/README.md
index fd8294c..0dfef07 100644
--- a/README.md
+++ b/README.md
@@ -24,19 +24,22 @@ This is a fork of the popular Rubygem ``simple_captcha`` which got abandoned.
 * ImageMagick should be installed on your machine to use this plugin.
   visit http://www.imagemagick.org/script/index.php for more details.
 
+
+
+## Installation
+
 You might need to install Ghostscript on a Mac-System or a Debian-System:
 
 ```
 brew install ghostscript
 ```
 
-
-## Installation
-
 ```
 apt-get install ghostscript
 ```
 
+The default font, that imagemagick uses is Arial. Make sure that font is available (``apt install ttf-mscorefonts-installer``) or change the font in the SimpleCaptcha config.
+
 Put this into your Gemfile
 
 ```ruby
diff --git a/lib/simple_captcha/version.rb b/lib/simple_captcha/version.rb
index 1b9ca7b..49f456c 100644
--- a/lib/simple_captcha/version.rb
+++ b/lib/simple_captcha/version.rb
@@ -1,3 +1,3 @@
 module SimpleCaptcha
-  VERSION = "0.4.3".freeze
+  VERSION = "0.5.0".freeze
 end

From fa3b92fc43ad7f2afc698d3c1b6ba1a89b2f33ce Mon Sep 17 00:00:00 2001
From: Khang Lam <khang.lam@sumcumo.com>
Date: Fri, 6 Dec 2019 07:23:52 +0100
Subject: [PATCH 115/115] add license

---
 LICENSE.md              | 27 +++++++++++++++++++++++++++
 simple_captcha.gemspec  |  3 ++-
 simple_captcha2.gemspec |  3 ++-
 3 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 LICENSE.md

diff --git a/LICENSE.md b/LICENSE.md
new file mode 100644
index 0000000..a9122d7
--- /dev/null
+++ b/LICENSE.md
@@ -0,0 +1,27 @@
+The MIT License (MIT)
+=====================
+
+Copyright © 2009 Chad Humphries, David Chelimsky
+Copyright © 2006 David Chelimsky, The RSpec Development Team
+Copyright © 2005 Steven Baker
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the “Software”), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
diff --git a/simple_captcha.gemspec b/simple_captcha.gemspec
index 7a6bd3d..6440275 100644
--- a/simple_captcha.gemspec
+++ b/simple_captcha.gemspec
@@ -6,13 +6,14 @@ Gem::Specification.new do |s|
   s.name = "simple_captcha"
   s.version = SimpleCaptcha::VERSION.dup
   s.platform = Gem::Platform::RUBY
+  s.license = "MIT"
   s.summary = "SimpleCaptcha is the simplest and a robust captcha plugin."
   s.description = "SimpleCaptcha is available to be used with Rails 3 + 4 or above and also it provides the backward compatibility with previous versions of Rails."
   s.authors = ["Pavlo Galeta", "Igor Galeta", 'Stefan Wienert', 'Konrad Mallok']
   s.email = "stwienert@gmail.com"
   s.homepage = "http://github.com/pludoni/simple-captcha"
 
-  s.files = Dir["{lib}/**/*"] + ["Rakefile", "README.md"]
+  s.files = Dir["{lib}/**/*"] + ["Rakefile", "README.md", "LICENSE.md"]
   s.extra_rdoc_files = ["README.md"]
   s.require_paths = ["lib"]
 
diff --git a/simple_captcha2.gemspec b/simple_captcha2.gemspec
index d5363b7..45f3a42 100644
--- a/simple_captcha2.gemspec
+++ b/simple_captcha2.gemspec
@@ -6,13 +6,14 @@ Gem::Specification.new do |s|
   s.name = "simple_captcha2"
   s.version = SimpleCaptcha::VERSION.dup
   s.platform = Gem::Platform::RUBY
+  s.license = "MIT"
   s.summary = "SimpleCaptcha is the simplest and a robust captcha plugin."
   s.description = "SimpleCaptcha is available to be used with Rails 3 + 4 or above and also it provides the backward compatibility with previous versions of Rails."
   s.authors = ["Pavlo Galeta", "Igor Galeta", 'Stefan Wienert', 'Konrad Mallok']
   s.email = "stwienert@gmail.com"
   s.homepage = "http://github.com/pludoni/simple-captcha"
 
-  s.files = Dir["{lib}/**/*"] + ["Rakefile", "README.md"]
+  s.files = Dir["{lib}/**/*"] + ["Rakefile", "README.md", "LICENSE.md"]
   s.extra_rdoc_files = ["README.md"]
   s.require_paths = ["lib"]