simple_captcha_reloaded 0.1.0.beta1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f4126818899ea31db41b60c51a036065f0fde3c
-  data.tar.gz: 479910c2d5ad2b20c5e0f9f3eeb0c3d1a693c0bb
+  metadata.gz: 6a0b34dbfa1c17906e1aaa726c06f77988b2a50c
+  data.tar.gz: 52b25d9225d5243a8fb64f38c16a431cb20869e5
 SHA512:
-  metadata.gz: 9f69f5ad7cf1e8737d8ccdf91e4b1788d00d3235f80882b20a42a58c5cb598247a8691e316f0771a5342047089d215ab3e11a34d2001f3b86cc43ccdfc822b0f
-  data.tar.gz: 901e27f5873bed57c56ee6d637d49ebb78ece64bed5226ebef34678c4f8b19ca7347f30fb82e4432688459fd99a2c6150b333d14753e562e7cb7277e0de6d553
+  metadata.gz: b783a5cc40dec2af2d423600b632681a7df1436c71e6ee7beb882f907555a1b2eb5013966f677ea5e6ac7d32c2783d5a0c54d865651e30c3a782387f810ef829
+  data.tar.gz: c05b24ccb8fce886dc2a9f13a9578c064465c3423aeac1f8f4e029614188cd872c9fc92e0dd949ebd64410e2a3628ca3a85ddfca8949e277f1ce5fae4dd02492

data/README.md

@@ -40,6 +40,13 @@ gem 'simple_captcha_reloaded'
 and run ``bundle install``.
 
 
+Install the migration to create the captcha data table:
+
+```
+rake simple_captcha_reloaded:install:migrations
+rake db:migrate
+```
+
 ### Integration 1: Model based
 
 Just integrate the module into on of your ActiveModel::Model compliant Models:

data/config/locales/simple_captcha.en.yml

@@ -5,3 +5,10 @@ en:
       blank: 'Please fill in the words above'
       wrong: 'The entered text was not correct. Please try again.'
     refresh_button_html: 'Refresh'
+de:
+  simple_captcha_reloaded:
+    errors:
+      missing_captcha: 'Captcha nicht gefunden'
+      blank: 'Bitte geben Sie den obigen Text ein'
+      wrong: 'Der eingebene Text war leider nicht richtig. Bitte probieren Sie es erneut.'
+    refresh_button_html: 'Neu laden'

data/lib/simple_captcha_reloaded/adapters/simple_form.rb

@@ -1,5 +1,10 @@
 require 'simple_form/version'
-class SimpleCaptchaInput < SimpleForm::Inputs::StringInput
+# to accommodate for the Bootstrap 3 Simple Form config
+superclass = SimpleForm::Inputs::StringInput
+if defined?(StringInput)
+  superclass = StringInput
+end
+class SimpleCaptchaInput < superclass
   def input(wrapper_options=nil)
     set_options
     @captcha = SimpleCaptchaReloaded.generate_captcha(id: options[:captcha][:id], request: template.request)

data/lib/simple_captcha_reloaded/config.rb

@@ -3,6 +3,7 @@ class SimpleCaptchaReloaded::Config
   cattr_accessor :image
   cattr_accessor :characters
   cattr_accessor :length
+  cattr_accessor :timeout
 
   def self.image_url(code, request)
     time = Time.now.to_i
@@ -37,5 +38,6 @@ SimpleCaptchaReloaded::Config.tap do |config|
   config.image = SimpleCaptchaReloaded::Image.new
   config.characters = %w[a b c d e f g h j k m n p q r s t u v w x y z 0 2 3 4 5 6 8 9]
   config.length = 6
+  config.timeout = 3
 end
 

data/lib/simple_captcha_reloaded/engine.rb

@@ -4,15 +4,17 @@ module SimpleCaptchaReloaded
   class Engine < ::Rails::Engine
     isolate_namespace SimpleCaptchaReloaded
     initializer "simple_captcha.load" do |app|
-      if defined?(SimpleForm)
-        require 'simple_captcha_reloaded/adapters/simple_form'
-      end
       ActiveSupport.on_load :action_controller do
         helper SimpleCaptchaReloaded::ViewHelper
         ActionController::Base.send(:include, SimpleCaptchaReloaded::ControllerHelper)
       end
       app.middleware.use SimpleCaptchaReloaded::Middleware
     end
