galetahub-simple_captcha 0.1.2 → 0.1.3

data/README.rdoc

@@ -28,7 +28,7 @@ backward compatibility with previous versions of Rails.
 
 or
 
-  gem 'simple_captcha', :git => 'git://github.com/galetahub/simple-captcha.git'
+  gem 'galetahub-simple_captcha', :require => 'simple_captcha', :git => 'git://github.com/galetahub/simple-captcha.git'
 
 ==Setup
 

data/lib/simple_captcha/engine.rb

@@ -9,16 +9,20 @@ module SimpleCaptcha
         ActiveRecord::Base.send(:include, SimpleCaptcha::ModelHelpers)
       end
     end
-    
+
     config.after_initialize do
       ActionView::Base.send(:include, SimpleCaptcha::ViewHelper)
       ActionView::Helpers::FormBuilder.send(:include, SimpleCaptcha::FormBuilder)
-      
+
       if Object.const_defined?("Formtastic")
-        Formtastic::SemanticFormHelper.builder = SimpleCaptcha::CustomFormBuilder
+        if Formtastic.const_defined?("Helpers")
+          Formtastic::Helpers::FormHelper.builder = SimpleCaptcha::CustomFormBuilder
+        else
+          Formtastic::SemanticFormHelper.builder = SimpleCaptcha::CustomFormBuilder
+        end
       end
     end
-    
+
     config.app_middleware.use SimpleCaptcha::Middleware
   end
 end

data/lib/simple_captcha/formtastic.rb

@@ -1,5 +1,5 @@
 module SimpleCaptcha
-  class CustomFormBuilder < Formtastic::FormBuilder
+  class CustomFormBuilder < Formtastic::SemanticFormBuilder
 
     private
 

data/lib/simple_captcha/image.rb

@@ -1,3 +1,4 @@
+require 'tempfile'
 module SimpleCaptcha #:nodoc
   module ImageHelpers #:nodoc
 
@@ -77,6 +78,7 @@ module SimpleCaptcha #:nodoc
         dst.close
 
         File.expand_path(dst.path)
+        #dst
       end
   end
 end

data/lib/simple_captcha/middleware.rb

@@ -3,6 +3,11 @@ module SimpleCaptcha
   class Middleware
     include SimpleCaptcha::ImageHelpers
     
+    DEFAULT_SEND_FILE_OPTIONS = {
+      :type         => 'application/octet-stream'.freeze,
+      :disposition  => 'attachment'.freeze,
+    }.freeze
+    
     def initialize(app, options={})
       @app = app
       self
@@ -17,21 +22,37 @@ module SimpleCaptcha
     end
     
     protected
-      def make_image(env, body = '', status = 404)
+      def make_image(env, headers = {}, status = 404)
         request = Rack::Request.new(env)
         code = request.params["code"]
+        body = []
         
         if !code.blank? && Utils::simple_captcha_value(code)
-          status = 200
-          body = generate_simple_captcha_image(code)
-          body = File.open(body, "rb")
+          #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
         
-        [status, {'Content-Type' => 'image/jpeg', 'Content-Length' => body.size.to_s}, body]
+        [status, headers, body]
       end
       
       def captcha_path?(request_path)
         request_path.include?('/simple_captcha')
       end
+      
+      def send_file(path, options = {})
+        raise MissingFile, "Cannot read file #{path}" unless File.file?(path) and File.readable?(path)
+
+        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")
+        
+        [status, headers, response_body]
+      end
   end
 end

data/lib/simple_captcha/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module SimpleCaptcha
-  VERSION = "0.1.2".freeze
+  VERSION = "0.1.3".freeze
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: galetahub-simple_captcha
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Pavlo Galeta
@@ -16,8 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-02 00:00:00 +02:00
-default_executable: 
+date: 2011-12-20 00:00:00 Z
 dependencies: []
 
 description: SimpleCaptcha is available to be used with Rails 3 or above and also it provides the backward compatibility with previous versions of Rails.
@@ -48,7 +47,6 @@ files:
 - Rakefile
 - README.rdoc
 - test/simple_captcha_test.rb
-has_rdoc: true
 homepage: http://github.com/galetahub/simple-captcha
 licenses: []
 
@@ -78,7 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: galetahub-simple_captcha
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: SimpleCaptcha is the simplest and a robust captcha plugin.