actionverb_s3_direct_upload 0.0.11 → 0.0.12

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjhhMjNhMTU4ODk2Y2FiNTE4YWE0OTMwNzA4MTc5ZWYzYWZmZTEwZA==
+    YWI4NjA5NDYwNWIwZmZiN2FmMDk4ODBlNmU3OTM0MDc1ZjlmZTgzYQ==
   data.tar.gz: !binary |-
-    NjIwZWRiYWY3MzNjMTFiOGJjNWE4NmFiMzA4MGJkODBmZjY0ZjRiMg==
+    NTZlOTIzNGJiNDdkYzUzMzFjODY2ZWZlNjEzODhkMmY4MTE0NTYyMg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZTEzZjJmNDQ4ZGI2ZDIzOTA3NTc0ODIwMjkxMGVlOWYyNWM4Njg1MTk3MDI5
-    ZjQ0ODIzOGI1NTUxYjQyMTczM2RkOGM2ZTY3MWRkNGE2YmI1YWNhYmRkOTYz
-    NWUyNzZhOTVmYmFhZGJlMmQ2MTVhMWExZDVhZDFjMzllNDk1Zjc=
+    ODNhYTZhNmM0MmQ5NmQ1Mjg0YjkwOWI3ZjZlMjRmNjZmMDJjOTdlZjAxMGMw
+    ZjFkODFlNTA1MmJmMTZjZjc5YjZmN2JhOWE2NTlkOTk1ZTNlODc4MzdjZGM1
+    OGY0OGM3MjNmZWY0YjNmYmJiZmUxNjlhNTdhYWZmNWE0ZGY2ZDE=
   data.tar.gz: !binary |-
-    N2ZjMjc0NDI4MWFjMzZiNGZlYTM3Y2RiYmNiZjgyZTA2ZTNiODI5YWNiNDIw
-    NWQ1YTZmN2ZiNzUzNWZiYzhiNDQzMjExZTUyYWQ5ZDVjZTI3ZTA2Nzk4ZjFm
-    NzM3Nzk2NmQyYzI4YzY4MDM4MGNlMTRiYmEzN2FlMDI1OWUwYjE=
+    NDU5ZTkwOWQ2NzM2NmY4MTMyNDMzM2ZkMTA5ODNiZWNjNmI4ZmY0OWU1MmQ1
+    NjA1ODY0MjY4NDUxMDU3ODI5OWVmMzNhMzNhZDIyYmI4YWFhZTlmZGM3YmMz
+    YTNjNjc3YThmNTRkZTcxNWU1YWMzYWQwZmFiNjNjNTVjMGRkN2Q=

data/lib/s3_direct_upload/form_helper.rb

@@ -22,9 +22,6 @@ module S3DirectUpload
           as: "file",
           key: key
         )
-        @additional_headers.each do |header|
-          @options[header[0]]=@options[header[1]]
-        end
       end
 
       def form_options
@@ -42,7 +39,7 @@ module S3DirectUpload
       end
 
       def fields
-        {
+        fields = {
           :key => @options[:key] || key,
           :acl => @options[:acl],
           :policy => policy,
@@ -50,6 +47,10 @@ module S3DirectUpload
           "AWSAccessKeyId" => @options[:aws_access_key_id],
           success_action_status: "201"
         }
+        @additional_headers.each do |header|
+          fields[header[0]]=header[1]
+        end
+        fields
       end
 
       def key
@@ -65,9 +66,8 @@ module S3DirectUpload
       end
 
       def policy_data
-        {
-          expiration: @options[:expiration],
-          conditions: [
+        header_conditions = @additional_headers.map { |header| { header[0] => header[1] } }
+        conditions = [
             ["starts-with", "$utf8", ""],
             ["starts-with", "$key", ""],
             ["content-length-range", 0, @options[:max_file_size]],
@@ -75,7 +75,10 @@ module S3DirectUpload
             {bucket: @options[:bucket]},
             {acl: @options[:acl]},
             {success_action_status: "201"}
-          ].concat(@additional_headers)
+          ].concat(header_conditions)
+        {
+          expiration: @options[:expiration],
+          conditions: conditions 
         }
       end
 

data/lib/s3_direct_upload/version.rb

@@ -1,3 +1,3 @@
 module S3DirectUpload
-  VERSION = "0.0.11"
+  VERSION = "0.0.12"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: actionverb_s3_direct_upload
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Wayne Hoover