captchachacha 0.0.3 → 0.4.2

data/.gitignore

@@ -1,5 +1,8 @@
 *.old
+*.tmproj
+.rvmrc
 .DS_Store
+*.tmproj
 
 *.gem
 

data/CHANGES

@@ -1 +1,11 @@
+v0.4.2 Fixed ultra stupid bug with names of params.
+
+v0.4.1 Changes to gemspec to get rid of YAML Psyck errors when installing gem.
+
+v0.4.0 Using secure random lib to generate better session id's; using X-... for non standard headers. 
+
+v0.0.3 Rebuild of v0.0.2 but without development dependencies, as one of them was causing errors via a bug with YAML Psyck::Syck
+
+v0.0.2 Working, with tests for rack portion.
+
 v0.0.1 Start of project.

data/README

@@ -1,22 +1,20 @@
 ## Rack::Captchachacha ##
 
-Rack middleware for using the [captchator.com][1] service.
+Rack middleware for using the captchator.com service http://captchator.com/.
 
 ### Usage ###
 
 #### Sinatra ####
 
     ## app.rb
+    require 'rack/captchachacha'
     use Rack::Captchachacha
     helpers Rack::Recaptcha::Helpers
 
+There is a longer example on my blog, http://iainbarnett.me.uk/posts/Using-rack-captchachacha/ 
 
 ### Acknowledgments ###
 
-The vast majority of this code comes from [sinatra-captcha][2] and [rack-recaptcha][3]
+The vast majority of this code comes from sinatra-captcha https://github.com/bmizerany/sinatra-captcha and rack-recaptcha https://github.com/achiu/rack-recaptcha
 
 Many thanks to Blake Mizerany, the author of sinatra-captcha, and Arthur Chiu, author of rack-recaptcha for making their code public.
-
-[1]: http://captchator.com/ 
-[2]: https://github.com/bmizerany/sinatra-captcha
-[3]: https://github.com/achiu/rack-recaptcha

data/captchachacha.gemspec

@@ -11,13 +11,13 @@ Gem::Specification.new do |s|
   EOF
   s.version        = Rack::Captchachacha::VERSION
   s.platform       = Gem::Platform::RUBY
-  s.require_path   = 'lib'
+  s.require_path   = "lib"
   s.required_ruby_version    = ">= 1.9.2"
-  s.author         = "Iain Barnett"
+  s.authors        = ["Iain Barnett"]
   s.files          = `git ls-files`.split("\n")
-  s.add_dependency('rack', '=1.3.0')
-  s.add_dependency('curb', '=0.7.15')
-  s.email          = "iainspeed @nospam@ gmail.com"
+  s.add_dependency("rack", "~> 1.3.0")
+  s.add_dependency("curb", "~> 0.7.15")
+  s.email          = ["iainspeed @nospam@ gmail.com"]
   s.homepage       = "https://github.com/yb66/Captchachacha"
   s.test_files     = `git ls-files -- {test,spec,features}`.split("\n")
   s.signing_key    = ENV['HOME'] + '/.ssh/gem-private_key.pem'

data/lib/rack/captchachacha.rb

@@ -8,8 +8,10 @@ module Rack
     
     VERIFY_URL = "http://captchator.com/captcha/check_answer"
     CHALLENGE_FIELD = 'captcha_session'
-    RESPONSE_FIELD  = 'captcha_answer'
-    
+    RESPONSE_FIELD  = 'captcha'
+    DEFAULT_MESSAGE = "Incorrect response, please try again."
+    RESULT_HEADER   = 'X-Captcha-Valid'
+    RESULT_MESSAGE  = 'X-Captcha-Msg'
     
     # @param app Rack application
     # @param [optional,Hash] options Hash of options
@@ -28,9 +30,8 @@ module Rack
     # @param env Rack environment
     def _call(env)
       request = Request.new(env)
-      
       if request.params[CHALLENGE_FIELD] && request.params[RESPONSE_FIELD]
-        
+ 
         result, msg = verify(
                         request.params[CHALLENGE_FIELD].to_i, 
                         request.params[RESPONSE_FIELD] )
@@ -41,20 +42,21 @@ module Rack
         # If it's a fail then the usual course of action would be to redirect back to the
         # captcha form, but on success to continue, so the error message will be ignored unless
         # of failure.
-        msg ||= "incorrect response, please try again"
+        msg ||= DEFAULT_MESSAGE
         
-        env.merge!('captcha.valid' => result == true, 'captcha.msg' => msg )
+        env.merge!(RESULT_HEADER => result == true, RESULT_MESSAGE => msg )
       end
