active_storage-postgresql 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 02204d5bc6e8a8e41d30c3d38ae5308345dce145c9b80f98127dacd8c74ac3ba
-  data.tar.gz: 2e15d75e150d8d3be1634f21f7c75b6018fa6a4b75f079aa301de2a526ff3f43
+  metadata.gz: 8e03540828022cafb6f37bcb926ed367951072e40af4970f51809b796e5fc8d5
+  data.tar.gz: 369c7335dfbb46aa1add165303bbb8c505600df7be8dc08663968b35884a08d5
 SHA512:
-  metadata.gz: 0f94e2258f91ef67cba241bca7936225f9f11076b307114a81df7b6f9b5d20aa7d126dd136c94d31813e045395635f3ad6de36b5f8eaf638d4b1c91d319db28a
-  data.tar.gz: c244fed09f914b4ce819577949ae12a33f80c8d4f0cee9987d3efd0952eb8a9048a52ba5aaaec959e1ef1b51d1045585313fb0ca63a1827d6684605a1853b5fe
+  metadata.gz: ffc0882ec92da092e0954498f3815367b9d52b6329e4aae764531cb888ffdd22b87ebaffd8189acb3c2750db71af0badf632642c57b3fd5ff30d80dc22100042
+  data.tar.gz: 9e4aabe7a6cd2dbf777749078db3e2d382ff385067bdd045883d5a3b56cab9bbc5dbe3926f191451c394677b2d4e76f7e00c315c82772ff8a9a1d86561823bd9

data/README.md

@@ -1,5 +1,8 @@
 # ActiveStorage::PostgreSQL
 
