s3ff 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ab82d0c43f5bc28968c06a40939bc3883f454ed
-  data.tar.gz: 72956174b49ff57a0a014ae50d38f1edcc8a7890
+  metadata.gz: 945f26d43ebe1d6948e75709b443f1c10ecae50e
+  data.tar.gz: e90b28d666f592ddda901d5b0e13216a05214587
 SHA512:
-  metadata.gz: df29ec657a8a95edd62172ec8d25d49f79e780e2eeeda20b55f971e6405f95ea2caeecb76d8c7a66603b09a3ee8f0c92e1315ba24208f6ad318e1b49b57829e4
-  data.tar.gz: 7ef2682ad8158cc7424d2cdc0ce40a82ef7dc0d4f9b73dde233893aa2c006a2c13c7d3b9ebd9fb6b28dccfddee545c6e8470dd7c67032c351916ca9fc27d8534
+  metadata.gz: e5d76292b4e71cb1f4d53ac99e7ed5765483206e46bb78561cd51b1f8854eee23d0d3702ea1434f14c3d4be61c0b205711666ff56aa093b78262a2ad7aa362e8
+  data.tar.gz: 3992c0fc1c8803b062eb07d0e6856db5cf0030570a01637437ac5bdc12428c5e08103f00ce0a77175872f645d01472d4e48034791cce942dcd8f9c6b4129256b

data/lib/s3ff.rb

@@ -7,15 +7,20 @@ ActionView::Base.send(:include, S3FF::ViewHelper)
 
 S3FileField::FormBuilder.class_eval do
   def s3_file_field_with_s3ff(method, options = {})
+    direct_url_attr = "#{method}_direct_url"
     changes = @object.try(:changes) || {} # { attr => [old_value, new_value], ... }
-    if new_direct_url = changes["#{method}_direct_url"].try(:last)
-      # if *_direct_url_changed? it means we're re-rendering
-      # :. we should prepopulate the s3ff fields to avoid re-uploading
+    new_direct_url = (@object.class.column_names.include?(direct_url_attr) ?
+      changes[direct_url_attr].try(:last) :
+      @object.try(direct_url_attr))
+    # set new_direct_url if such a db attribute exist & it has changed
+    # but if it isn't a db attribute, try and use attr_reader
+    if new_direct_url.present?
+      # this means we're re-rendering :. we should prepopulate the s3ff fields to avoid re-uploading
       options[:data] ||= {}
       options[:data].merge!({
         s3ff: {
           files: [{
-            unique_id: "#{@object_name.parameterize}#{SecureRandom.hex}",
+            unique_id: "#{object_name.to_s.parameterize}#{SecureRandom.hex}",
           }],
           result: {
             filename: changes["#{method}_file_name"].try(:last) || File.basename(new_direct_url),

data/lib/s3ff/version.rb

@@ -1,3 +1,3 @@
 module S3FF
-  VERSION = '0.9.3'
+  VERSION = '0.9.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: s3ff
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors:
 - Chew Choon Keat
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-29 00:00:00.000000000 Z
+date: 2014-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: s3_file_field
@@ -101,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: Direct S3 upload using CORS with s3_file_field + paperclip