better_storage 0.2.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 000e62192f58bc6619a6a900e46aeaab4e5877b9d76457e5ba1efec8a90c5c41
-  data.tar.gz: 0ab04353ca0bcc20e1fb8362862c5ad6b16c814db73abfe01693ba08d37bb56b
+  metadata.gz: 19e4e2bb937a1d4d57791bc27846be1bcea266eb868b0b37ffcb9049a98236bd
+  data.tar.gz: 0f7ccaf756b3a4e1200546d0e2aab58a703b6780937326ea5256a3d6c54a2d36
 SHA512:
-  metadata.gz: '08dbfb6408d2ca3859ea751ca3267c7719f2459abe885f2ced3ff38e824fb3148171c9a1d3a4dbfe29ccf953f8ec7fcd6d16ce6b1975a68417d88d42509a77c6'
-  data.tar.gz: 2f9beb8a09522bf7e7234a1177ecefbc02d381b9587069232c3efeeb74e7009c88994fe5d4556843e84639d73971ebc5c303bd380e7356abd555d910ac511236
+  metadata.gz: a5f40011f175c89f4ac285210bc1f4cce1338ead78b2addd9b3ea7064eb93f589b2bc062589a696b00f32da67bd76afc2c3c9d05f4fbc88b62c8c0efa3d89004
+  data.tar.gz: 7e04667198c980e608c2474529e72b489602214324908791a712ce92371e6967702a730bdc2695872705a6240591c751338ae44f28129e8ed20ec29ee87ccb51

data/README.md

@@ -1,21 +1,63 @@
 # BetterStorage
 
-* Prefix ActiveStorage uploads with `dev` and customized datetime format.
-* Protect production files from deletion in development environment.
-* `public_url` method for ActiveStorage attachments and blobs. 
+A Rails ActiveStorage extension for the S3 service: predictable object paths, protection against accidental deletion of production files during local development, and zero-DB-query variant URL resolution.
 
-## Usage
+English | [繁體中文](README.zh-TW.md)
+
+## Why
+
+| Pain point | Solution |
+|------------|----------|
+| 1. ActiveStorage uploads land at the bucket root with no structured path; multiple apps cannot share a bucket cleanly | `namespace` prefix with automatic date partitioning establishes a predictable path hierarchy and enables bucket sharing across applications |
+| 2. Local development against production data risks deleting real production files when destroying records | Development uploads automatically receive a `dev/` prefix; deletes against keys outside the dev path are intercepted |
+| 3. Resolving a variant URL via ActiveStorage costs multiple database queries, becoming a bottleneck when rendering many derived images | Variant blob keys are persisted in the source blob's metadata; URL resolution reads from in-memory metadata with zero database queries |
+
+## Supported Versions
+
+| Rails | Ruby   |
+|-------|--------|
+| 7.1.x | 2.7+   |
+| 7.2.x | 3.1+   |
+| 8.0.x | 3.2+   |
+| 8.1.x | 3.2+   |
+
+## Installation
 
 ```ruby
-# better_storage.rb initializer
+# Gemfile
+gem "better_storage"
+```
+
+```bash
+bundle install
+```
 
+## Configuration
+
+Configure in `config/initializers/better_storage.rb`:
+
+```ruby
 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"
+  config.namespace = "my_app"
+  # config.s3_endpoint = "https://my-bucket.s3.region.amazonaws.com"
+  # config.protect_production_files = true
+  # config.prefix_date_format = "%Y/%m/%d"
 end
 ```
 
+### Configuration fields
+
+| Field | Default | Description |
+|-------|---------|-------------|
+| `namespace` | `nil` | The outermost prefix applied to all upload paths. Trailing `/` is stripped automatically. |
+| `s3_endpoint` | Auto-derived | The base URL used when assembling public URLs. Lazily derived from `ActiveStorage::Blob.service.bucket.url` on first read; explicit values take precedence. May be set to a CDN URL (e.g. CloudFront) so that `public_url` returns CDN-served paths directly. |
+| `protect_production_files` | `Rails.env.development?` | Enables the production file protection mechanism (see below). |
+| `prefix_date_format` | `"%Y%m"` | The `strftime` format used for date partitioning. Set to `nil` or `false` to disable date partitioning. |
+
+## Usage
+
+### Public URL
+
 ```ruby
 class User < ApplicationRecord
   has_one_attached :avatar do |attachable|
@@ -24,25 +66,73 @@ class User < ApplicationRecord
 end
 
 user = User.first
-user.avatar.public_url
-user.avatar.public_url(:thumb)
+
+user.avatar.public_url            # original
+user.avatar.public_url(:thumb)    # named variant
+
+# For any ActiveStorage::Blob
+blob.public_url
 ```
 