+[![Gem Version](https://badge.fury.io/rb/active_storage-postgresql.svg)](https://badge.fury.io/rb/active_storage-postgresql)
+[![Build Status](https://travis-ci.com/lsylvester/active_storage-postgresql.svg?branch=master)](https://travis-ci.com/lsylvester/active_storage-postgresql)
+
 ActiveStorage Service to store files PostgeSQL.
 
 Files are stored in PostgreSQL as Large Objects, which provide streaming style access.
@@ -7,13 +10,13 @@ More information about Large Objects can be found [here](https://www.postgresql.
 
 This allows use of ActiveStorage on hosting platforms with ephemeral file systems such as Heroku without relying on third party storage services.
 
-There are [some limits](https://dba.stackexchange.com/questions/127270/what-are-the-limits-of-postgresqls-large-object-facility) to the storage of Large Objects in PostgerSQL, so this is only recommended for prototyping and very small sites. 
+There are [some limits](https://dba.stackexchange.com/questions/127270/what-are-the-limits-of-postgresqls-large-object-facility) to the storage of Large Objects in PostgerSQL, so this is only recommended for prototyping and very small sites.
 
 ## Installation
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'active_storage-postgresql', git: "https://github.com/lsylvester/active_storage-postgresql"
+gem 'active_storage-postgresql'
 ```
 
 And then execute:

data/lib/active_storage/postgresql/file.rb

@@ -1,8 +1,31 @@
 class ActiveStorage::PostgreSQL::File < ActiveRecord::Base
   self.table_name = "active_storage_postgresql_files"
 
-  before_create do
-    self.oid ||= lo_creat
+  attribute :oid, :integer, default: ->{ connection.raw_connection.lo_creat }
+  attr_accessor :checksum, :io
+  attr_writer :digest
+
+  def digest
+    @digest ||= Digest::MD5.new
+  end
+
+  before_create :write_or_import, if: :io
+  before_create :verify_checksum, if: :checksum
+
+  def write_or_import
+    if io.respond_to?(:to_path)
+      import(io.to_path)
+    else
+      open(::PG::INV_WRITE) do |file|
+        while data = io.read(5.megabytes)
+          write(data)
+        end
+      end
+    end
+  end
+
+  def verify_checksum
+    raise ActiveStorage::IntegrityError unless digest.base64digest == checksum
   end
 
   def self.open(key, &block)
@@ -22,34 +45,40 @@ class ActiveStorage::PostgreSQL::File < ActiveRecord::Base
 
   def write(content)
     lo_write(@lo, content)
+    digest.update(content)
   end
 
   def read(bytes=size)
     lo_read(@lo, bytes)
   end
 
-  def seek(position)
-    lo_seek(@lo, position, 0)
+  def seek(position, whence=PG::SEEK_SET)
+    lo_seek(@lo, position, whence)
   end
 
   def import(path)
-    transaction do
-      self.oid = lo_import(path)
-    end
+    self.oid = lo_import(path)
+    self.digest = Digest::MD5.file(path)
+  end
+
+  def tell
+    lo_tell(@lo)
   end
 
   def size
-    current_position = lo_tell(@lo)
-    lo_seek(@lo, 0,2)
-    lo_tell(@lo).tap do
-      lo_seek(@lo, current_position,0)
+    current_position = tell
+    seek(0, PG::SEEK_END)
+    tell.tap do
+      seek(current_position)
     end
   end
 
-  before_destroy do
-    self.class.connection.raw_connection.lo_unlink(oid)
+  def unlink
+    lo_unlink(oid)
   end
 
+  before_destroy :unlink
+
   delegate :lo_seek, :lo_tell, :lo_import, :lo_read, :lo_write, :lo_open,
       :lo_unlink, :lo_close, :lo_creat, to: 'self.class.connection.raw_connection'
 

data/lib/active_storage/postgresql/version.rb

@@ -1,5 +1,5 @@
 module ActiveStorage
   module PostgreSQL
-    VERSION = '0.1.0'
+    VERSION = '0.1.1'
   end
 end

data/lib/active_storage/service/postgresql_service.rb

@@ -9,33 +9,9 @@ module ActiveStorage
     def initialize(**options)
     end
 
-    def upload(key, io, checksum: nil)
+    def upload(key, io, checksum: nil, **)
       instrument :upload, key: key, checksum: checksum do
-        if io.respond_to?(:to_path)
-          ActiveStorage::PostgreSQL::File.create!(key: key) do |file|
-            file.import(io.to_path)
-          end
-          if checksum
-            unless Digest::MD5.file(io.to_path).base64digest == checksum
-              delete key
-              raise ActiveStorage::IntegrityError
-            end
-          end
-        else
-          md5 = Digest::MD5.new
-          ActiveStorage::PostgreSQL::File.create!(key: key).open(::PG::INV_WRITE) do |file|
-            while data = io.read(5.megabytes)
-              md5.update(data)
-              file.write(data)
-            end
-          end
-          if checksum
-            unless md5.base64digest == checksum
-              delete key
-              raise ActiveStorage::IntegrityError
-            end
-          end
-        end
+        ActiveStorage::PostgreSQL::File.create!(key: key, io: io, checksum: checksum)
       end
     end
 
@@ -88,17 +64,23 @@ module ActiveStorage
 
     def url(key, expires_in:, filename:, disposition:, content_type:)
       instrument :url, key: key do |payload|
-        verified_key_with_expiration = ActiveStorage.verifier.generate(key, expires_in: expires_in, purpose: :blob_key)
-
-        generated_url =
-          url_helpers.rails_disk_service_url(
-            verified_key_with_expiration,
-            host: current_host,
-            filename: filename,
-            disposition: content_disposition_with(type: disposition, filename: filename),
+        content_disposition = content_disposition_with(type: disposition, filename: filename)
+        verified_key_with_expiration = ActiveStorage.verifier.generate(
+          {
+            key: key,
+            disposition: content_disposition,
             content_type: content_type
-          )
+          },
+          { expires_in: expires_in,
+          purpose: :blob_key }
+        )
 
+        generated_url = url_helpers.rails_disk_service_url(verified_key_with_expiration,
+          host: current_host,
+          disposition: content_disposition,
+          content_type: content_type,
+          filename: filename
+        )
         payload[:url] = generated_url
 
         generated_url

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_storage-postgresql
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Lachlan Sylvester
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-27 00:00:00.000000000 Z
+date: 2018-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -104,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: PostgreSQL Adapter for Active Storage