middleman-s3_sync 4.6.2 → 4.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61870e8a5164a26db62b7463da7be2c74272800ab76cd6eab3fe83ec68e58081
-  data.tar.gz: d901b5c020cc4fe8ddc695ceeb2fde34a3555f4645aca7ec04cea7d513a0e37c
+  metadata.gz: e6b576cfe91e75975edadd71f0cfd319e84772edecd882aabe2e3c8c06c90082
+  data.tar.gz: 86bc102e074f9b47980e4cbf93060babd7f7b8a5117cbf35b60ea78ba7476ff0
 SHA512:
-  metadata.gz: 40ff859c4ae0b722c2132b3192bd14ab454988b612afb18f442645d7fbfb894b48e7d5ba502a1aae36439ec751c8f2f03e8496df255c736c5c2718770f69a7be
-  data.tar.gz: 0a1fe315c71b79ae80041efaf2beb206cdc4caa1db49a7635ede51c8e53c8bbb1cd95a2b0a28cf2e9eb2dcc4c98101e5a6847c3792fc567d6f2b2d26c4bd92f4
+  metadata.gz: 20b465799e297cff4e8085ba9c9e25637a25a3a77242d862f1d2b93291dd6112c32835fc91eb8fd92d0e4cd11df6676c034330d804e4556b5fc0ba4c2312215e
+  data.tar.gz: 36a4b96fa0c6831047a90ef4140c598bfab3eb5279fffa09adeee5e23673cb30a811806019ea63de16d1c52383b9a644a2ed6cf0bf400ccd1e9eaade616ae00a

data/.mise.toml

@@ -0,0 +1,17 @@
+[tools]
+ruby = "3.4"
+
+[env]
+_.file = ".env"
+_.path = ["./bin"]
+
+[tasks.binstubs]
+description = "Generate binstubs for all gems"
+run = "bundle binstubs --all"
+
+[tasks.setup]
+description = "Setup project dependencies and binstubs"
+run = [
+  "bundle install",
+  "mise run binstubs"
+]

data/Changelog.md

@@ -2,6 +2,14 @@
 
 The gem that tries really hard not to push files to S3.
 
+## v4.6.4
+* Remove map gem dependency and replace with native Ruby implementation
+* Add IndifferentHash class to provide string/symbol indifferent access without external dependencies
+* Improve gem stability by eliminating dependency on unmaintained library
+
+## v4.6.3
+* Restrict incompatible map 8.x installation
+
 ## v4.6.2
 
 * Fix AWS SDK parameter format issues from Fog migration

data/lib/middleman/s3_sync/caching_policy.rb

@@ -1,4 +1,4 @@
-require 'map'
+require 'middleman/s3_sync/indifferent_hash'
 
 module Middleman
   module S3Sync
@@ -17,7 +17,7 @@ module Middleman
       end
 
       def caching_policies
-        @caching_policies ||= Map.new
+        @caching_policies ||= IndifferentHash.new
       end
     end
 
@@ -25,7 +25,7 @@ module Middleman
       attr_accessor :policies
 
       def initialize(options = {})
-        @policies = Map.from_hash(options)
+        @policies = IndifferentHash.from_hash(options)
       end
 
       def cache_control

data/lib/middleman/s3_sync/indifferent_hash.rb

@@ -0,0 +1,62 @@
+module Middleman
+  module S3Sync
+    # A simple hash wrapper that provides string/symbol indifferent access
+    # This replaces the Map gem dependency with native Ruby functionality
+    class IndifferentHash < Hash
+      # Convert keys to strings for consistent access
+      def normalize_key(key)
+        key.to_s
+      end
+
+      # Override [] to provide indifferent access
+      def [](key)
+        super(normalize_key(key))
+      end
+
+      # Override []= to store with normalized keys
+      def []=(key, value)
+        super(normalize_key(key), value)
+      end
+
+      # Override fetch to provide indifferent access
+      def fetch(key, *args, &block)
+        super(normalize_key(key), *args, &block)
+      end
+
+      # Override has_key? to work with normalized keys
+      def has_key?(key)
+        super(normalize_key(key))
+      end
+      alias_method :key?, :has_key?
+      alias_method :include?, :has_key?
+
+      # Create an IndifferentHash from a regular hash
+      def self.from_hash(hash)
+        new_hash = new
+        hash.each do |key, value|
+          new_hash[key] = value
+        end
+        new_hash
+      end
+
+      # Provide dot notation access to hash values
+      def method_missing(method, *args, &block)
+        key = method.to_s
+        if key.end_with?('=')
+          # Handle setter: hash.key = value
+          self[key.chop] = args.first
+        elsif has_key?(key)
+          # Handle getter: hash.key
+          self[key]
+        else
+          super
+        end
+      end
+
+      def respond_to_missing?(method, include_private = false)
+        key = method.to_s.sub(/=$/, '')
+        has_key?(key) || super
+      end
+    end
+  end
+end

