qoobaa-s3_upload_form 0.2.2 → 0.3.0

data/README.markdown

@@ -1,11 +1,28 @@
 # s3_upload_form
 
 ### Usage
-    <%= s3_upload_form_tag  :key => 'uploads',
-                :redirect => image_processing_url,
-                :acl => 'public-read',
-                :max_filesize => 0..5.megabytes,
-                :submit => submit_tag("Upload!") %>
+  <% form_tag s3_bucket_url, :multipart => true do -%>
+    <%= s3_signature_tag :key => "uploads",
+                         :redirect => image_processing_url,
+                         :acl => "public-read",
+                         :max_filesize => 0..5.megabytes,
+                         :submit => submit_tag("Upload!") %>
+    <%= label_tag :file, "File" %>
+    <br/>
+    <%= file_field_tag :file %>
+    <br/>
+    <%= submit_tag "Upload" %>
+  <% end -%>
+
+Remember to turn off the request forgery protection in the controller:
+
+  class UploadsController < ApplicationController
+    self.allow_forgery_protection = false
+
+    def new
+      # ...
+    end
+  end
 
 ### Configuration
 

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.3.0

data/lib/s3_upload_form/helpers.rb

@@ -1,20 +1,26 @@
 module S3UploadForm
   module Helpers
-    def s3_upload_form_tag(options = {})
+    def s3_bucket_url(protocol = "http")
+      bucket = S3UploadForm.configuration.bucket
+
+      raise "Please configure S3UploadForm before use" if bucket.blank?
+
+      "#{protocol}://#{bucket}.s3.amazonaws.com/"
+    end
+
+    def s3_signature_tag(options = {})
       bucket            = S3UploadForm.configuration.bucket
       access_key_id     = S3UploadForm.configuration.access_key_id
       secret_access_key = S3UploadForm.configuration.secret_access_key
 
       raise "Please configure S3UploadForm before use" if bucket.blank? or access_key_id.blank? or secret_access_key.blank?
 
-      protocol          = options.delete(:protocol) || "http"
       key               = options.delete(:key) || ""
       redirect          = options.delete(:redirect) || "/"
       acl               = options.delete(:acl) || "public-read"
       expiration_date   = (options.delete(:expiration_date) || 10.hours).from_now.strftime("%Y-%m-%dT%H:%M:%S.000Z")
       filesize          = options.delete(:filesize) || (1..1.megabyte)
       filesize_range    = filesize.kind_of?(Fixnum) ? 1..filesize : filesize
-      submit            = options.delete(:submit) || submit_tag(I18n.t("button.upload", :default => "Upload"))
 
       policy_document = <<-eos
         {
@@ -33,11 +39,7 @@ module S3UploadForm
       policy = Base64.encode64(policy_document).gsub("\n","")
       signature = Base64.encode64(OpenSSL::HMAC.digest(OpenSSL::Digest::Digest.new("sha1"), secret_access_key, policy)).gsub("\n","")
 
-      options[:action] ||= "#{protocol}://#{bucket}.s3.amazonaws.com/"
-      options[:method] ||= "post"
-      options[:enctype] ||= "multipart/form-data"
-
-      content_tag :form, options do
+      content_tag :div, :style => "margin: 0pt; padding: 0pt; display: inline;" do
         content = ""
         content << hidden_field_tag("key", "#{key}/${filename}")
         content << hidden_field_tag("AWSAccessKeyId", access_key_id)
@@ -45,8 +47,6 @@ module S3UploadForm
         content << hidden_field_tag("success_action_redirect", redirect)
         content << hidden_field_tag("policy", policy)
         content << hidden_field_tag("signature", signature)
-        content << file_field_tag("file")
-        content << submit
       end
     end
   end

data/s3_upload_form.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{s3_upload_form}
-  s.version = "0.2.2"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jakub Kuźma"]
-  s.date = %q{2009-06-17}
+  s.date = %q{2009-08-03}
   s.email = %q{qoobaa@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -30,7 +30,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/qoobaa/s3_upload_form}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.4}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{S3 file upload form}
   s.test_files = [
     "test/test_helper.rb"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: qoobaa-s3_upload_form
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors: 
 - "Jakub Ku\xC5\xBAma"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-17 00:00:00 -07:00
+date: 2009-08-03 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -38,6 +38,7 @@ files:
 - test/test_helper.rb
 has_rdoc: false
 homepage: http://github.com/qoobaa/s3_upload_form
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -58,7 +59,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: S3 file upload form