-## Installation
-Add this line to your application's Gemfile:
+`public_url` concatenates `s3_endpoint` and the key directly without going through ActiveStorage's `service_url` signing flow. It is intended for publicly readable buckets. For private buckets, use ActiveStorage's native `attachment.url` to get a signed URL.
+
+### Upload paths
+
+The blob key structure produced under `namespace = "my_app"` and `prefix_date_format = "%Y%m"`:
+
+| Environment | Key example |
+|-------------|-------------|
+| development | `my_app/dev/202605/<token>` |
+| production  | `my_app/202605/<token>` |
+
+Variant blobs are independent `ActiveStorage::Blob` instances and follow the same prefix scheme.
+
+### Production file protection
+
+When `protect_production_files` is true:
+
+- Any `delete` or `delete_prefixed` call against a key not under `<namespace>/dev/` is intercepted and returns `false`
+- Enabled automatically when `Rails.env.development?` returns true
+
+Typical use case: developing locally with a snapshot of production data, where operations such as `User#destroy_all` would otherwise wipe production S3 objects.
+
+To temporarily disable:
 
 ```ruby
-gem "better_storage"
+BetterStorage.config.protect_production_files = false
 ```
 
-## Warning
+### Variant URL caching
+
+When an attachment's `attachment.public_url(:style)` is invoked:
+
+1. **First call**: Triggers ActiveStorage's normal variant processing flow and writes the resulting variant blob key into the source blob's `metadata["bs_variants"][variation_digest]`
+2. **Subsequent calls**: Read the variant key directly from the source blob's `metadata` — **zero database queries**
+
+Properties:
+
+- **Persistent and consistent across workers / deploys**: the cache lives in the database `metadata` column, not in process-local memory
+- **No manual invalidation needed**: the variant blob key never changes, so the metadata entry remains valid
+- **Idempotent**: writes are skipped when the digest entry already exists
 
-`ActiveStorage.track_variants = true` is assumed. This gem is not tested with `ActiveStorage.track_variants = false`.
-With the false setting, `variant_class` is ActiveStorage::Variant instead of ActiveStorage::VariantWithRecord.
-ActiveStorage::Variant implements its own special blob key.
+> **Note**: Dynamic transformations (e.g. `image.variant(resize_to_limit: [N, N])` with varying `N`) accumulate metadata entries on the source blob without bound. This is acceptable in practice — each entry is small (~150 bytes); 10000 entries ≈ 1.5MB. Named variants (the typical use case) are constant in size.
 
-## Contributing
-Contribution directions go here.
+## Assumptions / Limitations
+
+- **S3 service only**: All protection mechanisms and `public_url` semantics assume S3. Disk / GCS / Azure are not supported.
+- **`ActiveStorage.track_variants = true` (Rails default)**: The variant cache mechanism depends on the `VariantWithRecord` flow. `track_variants = false` is not supported.
+- **`public_url` assumes a publicly readable bucket**: For private buckets, use ActiveStorage's native `attachment.url` (which produces signed URLs).
+- **Protection only intercepts deletes**: Upload, update, and other write operations are unaffected.
+
+## Development
+
+```bash
+bundle install
+bundle exec rake test                          # default Rails version
+bundle exec appraisal rails-7.1 rake test      # specific Rails version
+bundle exec rake coverage                      # merged coverage report across all 4 Rails versions
+```
 
 ## License