+    config.after_initialize do
+      if defined?(SimpleForm)
+        require 'simple_captcha_reloaded/adapters/simple_form'
+      end
+    end
 
   end
 end

data/lib/simple_captcha_reloaded/error.rb

@@ -0,0 +1,4 @@
+module SimpleCaptchaReloaded
+  class Error < StandardError
+  end
+end

data/lib/simple_captcha_reloaded/image.rb

@@ -1,4 +1,7 @@
 require 'open3'
+require 'timeout'
+require 'simple_captcha_reloaded/error'
+
 module SimpleCaptchaReloaded
   class Image
     IMAGE_STYLES = {
@@ -25,12 +28,12 @@ module SimpleCaptchaReloaded
     }
 
     def initialize(implode: :medium,
-                   distortion: :random,
-                   image_styles: IMAGE_STYLES,
-                   noise: 0,
+                   distortion: :medium,
+                   image_styles: IMAGE_STYLES.slice('simply_red', 'simply_green', 'simply_blue'),
+                   noise: 1,
                    size: '100x28',
-                   image_magick_path: '',
-                   tmp_path: nil)
+                   image_magick_path: '')
+
       @implode           = implode
       @distortion        = distortion
       if !DISTORTIONS.keys.include?(@distortion)
@@ -41,13 +44,12 @@ module SimpleCaptchaReloaded
       @noise             = noise
       @size              = size
       @image_magick_path = image_magick_path
-      @tmp_path          = tmp_path
     end
 
     def generate(text)
       amplitude, frequency = calculate_distortion
 
-      params = image_params
+      params = image_params.dup
       params << "-size #{@size}"
       params << "-wave #{amplitude}x#{frequency}"
       params << "-gravity Center"
@@ -56,7 +58,7 @@ module SimpleCaptchaReloaded
       params << "label:#{text}"
       params << "-evaluate Uniform-noise #{@noise}"
       params << "jpeg:-"
-      run("convert", params.join(' '))
+      run("convert", params: params.join(' '))
     end
 
     protected
@@ -69,22 +71,26 @@ module SimpleCaptchaReloaded
       @distortion_function.call()
     end
 
-    def run(cmd, params = "")
+    def run(cmd, params: "", count: 0)
       command = %Q[#{cmd} #{params}].gsub(/\s+/, " ")
       command = "#{command} 2>&1"
       unless (image_magick_path = @image_magick_path).blank?
         command = File.join(image_magick_path, command)
       end
-      stderr_r, stderr_w = IO.pipe
-      stdout_r, stdout_w = IO.pipe
-      success = system(command, out: stdout_w, err: stderr_w)
-      stdout_w.close; stderr_w.close
-      output = stdout_r.read
-      error = stderr_r.read
-      unless success
-        raise ::StandardError, "Error while running #{command}\n Exit Code: #{$?}\n stderr:#{error.inspect}\n stdout:#{output.inspect}"
+      output = nil
+      Timeout::timeout(SimpleCaptchaReloaded::Config.timeout) {
+        output = `#{command}`
+      }
+      unless $?.success?
+        raise SimpleCaptchaReloaded::Error, "Error while running #{command}\n Exit Code: #{$?}\n stdout:#{output.inspect}"
       end
       output
+    rescue Timeout::Error
+      if count > 3
+        run(cmd, params: params, count: count + 1)
+      else
+        raise SimpleCaptchaReloaded::Error, "Error while running #{command} #{count + 1} times. Timed out after #{SimpleCaptchaReloaded::Config.timeout} seconds."
+      end
     end
   end
 end

data/lib/simple_captcha_reloaded/version.rb

@@ -1,3 +1,3 @@
 module SimpleCaptchaReloaded
-  VERSION = "0.1.0.beta1"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_captcha_reloaded
 version: !ruby/object:Gem::Version
-  version: 0.1.0.beta1
+  version: 0.1.0
 platform: ruby
 authors:
 - Stefan Wienert
@@ -203,6 +203,7 @@ files:
 - lib/simple_captcha_reloaded/config.rb
 - lib/simple_captcha_reloaded/controller_helper.rb
 - lib/simple_captcha_reloaded/engine.rb
+- lib/simple_captcha_reloaded/error.rb
 - lib/simple_captcha_reloaded/image.rb
 - lib/simple_captcha_reloaded/middleware.rb
 - lib/simple_captcha_reloaded/model.rb
@@ -224,9 +225,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2