carrierwave-postgresql-table 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '0873cdce630b258b27a7d62a870287ad2628e302'
-  data.tar.gz: 7e9ea222ace5c49b3f7392578b79e9c80209b2ab
+  metadata.gz: 5ef806ccfb8914f80bcbe80cdd3ebd8faa89cd7c
+  data.tar.gz: 0ab0e9e7757bb7c0767aa375ea55dceda7b2ac03
 SHA512:
-  metadata.gz: ad6c264a57086c050e01211d70e5f40e883a1881ace02bf5c694fe3fd1a6cebcedaddaaa0c6e60314b0a877b0301e707d0423872952347facb71ed45a49fcdba
-  data.tar.gz: c5a0f07a08f07ef5ae5770c752a589233e80a0e3fd9dc0197e537dbf127cd0bd89752f6d130a66006cdacf9611adb5bccc16fc72fa8e4ae7df69db0922118d73
+  metadata.gz: cca0e9d3e00674e05e7c224154d225706653393160210c3ae1bc1920ede30840316aa032aef256cf532b47abd89b9770bb25869baf6073300d1845696fda7c7c
+  data.tar.gz: 1d74a9ee0a82fdda54485fffd8cee3c2aa06f84197861ff2941119216fa5c3fa2395aae706253067f8e80c586d9f263b16d8cba0a76e0f72abb8f56548d13e1c

data/.gitignore

@@ -7,3 +7,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+/test/tmp/

data/lib/carrierwave/postgresql_table/version.rb

@@ -1,5 +1,5 @@
 module CarrierWave
   module PostgresqlTable
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

data/lib/carrierwave/storage/postgresql_table.rb

@@ -119,11 +119,12 @@ module CarrierWave
 
         def store(new_file)
           CarrierWaveFile.transaction do
+            connection = CarrierWaveFile.connection
+            raw_connection = connection.raw_connection
             oid = nil
             if(new_file.kind_of?(CarrierWave::Storage::PostgresqlTable::File))
               oid = new_file.copy_to(@path)
             else
-              raw_connection = CarrierWaveFile.connection.raw_connection
               file = new_file.to_file
 
               begin
@@ -142,10 +143,20 @@ module CarrierWave
             end
 
             begin
+              old_oid = @record.pg_largeobject_oid
               @record.pg_largeobject_oid = oid
               @record.size = new_file.size
               @record.content_type = new_file.content_type
               @record.save
+
+              # Cleanup old, unused largeobject OIDs if we're updating the
+              # record with a new OID reference.
+              if(old_oid && old_oid != oid)
+                old_references = connection.select_value("SELECT COUNT(*) FROM #{CarrierWaveFile.table_name} WHERE pg_largeobject_oid = #{CarrierWaveFile.sanitize(old_oid)}").to_i
+                if(old_references == 0)
+                  raw_connection.lo_unlink(old_oid)
+                end
+              end
             rescue ::ActiveRecord::RecordNotUnique
               @record = CarrierWaveFile.find_or_initialize_by(:path => @path)
               retry
@@ -174,7 +185,13 @@ module CarrierWave
         end
 
         def move_to(new_path)
-          @record.update_attribute(:path, new_path)
+          CarrierWaveFile.transaction do
+            # Remove any existing files at the current path.
+            CarrierWaveFile.delete_all_files("path = #{CarrierWaveFile.sanitize(new_path)} AND id != #{CarrierWaveFile.sanitize(@record.id)}")
+
+            # Change the current record's path to the new path.
+            @record.update_attribute(:path, new_path)
+          end
         end
 
         def delete

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-postgresql-table
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Nick Muerdter