Merge pull request waynehoover#147 from ThinkNear/master

add option to specify bucket in form helper
NishantUpadhyay-BTC · Feb 16, 2014 · a069078 · a069078
2 parents 156e5ab + 1cb32de
commit a069078
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -89,6 +89,7 @@ Optionally, you can also place this template in the same view for the progress b
 * `id:` Optional html id for the form, its recommended that you give the form an id so you can reference with the jQuery plugin.
 * `class:` Optional html class for the form.
 * `data:` Optional html data attribute hash.
+* `bucket:` Optional (defaults to bucket used in config).
 
 ### Example with all options
 ```ruby

diff --git a/lib/s3_direct_upload/form_helper.rb b/lib/s3_direct_upload/form_helper.rb
@@ -15,7 +15,7 @@ def initialize(options)
         @options = options.reverse_merge(
           aws_access_key_id: S3DirectUpload.config.access_key_id,
           aws_secret_access_key: S3DirectUpload.config.secret_access_key,
-          bucket: S3DirectUpload.config.bucket,
+          bucket: options[:bucket] || S3DirectUpload.config.bucket,
           region: S3DirectUpload.config.region || "s3",
           url: S3DirectUpload.config.url,
           ssl: true,