-The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
+
+Released under the [MIT License](https://opensource.org/licenses/MIT).

data/Rakefile

@@ -8,4 +8,15 @@ Rake::TestTask.new(:test) do |t|
   t.verbose = false
 end
 
-task default: :test
+task default: :test
+
+desc "跑 main + 全部 Appraisals 並合併 coverage 報告"
+task :coverage do
+  rm_rf "coverage"
+  sh "bundle exec rake test"
+  sh "bundle exec appraisal rails-7.1 rake test"
+  sh "bundle exec appraisal rails-7.2 rake test"
+  sh "bundle exec appraisal rails-8.0 rake test"
+  sh "bundle exec appraisal rails-8.1 rake test"
+  puts "→ 報告：coverage/index.html"
+end

data/lib/better_storage/configuration.rb

@@ -0,0 +1,47 @@
+module BetterStorage
+  class Configuration
+    UNSET = Object.new.freeze
+    private_constant :UNSET
+
+    def initialize
+      @s3_endpoint = UNSET
+      @namespace = UNSET
+      @protect_production_files = UNSET
+      @prefix_date_format = UNSET
+    end
+
+    def s3_endpoint
+      return @s3_endpoint unless @s3_endpoint.equal?(UNSET)
+      service = ActiveStorage::Blob.service
+      service.bucket.url if service.respond_to?(:bucket)
+    end
+
+    def s3_endpoint=(value)
+      @s3_endpoint = value
+    end
+
+    def namespace
+      @namespace.equal?(UNSET) ? nil : @namespace
+    end
+
+    def namespace=(value)
+      @namespace = value&.gsub(/\/$/, "")
+    end
+
+    def protect_production_files
+      @protect_production_files.equal?(UNSET) ? Rails.env.development? : @protect_production_files
+    end
+
+    def protect_production_files=(value)
+      @protect_production_files = value
+    end
+
+    def prefix_date_format
+      @prefix_date_format.equal?(UNSET) ? "%Y%m" : @prefix_date_format
+    end
+
+    def prefix_date_format=(value)
+      @prefix_date_format = value
+    end
+  end
+end

data/lib/better_storage/patches/attachment.rb

@@ -0,0 +1,25 @@
+module BetterStorage
+  module Patches
+    module Attachment
+      def public_url(style = :original)
+        return nil unless persisted?
+        key = style == :original ? self.key : variant_key_for(style)
+        BetterStorage.public_url(key)
+      end
+
+      private
+
+      def variant_key_for(style)
+        digest = variation_digest_for(style)
+        cached = BetterStorage::VariantMetadata.fetch(blob, digest)
+        return cached if cached
+        variant(style).processed
+        BetterStorage::VariantMetadata.fetch(blob, digest)
+      end
+
+      def variation_digest_for(style)
+        variant(style).variation.digest
+      end
+    end
+  end
+end

data/lib/better_storage/patches/blob.rb

@@ -0,0 +1,25 @@
+module BetterStorage
+  module Patches
+    module Blob
+      def key
+        self[:key] ||= begin
+          key = self.class.generate_unique_secure_token(length: self.class::MINIMUM_TOKEN_LENGTH)
+          BetterStorage.generate_blob_key(key)
+        end
+      end
+
+      def public_url
+        BetterStorage.public_url(key)
+      end
+
+      def delete
+        service.delete(key)
+        service.delete_prefixed(variant_prefix) if image?
+      end
+
+      def variant_prefix
+        "#{key}/variants/"
+      end
+    end
+  end
+end

data/lib/better_storage/patches/s3_service_proxy.rb

@@ -0,0 +1,22 @@
+module BetterStorage
+  # protect production files from deletion in development
+  module Patches
+    module S3ServiceProxy
+      def delete(key)
+        return false if should_protect?(key)
+        super
+      end
+
+      def delete_prefixed(prefix)
+        return false if should_protect?(prefix)
+        super
+      end
+
+      private
+
+      def should_protect?(key)
+        BetterStorage.protect_production_files && BetterStorage.protected_key?(key)
+      end
+    end
+  end
+end

data/lib/better_storage/patches/variant_record.rb

@@ -0,0 +1,11 @@
+module BetterStorage
+  module Patches
+    module VariantRecord
+      def destroy
+        result = super
+        BetterStorage::VariantMetadata.delete(blob, variation_digest) if destroyed? && blob
+        result
+      end
+    end
+  end
+end

data/lib/better_storage/patches/variant_with_record.rb

@@ -0,0 +1,18 @@
+module BetterStorage
+  module Patches
+    module VariantWithRecord
+      def processed
+        super
+        cache_variant_key_in_metadata
+        self
+      end
+
+      private
+
+      def cache_variant_key_in_metadata
+        return if BetterStorage::VariantMetadata.fetch(blob, variation.digest)
+        BetterStorage::VariantMetadata.store(blob, variation.digest, @record.image.key)
+      end
+    end
+  end
+end

data/lib/better_storage/railtie.rb

@@ -1,36 +1,18 @@
 module BetterStorage
   class Railtie < ::Rails::Railtie
-
-    initializer "better_storage.configs" do
-      config.after_initialize do |app|
-        BetterStorage.s3_endpoint ||= if ActiveStorage::Blob.service.respond_to?(:bucket)
-          ActiveStorage::Blob.service.bucket.url
-        end
-      end
-    end
-
-    initializer "better_storage.blob" do
-      ActiveSupport.on_load(:active_storage_blob) do
-        prepend BetterStorage::Blob
-      end
-    end
-
-    initializer "better_storage.variant" do
-      ActiveSupport.on_load(:active_storage_blob) do
-        ActiveStorage::Variant.prepend BetterStorage::Variant
-      end
-    end
-
-    initializer "better_storage.attachment" do
+    initializer "better_storage.active_storage_patches" do
       ActiveSupport.on_load(:active_storage_blob) do
-        ActiveStorage::Attachment.include BetterStorage::Attachment
+        prepend BetterStorage::Patches::Blob
+        ActiveStorage::Attachment.include BetterStorage::Patches::Attachment
+        ActiveStorage::VariantRecord.prepend BetterStorage::Patches::VariantRecord
+        ActiveStorage::VariantWithRecord.prepend BetterStorage::Patches::VariantWithRecord
       end
     end
 
-    initializer "better_storage.service" do
+    initializer "better_storage.s3_service_patch" do
       config.after_initialize do
         require "active_storage/service/s3_service"
-        ActiveStorage::Service::S3Service.prepend BetterStorage::S3ServiceProxy
+        ActiveStorage::Service::S3Service.prepend BetterStorage::Patches::S3ServiceProxy
       end
     end
   end

data/lib/better_storage/variant_metadata.rb

@@ -0,0 +1,31 @@
+module BetterStorage
+  module VariantMetadata
+    KEY = "bs_variants"
+
+    module_function
+
+    def fetch(blob, digest)
+      blob.metadata.dig(KEY, digest)
+    end
+
+    def store(blob, digest, variant_blob_key)
+      blob.with_lock do
+        return if blob.metadata.dig(KEY, digest) == variant_blob_key
+        new_metadata = blob.metadata.deep_merge(KEY => { digest => variant_blob_key })
+        blob.update_columns(metadata: new_metadata)
+        blob.metadata = new_metadata
+      end
+    end
+
+    def delete(blob, digest)
+      blob.with_lock do
+        return unless blob.metadata.dig(KEY, digest)
+        new_metadata = blob.metadata.deep_dup
+        new_metadata[KEY].delete(digest)
+        new_metadata.delete(KEY) if new_metadata[KEY].empty?
+        blob.update_columns(metadata: new_metadata)
+        blob.metadata = new_metadata
+      end
+    end
+  end
+end

data/lib/better_storage/version.rb

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

data/lib/better_storage.rb

@@ -1,48 +1,58 @@
 require "better_storage/version"
+require "better_storage/configuration"
+require "better_storage/variant_metadata"
 require "better_storage/railtie"
 
 module BetterStorage
   extend ActiveSupport::Autoload
 
-  autoload :Blob
-  autoload :S3ServiceProxy
-  autoload :Attachment
-  autoload :Variant
-
-  mattr_accessor :s3_endpoint
-  mattr_accessor :namespace
-  mattr_accessor :protect_production_files, default: Rails.env.development?
-  mattr_accessor :prefix_date_format, default: "%Y%m"
-
-  def self.configure
-    yield self
-  end
-
-  def namespace=(value)
-    @namespace = value.gsub(/\/$/, "")
-  end
-
-  def self.public_url(key)
-    url = URI.parse(s3_endpoint)
-    url.path += '/' unless url.path[-1] == '/'
-    url.path += key
-    url.to_s
-  end
-
-  def self.protected_key?(key)
-    dev_prefix = [namespace, "dev"].compact.join("/")
-    !key.start_with?(dev_prefix)
-  end
-
-  def self.prefix
-    parts = []
-    parts << namespace if namespace
-    parts << "dev" if Rails.env.development?
-    parts << Date.today.strftime(prefix_date_format) if prefix_date_format
-    parts.join("/")
+  module Patches
+    extend ActiveSupport::Autoload
+    autoload :Blob
+    autoload :Attachment
+    autoload :VariantRecord
+    autoload :VariantWithRecord
+    autoload :S3ServiceProxy
   end
 
-  def self.generate_blob_key(*key)
-    [BetterStorage.prefix, key].compact.join("/")
+  class << self
+    delegate :s3_endpoint, :s3_endpoint=,
+             :namespace, :namespace=,
+             :protect_production_files, :protect_production_files=,
+             :prefix_date_format, :prefix_date_format=,
+             to: :config
+
+    def configure
+      yield config
+      config
+    end
+
+    def config
+      @config ||= Configuration.new
+    end
+
+    def prefix
+      parts = []
+      parts << config.namespace if config.namespace
+      parts << "dev" if Rails.env.development?
+      parts << Date.today.strftime(config.prefix_date_format) if config.prefix_date_format
+      parts.join("/")
+    end
+
+    def generate_blob_key(token)
+      [prefix, token].compact_blank.join("/")
+    end
+
+    def protected_key?(key)
+      dev_prefix = [config.namespace, "dev"].compact.join("/")
+      !key.start_with?(dev_prefix)
+    end
+
+    def public_url(key)
+      uri = URI.parse(config.s3_endpoint)
+      uri.path += "/" unless uri.path.end_with?("/")
+      uri.path += key
+      uri.to_s
+    end
   end
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: better_storage
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Yi Feng Xie
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-29 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,85 +15,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.0.5
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.0.5
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  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'
-- !ruby/object:Gem::Dependency
-  name: pry
-  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'
-- !ruby/object:Gem::Dependency
-  name: aws-sdk-s3
-  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'
-- !ruby/object:Gem::Dependency
-  name: mocha
-  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'
-- !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
+        version: '7.1'
+description: |
+  Extends Rails ActiveStorage's S3 service with three improvements:
+  structured upload paths via configurable namespace and date partitioning;
+  protection against accidental deletion of production files during local
+  development; and zero-database-query variant URL resolution backed by
+  source blob metadata.
 email:
 - yfxie@me.com
 executables: []
@@ -105,17 +39,19 @@ files:
 - README.md
 - Rakefile
 - lib/better_storage.rb
-- lib/better_storage/attachment.rb
-- lib/better_storage/blob.rb
+- lib/better_storage/configuration.rb
+- lib/better_storage/patches/attachment.rb
+- lib/better_storage/patches/blob.rb
+- lib/better_storage/patches/s3_service_proxy.rb
+- lib/better_storage/patches/variant_record.rb
+- lib/better_storage/patches/variant_with_record.rb
 - lib/better_storage/railtie.rb
-- lib/better_storage/s3_service_proxy.rb
-- lib/better_storage/variant.rb
+- lib/better_storage/variant_metadata.rb
 - lib/better_storage/version.rb
 homepage: https://github.com/yfxie/better_storage/
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -130,8 +66,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.22
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
-summary: enhance active_storage
+summary: 'Rails ActiveStorage S3 extension: structured paths, production file protection,
+  zero-DB-query variant URLs'
 test_files: []

data/lib/better_storage/attachment.rb

@@ -1,33 +0,0 @@
-module BetterStorage
-  module Attachment
-    def public_url(style = :original)
-      return nil unless persisted?
-
-      key = if style == :original
-        self.key
-      else
-        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}"
-
-        Rails.cache.fetch([:better_storage_public_url, variant_cache_key, BetterStorage::VERSION]) do
-          variant(style).processed.key
-        end
-      end
-      BetterStorage.public_url(key)
-    end
-  end
-end

