aritcaptcha 2.0.1 → 2.0.2

data/README.markdown

@@ -0,0 +1,35 @@
+# Aritcaptcha: A simple numeric captcha for Rails 3
+
+Aritcaptcha provides a simple way to display a numeric captcha inside a page.
+
+## Usage
+
+Use RubyGems to install:
+
+	$ gem install aritcaptcha
+
+After the installation you can generate a simple numeric captcha inside a page:
+
+	<%= raw aritcaptcha_tag %>
+
+If you want to use a numeric captcha that renders an image:
+
+	<%= raw aritcaptcha_tag :format => "image" %>
+
+If you want to restrict the arithmetic operations:
+
+	<%= raw aritcaptcha_tag :operations => [:add, :sub], :format => "image" %> # only the operations of addition and subtraction are displayed
+
+## Contributing to Aritcaptcha
+
+* Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
+* Check out the [issue tracker](http://github.com/guinascimento/aritcaptcha/issues) to make sure someone already hasn't requested it and/or contributed it
+* Fork the project
+* Start a feature/bugfix branch
+* Commit and push until you are happy with your contribution
+* Make sure to add tests for the feature/bugfix. This is important so I don't break it in a future version unintentionally.
+* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate it to its own commit so I can cherry-pick around it.
+
+## Copyright
+
+Copyright (c) 2011 Guilherme Nascimento. See LICENSE for details.

data/VERSION

@@ -1 +1 @@
-2.0.1
+2.0.2

data/aritcaptcha.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{aritcaptcha}
-  s.version = "2.0.1"
+  s.version = "2.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Guilherme Nascimento"]
@@ -14,12 +14,12 @@ Gem::Specification.new do |s|
   s.email = %q{guilherme.ruby@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
-    "README.rdoc"
+    "README.markdown"
   ]
   s.files = [
     ".document",
     "LICENSE",
-    "README.rdoc",
+    "README.markdown",
     "Rakefile",
     "VERSION",
     "aritcaptcha.gemspec",

data/lib/aritcaptcha/aritcaptcha_helper.rb

@@ -1,3 +1,5 @@
+require "aritcaptcha/calculation"
+
 module Aritcaptcha
 
   module AritcaptchaHelper
@@ -29,17 +31,18 @@ module Aritcaptcha
       session[:equation] = [equation_key, eval(equation)]
 
       if options[:html]
-        options = options[:html].inject([]) { |dump, pair| dump << "#{pair[0]}=\"#{pair[1]}\"" }
-        options = options.join(" ")
+        options_html = options[:html].inject([]) { |dump, pair| dump << "#{pair[0]}=\"#{pair[1]}\"" }
+        options_html = options_html.join(" ")
       end
 
       html = ""
       if options[:format] == "image"
       	 session[:image] = equation_key
          img = generate_image equation_key, equation
-         html << "<img src=\"/images/aritcaptcha/#{img}\" style='vertical-align:top;' /> <input type=\"text\" name=\"equation\" size=\"3\" style='vertical-align:top;' #{options} />"
+
+         html << "<img src=\"/images/#{img}\" style='vertical-align:top;' /> <input type=\"text\" name=\"equation\" size=\"3\" style='vertical-align:top;' #{options_html unless options_html.nil?} />"
       else
-      	html << "#{equation} = <input type=\"text\" name=\"equation\" style='vertical-align:top;' size=\"3\" #{options} /></div>"
+      	html << "#{equation} = <input type=\"text\" name=\"equation\" style='vertical-align:top;' size=\"3\" #{options_html unless options_html.nil?} /></div>"
       end
 
       html << "<input type=\"hidden\" name=\"equation_key\" value=\"#{equation_key}\" /> \n"
@@ -47,20 +50,20 @@ module Aritcaptcha
 
     def generate_image(equation_key, equation)
       relative_name = "#{equation_key}.png"
-      full_path     = "#{Rails.root}/public/images/aritcaptcha/#{relative_name}"
+      full_path     = "#{Rails.root}/public/images/#{relative_name}"
 
       unless File.file?(full_path)
-         image = Magick::Image.new(85, 25)
+         image = Magick::Image.new(85, 32)
          image.format = "PNG"
          title = Magick::Draw.new
  
-         title.annotate(image, 5, 5, 5, 5, equation + " =") do
+         title.annotate(image, 5, 5, 12, 7, equation + " =") do
            self.fill        = "#333"
            self.font        = Rails.root + "/fonts/Clarenton LT Bold.ttf"
            self.font_family = "Clarenton LT Bold"
            self.font_weight = Magick::BoldWeight
            self.gravity     = Magick::NorthWestGravity
-           self.pointsize   = 20
+           self.pointsize   = 15
          end
          image.write(full_path)
       end      

data/lib/aritcaptcha/aritcaptcha_verify.rb

@@ -5,18 +5,19 @@ module Aritcaptcha
     SOLV      = 1
 
     def verify_aritcaptcha(params)
-      clean session[:image]
-
       if (equation_key = params[:equation_key]) and (equation = params[:equation])
-        return (session[:equation] and session[:equation][SOLV_KEY] == equation_key.to_i and session[:equation][SOLV] == equation.to_i)
+        if session[:equation] and session[:equation][SOLV_KEY] == equation_key.to_i and session[:equation][SOLV] == equation.to_i
+          clean session[:image] 
+          return true
+        end
       end          
     end
 
     def clean image
       unless image == nil
-          relative_name = "#{image}.png"
-          full_path     = "#{Rails.root}/public/images/aritcaptcha/#{relative_name}"
-          File.delete(full_path)
+        relative_name = "#{image}.png"
+        full_path     = "#{Rails.root}/public/images/#{relative_name}"
+        File.delete(full_path)
        end
     end
   end

data/lib/aritcaptcha.rb

@@ -1,3 +1,5 @@
 require 'aritcaptcha/aritcaptcha_helper'
+require 'aritcaptcha/aritcaptcha_verify'
 
-ActionView::Base.send(:include, Aritcaptcha::AritcaptchaHelper)
+ActionView::Base.send(:include, Aritcaptcha::AritcaptchaHelper)
+ActionController::Base.send(:include, Aritcaptcha::AritcaptchaVerify)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: aritcaptcha
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: false
   segments: 
   - 2
   - 0
-  - 1
-  version: 2.0.1
+  - 2
+  version: 2.0.2
 platform: ruby
 authors: 
 - Guilherme Nascimento
@@ -42,11 +42,11 @@ extensions: []
 
 extra_rdoc_files: 
 - LICENSE
-- README.rdoc
+- README.markdown
 files: 
 - .document
 - LICENSE
-- README.rdoc
+- README.markdown
 - Rakefile
 - VERSION
 - aritcaptcha.gemspec

data/README.rdoc

@@ -1,17 +0,0 @@
-= aritcaptcha
-
-Description goes here.
-
-== Note on Patches/Pull Requests
- 
-* Fork the project.
-* Make your feature addition or bug fix.
-* Add tests for it. This is important so I don't break it in a
-  future version unintentionally.
-* Commit, do not mess with rakefile, version, or history.
-  (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
-* Send me a pull request. Bonus points for topic branches.
-
-== Copyright
-
-Copyright (c) 2010 Guilherme Nascimento. See LICENSE for details.