mathcha 0.4.4 → 0.4.5

data/VERSION

@@ -1 +1 @@
-0.4.4
+0.4.5

data/lib/mathcha/mathcha_helper.rb

@@ -34,14 +34,18 @@ module Mathcha
     # * Only one mathcha can exist at a time, for now.
     def mathcha_tag(options={})
       options.reverse_merge!({:seed_one => 80, :seed_two => 10})
+
+      solv_key    = Time.now.to_i       
+      result, eq  = nil, nil
       
-      solv_key  = Time.now.to_i 
-      solv_prob = generate_solv(SOLV_OPS[rand(SOLV_OPS.size)], options[:seed_one].to_i, options[:seed_two].to_i)
+      while result.nil? or !result.is_a?(Integer) or result < 0
+        result, eq = generate_solv(SOLV_OPS[rand(SOLV_OPS.size)], 80, 10)
+      end 
 
-      session[:solv] = [solv_key, eval(solv_prob)]
+      session[:solv] = [solv_key, eval(eq)]
       
       html = ''
-      html << %{#{solv_prob} = <input type="text" name="solv" />\n}
+      html << %{#{eq} = <input type="text" name="solv" />\n}
       html << %{<input type="hidden" name="solv_key" value="#{solv_key}" />\n}
       html
     end
@@ -54,14 +58,7 @@ module Mathcha
       sol = eval(eq = "#{op1.to_f} #{op} #{op2.to_f}")
       sol = (sol == sol.floor) ? sol.to_i : sol
       
-      case
-      when op == DIV
-        generate_solv(op, seed1, seed2) if (!sol.is_a?(Integer)) or (sol < 0)
-      when op == SUB
-        generate_solv(op, seed1, seed2) if sol < 0
-      end
-      
-      return eq
+      return [sol, eq]
     end
     
     private :generate_solv

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mathcha
 version: !ruby/object:Gem::Version 
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors: 
 - Cory Wilkerson
@@ -30,13 +30,13 @@ files:
 - lib/mathcha.rb
 - lib/mathcha/mathcha_helper.rb
 - lib/mathcha/mathcha_verify.rb
-- mathcha.gemspec
 - pkg/mathcha-0.0.0.gem
 - pkg/mathcha-0.2.0.gem
 - pkg/mathcha-0.4.0.gem
 - pkg/mathcha-0.4.1.gem
 - pkg/mathcha-0.4.2.gem
 - pkg/mathcha-0.4.3.gem
+- pkg/mathcha-0.4.4.gem
 - rails/init.rb
 - tasks/mathcha_tasks.rake
 - test/mathcha_test.rb

data/mathcha.gemspec

@@ -1,59 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{mathcha}
-  s.version = "0.4.4"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Cory Wilkerson"]
-  s.date = %q{2009-10-16}
-  s.description = %q{Quick little arithmetic plain-text captcha}
-  s.email = %q{coryjwilkerson@gmail.com}
-  s.extra_rdoc_files = [
-    "README"
-  ]
-  s.files = [
-    "MIT-LICENSE",
-     "README",
-     "Rakefile",
-     "VERSION",
-     "install.rb",
-     "lib/mathcha.rb",
-     "lib/mathcha/mathcha_helper.rb",
-     "lib/mathcha/mathcha_verify.rb",
-     "mathcha.gemspec",
-     "pkg/mathcha-0.0.0.gem",
-     "pkg/mathcha-0.2.0.gem",
-     "pkg/mathcha-0.4.0.gem",
-     "pkg/mathcha-0.4.1.gem",
-     "pkg/mathcha-0.4.2.gem",
-     "pkg/mathcha-0.4.3.gem",
-     "rails/init.rb",
-     "tasks/mathcha_tasks.rake",
-     "test/mathcha_test.rb",
-     "test/test_helper.rb",
-     "uninstall.rb"
-  ]
-  s.homepage = %q{http://github.com/corywilkerson/mathcha}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
-  s.summary = %q{Quick little arithmetic plain-text captcha}
-  s.test_files = [
-    "test/mathcha_test.rb",
-     "test/test_helper.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-    else
-    end
-  else
-  end
-end