s3ff 0.10.2 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee02eea6c1abbeb05b96862bc1af431e0fe03bc2
-  data.tar.gz: 82ce6654ba31e8516af38dacb85b771af855e671
+  metadata.gz: 4bd380626001b2b203f6924a3b66d6e89bf28c7e
+  data.tar.gz: 0cd8675ecdd614a797e39062e46b9f97ae795000
 SHA512:
-  metadata.gz: ac8422d2d00000c60433f202935788ad244cee8f8080f865e5f9152ed653382b426b7a1395a0a373641c36b4199af60f978ea23b959644524ba9e30e2c55550c
-  data.tar.gz: 98812baa4b41c2b558f36a365b880cc42d15399b84e0c0be6ebbeb64d38be84b05cc8d13939941c77ac0c71fd77006d5b527766339308f0333023087108171b8
+  metadata.gz: 8c1ed0e0a858f87395cbd48fcb03b33f09ef844404f8701a971a23377d0d36721c32134d44eccb9d2b10222fa96b56728f350df9156eb2545ab523763d97561e
+  data.tar.gz: f61cbbea7b9c342d5005a6f1f90e7c7db2fe312892d7f54dc1e624de76abeb5572b6e006dab901d0d11e37e6e680ccbf4bec4c2404102317ab18239f5289b4ce

data/lib/s3ff/model_helper.rb

@@ -1,19 +1,34 @@
 module S3FF
   module ModelHelper
-    def download_from_direct_url_with_delay(attr_name)
+    def download_from_direct_url_with_delay(attr_name, nil_direct_url_after_save: false)
       if self.respond_to?(:delay)
-        self.class_eval <<-EOM
+        has_db_column = self.column_names.include?("#{attr_name}_direct_url") rescue false
 
-          def #{attr_name}_direct_url
-            @#{attr_name}_direct_url
-          end
+        if has_db_column
+          self.class_eval <<-EOM
 
-          def #{attr_name}_direct_url=(val)
-            self.updated_at = Time.now if val != @#{attr_name}_direct_url
-            @#{attr_name}_direct_url = val
-          end
+            after_save :delay_s3ff_download_direct_url, if: -> { #{attr_name}_direct_url.present? && #{attr_name}_direct_url_changed? }
+
+          EOM
+        else
+          self.class_eval <<-EOM
+
+            def #{attr_name}_direct_url
+              @#{attr_name}_direct_url
+            end
 
-          after_save :delay_s3ff_download_direct_url, if: proc { #{attr_name}_direct_url.present? }
+            def #{attr_name}_direct_url=(val)
+              #{"return if val.blank?" if nil_direct_url_after_save}
+              self.updated_at = Time.now if val != @#{attr_name}_direct_url
+              @#{attr_name}_direct_url = val
+            end
+
+            after_save :delay_s3ff_download_direct_url, if: proc { #{attr_name}_direct_url.present? }
+
+          EOM
+        end
+
+        self.class_eval <<-EOM
 
           def delay_s3ff_download_direct_url
             self.class.delay.s3ff_download_direct_url(id, #{attr_name}_direct_url)
@@ -24,11 +39,14 @@ module S3FF
               find(instance_id).update(
                 #{attr_name}: file,
                 #{attr_name}_file_name: File.basename(#{attr_name}_direct_url),
+                #{"#{attr_name}_direct_url: nil," if nil_direct_url_after_save}
               )
             end
           end
         EOM
       elsif self.respond_to?(:handle_asynchronously)
+
+        # handle_asynchronously requires db column anyways
         self.class_eval <<-EOM
           after_save :s3ff_download_direct_url, if: -> { #{attr_name}_direct_url.present? && #{attr_name}_direct_url_changed? }
 
@@ -37,6 +55,7 @@ module S3FF
               update(
                 #{attr_name}: file,
                 #{attr_name}_file_name: File.basename(#{attr_name}_direct_url),
+                #{"#{attr_name}_direct_url: nil," if nil_direct_url_after_save}
               )
             end
           end

data/lib/s3ff/version.rb

@@ -1,3 +1,3 @@
 module S3FF
-  VERSION = '0.10.2'
+  VERSION = '0.11.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: s3ff
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.11.0
 platform: ruby
 authors:
 - Chew Choon Keat
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-26 00:00:00.000000000 Z
+date: 2014-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: s3_file_field