directlytos3 0.1.6 → 0.1.7

data/lib/directlytos3/form_helpers.rb

@@ -14,12 +14,12 @@ module Directlytos3
     options[:key] ||= ''
     options[:key].gsub!(/(\/)$/, '')
     options[:content_type] ||= MIME::Types.type_for("${filename}").to_s
-    options[:redirect] ||= '/'
+    options[:redirect] ||= nil
     options[:acl] ||= 'public-read'
     options[:expiration_date] ||= 10.hours.from_now.utc.xmlschema
     options[:max_filesize] ||= 1.megabyte
     options[:randomize] ||= false
-    options[:status] ||= 200
+    options[:status] ||= nil
     raise Directlytos3::Exceptions::NoBucketSpecified if !options[:bucket]
     raise Directlytos3::Exceptions::MissingAccessKey, "secret" if !options[:secret_key]
     raise Directlytos3::Exceptions::MissingAccessKey, "public" if !options[:access_key]
@@ -70,8 +70,8 @@ module Directlytos3
       concat hidden_field_tag('key', "#{options[:key]}#{'/' if !options[:key].blank?}#{Directlytos3.random_string if options[:randomize]}${filename}")
       concat hidden_field_tag('AWSAccessKeyId', "#{options[:access_key]}")
       concat hidden_field_tag('acl', "#{options[:acl]}")
-      concat hidden_field_tag('success_action_redirect', "#{options[:redirect]}")
-      # concat hidden_field_tag('success_action_status', "#{options[:status].to_s}")
+      concat hidden_field_tag('success_action_redirect', "#{options[:redirect]}") if options[:redirect]
+      concat hidden_field_tag('success_action_status', "#{options[:status].to_s}") if options[:status]
       concat hidden_field_tag('policy', "#{policy}")
       concat hidden_field_tag('signature', "#{signature}")
       concat hidden_field_tag('Content-Type', "#{options[:content_type]}")

data/lib/directlytos3/s3.rb

@@ -18,11 +18,12 @@ module Directlytos3::S3
         {"bucket" =>  options[:bucket]}, 
         ["starts-with", "$key", options[:key]],
         {"acl" => options[:acl]},
-        {"success_action_redirect" => options[:redirect]},
         ["starts-with", "$Content-Type", ''],
         ["content-length-range", 0, options[:max_filesize]]
       ]
     }
+    policy["conditions"] << {"success_action_redirect" => options[:redirect]} if options[:redirect]
+    policy["conditions"] << {"success_action_status" => options[:status].to_s} if options[:status]
     Base64.encode64(policy.to_json).gsub(/\n/,'')
   end
 

data/lib/directlytos3/version.rb

@@ -1,3 +1,3 @@
 module Directlytos3
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: directlytos3
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-12-06 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &70355887225840 !ruby/object:Gem::Requirement
+  requirement: &70171899550120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *70355887225840
+  version_requirements: *70171899550120
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &70355887225340 !ruby/object:Gem::Requirement
+  requirement: &70171899549620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *70355887225340
+  version_requirements: *70171899549620
 description: A rails helper to create an S3 upload form
 email:
 - scott@tesoriere.com