aritcaptcha 1.18.0 → 1.19.0

data/VERSION

@@ -1 +1 @@
-1.18.0
+1.19.0

data/aritcaptcha.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{aritcaptcha}
-  s.version = "1.18.0"
+  s.version = "1.19.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Guilherme Nascimento"]
-  s.date = %q{2010-07-05}
+  s.date = %q{2010-07-10}
   s.description = %q{Arithmetic Captcha}
   s.email = %q{guilherme.ruby@gmail.com}
   s.extra_rdoc_files = [

data/lib/aritcaptcha/aritcaptcha_helper.rb

@@ -1,40 +1,71 @@
 module Aritcaptcha
 
   module AritcaptchaHelper
+    ADD = '+'
+    SUB = '-'
+    DIV = '/'
+    MUL = '*'
 
-    def aritcaptcha_tag(options={})
-      equation_key = Time.now.to_i 
-      operations = {:add => "+", :sub => "-", :mul => "*", :div => "/"}
+    OPERATIONS = [ADD, SUB, DIV, MUL]
+
+   def aritcaptcha_tag(options={})
+      equation_key = Time.now.to_i
+
+      default_operations = {:add => "+", :sub => "-", :mul => "*", :div => "/"}
 
       operator = nil
-      if options[:op] == nil
-        operator = operations.to_a[rand(operations.size)][1]
+      if options[:operations] == nil
+         operator = default_operations.to_a[rand(default_operations.size)][1]
       else
-        non_default_operations = {}
-        options[:op].each do |op|
-        non_default_operations[op] = operations[op]
-      end
-        operator = non_default_operations.to_a[rand(non_default_operations.size)][1]
+         non_default_operations = {}
+         options[:operations].each do |op|
+            non_default_operations[op] = default_operations[op]
+         end
+	       operator = non_default_operations.to_a[rand(non_default_operations.size)][1]
       end
 
-      equation, result = Aritcaptcha::Calculation.generate_calculation options, 50, 50
-      #session[:equation] = [equation_key, eval(equation)]
-      puts "=========================================================="
-      puts equation
-      puts result
-      puts "=========================================================="
+      equation, result = Aritcaptcha::Calculation.generate_calculation 50, 50, operator
 
-      #options[:op] = operator
+      session[:equation] = [equation_key, eval(equation)]
 
       if options[:html]
         options = options[:html].inject([]){|dump, pair| dump << "#{pair[0]}=\"#{pair[1]}\""}
-        options.join(" ")
-      end 
+        options = options.join(" ")
+      end
+
+      html = ""
+      if options[:format] == "image"
+      	 session[:image] = equation_key
+         format = generate_image equation_key, equation
+         html << "<img src=\"#{format}\" style='vertical-align:top;' /> <input type=\"text\" name=\"equation\" size=\"3\" style='vertical-align:top;' #{options} />"
+      else
+      	html << "#{equation} = <input type=\"text\" name=\"equation\" style='vertical-align:top;' size=\"3\" #{options} /></div>"
+      end
+
+      html << "<input type=\"hidden\" name=\"equation_key\" value=\"#{equation_key}\" /> \n"
+    end
+
+    def generate_image(equation_key, equation)
+      relative_name = "#{equation_key}.png"
+      full_path     = "#{Rails.root}/public/images/#{relative_name}"
 
-      html = "#{equation} = <input type='text' name='equation' #{options} />"
-      html << %{<input type="hidden" name="equation_key" value="#{equation_key}" />\n}
-      html
+      unless File.file?(full_path)
+         image = Magick::Image.new(85, 25)
+         image.format = "PNG"
+         title = Magick::Draw.new
+ 
+         title.annotate(image, 5, 5, 5, 5, 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
+         end
+         image.write(full_path)
+       end
+       url = image_path(relative_name)
     end
   end
 
-end
+end

data/lib/aritcaptcha/aritcaptcha_verify.rb

@@ -5,10 +5,20 @@ 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)
       end          
     end
+
+    def clean image
+       unless image == nil
+          relative_name = "#{image}.png"
+          full_path     = "#{Rails.root}/public/images/#{relative_name}"
+          File.delete(full_path)
+       end
+    end
   end
 
-end
+end

data/lib/aritcaptcha/calculation.rb

@@ -2,15 +2,15 @@ module Aritcaptcha
 
   class Calculation
   
-    def self.generate_calculation number1, number2, operation
+    def generate_calculation number1, number2, operator
+      # Division by zero
+      return [nil, nil] if operator == "/" and number1.zero? or number2.zero?
+
       number1 = rand(number1)
       number2 = rand(number2)
-      equation = "#{number1} #{operation} #{number2}"
-
-      # Division by zero
-      return [nil, nil] if operation == "/" and number1.zero? or number2.zero?
 
-      result = eval("#{number1.to_f} #{operation} #{number2.to_f}")
+      equation = "#{number1} #{operator} #{number2}"
+      result = eval("#{number1.to_f} #{operator} #{number2.to_f}")
 
       [equation, result]
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: aritcaptcha
 version: !ruby/object:Gem::Version 
-  hash: 95
+  hash: 91
   prerelease: false
   segments: 
   - 1
-  - 18
+  - 19
   - 0
-  version: 1.18.0
+  version: 1.19.0
 platform: ruby
 authors: 
 - Guilherme Nascimento
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-05 00:00:00 -03:00
+date: 2010-07-10 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency