aritcaptcha 1.20.0 → 2.0.1

data/VERSION

@@ -1 +1 @@
-1.20.0
+2.0.1

data/aritcaptcha.gemspec

@@ -1,47 +1,44 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{aritcaptcha}
-  s.version = "1.20.0"
+  s.version = "2.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Guilherme Nascimento"]
-  s.date = %q{2010-07-10}
+  s.date = %q{2011-05-09}
   s.description = %q{Arithmetic Captcha}
   s.email = %q{guilherme.ruby@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+    "README.rdoc"
   ]
   s.files = [
     ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "aritcaptcha.gemspec",
-     "lib/aritcaptcha.rb",
-     "lib/aritcaptcha/aritcaptcha_helper.rb",
-     "lib/aritcaptcha/aritcaptcha_verify.rb",
-     "lib/aritcaptcha/calculation.rb",
-     "spec/aritcaptcha_helper_spec.rb",
-     "spec/aritcaptcha_spec.rb",
-     "spec/spec.opts",
-     "spec/spec_helper.rb"
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "aritcaptcha.gemspec",
+    "lib/aritcaptcha.rb",
+    "lib/aritcaptcha/aritcaptcha_helper.rb",
+    "lib/aritcaptcha/aritcaptcha_verify.rb",
+    "lib/aritcaptcha/calculation.rb",
+    "spec/aritcaptcha_spec.rb",
+    "spec/spec.opts",
+    "spec/spec_helper.rb",
+    "tags"
   ]
   s.homepage = %q{http://github.com/guinascimento/aritcaptcha}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Arithmetic Captcha}
   s.test_files = [
-    "spec/aritcaptcha_helper_spec.rb",
-     "spec/aritcaptcha_spec.rb",
-     "spec/spec_helper.rb"
+    "spec/aritcaptcha_spec.rb",
+    "spec/spec_helper.rb"
   ]
 
   if s.respond_to? :specification_version then

data/lib/aritcaptcha.rb

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

data/lib/aritcaptcha/aritcaptcha_helper.rb

@@ -29,15 +29,15 @@ module Aritcaptcha
       session[:equation] = [equation_key, eval(equation)]
 
       if options[:html]
-        options = options[:html].inject([]){|dump, pair| dump << "#{pair[0]}=\"#{pair[1]}\""}
+        options = options[:html].inject([]) { |dump, pair| dump << "#{pair[0]}=\"#{pair[1]}\"" }
         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} />"
+         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} />"
       else
       	html << "#{equation} = <input type=\"text\" name=\"equation\" style='vertical-align:top;' size=\"3\" #{options} /></div>"
       end
@@ -47,7 +47,7 @@ module Aritcaptcha
 
     def generate_image(equation_key, equation)
       relative_name = "#{equation_key}.png"
-      full_path     = "#{Rails.root}/public/images/#{relative_name}"
+      full_path     = "#{Rails.root}/public/images/aritcaptcha/#{relative_name}"
 
       unless File.file?(full_path)
          image = Magick::Image.new(85, 25)
@@ -63,9 +63,9 @@ module Aritcaptcha
            self.pointsize   = 20
          end
          image.write(full_path)
-       end
-       url = image_path(relative_name)
+      end      
+       relative_name
     end
   end
 
-end
+end

data/lib/aritcaptcha/aritcaptcha_verify.rb

@@ -13,9 +13,9 @@ module Aritcaptcha
     end
 
     def clean image
-       unless image == nil
+      unless image == nil
           relative_name = "#{image}.png"
-          full_path     = "#{Rails.root}/public/images/#{relative_name}"
+          full_path     = "#{Rails.root}/public/images/aritcaptcha/#{relative_name}"
           File.delete(full_path)
        end
     end

data/lib/aritcaptcha/calculation.rb

@@ -2,7 +2,7 @@ module Aritcaptcha
 
   class Calculation
   
-    def self.generate_calculation number1, number2, operator
+    def self.generate_calculation number1, number2, operator, &block
       # Division by zero
       return [nil, nil] if operator == "/" and number1.zero? or number2.zero?
 
@@ -12,6 +12,14 @@ module Aritcaptcha
       equation = "#{number1} #{operator} #{number2}"
       result = eval("#{number1.to_f} #{operator} #{number2.to_f}")
 
+      if result.infinite?
+        # over and over again untill !infnite
+        number1 = rand(number1)
+        number2 = rand(number2)
+        result = eval("#{number1.to_f} #{operator} #{number2.to_f}")
+      end
+
+      result = (result == result.floor) ? result.to_i : result
       [equation, result]
     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
-#       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
+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 have(2).items
+  end
+
+  it "should return the subtraction of its arguments" do
+    Aritcaptcha::Calculation.generate_calculation(20, 10, "-").should have(2).items
+  end
+
+  it "should return the division of its arguments" do
+    Aritcaptcha::Calculation.generate_calculation(10, 2, "/").should have(2).items
+  end
+
+  it "should return the multiplication of its arguments" do
+    Aritcaptcha::Calculation.generate_calculation(10, 10, "*").should have(2).items
+  end
+end

data/spec/spec_helper.rb

@@ -1,10 +1,4 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'aritcaptcha/calculation'
-require 'aritcaptcha/aritcaptcha_helper'
-require 'spec'
-require 'spec/autorun'
 
-Spec::Runner.configure do |config|
-  
-end
+require 'aritcaptcha/calculation'

data/tags

@@ -0,0 +1,19 @@
+1279032088
+ADD	/home/guilherme/Projetos/aritcaptcha/lib/aritcaptcha/aritcaptcha_helper.rb	    ADD =
+Aritcaptcha	/home/guilherme/Projetos/aritcaptcha/lib/aritcaptcha/aritcaptcha_helper.rb	module Aritcaptcha
+Aritcaptcha	/home/guilherme/Projetos/aritcaptcha/lib/aritcaptcha/aritcaptcha_verify.rb	module Aritcaptcha
+Aritcaptcha	/home/guilherme/Projetos/aritcaptcha/lib/aritcaptcha/calculation.rb	module Aritcaptcha
+AritcaptchaHelper	/home/guilherme/Projetos/aritcaptcha/lib/aritcaptcha/aritcaptcha_helper.rb	  module AritcaptchaHelper
+AritcaptchaVerify	/home/guilherme/Projetos/aritcaptcha/lib/aritcaptcha/aritcaptcha_verify.rb	  module AritcaptchaVerify
+Calculation	/home/guilherme/Projetos/aritcaptcha/lib/aritcaptcha/calculation.rb	  class Calculation
+DIV	/home/guilherme/Projetos/aritcaptcha/lib/aritcaptcha/aritcaptcha_helper.rb	    DIV =
+MUL	/home/guilherme/Projetos/aritcaptcha/lib/aritcaptcha/aritcaptcha_helper.rb	    MUL =
+OPERATIONS	/home/guilherme/Projetos/aritcaptcha/lib/aritcaptcha/aritcaptcha_helper.rb	    OPERATIONS =
+SOLV	/home/guilherme/Projetos/aritcaptcha/lib/aritcaptcha/aritcaptcha_verify.rb	    SOLV      =
+SOLV_KEY	/home/guilherme/Projetos/aritcaptcha/lib/aritcaptcha/aritcaptcha_verify.rb	    SOLV_KEY  =
+SUB	/home/guilherme/Projetos/aritcaptcha/lib/aritcaptcha/aritcaptcha_helper.rb	    SUB =
+aritcaptcha_tag	/home/guilherme/Projetos/aritcaptcha/lib/aritcaptcha/aritcaptcha_helper.rb	   def aritcaptcha_tag
+clean	/home/guilherme/Projetos/aritcaptcha/lib/aritcaptcha/aritcaptcha_verify.rb	    def clean
+generate_calculation	/home/guilherme/Projetos/aritcaptcha/lib/aritcaptcha/calculation.rb	    def self.generate_calculation
+generate_image	/home/guilherme/Projetos/aritcaptcha/lib/aritcaptcha/aritcaptcha_helper.rb	    def generate_image
+verify_aritcaptcha	/home/guilherme/Projetos/aritcaptcha/lib/aritcaptcha/aritcaptcha_verify.rb	    def verify_aritcaptcha

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: aritcaptcha
 version: !ruby/object:Gem::Version 
-  hash: 71
+  hash: 13
   prerelease: false
   segments: 
-  - 1
-  - 20
+  - 2
   - 0
-  version: 1.20.0
+  - 1
+  version: 2.0.1
 platform: ruby
 authors: 
 - Guilherme Nascimento
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-10 00:00:00 -03:00
+date: 2011-05-09 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -45,7 +45,6 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .document
-- .gitignore
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -55,17 +54,17 @@ files:
 - lib/aritcaptcha/aritcaptcha_helper.rb
 - lib/aritcaptcha/aritcaptcha_verify.rb
 - lib/aritcaptcha/calculation.rb
-- spec/aritcaptcha_helper_spec.rb
 - spec/aritcaptcha_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
+- tags
 has_rdoc: true
 homepage: http://github.com/guinascimento/aritcaptcha
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -94,6 +93,5 @@ signing_key:
 specification_version: 3
 summary: Arithmetic Captcha
 test_files: 
-- spec/aritcaptcha_helper_spec.rb
 - spec/aritcaptcha_spec.rb
 - spec/spec_helper.rb

data/.gitignore

@@ -1,21 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC

data/spec/aritcaptcha_helper_spec.rb

@@ -1,11 +0,0 @@
-# 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