+      
       @app.call(env)
     end
     
     
     def verify( session_id, answer )
-      return false if session_id == 0
+      return false if session_id == 0 || session_id.nil?
       return false if answer.nil?
     
       require 'curb'
-      Curl::Easy.perform("#{VERIFY_URL}/#{session_id}/#{answer}").body_str.to_i == 1
+      Curl::Easy.perform("#{VERIFY_URL}/#{session_id}/#{answer}").body_str == "1"
     end # def
     
   end # class

data/lib/rack/captchachacha/helpers.rb

@@ -7,25 +7,25 @@
 module Rack
   class Captchachacha
     module Helpers
-      
+      require 'securerandom'
       
       def captcha_valid?
-        request.env['captcha.valid']
+        request.env['X-Captcha-Valid']
       end # def
 
 
       def captcha_session
-        @captcha_session ||= rand(9000) + 1000
+        @captcha_session ||= SecureRandom.random_number.to_s[2..-1]
       end
 
 
       def captcha_answer_tag
-        %Q!<input id="captcha-answer" name="captcha_answer" type="text" size="10"/>!
+        %Q!<input id="captcha_answer" name="captcha_answer" type="text" size="6"/>!
       end
 
 
       def captcha_image_tag
-        %Q!<input name="captcha_session" type="hidden" value="#{captcha_session}"/>\n<img id="captcha-image" src="http://captchator.com/captcha/image/#{captcha_session}"/>!
+        %Q!<input id="captcha_session" name="captcha_session" type="hidden" value="#{captcha_session}"/><img id="captcha_image" src="http://captchator.com/captcha/image/#{captcha_session}"/>!
       end
  
     end # Helpers

data/lib/rack/captchachacha/version.rb

@@ -1,5 +1,5 @@
 module Rack
   class Captchachacha
-    VERSION = "0.0.3"
+    VERSION = "0.4.2"
   end
-end
+end

data/spec/captchachacha_spec.rb

@@ -3,6 +3,7 @@ require 'rack/test'
 require 'rack/mock'
 require 'curb'
 require 'webmock/rspec'
+require 'securerandom'
 
 require_relative '../lib/rack/captchachacha.rb'
 
@@ -23,7 +24,7 @@ include Rack::Test::Methods
       when '/' then [200,'Hello world']
       when '/login'
         if request.post?
-          env['captcha.valid'] ? [200, 'post login'] : [200, 'post fail']
+          env['X-Captcha-Valid'] ? [200, 'post login'] : [200, 'post fail']
         else
           [200,'login']
         end
@@ -51,12 +52,12 @@ include Rack::Test::Methods
   end # context
   
   context "a page that requires a captcha" do
-    let(:session_id){ rand(1000) }
+    let(:session_id){ SecureRandom.random_number.to_s[2..-1] }
     let(:url_to_request) { "#{Rack::Captchachacha::VERIFY_URL}/#{session_id}/response" }
     
     it "should pass the captcha" do
       stub_request(:get, url_to_request).to_return({:body => "1"})
-      post "/login", {'captcha_session' => session_id, 'captcha_answer' => 'response'}
+      post "/login", {'captcha_session' => session_id, 'captcha' => 'response'}
       
       WebMock.should have_requested(:get, url_to_request)
         
@@ -67,7 +68,7 @@ include Rack::Test::Methods
     
     it "should fail the captcha" do
       stub_request(:get, url_to_request).to_return({:body => "0"})
-      post "/login", {'captcha_session' => session_id, 'captcha_answer' => 'response'}
+      post "/login", {'captcha_session' => session_id, 'captcha' => 'response'}
       
       WebMock.should have_requested(:get, url_to_request)
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: captchachacha
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -50,34 +50,35 @@ cert_chain:
   -----END CERTIFICATE-----
 
 '
-date: 2011-06-14 00:00:00.000000000Z
+date: 2011-06-28 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &2161671660 !ruby/object:Gem::Requirement
+  requirement: &2156651920 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *2161671660
+  version_requirements: *2156651920
 - !ruby/object:Gem::Dependency
   name: curb
-  requirement: &2161671200 !ruby/object:Gem::Requirement
+  requirement: &2156651460 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.7.15
   type: :runtime
   prerelease: false
-  version_requirements: *2161671200
+  version_requirements: *2156651460
 description: ! '    Captchator as Rack middleware, and helpers for sinatra.
 
 '
-email: iainspeed @nospam@ gmail.com
+email:
+- iainspeed @nospam@ gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []