simple_captcha2 0.4.0 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e59bb7e3f61e3c9f11d561c0bd8d4092bd8d2777
-  data.tar.gz: 8463a940c3d8388a788ce4f0284c84e23b363d71
+  metadata.gz: f8f865e98ebd2b44687dd85cba7e5dec3d5eaeae
+  data.tar.gz: cc24a8eb5fc210777e4633df42ad7c00a705c305
 SHA512:
-  metadata.gz: c9b3b883001bef8e12d2a00ce43c9c3e090a7249db8c196679879bd537ceb7e72e6cc227414f586aa10a21a92a1bdb7011c838cdc931e0fd86c81ab327e3a38b
-  data.tar.gz: 3754be1742f26b3210adcd52bdd85fcd1565e003756692a2f2d4cfba6f8d7db305c39d9e4ccfea24cc2e5390a91541a23b1e0e53e8a2ccc7b18468d07e069b12
+  metadata.gz: adac76147dd7b88e82f4761b338e8a7b83235ed2d8fcfc288e00dd50376c05231439d7ce29518d550cf02ccaaba6279d76ff1b860372b9fa5b945ca518f1d24d
+  data.tar.gz: 12b6d66de5ff5e9a2ac83a981c5ce12655748828bce13e9b96327fa2516d50446f4dbf3c41d040c070b3a8dfe3eff3b820135c4e6050e1a7265596e35fc2477b

data/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, or :plain_javascript default is :jquery
+end
+```
+
 
 ### How to change the CSS for SimpleCaptcha DOM elements?
 
@@ -307,12 +315,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.

data/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'

data/lib/simple_captcha.rb

@@ -51,6 +51,10 @@ module SimpleCaptcha
   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 = ''

data/lib/simple_captcha/controller.rb

@@ -15,7 +15,7 @@ module SimpleCaptcha #: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]

data/lib/simple_captcha/engine.rb

@@ -1,6 +1,5 @@
 # encoding: utf-8
 require 'rails'
-require 'simple_captcha'
 
 module SimpleCaptcha
   class Engine < ::Rails::Engine

data/lib/simple_captcha/middleware.rb

@@ -9,6 +9,27 @@ module SimpleCaptcha
       :disposition  => 'attachment'.freeze,
     }.freeze
 
+    REFRESH_FORMATS = {
+      :jquery       => %Q{
+          $("#%{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}');
+      }.freeze,
+    }.freeze
+
     def initialize(app, options={})
       @app = app
       self
@@ -80,11 +101,11 @@ module SimpleCaptcha
         status = 200
         id = request.params['id']
         captcha_hidden_field_id = simple_captch_hidden_field_id(id)
+        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}
 
-        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

data/lib/simple_captcha/simple_captcha_data.rb

@@ -19,13 +19,13 @@ module SimpleCaptcha
       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

data/lib/simple_captcha/version.rb

@@ -1,3 +1,3 @@
 module SimpleCaptcha
-  VERSION = "0.4.0".freeze
+  VERSION = "0.4.2".freeze
 end

data/lib/simple_captcha/view.rb

@@ -56,7 +56,7 @@ module SimpleCaptcha #:nodoc
         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),

metadata

@@ -1,16 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: simple_captcha2
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.2
 platform: ruby
 authors:
 - Pavlo Galeta
 - Igor Galeta
 - Stefan Wienert
+- Konrad Mallok
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-29 00:00:00.000000000 Z
+date: 2017-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -130,7 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: SimpleCaptcha is the simplest and a robust captcha plugin.