aritcaptcha 1.14.0 → 1.15.0

data/VERSION

@@ -1 +1 @@
-1.14.0
+1.15.0

data/aritcaptcha.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{aritcaptcha}
-  s.version = "1.14.0"
+  s.version = "1.15.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Guilherme Nascimento"]

data/lib/aritcaptcha/aritcaptcha_helper.rb

@@ -12,13 +12,6 @@ module Aritcaptcha
       equation_key = Time.now.to_i 
       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]
@@ -35,6 +28,13 @@ module Aritcaptcha
         :two => 50
       }.merge options
 
+      equation, result = Aritcaptcha::Calculation.generate_calculation options, options[:one], options[:two]
+      session[:equation] = [equation_key, eval(equation)]
+      puts "=========================================================="
+      puts equation
+      puts result
+      puts "=========================================================="
+
       options[:op] = operator
 
       if options[:html]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: aritcaptcha
 version: !ruby/object:Gem::Version 
-  hash: 47
+  hash: 43
   prerelease: false
   segments: 
   - 1
-  - 14
+  - 15
   - 0
-  version: 1.14.0
+  version: 1.15.0
 platform: ruby
 authors: 
 - Guilherme Nascimento