better_storage 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c648e03cd0078c3c9db4ca303108a6e7d94ead8cf9209c8254a142ab6e76bfe0
-  data.tar.gz: 8ed57e8a1d12ba42c0d5131783a1dafeb421fc1f22d2b1a85003e80df004aa85
+  metadata.gz: 000e62192f58bc6619a6a900e46aeaab4e5877b9d76457e5ba1efec8a90c5c41
+  data.tar.gz: 0ab04353ca0bcc20e1fb8362862c5ad6b16c814db73abfe01693ba08d37bb56b
 SHA512:
-  metadata.gz: 7e823c08ad67aa4abf3f88d989c10839fa88b511f31fded4793d61af4acc4c37f16a601ceca9b59d284d242785f0c6e866aa56c48d04e81f768133e87eadc137
-  data.tar.gz: 49e72c46273de6ebd737674cf284477968ba548701edf5a42e55768119c461a7c49eaba2588331d23cbe0a3ad57d71abfb440174625b58f263248876f3b82186
+  metadata.gz: '08dbfb6408d2ca3859ea751ca3267c7719f2459abe885f2ced3ff38e824fb3148171c9a1d3a4dbfe29ccf953f8ec7fcd6d16ce6b1975a68417d88d42509a77c6'
+  data.tar.gz: 2f9beb8a09522bf7e7234a1177ecefbc02d381b9587069232c3efeeb74e7009c88994fe5d4556843e84639d73971ebc5c303bd380e7356abd555d910ac511236

data/README.md

@@ -10,6 +10,7 @@
 # better_storage.rb initializer
 
 BetterStorage.configure do |config|
+  config.namespace = "storage" # prefix for ActiveStorage uploads default: nil
   config.protect_production_files = true # default: Rails.env.development?
   config.prefix_date_format = "%Y/%m/%d" # default: "%Y%m"
 end

data/lib/better_storage/attachment.rb

@@ -6,11 +6,20 @@ module BetterStorage
       key = if style == :original
         self.key
       else
-        variants = record.attachment_reflections[name]&.variants
-        transformations = variants.fetch(style) do
-          record_model_name = record.to_model.model_name.name
-          raise ArgumentError, "Cannot find variant :#{style} for #{record_model_name}##{name}"
+        transformations = if Rails.version.to_f >= 7.1
+          variants = record.attachment_reflections[name]&.named_variants
+          variants.fetch(style) do
+            record_model_name = record.to_model.model_name.name
+            raise ArgumentError, "Cannot find variant :#{style} for #{record_model_name}##{name}"
+          end.transformations
+        else
+          variants = record.attachment_reflections[name]&.variants
+          variants.fetch(style) do
+            record_model_name = record.to_model.model_name.name
+            raise ArgumentError, "Cannot find variant :#{style} for #{record_model_name}##{name}"
+          end
         end
+
         transformation_key = ActiveStorage::Variation.wrap(transformations).digest
         variant_cache_key = "#{id}-#{transformation_key}"
 

data/lib/better_storage/railtie.rb

@@ -3,7 +3,9 @@ module BetterStorage
 
     initializer "better_storage.configs" do
       config.after_initialize do |app|
-        BetterStorage.s3_endpoint ||= ActiveStorage::Blob.service.bucket.url
+        BetterStorage.s3_endpoint ||= if ActiveStorage::Blob.service.respond_to?(:bucket)
+          ActiveStorage::Blob.service.bucket.url
+        end
       end
     end
 

data/lib/better_storage/version.rb

@@ -1,3 +1,3 @@
 module BetterStorage
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: better_storage
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Yi Feng Xie
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-16 00:00:00.000000000 Z
+date: 2023-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !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: enhance active_storage
 email:
 - yfxie@me.com
@@ -116,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.4.22
 signing_key:
 specification_version: 4
 summary: enhance active_storage