mathcha 0.4.7 → 0.5.0

data/Rakefile

@@ -11,6 +11,8 @@ begin
     gemspec.email       = "coryjwilkerson@gmail.com"
     gemspec.homepage    = "http://github.com/corywilkerson/mathcha"
     gemspec.authors     = ["Cory Wilkerson"]
+    
+    gemspec.add_dependency('Linguistics', '> 1.0.5')
   end
 rescue LoadError
   puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"

data/VERSION

@@ -1 +1 @@
-0.4.7
+0.5.0

data/lib/mathcha/mathcha_helper.rb

@@ -1,3 +1,5 @@
+require 'linguistics'
+
 module Mathcha
 
   # Helper included in ActionView::Base. Use mathcha_tag in your views to 
@@ -39,13 +41,13 @@ module Mathcha
       result, eq  = nil, nil
       
       while result.nil? or !result.is_a?(Integer) or result < 0
-        result, eq = generate_solv(SOLV_OPS[rand(SOLV_OPS.size)], options[:seed_one], options[:seed_two])
+        result, eq, eq_slick = generate_solv(SOLV_OPS[rand(SOLV_OPS.size)], options[:seed_one], options[:seed_two])
       end 
 
       session[:solv] = [solv_key, eval(eq)]
       
       html = ''
-      html << %{#{eq} = <input type="text" name="solv" />\n}
+      html << %{#{eq_slick.titlecase} = <input type="text" name="solv" />\n}
       html << %{<input type="hidden" name="solv_key" value="#{solv_key}" />\n}
       html
     end
@@ -58,12 +60,14 @@ module Mathcha
       # want to bail on division by zero, just cut it off.
       return [nil, nil] if (op == DIV and op2 == 0)
       
+      eq_slick = "#{Linguistics::EN.numwords(op1)} #{op} #{Linguistics::EN.numwords(op2)}"
+      
       sol = eval(eq = "#{op1.to_f} #{op} #{op2.to_f}")
       sol = (sol == sol.floor) ? sol.to_i : sol
       
-      return [sol, eq]
+      return [sol, eq, eq_slick]
     end
     
     private :generate_solv
   end 
-end 
+end

data/mathcha.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mathcha}
-  s.version = "0.4.7"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Cory Wilkerson"]
@@ -34,6 +34,7 @@ Gem::Specification.new do |s|
      "pkg/mathcha-0.4.4.gem",
      "pkg/mathcha-0.4.5.gem",
      "pkg/mathcha-0.4.6.gem",
+     "pkg/mathcha-0.4.7.gem",
      "rails/init.rb",
      "tasks/mathcha_tasks.rake",
      "test/mathcha_test.rb",
@@ -55,8 +56,11 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<Linguistics>, ["> 1.0.5"])
     else
+      s.add_dependency(%q<Linguistics>, ["> 1.0.5"])
     end
   else
+    s.add_dependency(%q<Linguistics>, ["> 1.0.5"])
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mathcha
 version: !ruby/object:Gem::Version 
-  version: 0.4.7
+  version: 0.5.0
 platform: ruby
 authors: 
 - Cory Wilkerson
@@ -11,8 +11,17 @@ cert_chain: []
 
 date: 2009-10-16 00:00:00 -05:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: Linguistics
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">"
+      - !ruby/object:Gem::Version 
+        version: 1.0.5
+    version: 
 description: Quick little arithmetic plain-text captcha
 email: coryjwilkerson@gmail.com
 executables: []
@@ -40,6 +49,7 @@ files:
 - pkg/mathcha-0.4.4.gem
 - pkg/mathcha-0.4.5.gem
 - pkg/mathcha-0.4.6.gem
+- pkg/mathcha-0.4.7.gem
 - rails/init.rb
 - tasks/mathcha_tasks.rake
 - test/mathcha_test.rb