aritcaptcha 1.13.0 → 1.14.0

data/VERSION

@@ -1 +1 @@
-1.13.0
+1.14.0

data/aritcaptcha.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{aritcaptcha}
-  s.version = "1.13.0"
+  s.version = "1.14.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-04}
+  s.date = %q{2010-07-05}
   s.description = %q{Arithmetic Captcha}
   s.email = %q{guilherme.ruby@gmail.com}
   s.extra_rdoc_files = [

data/lib/aritcaptcha/aritcaptcha_helper.rb

@@ -10,22 +10,39 @@ module Aritcaptcha
 
     def aritcaptcha_tag(options={})
       equation_key = Time.now.to_i 
-      number1 = options[:one] || 50
-      number2 = options[:two] || 50
-      operation = options[:op] || OPERATIONS[rand(OPERATIONS.size)]
-
+      operations = {:add => "+", :sub => "-", :mul => "*", :div => "/"}
 
       equation, result = Aritcaptcha::Calculation.generate_calculation number1, number2, operation
-
-
       session[:equation] = [equation_key, eval(equation)]
+      puts "=========================================================="
+      puts equation
+      puts result
+      puts "=========================================================="
+
+      operator = nil
+      if options[:op] == nil
+        operator = operations.to_a[rand(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]
+      end
+
+      options = {
+        :one => 50,
+        :two => 50
+      }.merge options
+
+      options[:op] = operator
 
       if options[:html]
-        html_options = options[:html].inject([]){|dump, pair| dump << "#{pair[0]}=\"#{pair[1]}\""}
-        html_options.join(" ")
+        options = options[:html].inject([]){|dump, pair| dump << "#{pair[0]}=\"#{pair[1]}\""}
+        options.join(" ")
       end 
 
-      html = "#{equation} = <input type='text' name='equation' #{html_options} />"
+      html = "#{equation} = <input type='text' name='equation' #{options} />"
       html << %{<input type="hidden" name="equation_key" value="#{equation_key}" />\n}
       html
     end

data/lib/aritcaptcha/calculation.rb

@@ -8,7 +8,7 @@ module Aritcaptcha
       equation = "#{number1} #{operation} #{number2}"
 
       # Division by zero
-      return [nil, nil] if operation == "/" and number2.zero?
+      return [nil, nil] if operation == "/" and number1.zero? or number2.zero?
 
       result = eval("#{number1.to_f} #{operation} #{number2.to_f}")
 
@@ -17,6 +17,4 @@ module Aritcaptcha
 
   end
 
-end
-
-puts Aritcaptcha::Calculation.generate_calculation(10, 0, "/")
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: aritcaptcha
 version: !ruby/object:Gem::Version 
-  hash: 35
+  hash: 47
   prerelease: false
   segments: 
   - 1
-  - 13
+  - 14
   - 0
-  version: 1.13.0
+  version: 1.14.0
 platform: ruby
 authors: 
 - Guilherme Nascimento
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-04 00:00:00 -03:00
+date: 2010-07-05 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency