photofy 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 15f222df7c291febdb3847b0099effdf613ea939
-  data.tar.gz: faa98040b22f84fe1f0dcd2ffeb670b6e5bb9051
+  metadata.gz: 01170cecbe978f73d3a6b5f1c9aad979149a89f2
+  data.tar.gz: dd71457da82f23d3c9121e5ff2c60f86b716309b
 SHA512:
-  metadata.gz: 8af8641aeeee7f6d530c72c6667f5ab7d42ee617033e2bf63c8b7c38c1244afd67102c1b86b8dbc56f63796394141366eb2af6aedc97d2a8cffb0a231a75e55c
-  data.tar.gz: 0eb747f7c0c34f5eeb6ecc16da48c3ef54f573cc3887bb59cc94d5bd6513d97c303661939002acb5a13dbf1974a26558f8b69bb26b4aa068884ce815249fdd79
+  metadata.gz: 38b61e941bb7cd41fc9bd4df289c3f0d14860b33e45e8004415b8c1374f2d8b75cbceb31c7c0280681ca1df97eb92d243258f871493dfe3f46eb205be0acf31f
+  data.tar.gz: 67ac931b404622c32caf7cde528013d9165f8438b61283157a5b0e2bcb459c6095a2078a0057aa355b48fd11ca2e9c900f6b46df7445e14c287ce13db82437ca

data/lib/photofy/core.rb

@@ -64,10 +64,10 @@ module Photofy
           _path = File.join(directory_path, self.send(self.class.primary_key).to_s)
           _path.gsub!(/^#{Rails.root}\//, "")
 
-          (_s3_objects = s3_bucket.objects.with_prefix("#{_path}_")).count > 0 ? _s3_objects.collect(&:key)[0] : nil
+          (_s3_objects = s3_bucket.objects.with_prefix("#{_path}_")).count > 0 ? _s3_objects.collect(&:key)[0] : ''
         else
           (guessed_file = Dir[File.join(directory_path, "#{self.send(self.class.primary_key).to_s}_*")].first).nil? ?
-              nil : guessed_file.to_s
+              '' : guessed_file.to_s
         end
       end
 
@@ -157,7 +157,7 @@ module Photofy
         #Loading content from parent_photo_field if specified
         unless parent_photo_field.nil?
           if s3_connected?
-            unless send("#{parent_photo_field}_path").nil?
+            unless send("#{parent_photo_field}_path").empty?
               _parent_file_path = send("#{parent_photo_field}_path")
               _temp_file_path = File.join(Rails.root, File.basename(_parent_file_path))
               file = File.open(_temp_file_path, 'wb')
@@ -169,14 +169,14 @@ module Photofy
               File.delete(file.path)
             end
           else
-            send("#{photo_field}=", File.open(send("#{parent_photo_field}_path"))) unless send("#{parent_photo_field}_path").nil?
+            send("#{photo_field}=", File.open(send("#{parent_photo_field}_path"))) unless send("#{parent_photo_field}_path").empty?
           end
         end
 
         unless @photo_file_buffer[photo_field].nil?
 
           if s3_connected?
-            s3_bucket.objects[send("#{photo_field}_path")].try(:delete) if (not send("#{photo_field}_path").nil?) and (s3_bucket.objects.with_prefix(send("#{photo_field}_path")).count > 0)
+            s3_bucket.objects[send("#{photo_field}_path")].try(:delete) if (not send("#{photo_field}_path").empty?) and (s3_bucket.objects.with_prefix(send("#{photo_field}_path")).count > 0)
             s3_bucket.objects[send("#{photo_field}_path_to_write")].write(@photo_file_buffer[photo_field])
 
             unless proc.nil?
@@ -192,7 +192,7 @@ module Photofy
               file.unlink # deletes the temp file
             end
           else
-            File.delete(send("#{photo_field}_path")) if ((not send("#{photo_field}_path").nil?) and File.exist?(send("#{photo_field}_path"))) #Clearing any existing file at the path
+            File.delete(send("#{photo_field}_path")) if  File.exist?(send("#{photo_field}_path")) #Clearing any existing file at the path
             File.open(send("#{photo_field}_path_to_write"), "wb+") { |f| f.puts(@photo_file_buffer[photo_field]) }
 
             unless proc.nil?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: photofy
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Praveen Kumar Sinha