glebtv-simple_captcha 0.5.2 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56b2f0ffd426ed4af21105feeef7b12d53c79c3c
-  data.tar.gz: f75531cc8139786aa6c8ac053414b642b5369d39
+  metadata.gz: c317ffb46efc02b32a774729631923802e597047
+  data.tar.gz: 38ddb5ce01cbdbc4bb626dfe13c999543e04cff1
 SHA512:
-  metadata.gz: 9f5845f8550ef7b8de8ab5ac2c15f660b4975b8a58325d8fa3ab9d289b682f41e3c0607ba3327f1735a997841580f80a4e9ca524778d8c707148de264ba63c90
-  data.tar.gz: 58053f230938ca6177d0b602f3049357a27c4bfd24a47249c08fcbd96fb9a596aba339151b76982ae292d327e4ef9318ca071a7025b8d8ee43d7fd47a7690f47
+  metadata.gz: 4a3f9a98aed2cb7e3d8135d5516e7d7daec23285d85586cfe06ab3463c3d53046e304b0bef5fa1612db48be05d9c4b226ba47b5a8422904cf1112c243c1e74db
+  data.tar.gz: f20894ec31d8450f4d6ce6fbd1bd2fc286981e8424bf49a79af2890c2ea3a9703e68b893232365d65e51bd89fb6e460bbbf0b5effe6b6a1e937d39b0619dd1b6

data/lib/simple_captcha/controller.rb

@@ -18,7 +18,7 @@ module SimpleCaptcha #:nodoc
       
       if params[:captcha]
         data = SimpleCaptcha::Utils::simple_captcha_value(session[:captcha])
-        result = data == params[:captcha].delete(" ").upcase
+        result = (!data.nil? && data.upcase == params[:captcha].delete(" ").upcase)
         SimpleCaptcha::Utils::simple_captcha_passed!(session[:captcha]) if result
         return result
       else

data/lib/simple_captcha/middleware.rb

@@ -26,13 +26,7 @@ module SimpleCaptcha
         request = Rack::Request.new(env)
         code = request.params["code"]
         body = []
-        
         if !code.blank? && Utils::simple_captcha_value(code)
-          #status, headers, body = @app.call(env)
-          #status = 200
-          #body = generate_simple_captcha_image(code)
-          #headers['Content-Type'] = 'image/jpeg'
-          
           return send_file(generate_simple_captcha_image(code), :type => 'image/jpeg', :disposition => 'inline', :filename =>  'simple_captcha.jpg')
         end
         
@@ -44,13 +38,17 @@ module SimpleCaptcha
       end
       
       def send_file(path, options = {})
-        raise MissingFile, "Cannot read file #{path}" unless File.file?(path) and File.readable?(path)
+        unless File.file?(path) and File.readable?(path)
+          puts "[simple captcha] Cannot read file #{path}"
+          raise MissingFile, "Cannot read file #{path}"
+        end
 
         options[:filename] ||= File.basename(path) unless options[:url_based_filename]
 
         status = options[:status] || 200
         headers = {"Content-Disposition" => "#{options[:disposition]}; filename='#{options[:filename]}'", "Content-Type" => options[:type], 'Content-Transfer-Encoding' => 'binary', 'Cache-Control' => 'private'}
-        response_body = File.open(path, "rb")
+        response_body = [File.open(path, "rb").read]
+        File.delete(path)
         
         [status, headers, response_body]
       end

data/lib/simple_captcha/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module SimpleCaptcha
-  VERSION = "0.5.2".freeze
+  VERSION = "0.6.0".freeze
 end

data/lib/simple_captcha/view.rb

@@ -57,12 +57,12 @@ module SimpleCaptcha #:nodoc
 
     private
 
-      def simple_captcha_image(simple_captcha_key, options = {})
+      def simple_captcha_image(sc_key, options = {})
         defaults = {}
         defaults[:time] = options[:time] || Time.now.to_i
         
         query = defaults.collect{ |key, value| "#{key}=#{value}" }.join('&')
-        url = "/simple_captcha?code=#{simple_captcha_key}&#{query}"
+        url = "/simple_captcha?code=#{sc_key}&#{query}"
         
         "<img src='#{url}' alt='captcha' />".html_safe
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glebtv-simple_captcha
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.0
 platform: ruby
 authors:
 - GlebTv
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-08 00:00:00.000000000 Z
+date: 2013-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport