actionverb_s3_direct_upload 0.0.11 → 0.0.12

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,15 +1,15 @@
1
1
  ---
2
2
  !binary "U0hBMQ==":
3
3
  metadata.gz: !binary |-
4
- MjhhMjNhMTU4ODk2Y2FiNTE4YWE0OTMwNzA4MTc5ZWYzYWZmZTEwZA==
4
+ YWI4NjA5NDYwNWIwZmZiN2FmMDk4ODBlNmU3OTM0MDc1ZjlmZTgzYQ==
5
5
  data.tar.gz: !binary |-
6
- NjIwZWRiYWY3MzNjMTFiOGJjNWE4NmFiMzA4MGJkODBmZjY0ZjRiMg==
6
+ NTZlOTIzNGJiNDdkYzUzMzFjODY2ZWZlNjEzODhkMmY4MTE0NTYyMg==
7
7
  !binary "U0hBNTEy":
8
8
  metadata.gz: !binary |-
9
- ZTEzZjJmNDQ4ZGI2ZDIzOTA3NTc0ODIwMjkxMGVlOWYyNWM4Njg1MTk3MDI5
10
- ZjQ0ODIzOGI1NTUxYjQyMTczM2RkOGM2ZTY3MWRkNGE2YmI1YWNhYmRkOTYz
11
- NWUyNzZhOTVmYmFhZGJlMmQ2MTVhMWExZDVhZDFjMzllNDk1Zjc=
9
+ ODNhYTZhNmM0MmQ5NmQ1Mjg0YjkwOWI3ZjZlMjRmNjZmMDJjOTdlZjAxMGMw
10
+ ZjFkODFlNTA1MmJmMTZjZjc5YjZmN2JhOWE2NTlkOTk1ZTNlODc4MzdjZGM1
11
+ OGY0OGM3MjNmZWY0YjNmYmJiZmUxNjlhNTdhYWZmNWE0ZGY2ZDE=
12
12
  data.tar.gz: !binary |-
13
- N2ZjMjc0NDI4MWFjMzZiNGZlYTM3Y2RiYmNiZjgyZTA2ZTNiODI5YWNiNDIw
14
- NWQ1YTZmN2ZiNzUzNWZiYzhiNDQzMjExZTUyYWQ5ZDVjZTI3ZTA2Nzk4ZjFm
15
- NzM3Nzk2NmQyYzI4YzY4MDM4MGNlMTRiYmEzN2FlMDI1OWUwYjE=
13
+ NDU5ZTkwOWQ2NzM2NmY4MTMyNDMzM2ZkMTA5ODNiZWNjNmI4ZmY0OWU1MmQ1
14
+ NjA1ODY0MjY4NDUxMDU3ODI5OWVmMzNhMzNhZDIyYmI4YWFhZTlmZGM3YmMz
15
+ YTNjNjc3YThmNTRkZTcxNWU1YWMzYWQwZmFiNjNjNTVjMGRkN2Q=
@@ -22,9 +22,6 @@ module S3DirectUpload
22
22
  as: "file",
23
23
  key: key
24
24
  )
25
- @additional_headers.each do |header|
26
- @options[header[0]]=@options[header[1]]
27
- end
28
25
  end
29
26
 
30
27
  def form_options
@@ -42,7 +39,7 @@ module S3DirectUpload
42
39
  end
43
40
 
44
41
  def fields
45
- {
42
+ fields = {
46
43
  :key => @options[:key] || key,
47
44
  :acl => @options[:acl],
48
45
  :policy => policy,
@@ -50,6 +47,10 @@ module S3DirectUpload
50
47
  "AWSAccessKeyId" => @options[:aws_access_key_id],
51
48
  success_action_status: "201"
52
49
  }
50
+ @additional_headers.each do |header|
51
+ fields[header[0]]=header[1]
52
+ end
53
+ fields
53
54
  end
54
55
 
55
56
  def key
@@ -65,9 +66,8 @@ module S3DirectUpload
65
66
  end
66
67
 
67
68
  def policy_data
68
- {
69
- expiration: @options[:expiration],
70
- conditions: [
69
+ header_conditions = @additional_headers.map { |header| { header[0] => header[1] } }
70
+ conditions = [
71
71
  ["starts-with", "$utf8", ""],
72
72
  ["starts-with", "$key", ""],
73
73
  ["content-length-range", 0, @options[:max_file_size]],
@@ -75,7 +75,10 @@ module S3DirectUpload
75
75
  {bucket: @options[:bucket]},
76
76
  {acl: @options[:acl]},
77
77
  {success_action_status: "201"}
78
- ].concat(@additional_headers)
78
+ ].concat(header_conditions)
79
+ {
80
+ expiration: @options[:expiration],
81
+ conditions: conditions
79
82
  }
80
83
  end
81
84
 
@@ -1,3 +1,3 @@
1
1
  module S3DirectUpload
2
- VERSION = "0.0.11"
2
+ VERSION = "0.0.12"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: actionverb_s3_direct_upload
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.11
4
+ version: 0.0.12
5
5
  platform: ruby
6
6
  authors:
7
7
  - Wayne Hoover