carrierwave-postgresql-table 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ef806ccfb8914f80bcbe80cdd3ebd8faa89cd7c
-  data.tar.gz: 0ab0e9e7757bb7c0767aa375ea55dceda7b2ac03
+  metadata.gz: 764a5c85b7937568cc214e4ba49dd3bbac7ccdef
+  data.tar.gz: 1800fb54ffcd1e5518db1afe702fa6353696c2b2
 SHA512:
-  metadata.gz: cca0e9d3e00674e05e7c224154d225706653393160210c3ae1bc1920ede30840316aa032aef256cf532b47abd89b9770bb25869baf6073300d1845696fda7c7c
-  data.tar.gz: 1d74a9ee0a82fdda54485fffd8cee3c2aa06f84197861ff2941119216fa5c3fa2395aae706253067f8e80c586d9f263b16d8cba0a76e0f72abb8f56548d13e1c
+  metadata.gz: 8a73a0cb83935b7359fde2b33717050aecbefe7b39417d57806c555500e9c131f02067da4560bb079a47febfc22a7327d62c6f825c7f96cd6f5c1211ca894324
+  data.tar.gz: 50caf0ae944e1e96260c066f0769bcf18965a36e6c72d146b94ff9d54001dcdf6e428a2786b0ae313302c7a6c80540271607412a96b78a91a354c4e1cf7dc088

data/circle.yml

@@ -5,7 +5,8 @@ dependencies:
     - bundle exec appraisal install
 database:
   override:
-    - psql -c "CREATE DATABASE carrierwave_postgresql_table_test;" -U postgres
+    - psql -c "CREATE USER carrierwave_postgresql_table_test WITH PASSWORD '';" -U postgres
+    - psql -c "CREATE DATABASE carrierwave_postgresql_table_test OWNER carrierwave_postgresql_table_test;" -U postgres
 test:
   override:
     - bundle exec appraisal rake

data/gemfiles/carrierwave_0.11_rails_4.2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    carrierwave-postgresql-table (0.1.0)
+    carrierwave-postgresql-table (0.1.2)
       activerecord
       carrierwave
       pg
@@ -132,4 +132,4 @@ DEPENDENCIES
   rake (~> 10.0)
 
 BUNDLED WITH
-   1.13.0
+   1.13.1

data/gemfiles/carrierwave_1.0.0_rails_4.2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    carrierwave-postgresql-table (0.1.0)
+    carrierwave-postgresql-table (0.1.2)
       activerecord
       carrierwave
       pg
@@ -129,4 +129,4 @@ DEPENDENCIES
   rake (~> 10.0)
 
 BUNDLED WITH
-   1.13.0
+   1.13.1

data/gemfiles/carrierwave_1.0.0_rails_5.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    carrierwave-postgresql-table (0.1.0)
+    carrierwave-postgresql-table (0.1.2)
       activerecord
       carrierwave
       pg
@@ -134,4 +134,4 @@ DEPENDENCIES
   rake (~> 10.0)
 
 BUNDLED WITH
-   1.13.0
+   1.13.1

data/lib/carrierwave/postgresql_table/version.rb

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

data/lib/carrierwave/storage/postgresql_table.rb

@@ -71,7 +71,7 @@ module CarrierWave
                 data = raw_connection.lo_read(lo, length)
                 @read_pos = raw_connection.lo_tell(lo)
               else
-                data = raw_connection.lo_read(lo, size)
+                data = raw_connection.lo_read(lo, self.size)
               end
             ensure
               raw_connection.lo_close(lo) if(lo)
@@ -88,6 +88,7 @@ module CarrierWave
         def to_tempfile
           Tempfile.new(:binmode => true).tap do |tempfile|
             IO.copy_stream(self, tempfile)
+            self.rewind
             tempfile.rewind
             tempfile.fsync
           end
@@ -102,7 +103,15 @@ module CarrierWave
         end
 
         def size
-          @record.size
+          @size = @record.size || fetch_size
+        end
+
+        def eof?
+          @read_pos == self.size
+        end
+
+        def rewind
+          @read_pos = 0
         end
 
         def content_type
@@ -123,23 +132,23 @@ module CarrierWave
             raw_connection = connection.raw_connection
             oid = nil
             if(new_file.kind_of?(CarrierWave::Storage::PostgresqlTable::File))
-              oid = new_file.copy_to(@path)
+              file = new_file
             else
               file = new_file.to_file
+            end
 
-              begin
-                oid = @record.pg_largeobject_oid || raw_connection.lo_creat
-                handle = raw_connection.lo_open(oid, PG::INV_WRITE)
-                raw_connection.lo_truncate(handle, 0)
-                buffer = ""
-                until file.eof?
-                  file.read(READ_CHUNK_SIZE, buffer)
-                  raw_connection.lo_write(handle, buffer)
-                end
-                file.close
-              ensure
-                raw_connection.lo_close(handle)
+            begin
+              oid = @record.pg_largeobject_oid || raw_connection.lo_creat
+              handle = raw_connection.lo_open(oid, PG::INV_WRITE)
+              raw_connection.lo_truncate(handle, 0)
+              buffer = ""
+              until file.eof?
+                file.read(READ_CHUNK_SIZE, buffer)
+                raw_connection.lo_write(handle, buffer)
               end
+              file.rewind
+            ensure
+              raw_connection.lo_close(handle)
             end
 
             begin
@@ -164,26 +173,6 @@ module CarrierWave
           end
         end
 
-        def copy_to(new_path)
-          CarrierWaveFile.transaction do
-            connection = CarrierWaveFile.connection
-
-            result = connection.execute("INSERT INTO pg_largeobject_metadata(lomowner, lomacl)
-              SELECT lomowner, lomacl
-              FROM pg_largeobject_metadata
-              WHERE oid = #{CarrierWaveFile.sanitize(@record.pg_largeobject_oid)}
-              RETURNING oid AS new_oid")
-            new_oid = Integer(result.values[0][0])
-
-            connection.execute("INSERT INTO pg_largeobject(loid, pageno, data)
-              SELECT #{new_oid}, pageno, data
-              FROM pg_largeobject
-              WHERE loid = #{CarrierWaveFile.sanitize(@record.pg_largeobject_oid)}")
-
-            new_oid
-          end
-        end
-
         def move_to(new_path)
           CarrierWaveFile.transaction do
             # Remove any existing files at the current path.
@@ -197,6 +186,19 @@ module CarrierWave
         def delete
           CarrierWaveFile.delete_all_files("id = #{CarrierWaveFile.sanitize(@record.id)}")
         end
+
+        private
+
+        def fetch_size
+          size = nil
+          CarrierWaveFile.transaction do
+            raw_connection = CarrierWaveFile.connection.raw_connection
+            lo = raw_connection.lo_open(@record.pg_largeobject_oid)
+            size = raw_connection.lo_lseek(lo, 0, PG::SEEK_END)
+          end
+
+          size
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-postgresql-table
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Nick Muerdter
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-25 00:00:00.000000000 Z
+date: 2016-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord