Skip to content

Make simple captcha work on Windows #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Make simple captcha work on Windows #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1b4ba41
' removed for Windows compatibility
Jul 26, 2012
b887582
Submit captcha_key in hidden_field_tag
Aug 21, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/simple_captcha/controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ def simple_captcha_valid?
return true if Rails.env.test?

if params[:captcha]
data = SimpleCaptcha::Utils::simple_captcha_value(session[: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
Expand Down
4 changes: 2 additions & 2 deletions lib/simple_captcha/image.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,14 +64,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 << "-pointsize 22"
params << "-implode 0.2"

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} #{File.expand_path(dst.path)}"

SimpleCaptcha::Utils::run("convert", params.join(' '))

Expand Down
3 changes: 2 additions & 1 deletion lib/simple_captcha/view.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,8 @@ def simple_captcha_field(options={})
text_field(options[:object], :captcha, :value => '', :autocomplete => 'off') +
hidden_field(options[:object], :captcha_key, {:value => options[:field_value]})
else
text_field_tag(:captcha, nil, :autocomplete => 'off')
text_field_tag(:captcha, nil, :autocomplete => 'off') +
hidden_field_tag(:captcha_key, options[:field_value])
end
end

Expand Down