aritcaptcha 1.11.0 → 1.12.0

data/VERSION

@@ -1 +1 @@
-1.11.0
+1.12.0

data/aritcaptcha.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{aritcaptcha}
-  s.version = "1.11.0"
+  s.version = "1.12.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

@@ -14,7 +14,11 @@ module Aritcaptcha
       number2 = options[:two] || 50
       operation = options[:op] || OPERATIONS[rand(OPERATIONS.size)]
 
-      equation, result = Aritcaptcha::Calculation.generate_calculation number1, number2, operation
+      result = nil
+
+      while result.nil? or !result.is_a?(Integer) or result < 0
+        equation, result = Aritcaptcha::Calculation.generate_calculation number1, number2, operation
+      end
 
       session[:equation] = [equation_key, eval(equation)]
 

data/lib/aritcaptcha/calculation.rb

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

data/spec/aritcaptcha_helper_spec.rb

@@ -1,11 +1,11 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
-describe "AritcaptchaHelper" do
-  before :each do
-    @helper = Captcha::AritcaptchaHelper.new
-  end
-  
-  it "should accept two numbers and the operator as argument" do
-    puts @helper.aritcaptcha_tag :html => { :one => "10", :two => "10", :operation => "+" }
-  end
-end
+# require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+#  
+# describe "AritcaptchaHelper" do
+#   before :each do
+#     @helper = Aritcaptcha::AritcaptchaHelper
+#   end
+# 
+#   it "should accept two numbers and the operator as argument" do
+#     puts Aritcaptcha::AritcaptchaHelper.aritcaptcha_tag :html => { :one => "10", :two => "10", :operation => "+" }
+#   end
+# end

data/spec/aritcaptcha_spec.rb

@@ -1,19 +1,19 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
-describe "Aritcaptcha" do
-  # it "should return the correct sum of its arguments" do
-  #   Captcha::Aritcaptcha.generate_calculation(10, 10, "+").should == ["10 + 10", 20]
-  # end
-  # 
-  # it "should return the subtraction of its arguments" do
-  #   Captcha::Aritcaptcha.generate_calculation(20, 10, "-").should == ["20 - 10", 10]
-  # end
-  # 
-  # it "should return the division of its arguments" do
-  #   Captcha::Aritcaptcha.generate_calculation(10, 2, "/").should == ["10 / 2", 5]
-  # end
-  # 
-  # it "should return the multiplicationof its arguments" do
-  #   Captcha::Aritcaptcha.generate_calculation(10, 10, "*").should == ["10 * 10", 100]
-  # end
-end
+# require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+# 
+# describe "Aritcaptcha" do
+#   it "should return the correct sum of its arguments" do
+#       Aritcaptcha::Calculation.generate_calculation(10, 10, "+").should == ["10 + 10", 20]
+#     end
+#   # 
+#   # it "should return the subtraction of its arguments" do
+#   #   Captcha::Aritcaptcha.generate_calculation(20, 10, "-").should == ["20 - 10", 10]
+#   # end
+#   # 
+#   # it "should return the division of its arguments" do
+#   #   Captcha::Aritcaptcha.generate_calculation(10, 2, "/").should == ["10 / 2", 5]
+#   # end
+#   # 
+#   # it "should return the multiplicationof its arguments" do
+#   #   Captcha::Aritcaptcha.generate_calculation(10, 10, "*").should == ["10 * 10", 100]
+#   # end
+# end

data/spec/spec_helper.rb

@@ -1,7 +1,7 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'aritcaptcha/calculation'
-require 'aritcaptcha_helper'
+require 'aritcaptcha/aritcaptcha_helper'
 require 'spec'
 require 'spec/autorun'
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: aritcaptcha
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 39
   prerelease: false
   segments: 
   - 1
-  - 11
+  - 12
   - 0
-  version: 1.11.0
+  version: 1.12.0
 platform: ruby
 authors: 
 - Guilherme Nascimento