s3ff 0.9.3 → 0.9.4
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 +4 -4
- data/lib/s3ff.rb +9 -4
- data/lib/s3ff/version.rb +1 -1
- metadata +3 -3
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 945f26d43ebe1d6948e75709b443f1c10ecae50e
|
|
4
|
+
data.tar.gz: e90b28d666f592ddda901d5b0e13216a05214587
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: e5d76292b4e71cb1f4d53ac99e7ed5765483206e46bb78561cd51b1f8854eee23d0d3702ea1434f14c3d4be61c0b205711666ff56aa093b78262a2ad7aa362e8
|
|
7
|
+
data.tar.gz: 3992c0fc1c8803b062eb07d0e6856db5cf0030570a01637437ac5bdc12428c5e08103f00ce0a77175872f645d01472d4e48034791cce942dcd8f9c6b4129256b
|
data/lib/s3ff.rb
CHANGED
|
@@ -7,15 +7,20 @@ ActionView::Base.send(:include, S3FF::ViewHelper)
|
|
|
7
7
|
|
|
8
8
|
S3FileField::FormBuilder.class_eval do
|
|
9
9
|
def s3_file_field_with_s3ff(method, options = {})
|
|
10
|
+
direct_url_attr = "#{method}_direct_url"
|
|
10
11
|
changes = @object.try(:changes) || {} # { attr => [old_value, new_value], ... }
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
12
|
+
new_direct_url = (@object.class.column_names.include?(direct_url_attr) ?
|
|
13
|
+
changes[direct_url_attr].try(:last) :
|
|
14
|
+
@object.try(direct_url_attr))
|
|
15
|
+
# set new_direct_url if such a db attribute exist & it has changed
|
|
16
|
+
# but if it isn't a db attribute, try and use attr_reader
|
|
17
|
+
if new_direct_url.present?
|
|
18
|
+
# this means we're re-rendering :. we should prepopulate the s3ff fields to avoid re-uploading
|
|
14
19
|
options[:data] ||= {}
|
|
15
20
|
options[:data].merge!({
|
|
16
21
|
s3ff: {
|
|
17
22
|
files: [{
|
|
18
|
-
unique_id: "#{
|
|
23
|
+
unique_id: "#{object_name.to_s.parameterize}#{SecureRandom.hex}",
|
|
19
24
|
}],
|
|
20
25
|
result: {
|
|
21
26
|
filename: changes["#{method}_file_name"].try(:last) || File.basename(new_direct_url),
|
data/lib/s3ff/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: s3ff
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.9.
|
|
4
|
+
version: 0.9.4
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Chew Choon Keat
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2014-
|
|
11
|
+
date: 2014-11-04 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: s3_file_field
|
|
@@ -101,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
101
101
|
version: '0'
|
|
102
102
|
requirements: []
|
|
103
103
|
rubyforge_project:
|
|
104
|
-
rubygems_version: 2.
|
|
104
|
+
rubygems_version: 2.4.2
|
|
105
105
|
signing_key:
|
|
106
106
|
specification_version: 4
|
|
107
107
|
summary: Direct S3 upload using CORS with s3_file_field + paperclip
|