active_storage-postgresql 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf747808043e0bd24040e66f83ac859af66e0baeacc7b309ec58b5bd9f40a89c
-  data.tar.gz: 5a9244336b37ecebe236c1f2fa02dc437ed01ebe489d01450cb97f4b692dc26f
+  metadata.gz: 1212a9c234be19bf6444a03c0bdf66ab92397ad4527ac9e0ce029d0440724a34
+  data.tar.gz: 7ca4cb2634cac459ee8caf886887293f69d00f989128a41d108b3023bf6ee7e0
 SHA512:
-  metadata.gz: 48c47b3da3d266d39552dab7c52b7f990046c2af696fa5f78e9d00528639dca8be27fea0779d028cdf3d0badc008ae8b84d1f3ab77a74a8d96c28d6f7e4d8cbf
-  data.tar.gz: b2626b333f82f99199e41db2c549524b545ca455a153f436f3760e06690352447e1c773ea3bead8c63a83c03b6e9555ce00e1b1d60b96e780565ce942a014b35
+  metadata.gz: 6773b507eae6af885133918d77876e310b946f19221aeeea2a4b122805b852699350d86556a0b04e0dbdd3dda98def4580756e51af0bc44f2611afe45209b04d
+  data.tar.gz: 6b1617c425df194ae4bcf2b415e11fd8cb16eb76698677036a7a981188120dd71ece4a6307654a336a74d86327cb94bb7fc223347f4db973f9f9e87aff8be944

data/lib/active_storage/postgresql/version.rb

@@ -1,5 +1,5 @@
 module ActiveStorage
   module PostgreSQL
-    VERSION = '0.2.1'
+    VERSION = '0.3.0'
   end
 end

data/lib/active_storage/service/postgresql_service.rb

@@ -6,7 +6,8 @@ module ActiveStorage
   # Wraps a PostgreSQL database as an Active Storage service. See ActiveStorage::Service for the generic API
   # documentation that applies to all services.
   class Service::PostgreSQLService < Service
-    def initialize(**options)
+    def initialize(public: false, **options)
+      @public = public
     end
 
     def upload(key, io, checksum: nil, **)
@@ -62,7 +63,25 @@ module ActiveStorage
       end
     end
 
-    def url(key, expires_in:, filename:, disposition:, content_type:)
+    def private_url(key, expires_in:, filename:, content_type:, disposition:, **)
+      generate_url(key, expires_in: expires_in, filename: filename, content_type: content_type, disposition: disposition)
+    end
+
+    def public_url(key, filename:, content_type: nil, disposition: :attachment, **)
+      generate_url(key, expires_in: nil, filename: filename, content_type: content_type, disposition: disposition)
+    end
+
+    def url(key, **options)
+      super
+    rescue NotImplementedError, ArgumentError
+      if @public
+        public_url(key, **options)
+      else
+        private_url(key, **options)
+      end
+    end
+
+    def generate_url(key, expires_in:, filename:, disposition:, content_type:)
       instrument :url, key: key do |payload|
         content_disposition = content_disposition_with(type: disposition, filename: filename)
         verified_key_with_expiration = ActiveStorage.verifier.generate(
@@ -71,12 +90,12 @@ module ActiveStorage
             disposition: content_disposition,
             content_type: content_type
           },
-          { expires_in: expires_in,
-          purpose: :blob_key }
+          expires_in: expires_in,
+          purpose: :blob_key
         )
 
         generated_url = url_helpers.rails_postgresql_service_url(verified_key_with_expiration,
-          host: current_host,
+          **url_options,
           disposition: content_disposition,
           content_type: content_type,
           filename: filename
@@ -87,7 +106,7 @@ module ActiveStorage
       end
     end
 
-    def url_for_direct_upload(key, expires_in:, content_type:, content_length:, checksum:)
+    def url_for_direct_upload(key, expires_in:, content_type:, content_length:, checksum:, custom_metadata: {})
       instrument :url, key: key do |payload|
         verified_token_with_expiration = ActiveStorage.verifier.generate(
           {
@@ -96,11 +115,11 @@ module ActiveStorage
             content_length: content_length,
             checksum: checksum
           },
-          { expires_in: expires_in,
-          purpose: :blob_token }
+          expires_in: expires_in,
+          purpose: :blob_token
         )
 
-        generated_url = url_helpers.update_rails_postgresql_service_url(verified_token_with_expiration, host: current_host)
+        generated_url = url_helpers.update_rails_postgresql_service_url(verified_token_with_expiration, **url_options)
 
         payload[:url] = generated_url
 
@@ -118,8 +137,12 @@ module ActiveStorage
       @url_helpers ||= Rails.application.routes.url_helpers
     end
 
-    def current_host
-      ActiveStorage::Current.host
+    def url_options
+      if ActiveStorage::Current.respond_to?(:url_options)
+        ActiveStorage::Current.url_options
+      else
+        { host: ActiveStorage::Current.host }
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_storage-postgresql
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Lachlan Sylvester
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-31 00:00:00.000000000 Z
+date: 2022-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - lachlan.sylvester@hypothetical.com.au
@@ -105,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.3.4
 signing_key: 
 specification_version: 4
 summary: PostgreSQL Adapter for Active Storage