data/lib/middleman/s3_sync/options.rb

@@ -10,10 +10,10 @@ module Middleman
         :region,
         :aws_access_key_id,
         :aws_secret_access_key,
+        :aws_session_token,
         :after_build,
         :delete,
         :encryption,
-        :existing_remote_file,
         :build_dir,
         :force,
         :prefer_gzip,
@@ -25,12 +25,35 @@ module Middleman
         :content_types,
         :ignore_paths,
         :index_document,
-        :error_document
+        :error_document,
+        :cloudfront_distribution_id,
+        :cloudfront_invalidate,
+        :cloudfront_invalidate_all,
+        :cloudfront_invalidation_batch_size,
+        :cloudfront_invalidation_max_retries,
+        :cloudfront_invalidation_batch_delay,
+        :cloudfront_wait
       ]
       attr_accessor *OPTIONS
 
       def acl
-        @acl || 'public-read'
+        # If @acl is explicitly set to empty string or false, return nil (for buckets with ACLs disabled)
+        # If @acl is nil and was never set, return default 'public-read'
+        # Otherwise return the set value
+        return nil if @acl == '' || @acl == false
+        @acl_explicitly_set ? @acl : (@acl || 'public-read')
+      end
+
+      def acl=(value)
+        @acl_explicitly_set = true
+        @acl = value
+      end
+
+      def acl_enabled?
+        # ACLs are disabled if explicitly set to nil, empty string, or false
+        return false if @acl_explicitly_set && (@acl.nil? || @acl == '' || @acl == false)
+        # Otherwise ACLs are enabled (using default or explicit value)
+        true
       end
 
       def aws_access_key_id=(aws_access_key_id)

data/lib/middleman/s3_sync/resource.rb

@@ -55,10 +55,11 @@ module Middleman
       def to_h
         attributes = {
           :key => key,
-          :acl => options.acl,
           :content_type => content_type,
           'content-md5' => local_content_md5
         }
+        # Only add ACL if enabled (not for buckets with ACLs disabled)
+        attributes[:acl] = options.acl if options.acl_enabled?
 
         if caching_policy
           attributes[:cache_control] = caching_policy.cache_control
@@ -115,40 +116,22 @@ module Middleman
 
       def upload!
         object = bucket.object(remote_path.sub(/^\//, ''))
-        upload_options = {
-          body: local_content,
-          content_type: content_type,
-          acl: options.acl
-        }
-
-        # Add metadata if present
-        if local_content_md5
-          upload_options[:metadata] = { 'content-md5' => local_content_md5 }
-        end
-
-        # Add redirect if present
-        upload_options[:website_redirect_location] = redirect_url if redirect?
-
-        # Add content encoding if present
-        upload_options[:content_encoding] = "gzip" if options.prefer_gzip && gzipped
-
-        # Add cache control and expires if present
-        if caching_policy
-          upload_options[:cache_control] = caching_policy.cache_control
-          upload_options[:expires] = caching_policy.expires
-        end
-
-        # Add storage class if needed
-        if options.reduced_redundancy_storage
-          upload_options[:storage_class] = 'REDUCED_REDUNDANCY'
-        end
-
-        # Add encryption if needed
-        if options.encryption
-          upload_options[:server_side_encryption] = 'AES256'
+        upload_options = build_upload_options
+
+        begin
+          object.put(upload_options)
+        rescue Aws::S3::Errors::AccessControlListNotSupported => e
+          # Bucket has ACLs disabled - retry without ACL
+          if upload_options.key?(:acl)
+            say_status "#{ANSI.yellow{"Note"}} Bucket does not support ACLs, retrying without ACL parameter"
+            # Automatically disable ACLs for this bucket going forward
+            options.acl = ''
+            upload_options.delete(:acl)
+            retry
+          else
+            raise e
+          end
         end
-
-        object.put(upload_options)
       end
 
       def ignore!
@@ -330,6 +313,45 @@ module Middleman
       end
 
       protected
+      
+      def build_upload_options
+        upload_options = {
+          body: local_content,
+          content_type: content_type
+        }
+        # Only add ACL if enabled (not for buckets with ACLs disabled)
+        upload_options[:acl] = options.acl if options.acl_enabled?
+
+        # Add metadata if present
+        if local_content_md5
+          upload_options[:metadata] = { 'content-md5' => local_content_md5 }
+        end
+
+        # Add redirect if present
+        upload_options[:website_redirect_location] = redirect_url if redirect?
+
+        # Add content encoding if present
+        upload_options[:content_encoding] = "gzip" if options.prefer_gzip && gzipped
+
+        # Add cache control and expires if present
+        if caching_policy
+          upload_options[:cache_control] = caching_policy.cache_control
+          upload_options[:expires] = caching_policy.expires
+        end
+
+        # Add storage class if needed
+        if options.reduced_redundancy_storage
+          upload_options[:storage_class] = 'REDUCED_REDUNDANCY'
+        end
+
+        # Add encryption if needed
+        if options.encryption
+          upload_options[:server_side_encryption] = 'AES256'
+        end
+
+        upload_options
+      end
+
       def bucket
         Middleman::S3Sync.bucket
       end

data/lib/middleman/s3_sync/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module S3Sync
-    VERSION = "4.6.2"
+    VERSION = "4.6.4"
   end
 end

data/lib/middleman-s3_sync/extension.rb

@@ -1,6 +1,5 @@
 require 'middleman-core'
 require 'middleman/s3_sync'
-require 'map'
 
 module Middleman
   class S3SyncExtension < ::Middleman::Extension
@@ -77,7 +76,28 @@ module Middleman
     end
 
     def s3_sync_options
-      options
+      self
+    end
+
+    def acl_enabled?
+      # ACLs are disabled if acl is explicitly set to nil, empty string, or false
+      acl_value = options.acl
+      return false if acl_value.nil? || acl_value == '' || acl_value == false
+      # Otherwise ACLs are enabled (using default or explicit value)
+      true
+    end
+
+    # Delegate option readers to the options object
+    def method_missing(method, *args, &block)
+      if options.respond_to?(method)
+        options.send(method, *args, &block)
+      else
+        super
+      end
+    end
+
+    def respond_to_missing?(method, include_private = false)
+      options.respond_to?(method) || super
     end
 
     # Read config options from an IO stream and set them on `self`. Defaults

data/middleman-s3_sync.gemspec

@@ -20,15 +20,12 @@ Gem::Specification.new do |gem|
 
   gem.add_runtime_dependency 'middleman-core'
   gem.add_runtime_dependency 'middleman-cli'
-  gem.add_runtime_dependency 'unf'
-  gem.add_runtime_dependency 'aws-sdk-s3'
+  gem.add_runtime_dependency 'aws-sdk-s3', '>= 1.187.0'
   gem.add_runtime_dependency 'aws-sdk-cloudfront'
-  gem.add_runtime_dependency 'map'
   gem.add_runtime_dependency 'parallel'
   gem.add_runtime_dependency 'ruby-progressbar'
   gem.add_runtime_dependency 'ansi', '~> 1.5.0'
   gem.add_runtime_dependency 'mime-types', '~> 3.1'
-  gem.add_runtime_dependency 'base64'
   gem.add_runtime_dependency 'nokogiri', '>= 1.18.4'
 
   gem.add_development_dependency 'rake'

data/spec/aws_sdk_parameters_spec.rb

@@ -152,6 +152,88 @@ describe 'AWS SDK Parameter Validation' do
       resource.upload!
     end
 
+    context 'when ACL is set to empty string (for buckets with ACLs disabled)' do
+      before do
+        options.acl = ''
+      end
+
+      it 'does not include acl parameter in upload' do
+        expect(s3_object).to receive(:put) do |upload_options|
+          expect(upload_options).not_to have_key(:acl)
+          expect(upload_options[:body]).to eq('test content')
+          expect(upload_options[:content_type]).to eq('text/html')
+        end
+
+        resource.upload!
+      end
+    end
+
+    context 'when ACL is set to nil (for buckets with ACLs disabled)' do
+      before do
+        options.acl = nil
+      end
+
+      it 'does not include acl parameter in upload' do
+        expect(s3_object).to receive(:put) do |upload_options|
+          expect(upload_options).not_to have_key(:acl)
+          expect(upload_options[:body]).to eq('test content')
+          expect(upload_options[:content_type]).to eq('text/html')
+        end
+
+        resource.upload!
+      end
+    end
+
+    context 'when bucket does not support ACLs (auto-detection)' do
+      before do
+        # ACL is enabled by default
+        expect(options.acl).to eq('public-read')
+      end
+
+      it 'automatically retries without ACL when AccessControlListNotSupported error occurs' do
+        call_count = 0
+        expect(s3_object).to receive(:put).twice do |upload_options|
+          call_count += 1
+          if call_count == 1
+            # First call should include ACL
+            expect(upload_options[:acl]).to eq('public-read')
+            raise Aws::S3::Errors::AccessControlListNotSupported.new(nil, 'The bucket does not allow ACLs')
+          else
+            # Second call should not include ACL
+            expect(upload_options).not_to have_key(:acl)
+            expect(upload_options[:body]).to eq('test content')
+            expect(upload_options[:content_type]).to eq('text/html')
+          end
+        end
+
+        # Should automatically disable ACLs after the error
+        resource.upload!
+        expect(options.acl_enabled?).to be false
+      end
+
+      it 'permanently disables ACLs after detecting bucket does not support them' do
+        call_count = 0
+        allow(s3_object).to receive(:put) do |upload_options|
+          call_count += 1
+          if call_count == 1
+            expect(upload_options[:acl]).to eq('public-read')
+            raise Aws::S3::Errors::AccessControlListNotSupported.new(nil, 'The bucket does not allow ACLs')
+          else
+            # Second call should succeed without ACL
+            expect(upload_options).not_to have_key(:acl)
+            true
+          end
+        end
+        
+        resource.upload!
+        expect(options.acl_enabled?).to be false
+        
+        # Verify ACLs stay disabled for future uploads
+        resource.upload!
+        expect(call_count).to eq(3) # First attempt, retry, and third upload
+      end
+    end
+
     context 'when gzip is enabled' do
       before do
         options.prefer_gzip = true
@@ -306,6 +388,34 @@ describe 'AWS SDK Parameter Validation' do
       expect(attributes).not_to have_key('x-amz-meta-content-md5')
     end
 
+    context 'when ACL is set to empty string' do
+      before do
+        options.acl = ''
+      end
+
+      it 'does not include acl in attributes' do
+        attributes = resource.to_h
+
+        expect(attributes).not_to have_key(:acl)
+        expect(attributes[:key]).to eq('test/file.html')
+        expect(attributes[:content_type]).to eq('text/html')
+      end
+    end
+
+    context 'when ACL is set to nil' do
+      before do
+        options.acl = nil
+      end
+
+      it 'does not include acl in attributes' do
+        attributes = resource.to_h
+
+        expect(attributes).not_to have_key(:acl)
+        expect(attributes[:key]).to eq('test/file.html')
+        expect(attributes[:content_type]).to eq('text/html')
+      end
+    end
+
     context 'when resource has a redirect' do
       let(:mm_resource) do
         double(

data/spec/extension_spec.rb

@@ -0,0 +1,114 @@
+require 'spec_helper'
+
+describe Middleman::S3SyncExtension do
+  let(:app) { double('app').as_null_object }
+  
+  let(:extension) { described_class.new(app, {}) }
+
+  describe '#acl_enabled?' do
+    context 'when acl has default value' do
+      it 'returns true' do
+        expect(extension.acl_enabled?).to be true
+      end
+    end
+
+    context 'when acl is explicitly set to a value' do
+      let(:extension) { described_class.new(app, acl: 'private') }
+
+      it 'returns true' do
+        expect(extension.acl_enabled?).to be true
+      end
+    end
+
+    context 'when acl is set to nil' do
+      let(:extension) { described_class.new(app, acl: nil) }
+
+      it 'returns false' do
+        expect(extension.acl_enabled?).to be false
+      end
+    end
+
+    context 'when acl is set to empty string' do
+      let(:extension) { described_class.new(app, acl: '') }
+
+      it 'returns false' do
+        expect(extension.acl_enabled?).to be false
+      end
+    end
+
+    context 'when acl is set to false' do
+      let(:extension) { described_class.new(app, acl: false) }
+
+      it 'returns false' do
+        expect(extension.acl_enabled?).to be false
+      end
+    end
+  end
+
+  describe '#s3_sync_options' do
+    it 'returns the extension instance itself' do
+      expect(extension.s3_sync_options).to eq(extension)
+    end
+
+    it 'allows access to acl_enabled? through s3_sync_options' do
+      expect(extension.s3_sync_options.acl_enabled?).to be true
+    end
+  end
+
+  describe 'option delegation' do
+    let(:extension) do
+      described_class.new(app, 
+        bucket: 'test-bucket',
+        region: 'us-west-2',
+        acl: 'public-read',
+        verbose: true
+      )
+    end
+
+    it 'delegates option readers to the options object' do
+      expect(extension.bucket).to eq('test-bucket')
+      expect(extension.region).to eq('us-west-2')
+      expect(extension.acl).to eq('public-read')
+      expect(extension.verbose).to be true
+    end
+
+    it 'responds to option methods' do
+      expect(extension.respond_to?(:bucket)).to be true
+      expect(extension.respond_to?(:region)).to be true
+      expect(extension.respond_to?(:acl)).to be true
+      expect(extension.respond_to?(:verbose)).to be true
+    end
+
+    it 'does not respond to non-existent methods' do
+      expect(extension.respond_to?(:nonexistent_method)).to be false
+    end
+
+    it 'raises NoMethodError for non-existent methods' do
+      expect { extension.nonexistent_method }.to raise_error(NoMethodError)
+    end
+  end
+
+  describe 'integration with S3Sync module' do
+    before do
+      allow(Middleman::Application).to receive(:root).and_return('/tmp')
+      allow(File).to receive(:exist?).with('/tmp/.s3_sync').and_return(false)
+    end
+
+    let(:extension) do
+      described_class.new(app,
+        bucket: 'test-bucket',
+        acl: 'private'
+      )
+    end
+
+    it 'sets s3_sync_options to the extension instance' do
+      extension.after_configuration
+      expect(Middleman::S3Sync.s3_sync_options).to eq(extension)
+    end
+
+    it 'allows S3Sync to access acl_enabled? through s3_sync_options' do
+      extension.after_configuration
+      expect(Middleman::S3Sync.s3_sync_options.acl_enabled?).to be true
+    end
+  end
+end

data/spec/options_spec.rb

@@ -0,0 +1,272 @@
+require 'spec_helper'
+
+describe Middleman::S3Sync::Options do
+  let(:options) { described_class.new }
+
+  describe 'option accessors' do
+    it 'provides accessors for all defined options' do
+      described_class::OPTIONS.each do |option_name|
+        expect(options).to respond_to(option_name)
+        expect(options).to respond_to("#{option_name}=")
+      end
+    end
+  end
+
+  describe 'AWS credentials options' do
+    it 'supports aws_access_key_id' do
+      options.aws_access_key_id = 'test_key'
+      expect(options.aws_access_key_id).to eq('test_key')
+    end
+
+    it 'supports aws_secret_access_key' do
+      options.aws_secret_access_key = 'test_secret'
+      expect(options.aws_secret_access_key).to eq('test_secret')
+    end
+
+    it 'supports aws_session_token' do
+      options.aws_session_token = 'test_token'
+      expect(options.aws_session_token).to eq('test_token')
+    end
+
+    it 'falls back to ENV for aws_access_key_id' do
+      ENV['AWS_ACCESS_KEY_ID'] = 'env_key'
+      expect(options.aws_access_key_id).to eq('env_key')
+    ensure
+      ENV.delete('AWS_ACCESS_KEY_ID')
+    end
+
+    it 'falls back to ENV for aws_secret_access_key' do
+      ENV['AWS_SECRET_ACCESS_KEY'] = 'env_secret'
+      expect(options.aws_secret_access_key).to eq('env_secret')
+    ensure
+      ENV.delete('AWS_SECRET_ACCESS_KEY')
+    end
+  end
+
+  describe 'CloudFront options' do
+    it 'supports cloudfront_distribution_id' do
+      options.cloudfront_distribution_id = 'E1234567890123'
+      expect(options.cloudfront_distribution_id).to eq('E1234567890123')
+    end
+
+    it 'supports cloudfront_invalidate' do
+      options.cloudfront_invalidate = true
+      expect(options.cloudfront_invalidate).to be true
+    end
+
+    it 'supports cloudfront_invalidate_all' do
+      options.cloudfront_invalidate_all = true
+      expect(options.cloudfront_invalidate_all).to be true
+    end
+
+    it 'supports cloudfront_invalidation_batch_size' do
+      options.cloudfront_invalidation_batch_size = 500
+      expect(options.cloudfront_invalidation_batch_size).to eq(500)
+    end
+
+    it 'supports cloudfront_invalidation_max_retries' do
+      options.cloudfront_invalidation_max_retries = 10
+      expect(options.cloudfront_invalidation_max_retries).to eq(10)
+    end
+
+    it 'supports cloudfront_invalidation_batch_delay' do
+      options.cloudfront_invalidation_batch_delay = 5
+      expect(options.cloudfront_invalidation_batch_delay).to eq(5)
+    end
+
+    it 'supports cloudfront_wait' do
+      options.cloudfront_wait = true
+      expect(options.cloudfront_wait).to be true
+    end
+  end
+
+  describe 'S3 options' do
+    it 'supports bucket' do
+      options.bucket = 'my-bucket'
+      expect(options.bucket).to eq('my-bucket')
+    end
+
+    it 'supports region' do
+      options.region = 'us-west-2'
+      expect(options.region).to eq('us-west-2')
+    end
+
+    it 'supports endpoint' do
+      options.endpoint = 'https://s3-compatible.example.com'
+      expect(options.endpoint).to eq('https://s3-compatible.example.com')
+    end
+
+    it 'supports prefix' do
+      options.prefix = 'my-prefix'
+      expect(options.prefix).to eq('my-prefix/')
+    end
+
+    it 'supports path_style' do
+      options.path_style = false
+      expect(options.path_style).to be false
+    end
+
+    it 'defaults path_style to true' do
+      expect(options.path_style).to be true
+    end
+
+    it 'supports encryption' do
+      options.encryption = true
+      expect(options.encryption).to be true
+    end
+
+    it 'defaults encryption to false' do
+      expect(options.encryption).to be false
+    end
+
+    it 'supports reduced_redundancy_storage' do
+      options.reduced_redundancy_storage = true
+      expect(options.reduced_redundancy_storage).to be true
+    end
+  end
+
+  describe 'ACL options' do
+    it 'supports acl' do
+      options.acl = 'private'
+      expect(options.acl).to eq('private')
+    end
+
+    it 'defaults acl to public-read' do
+      expect(options.acl).to eq('public-read')
+    end
+
+    it 'supports acl_enabled?' do
+      expect(options.acl_enabled?).to be true
+    end
+
+    context 'when acl is disabled' do
+      it 'returns false for acl_enabled? when set to empty string' do
+        options.acl = ''
+        expect(options.acl_enabled?).to be false
+      end
+
+      it 'returns false for acl_enabled? when set to nil' do
+        options.acl = nil
+        expect(options.acl_enabled?).to be false
+      end
+
+      it 'returns false for acl_enabled? when set to false' do
+        options.acl = false
+        expect(options.acl_enabled?).to be false
+      end
+    end
+  end
+
+  describe 'sync behavior options' do
+    it 'supports delete' do
+      options.delete = false
+      expect(options.delete).to be false
+    end
+
+    it 'defaults delete to true' do
+      expect(options.delete).to be true
+    end
+
+    it 'supports force' do
+      options.force = true
+      expect(options.force).to be true
+    end
+
+    it 'supports prefer_gzip' do
+      options.prefer_gzip = false
+      expect(options.prefer_gzip).to be false
+    end
+
+    it 'defaults prefer_gzip to true' do
+      expect(options.prefer_gzip).to be true
+    end
+
+    it 'supports verbose' do
+      options.verbose = true
+      expect(options.verbose).to be true
+    end
+
+    it 'supports dry_run' do
+      options.dry_run = true
+      expect(options.dry_run).to be true
+    end
+
+    it 'supports version_bucket' do
+      options.version_bucket = true
+      expect(options.version_bucket).to be true
+    end
+
+    it 'defaults version_bucket to false' do
+      expect(options.version_bucket).to be false
+    end
+  end
+
+  describe 'build options' do
+    it 'supports build_dir' do
+      options.build_dir = 'dist'
+      expect(options.build_dir).to eq('dist')
+    end
+
+    it 'supports after_build' do
+      options.after_build = true
+      expect(options.after_build).to be true
+    end
+
+    it 'defaults after_build to false' do
+      expect(options.after_build).to be false
+    end
+  end
+
+  describe 'content options' do
+    it 'supports content_types' do
+      content_types = { '.webp' => 'image/webp' }
+      options.content_types = content_types
+      expect(options.content_types).to eq(content_types)
+    end
+
+    it 'supports ignore_paths' do
+      ignore_paths = [/\.bak$/, 'temp/']
+      options.ignore_paths = ignore_paths
+      expect(options.ignore_paths).to eq(ignore_paths)
+    end
+
+    it 'defaults ignore_paths to empty array' do
+      expect(options.ignore_paths).to eq([])
+    end
+  end
+
+  describe 'website options' do
+    it 'supports index_document' do
+      options.index_document = 'index.html'
+      expect(options.index_document).to eq('index.html')
+    end
+
+    it 'supports error_document' do
+      options.error_document = '404.html'
+      expect(options.error_document).to eq('404.html')
+    end
+  end
+
+  describe 'option consistency' do
+    it 'includes all options from extension in OPTIONS constant' do
+      # These are the options defined in the extension
+      extension_options = [
+        :prefix, :http_prefix, :acl, :bucket, :endpoint, :region,
+        :aws_access_key_id, :aws_secret_access_key, :aws_session_token,
+        :after_build, :build_dir, :delete, :encryption, :force,
+        :prefer_gzip, :reduced_redundancy_storage, :path_style,
+        :version_bucket, :verbose, :dry_run, :index_document,
+        :error_document, :content_types, :ignore_paths,
+        :cloudfront_distribution_id, :cloudfront_invalidate,
+        :cloudfront_invalidate_all, :cloudfront_invalidation_batch_size,
+        :cloudfront_invalidation_max_retries, :cloudfront_invalidation_batch_delay,
+        :cloudfront_wait
+      ]
+
+      extension_options.each do |option_name|
+        expect(described_class::OPTIONS).to include(option_name),
+          "Expected OPTIONS to include :#{option_name}"
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: middleman-s3_sync
 version: !ruby/object:Gem::Version
-  version: 4.6.2
+  version: 4.6.4
 platform: ruby
 authors:
 - Frederic Jean
 - Will Koehler
 bindir: bin
 cert_chain: []
-date: 2025-09-27 00:00:00.000000000 Z
+date: 2026-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
@@ -38,34 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: unf
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  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'
+        version: 1.187.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.187.0
 - !ruby/object:Gem::Dependency
   name: aws-sdk-cloudfront
   requirement: !ruby/object:Gem::Requirement
@@ -80,20 +66,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: map
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: parallel
   requirement: !ruby/object:Gem::Requirement
@@ -150,20 +122,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
-- !ruby/object:Gem::Dependency
-  name: base64
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -311,8 +269,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".envrc"
+- ".envrc.backup"
 - ".gitignore"
+- ".mise.toml"
 - ".rspec"
 - ".s3_sync.sample"
 - ".travis.yml"
@@ -329,6 +288,7 @@ files:
 - lib/middleman/s3_sync.rb
 - lib/middleman/s3_sync/caching_policy.rb
 - lib/middleman/s3_sync/cloudfront.rb
+- lib/middleman/s3_sync/indifferent_hash.rb
 - lib/middleman/s3_sync/options.rb
 - lib/middleman/s3_sync/resource.rb
 - lib/middleman/s3_sync/status.rb
@@ -338,6 +298,8 @@ files:
 - spec/aws_sdk_parameters_spec.rb
 - spec/caching_policy_spec.rb
 - spec/cloudfront_spec.rb
+- spec/extension_spec.rb
+- spec/options_spec.rb
 - spec/resource_spec.rb
 - spec/s3_sync_integration_spec.rb
 - spec/spec_helper.rb
@@ -366,6 +328,8 @@ test_files:
 - spec/aws_sdk_parameters_spec.rb
 - spec/caching_policy_spec.rb
 - spec/cloudfront_spec.rb
+- spec/extension_spec.rb
+- spec/options_spec.rb
 - spec/resource_spec.rb
 - spec/s3_sync_integration_spec.rb
 - spec/spec_helper.rb