data/lib/better_storage/blob.rb

@@ -1,24 +0,0 @@
-module BetterStorage
-  module Blob
-    def key
-      self[:key] ||= begin
-        key = self.class.generate_unique_secure_token(length: self.class::MINIMUM_TOKEN_LENGTH)
-        BetterStorage.generate_blob_key(key)
-      end
-    end
-
-    def public_url
-      BetterStorage.public_url(key)
-    end
-
-    def delete
-      service.delete(key)
-      # original implementation is `service.delete_prefixed("variants/#{key}/") if image?`
-      service.delete_prefixed(variant_prefix) if image?
-    end
-
-    def variant_prefix
-      "#{key}/variants/"
-    end
-  end
-end

data/lib/better_storage/s3_service_proxy.rb

@@ -1,18 +0,0 @@
-module BetterStorage
-  # protect production files from deletion in development
-  module S3ServiceProxy
-    def delete(key)
-      return false if should_protect?(key)
-      super
-    end
-
-    def delete_prefixed(prefix)
-      return false if should_protect?(prefix)
-      super
-    end
-
-    def should_protect?(key)
-      BetterStorage.protect_production_files && BetterStorage.protected_key?(key)
-    end
-  end
-end

data/lib/better_storage/variant.rb

@@ -1,11 +0,0 @@
-module BetterStorage
-  module Variant
-    # original implementation:
-    # def key
-    #   "variants/#{blob.key}/#{OpenSSL::Digest::SHA256.hexdigest(variation.key)}"
-    # end
-    def key
-      "#{blob.key}/variants/#{OpenSSL::Digest::SHA256.hexdigest(variation.key)}"
-    end
-  end
-end