middleman-s3_sync 4.0.2 → 4.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 43571ce8542c63438002421697693bdb2df3811d
-  data.tar.gz: deef0be22c915cf14538f00a3c2403820d6328ac
+SHA256:
+  metadata.gz: 0e217a8648de15ba3454749ebf5373e9e2bf31591078be5ae0f5128aeac21d79
+  data.tar.gz: 4f82b54882d96b1ece6585e2075a19d8ef54af78fb8aaec42c07ca14cf41fc7d
 SHA512:
-  metadata.gz: 7c63611753c1cc11b91d9893c8e0470b94b99c65142631d920cf78b184e852833c62891834a8d716f05393a605237089f5b48f785a63e9c288084ced1ed9cf37
-  data.tar.gz: 9a4897fe6772f0bb913871cfa400cbc2b751a8ede6b8f1a08280065f677292c3771649343996b6695dc89cef373edc32988811732386c23a60c43065b66bf749
+  metadata.gz: 2640264fb1f0d4c2be50526d966842176ab9997537a4d2f271b0e1e0e29e4398da44f2c66969b08d9f9f4ddeaeef2014a2b2afe3eb68c95986725aa399524f3c
+  data.tar.gz: b9fa2b48b0f63638627750a532e7c7f1fd94a15cf1af4bd9a9826a24021b9fce288d83c9e5d240b4483a0e0488f57b0a7726ede24af9a861d922095bd26eabda

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.aider*

data/.travis.yml

@@ -3,9 +3,8 @@ language: ruby
 sudo: false
 cache: bundler
 rvm:
-- 2.0.0
-- 2.1.5
 - 2.2.3
+- 2.3.1
 
 notifications:
   webhooks:

data/README.md

@@ -1,6 +1,6 @@
 # Middleman::S3Sync
 
-[![Join the chat at https://gitter.im/fredjean/middleman-s3_sync](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/fredjean/middleman-s3_sync?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Code Climate](https://codeclimate.com/github/fredjean/middleman-s3_sync.png)](https://codeclimate.com/github/fredjean/middleman-s3_sync) [![Build Status](https://travis-ci.org/fredjean/middleman-s3_sync.png?branch=master)](https://travis-ci.org/fredjean/middleman-s3_sync)
+[![Join the chat at https://gitter.im/fredjean/middleman-s3_sync](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/fredjean/middleman-s3_sync?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Code Climate](https://codeclimate.com/github/fredjean/middleman-s3_sync.svg)](https://codeclimate.com/github/fredjean/middleman-s3_sync) [![Build Status](https://travis-ci.org/fredjean/middleman-s3_sync.svg?branch=master)](https://travis-ci.org/fredjean/middleman-s3_sync)
 
 This gem determines which files need to be added, updated and optionally deleted
 and only transfer these files up. This reduces the impact of an update
@@ -39,7 +39,7 @@ You need to add the following code to your ```config.rb``` file:
 
 ```ruby
 activate :s3_sync do |s3_sync|
-  s3_sync.bucket                     = 'my.bucket.com' # The name of the S3 bucket you are targetting. This is globally unique.
+  s3_sync.bucket                     = 'my.bucket.com' # The name of the S3 bucket you are targeting. This is globally unique.
   s3_sync.region                     = 'us-west-1'     # The AWS region for your bucket.
   s3_sync.aws_access_key_id          = 'AWS KEY ID'
   s3_sync.aws_secret_access_key      = 'AWS SECRET KEY'
@@ -79,7 +79,8 @@ The following defaults apply to the configuration items:
 
 ## Setting AWS Credentials
 
-There are several ways to provide the AWS credentials for s3_sync:
+There are several ways to provide the AWS credentials for s3_sync. I strongly recommend using some form of federation to assume a role with permissions to publish to your
+S3 bucket. However, you can still use the following methods::We
 
 #### Through `config.rb`
 
@@ -118,6 +119,7 @@ map to the following values:
 | --------------------- | ---------------------------------- |
 | aws_access_key_id     | ```ENV['AWS_ACCESS_KEY_ID']```     |
 | aws_secret_access_key | ```ENV['AWS_SECRET_ACCESS_KEY']``` |
+| aws_session_token     | ```ENV['AWS_SESSION_TOKEN']```     |
 | bucket                | ```ENV['AWS_BUCKET']```            |
 
 The environment is used when the credentials are not set in the activate
@@ -182,6 +184,19 @@ You can specify which environment to run Middleman under using the
 
     $ middleman s3_sync --environment=production
 
+You can set up separate sync environments in config.rb like this:
+
+```ruby
+	configure :staging do
+		activate :s3_sync do |s3_sync|
+			s3_sync.bucket = '<bucket'
+			...
+    	end
+    end
+```
+
+See the Usage section above for all the s3_sync. options to include. Currently, the .s3_sync file does not allow separate environments.
+
 #### Dry Run
 
 You can perform a dry run to see what would be the result of a sync
@@ -278,7 +293,7 @@ The following keys can be set:
 You can pass the `expires` key to the `caching_policy` and
 `default_caching_policy` methods if you insist on setting the expires
 header on a results. You will need to pass it a Time object indicating
-when the resourse is set to expire.
+when the resource is set to expire.
 
 > Note that the `Cache-Control` header will take precedence over the
 > `Expires` header if both are present.

data/lib/middleman/redirect.rb

@@ -0,0 +1,21 @@
+module Middleman
+  module Sitemap
+    class Resource
+      def redirect?
+        false
+      end
+    end
+
+    module Extensions
+      class RedirectResource < Resource
+        def target_url
+          @target_url ||= ::Middleman::Util.url_for(@store.app, @request_path, relative: false, find_resource: true)
+        end
+
+        def redirect?
+          true
+        end
+      end
+    end
+  end
+end

data/lib/middleman/s3_sync/options.rb

@@ -6,6 +6,7 @@ module Middleman
         :http_prefix,
         :acl,
         :bucket,
+        :endpoint,
         :region,
         :aws_access_key_id,
         :aws_secret_access_key,
@@ -22,6 +23,7 @@ module Middleman
         :dry_run,
         :verbose,
         :content_types,
+        :ignore_paths,
         :index_document,
         :error_document
       ]
@@ -67,6 +69,10 @@ module Middleman
         (@path_style.nil? ? true : @path_style)
       end
 
+      def ignore_paths
+        @ignore_paths.nil? ? [] : @ignore_paths
+      end
+
       def prefix=(prefix)
         http_prefix = @http_prefix ? @http_prefix.sub(%r{^/}, "") : ""
         if http_prefix.split("/").first == prefix

data/lib/middleman/s3_sync/resource.rb

@@ -4,12 +4,19 @@ module Middleman
       attr_accessor :path, :resource, :partial_s3_resource, :full_s3_resource, :content_type, :gzipped, :options
 
       CONTENT_MD5_KEY = 'x-amz-meta-content-md5'
+      REDIRECT_KEY = 'x-amz-website-redirect-location'
 
       include Status
 
       def initialize(resource, partial_s3_resource)
         @resource = resource
-        @path = resource ? resource.destination_path : partial_s3_resource.key
+        @path = if resource
+                  resource.destination_path.sub(/^\//, '')
+                elsif partial_s3_resource&.key
+                  partial_s3_resource.key.sub(/^\//, '')
+                else
+                  ''
+                end
         @partial_s3_resource = partial_s3_resource
       end
 
@@ -19,13 +26,33 @@ module Middleman
 
       # S3 resource as returned by a HEAD request
       def full_s3_resource
-        @full_s3_resource ||= bucket.files.head(remote_path)
+        @full_s3_resource ||= begin
+          bucket.object(remote_path.sub(/^\//, '')).head
+        rescue Aws::S3::Errors::NotFound
+          nil
+        end
       end
 
       def remote_path
-        s3_resource ? s3_resource.key : "#{options.prefix}#{path}"
+        if s3_resource
+          if s3_resource.respond_to?(:key)
+            s3_resource.key.sub(/^\//, '')
+          else
+            # For HeadObjectOutput objects which don't have key method
+            options.prefix ? normalize_path(options.prefix, path) : path.sub(/^\//, '')
+          end
+        else
+          options.prefix ? normalize_path(options.prefix, path) : path.sub(/^\//, '')
+        end.sub(/^\//, '')  # Ensure no leading slash
       end
       alias :key :remote_path
+      
+      def normalize_path(prefix, path)
+        # Remove any trailing slash from prefix and leading slash from path
+        prefix = prefix.chomp('/')
+        path = path.sub(/^\//, '')
+        "#{prefix}/#{path}"
+      end
 
       def to_h
         attributes = {
@@ -52,18 +79,19 @@ module Middleman
           attributes[:encryption] = 'AES256'
         end
 
+        if redirect?
+          attributes[REDIRECT_KEY] = redirect_url
+        end
+
         attributes
       end
       alias :attributes :to_h
 
       def update!
-        local_content { |body|
-          say_status "#{ANSI.blue{"Updating"}} #{remote_path}#{ gzipped ? ANSI.white {' (gzipped)'} : ''}"
-          s3_resource.merge_attributes(to_h)
-          s3_resource.body = body
-
-          s3_resource.save unless options.dry_run
-        }
+        say_status "#{ANSI.blue{"Updating"}} #{remote_path}#{ gzipped ? ANSI.white {' (gzipped)'} : ''}"
+        unless options.dry_run
+          upload!
+        end
       end
 
       def local_path
@@ -77,14 +105,52 @@ module Middleman
 
       def destroy!
         say_status "#{ANSI.red{"Deleting"}} #{remote_path}"
-        bucket.files.destroy remote_path unless options.dry_run
+        bucket.object(remote_path.sub(/^\//, '')).delete unless options.dry_run
       end
 
       def create!
         say_status "#{ANSI.green{"Creating"}} #{remote_path}#{ gzipped ? ANSI.white {' (gzipped)'} : ''}"
-        local_content { |body|
-          bucket.files.create(to_h.merge(body: body)) unless options.dry_run
+        unless options.dry_run
+          upload!
+        end
+      end
+
+      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_KEY => 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
+
+        object.put(upload_options)
       end
 
       def ignore!
@@ -122,12 +188,18 @@ module Middleman
         status == :ignored || status == :alternate_encoding
       end
 
-      def local_content(&block)
-        File.open(local_path, &block)
+      def local_content
+        if block_given?
+          File.open(local_path) { |f| yield f.read }
+        else
+          File.read(local_path)
+        end
       end
 
       def status
-        @status ||= if directory?
+        @status ||= if shunned?
+                      :ignored
+                    elsif directory?
                       if remote?
                         :deleted
                       else
@@ -136,7 +208,7 @@ module Middleman
                     elsif local? && remote?
                       if options.force
                         :updated
-                      elsif not caching_policy_match?
+                      elsif not metadata_match?
                         :updated
                       elsif local_object_md5 == remote_object_md5
                         :identical
@@ -170,11 +242,36 @@ module Middleman
       end
 
       def remote?
-        !!s3_resource
+        !full_s3_resource.nil?
       end
 
       def redirect?
-        full_s3_resource && full_s3_resource.metadata.has_key?('x-amz-website-redirect-location')
+        (resource && resource.respond_to?(:redirect?) && resource.redirect?) || 
+          (full_s3_resource && full_s3_resource.respond_to?(:website_redirect_location) && full_s3_resource.website_redirect_location)
+      end
+
+      def metadata_match?
+        redirect_match? && caching_policy_match?
+      end
+
+      def redirect_match?
+        if redirect?
+          redirect_url == remote_redirect_url
+        else
+          true
+        end
+      end
+
+      def shunned?
+        !!path[Regexp.union(options.ignore_paths)]
+      end
+
+      def remote_redirect_url
+        full_s3_resource&.website_redirect_location
+      end
+
+      def redirect_url
+        resource.respond_to?(:target_url) ? resource.target_url : nil
       end
 
       def directory?
@@ -186,7 +283,7 @@ module Middleman
       end
 
       def remote_object_md5
-        s3_resource.etag
+        s3_resource.etag.gsub(/"/, '') if s3_resource.etag
       end
 
       def encoding_match?
@@ -194,7 +291,9 @@ module Middleman
       end
 
       def remote_content_md5
-        full_s3_resource.metadata[CONTENT_MD5_KEY]
+        if full_s3_resource && full_s3_resource.metadata
+          full_s3_resource.metadata[CONTENT_MD5_KEY]
+        end
       end
 
       def local_object_md5
@@ -202,7 +301,13 @@ module Middleman
       end
 
       def local_content_md5
-        @local_content_md5 ||= Digest::MD5.hexdigest(File.read(original_path))
+        @local_content_md5 ||= begin
+          if File.exist?(original_path)
+            Digest::MD5.hexdigest(File.read(original_path))
+          else
+            nil
+          end
+        end
       end
 
       def original_path
@@ -211,7 +316,7 @@ module Middleman
 
       def content_type
         @content_type ||= Middleman::S3Sync.content_types[local_path]
-        @content_type ||= !resource.nil? ? resource.content_type : nil
+        @content_type ||= !resource.nil? && resource.respond_to?(:content_type) ? resource.content_type : nil
       end
 
       def caching_policy
@@ -219,7 +324,7 @@ module Middleman
       end
 
       def caching_policy_match?
-        if (caching_policy)
+        if caching_policy && full_s3_resource && full_s3_resource.respond_to?(:cache_control)
           caching_policy.cache_control == full_s3_resource.cache_control
         else
           true

data/lib/middleman/s3_sync/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module S3Sync
-    VERSION = "4.0.2"
+    VERSION = "4.5.0"
   end
 end

data/lib/middleman/s3_sync.rb

@@ -1,5 +1,4 @@
-require 'fog/aws'
-require 'fog/aws/storage'
+require 'aws-sdk-s3'
 require 'digest/md5'
 require 'middleman/s3_sync/version'
 require 'middleman/s3_sync/options'
@@ -7,6 +6,7 @@ require 'middleman/s3_sync/caching_policy'
 require 'middleman/s3_sync/status'
 require 'middleman/s3_sync/resource'
 require 'middleman-s3_sync/extension'
+require 'middleman/redirect'
 require 'parallel'
 require 'ruby-progressbar'
 require 'thread'
@@ -24,6 +24,8 @@ module Middleman
       attr_accessor :mm_resources
       attr_reader   :app
 
+      THREADS_COUNT = 8
+
       def sync()
         @app ||= ::Middleman::Application.new
 
@@ -48,8 +50,8 @@ module Middleman
       def bucket
         @@bucket_lock.synchronize do
           @bucket ||= begin
-                        bucket = connection.directories.get(s3_sync_options.bucket, :prefix => s3_sync_options.prefix)
-                        raise "Bucket #{s3_sync_options.bucket} doesn't exist!" unless bucket
+                        bucket = s3_resource.bucket(s3_sync_options.bucket)
+                        raise "Bucket #{s3_sync_options.bucket} doesn't exist!" unless bucket.exists?
                         bucket
                       end
         end
@@ -73,7 +75,12 @@ module Middleman
 
       protected
       def update_bucket_versioning
-        connection.put_bucket_versioning(s3_sync_options.bucket, "Enabled") if s3_sync_options.version_bucket
+        s3_client.put_bucket_versioning({
+          bucket: s3_sync_options.bucket,
+          versioning_configuration: {
+            status: "Enabled"
+          }
+        }) if s3_sync_options.version_bucket
       end
 
       def update_bucket_website
@@ -87,30 +94,47 @@ module Middleman
 
         unless opts.empty?
           say_status "Putting bucket website: #{opts.to_json}"
-          connection.put_bucket_website(s3_sync_options.bucket, opts)
+          s3_client.put_bucket_website({
+            bucket: s3_sync_options.bucket,
+            website_configuration: opts
+          })
         end
       end
 
-      def connection
-        connection_options = {
-          :region => s3_sync_options.region,
-          :path_style => s3_sync_options.path_style
-        }
+      def s3_client
+        @s3_client ||= Aws::S3::Client.new(connection_options)
+      end
 
-        if s3_sync_options.aws_access_key_id && s3_sync_options.aws_secret_access_key
-          connection_options.merge!({
-            :aws_access_key_id => s3_sync_options.aws_access_key_id,
-            :aws_secret_access_key => s3_sync_options.aws_secret_access_key
-          })
-        else
-          connection_options.merge!({ :use_iam_profile => true })
-        end
+      def s3_resource
+        @s3_resource ||= Aws::S3::Resource.new(client: s3_client)
+      end
+
+      def connection_options
+        @connection_options ||= begin
+          connection_options = {
+            endpoint: s3_sync_options.endpoint,
+            region: s3_sync_options.region,
+            force_path_style: s3_sync_options.path_style
+          }
+
+          if s3_sync_options.aws_access_key_id && s3_sync_options.aws_secret_access_key
+            connection_options.merge!({
+              access_key_id: s3_sync_options.aws_access_key_id,
+              secret_access_key: s3_sync_options.aws_secret_access_key
+            })
+
+            # If using an assumed role
+            connection_options.merge!({
+              session_token: s3_sync_options.aws_session_token
+            }) if s3_sync_options.aws_session_token
+          end
 
-        @connection ||= Fog::Storage::AWS.new(connection_options)
+          connection_options
+        end
       end
 
       def remote_resource_for_path(path)
-        bucket_files.find { |f| f.key == "#{s3_sync_options.prefix}#{path}" }
+        bucket_files[path]
       end
 
       def s3_sync_resources
@@ -125,7 +149,7 @@ module Middleman
 
       def remote_paths
         @remote_paths ||= if s3_sync_options.delete
-                            bucket_files.map(&:key)
+                            bucket_files.keys
                           else
                             []
                           end
@@ -133,42 +157,36 @@ module Middleman
 
       def bucket_files
         @@bucket_files_lock.synchronize do
-          @bucket_files ||= [].tap { |files|
-            bucket.files.each { |f|
-              files << f
-            }
-          }
+          @bucket_files ||= begin
+            files = {}
+            bucket.objects.each do |object|
+              files[object.key] = object
+            end
+            files
+          end
         end
       end
 
       def create_resources
-        files_to_create.each do |r|
-          r.create!
-        end
+        Parallel.map(files_to_create, in_threads: THREADS_COUNT, &:create!)
       end
 
       def update_resources
-        files_to_update.each do |r|
-          r.update!
-        end
+        Parallel.map(files_to_update, in_threads: THREADS_COUNT, &:update!)
       end
 
       def delete_resources
-        files_to_delete.each do |r|
-          r.destroy!
-        end
+        Parallel.map(files_to_delete, in_threads: THREADS_COUNT, &:destroy!)
       end
 
       def ignore_resources
-        files_to_ignore.each do |r|
-          r.ignore!
-        end
+        Parallel.map(files_to_ignore, in_threads: THREADS_COUNT, &:ignore!)
       end
 
       def work_to_be_done?
-        Parallel.each(mm_resources, in_threads: 8, progress: "Processing sitemap") { |mm_resource| add_local_resource(mm_resource) }
+        Parallel.each(mm_resources, in_threads: THREADS_COUNT, progress: "Processing sitemap") { |mm_resource| add_local_resource(mm_resource) }
 
-        Parallel.each(remote_only_paths, in_threads: 8, progress: "Processing remote files") do |remote_path|
+        Parallel.each(remote_only_paths, in_threads: THREADS_COUNT, progress: "Processing remote files") do |remote_path|
           s3_sync_resources[remote_path] ||= S3Sync::Resource.new(nil, remote_resource_for_path(remote_path)).tap(&:status)
         end
 

data/lib/middleman-s3_sync/commands.rb

@@ -70,8 +70,10 @@ module Middleman
         verbose = options[:verbose] ? 0 : 1
         instrument = options[:instrument]
 
+        mode = options[:build] ? :build : :config
+
         ::Middleman::S3Sync.app = ::Middleman::Application.new do
-          config[:mode] = :build
+          config[:mode] = mode
           config[:environment] = env
           ::Middleman::Logger.singleton(verbose, instrument)
         end

data/lib/middleman-s3_sync/extension.rb

@@ -9,9 +9,11 @@ module Middleman
     option :http_prefix, nil, 'Path prefix of the resources'
     option :acl, 'public-read', 'ACL for the resources being pushed to S3'
     option :bucket, nil, 'The name of the bucket we are pushing to.'
+    option :endpoint, nil, 'The name of the endpoint to use - useful when using S3 compatible storage'
     option :region, 'us-east-1', 'The name of the AWS region hosting the S3 bucket'
     option :aws_access_key_id, ENV['AWS_ACCESS_KEY_ID'] , 'The AWS access key id'
     option :aws_secret_access_key, ENV['AWS_SECRET_ACCESS_KEY'], 'The AWS secret access key'
+    option :aws_session_token, ENV['AWS_SESSION_TOKEN'] || ENV['AWS_SECURITY_TOKEN'], 'The AWS session token (for assuming roles)'
     option :after_build, false, 'Whether to synchronize right after the build'
     option :build_dir, nil, 'Where the built site is stored'
     option :delete, true, 'Whether to delete resources that do not have a local equivalent'
@@ -25,6 +27,8 @@ module Middleman
     option :dry_run, false, 'Whether to perform a dry-run'
     option :index_document, nil, 'S3 custom index document path'
     option :error_document, nil, 'S3 custom error document path'
+    option :content_types, {}, 'Custom content types'
+    option :ignore_paths, [], 'Paths that should be ignored during sync, strings or regex are allowed'
 
     expose_to_config :s3_sync_options, :default_caching_policy, :caching_policy
 
@@ -39,6 +43,7 @@ module Middleman
       read_config
       options.aws_access_key_id ||= ENV['AWS_ACCESS_KEY_ID']
       options.aws_secret_access_key ||= ENV['AWS_SECRET_ACCESS_KEY']
+      options.aws_session_token ||= ENV['AWS_SESSION_TOKEN'] || ENV['AWS_SECURITY_TOKEN']
       options.bucket ||= ENV['AWS_BUCKET']
       options.http_prefix = app.http_prefix if app.respond_to? :http_prefix
       options.build_dir ||= app.build_dir if app.respond_to? :build_dir
@@ -53,8 +58,15 @@ module Middleman
       ::Middleman::S3Sync.sync() if options.after_build
     end
 
-    def manipulate_resource_list(mm_resources)
-      ::Middleman::S3Sync.mm_resources = mm_resources
+    def manipulate_resource_list(resources)
+      ::Middleman::S3Sync.mm_resources = resources.each_with_object([]) do |resource, list|
+        next if resource.ignored?
+
+        list << resource
+        list << resource.target_resource if resource.respond_to?(:target_resource)
+      end
+
+      resources
     end
 
     def s3_sync_options
@@ -72,7 +84,7 @@ module Middleman
         config_file_path = File.join(root_path, ".s3_sync")
 
         # skip if config file does not exist
-        return unless File.exists?(config_file_path)
+        return unless File.exist?(config_file_path)
 
         io = File.open(config_file_path, "r")
       end

data/lib/middleman-s3_sync.rb

@@ -1,3 +1,4 @@
+require 'logger'
 require 'middleman-core'
 require 'middleman-s3_sync/commands'
 require 'middleman/s3_sync'

data/middleman-s3_sync.gemspec

@@ -18,22 +18,25 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_runtime_dependency 'middleman-core', '>= 4.0.0'
+  gem.add_runtime_dependency 'middleman-core'
   gem.add_runtime_dependency 'middleman-cli'
   gem.add_runtime_dependency 'unf'
-  gem.add_runtime_dependency 'fog-aws', '>= 0.1.1'
+  gem.add_runtime_dependency 'aws-sdk-s3'
   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'
   gem.add_development_dependency 'pry'
   gem.add_development_dependency 'pry-byebug'
-  gem.add_development_dependency 'rspec', '>= 3.0.0'
+  gem.add_development_dependency 'rspec'
+  gem.add_development_dependency 'rspec-support'
   gem.add_development_dependency 'rspec-its'
   gem.add_development_dependency 'rspec-mocks'
   gem.add_development_dependency 'timerizer'
-  gem.add_development_dependency 'travis'
-  gem.add_development_dependency 'travis-lint'
+  gem.add_development_dependency 'webrick'
 end

data/spec/caching_policy_spec.rb

@@ -7,59 +7,59 @@ describe Middleman::S3Sync::BrowserCachePolicy do
     subject(:policy) { Middleman::S3Sync::BrowserCachePolicy.new(options) }
 
     it "should be blank" do
-      policy.should_not be_nil
-
-      policy.to_s.should_not =~ /max-age=/
-      policy.to_s.should_not =~ /s-maxage=/
-      policy.to_s.should_not =~ /public/
-      policy.to_s.should_not =~ /private/
-      policy.to_s.should_not =~ /no-cache/
-      policy.to_s.should_not =~ /no-store/
-      policy.to_s.should_not =~ /must-revalidate/
-      policy.to_s.should_not =~ /proxy-revalidate/
-      policy.expires.should be_nil
+      expect(policy).to_not eq nil
+
+      expect(policy.to_s).to_not match /max-age=/
+      expect(policy.to_s).to_not match /s-maxage=/
+      expect(policy.to_s).to_not match /public/
+      expect(policy.to_s).to_not match /private/
+      expect(policy.to_s).to_not match /no-cache/
+      expect(policy.to_s).to_not match /no-store/
+      expect(policy.to_s).to_not match /must-revalidate/
+      expect(policy.to_s).to_not match /proxy-revalidate/
+      expect(policy.expires).to eq nil
     end
 
     context "setting max-age" do
       let(:options) { { max_age: 300 } }
 
-      its(:to_s) { should =~ /max-age=300/ }
+      its(:to_s) { is_expected.to match /max-age=300/ }
     end
 
     context "setting s-maxage" do
       let(:options) { { s_maxage: 300 } }
 
-      its(:to_s) { should =~ /s-maxage=300/ }
+      its(:to_s) { is_expected.to match /s-maxage=300/ }
     end
 
     context "set public flag" do
       let(:options) { { public: true } }
-      its(:to_s) { should =~ /public/ }
+      its(:to_s) { is_expected.to match /public/ }
     end
 
     context "it should set the private flag if it is set to true" do
       let(:options) { { private: true } }
-      its(:to_s) { should =~ /private/ }
+      its(:to_s) { is_expected.to match /private/ }
     end
 
     context "it should set the no-cache flag when set property" do
       let(:options) { { no_cache: true }}
-      its(:to_s) { should =~ /no-cache/ }
+      its(:to_s) { is_expected.to match /no-cache/ }
     end
 
     context "setting the no-store flag" do
       let(:options) { { no_store: true } }
-      its(:to_s) { should =~ /no-store/ }
+      its(:to_s) { is_expected.to match /no-store/ }
     end
 
     context "setting the must-revalidate policy" do
       let(:options) { { must_revalidate: true } }
-      its(:to_s) { should =~ /must-revalidate/ }
+      its(:to_s) { is_expected.to match /must-revalidate/ }
     end
 
     context "setting the proxy-revalidate policy" do
       let(:options) { { proxy_revalidate: true } }
-      its(:to_s) { should =~ /proxy-revalidate/ }
+      its(:to_s) { is_expected.to match /proxy-revalidate/ }
     end
 
     context "divide caching policiies with a comma and a space" do
@@ -67,16 +67,16 @@ describe Middleman::S3Sync::BrowserCachePolicy do
 
       it "splits policies eith commans and spaces" do
         policies = policy.to_s.split(/, /)
-        policies.length.should == 2
-        policies.first.should == 'max-age=300'
-        policies.last.should == 'public'
+        expect(policies.length).to eq 2
+        expect(policies.first).to eq 'max-age=300'
+        expect(policies.last).to eq 'public'
       end
     end
 
     context "set the expiration date" do
       let(:options) { { expires: 1.years.from_now } }
 
-      its(:expires) { should == CGI.rfc1123_date(1.year.from_now )}
+      its(:expires) { is_expected.to eq CGI.rfc1123_date(1.year.from_now )}
     end
   end
 end
@@ -92,7 +92,7 @@ describe "Storing and retrieving policies" do
   it "finds the policies by the mime-type excluding the parameters" do
     caching_policy.add_caching_policy("text/html", max_age: 300)
 
-    expect(policy).to_not be_nil
+    expect(policy).to_not eq nil
     expect(policy.policies.max_age).to eq(300)
   end
 end
@@ -107,14 +107,14 @@ describe "Handling situations where the content type is nil" do
   it "returns the default caching policy when the content type is nil" do
     caching_policy.add_caching_policy(:default, max_age:(60 * 60 * 24 * 365))
 
-    expect(caching_policy.caching_policy_for(nil)).to_not be_nil
+    expect(caching_policy.caching_policy_for(nil)).to_not eq nil
     expect(caching_policy.caching_policy_for(nil).policies[:max_age]).to eq(60 * 60 * 24 * 365)
   end
 
   it "returns the default caching policy when the content type is blank" do
     caching_policy.add_caching_policy(:default, max_age:(60 * 60 * 24 * 365))
 
-    expect(caching_policy.caching_policy_for("")).to_not be_nil
+    expect(caching_policy.caching_policy_for("")).to_not eq nil
     expect(caching_policy.caching_policy_for("").policies[:max_age]).to eq(60 * 60 * 24 * 365)
   end
 end

data/spec/resource_spec.rb

@@ -8,13 +8,39 @@ describe Middleman::S3Sync::Resource do
 
   let(:mm_resource) {
     double(
-      destination_path: 'path/to/resource.html'
+      destination_path: 'path/to/resource.html',
+      content_type: 'text/html'
     )
   }
+
+  let(:s3_client) { instance_double(Aws::S3::Client) }
+  let(:s3_resource) { instance_double(Aws::S3::Resource) }
+  let(:bucket) { instance_double(Aws::S3::Bucket) }
+  let(:s3_object) { instance_double(Aws::S3::Object) }
+
   before do
     Middleman::S3Sync.s3_sync_options = options
+
     options.build_dir = "build"
     options.prefer_gzip = false
+    options.bucket = "test-bucket"
+    options.acl = "public-read"
+
+    allow(Aws::S3::Client).to receive(:new).and_return(s3_client)
+    allow(Aws::S3::Resource).to receive(:new).and_return(s3_resource)
+    allow(s3_resource).to receive(:bucket).and_return(bucket)
+    allow(bucket).to receive(:exists?).and_return(true)
+    allow(bucket).to receive(:object) do |path|
+      # Ensure path has no leading slash
+      path = path.sub(/^\//, '') if path.is_a?(String)
+      s3_object
+    end
+    allow(s3_object).to receive(:head).and_return(nil)
+    allow(s3_object).to receive(:put).and_return(true)
+    allow(s3_object).to receive(:delete).and_return(true)
+
+    # Allow Middleman::S3Sync to use our mocked bucket
+    allow(Middleman::S3Sync).to receive(:bucket).and_return(bucket)
   end
 
   context "a new resource" do
@@ -23,26 +49,28 @@ describe Middleman::S3Sync::Resource do
     context "without a prefix" do
       before do
         allow(File).to receive(:exist?).with('build/path/to/resource.html').and_return(true)
+        allow(File).to receive(:read).with('build/path/to/resource.html').and_return('test content')
       end
 
-      its(:status) { should eq :new }
+      its(:status) { is_expected.to eq :new }
 
       it "does not have a remote equivalent" do
         expect(resource).not_to be_remote
       end
 
-      it "exits locally" do
+      it "exists locally" do
         expect(resource).to be_local
       end
 
-      its(:path) { should eq 'path/to/resource.html'}
-      its(:local_path) { should eq 'build/path/to/resource.html' }
-      its(:remote_path) { should eq 'path/to/resource.html' }
+      its(:path) { is_expected.to eq 'path/to/resource.html' }
+      its(:local_path) { is_expected.to eq 'build/path/to/resource.html' }
+      its(:remote_path) { is_expected.to eq 'path/to/resource.html' }
     end
 
     context "with a prefix set" do
       before do
         allow(File).to receive(:exist?).with('build/path/to/resource.html').and_return(true)
+        allow(File).to receive(:read).with('build/path/to/resource.html').and_return('test content')
         options.prefix = "bob"
       end
 
@@ -54,14 +82,17 @@ describe Middleman::S3Sync::Resource do
         expect(resource).to be_local
       end
 
-      its(:path) { should eq 'path/to/resource.html' }
-      its(:local_path) { should eq 'build/path/to/resource.html' }
-      its(:remote_path) { should eq 'bob/path/to/resource.html' }
+      its(:path) { is_expected.to eq 'path/to/resource.html' }
+      its(:local_path) { is_expected.to eq 'build/path/to/resource.html' }
+      its(:remote_path) { is_expected.to eq 'bob/path/to/resource.html' }
     end
 
     context "gzipped" do
       before do
         allow(File).to receive(:exist?).with('build/path/to/resource.html.gz').and_return(true)
+        allow(File).to receive(:read).with('build/path/to/resource.html.gz').and_return('gzipped content')
+        allow(File).to receive(:exist?).with('build/path/to/resource.html').and_return(true)
+        allow(File).to receive(:read).with('build/path/to/resource.html').and_return('test content')
         options.prefer_gzip = true
       end
 
@@ -73,21 +104,16 @@ describe Middleman::S3Sync::Resource do
         expect(resource).to be_local
       end
 
-      its(:path) { should eq 'path/to/resource.html' }
-      its(:local_path) { should eq 'build/path/to/resource.html.gz' }
-      its(:remote_path) { should eq 'path/to/resource.html' }
+      its(:path) { is_expected.to eq 'path/to/resource.html' }
+      its(:local_path) { is_expected.to eq 'build/path/to/resource.html.gz' }
+      its(:remote_path) { is_expected.to eq 'path/to/resource.html' }
     end
   end
 
   context "the file does not exist locally" do
     subject(:resource) { Middleman::S3Sync::Resource.new(nil, remote) }
 
-    let(:remote) {
-      double(
-        key: 'path/to/resource.html',
-        metadata: {}
-      )
-    }
+    let(:remote) { mock_s3_object('path/to/resource.html') }
 
     before do
       resource.full_s3_resource = remote
@@ -98,28 +124,29 @@ describe Middleman::S3Sync::Resource do
         allow(File).to receive(:exist?).with('build/path/to/resource.html').and_return(false)
       end
 
-      its(:status) { should eq :deleted }
+      its(:status) { is_expected.to eq :deleted }
       it "does not have a remote equivalent" do
         expect(resource).to be_remote
       end
 
-      it "exits locally" do
+      it "does not exist locally" do
         expect(resource).not_to be_local
       end
 
-      its(:path) { should eq 'path/to/resource.html'}
-      its(:local_path) { should eq 'build/path/to/resource.html' }
-      its(:remote_path) { should eq 'path/to/resource.html' }
+      its(:path) { is_expected.to eq 'path/to/resource.html'}
+      its(:local_path) { is_expected.to eq 'build/path/to/resource.html' }
+      its(:remote_path) { is_expected.to eq 'path/to/resource.html' }
     end
 
     context "with a prefix set" do
       before do
         allow(File).to receive(:exist?).with('build/path/to/resource.html').and_return(false)
-        allow(remote).to receive(:key).and_return('bob/path/to/resource.html')
-        options.prefix = "bob"
+        remote = mock_s3_object('bob/path/to/resource.html')
+        resource.full_s3_resource = remote
+        options.prefix = "bob/"
       end
 
-      its(:status) { should eq :deleted }
+      its(:status) { is_expected.to eq :deleted }
       it "does not have a remote equivalent" do
         expect(resource).to be_remote
       end
@@ -128,9 +155,9 @@ describe Middleman::S3Sync::Resource do
         expect(resource).not_to be_local
       end
 
-      its(:path) { should eq 'path/to/resource.html' }
-      its(:local_path) { should eq 'build/path/to/resource.html' }
-      its(:remote_path) { should eq 'bob/path/to/resource.html' }
+      its(:path) { is_expected.to eq 'path/to/resource.html' }
+      its(:local_path) { is_expected.to eq 'build/path/to/resource.html' }
+      its(:remote_path) { is_expected.to eq 'bob/path/to/resource.html' }
     end
 
     context "gzipped" do
@@ -140,18 +167,56 @@ describe Middleman::S3Sync::Resource do
         options.prefer_gzip = true
       end
 
-      its(:status) { should eq :deleted }
+      its(:status) { is_expected.to eq :deleted }
       it "does not have a remote equivalent" do
         expect(resource).to be_remote
       end
 
-      it "exists locally" do
+      it "does not exist locally" do
         expect(resource).not_to be_local
       end
 
-      its(:path) { should eq 'path/to/resource.html' }
-      its(:local_path) { should eq 'build/path/to/resource.html' }
-      its(:remote_path) { should eq 'path/to/resource.html' }
+      its(:path) { is_expected.to eq 'path/to/resource.html' }
+      its(:local_path) { is_expected.to eq 'build/path/to/resource.html' }
+      its(:remote_path) { is_expected.to eq 'path/to/resource.html' }
+    end
+  end
+
+  context 'An ignored resource' do
+    context "that is local" do
+
+      subject(:resource) { Middleman::S3Sync::Resource.new(mm_resource, nil) }
+
+      let(:mm_resource) {
+        double(
+          destination_path: 'ignored/path/to/resource.html',
+          content_type: 'text/html'
+        )
+      }
+
+      before do
+        allow(File).to receive(:exist?).with('build/ignored/path/to/resource.html').and_return(true)
+        allow(File).to receive(:read).with('build/ignored/path/to/resource.html').and_return('test content')
+        options.ignore_paths = [/^ignored/]
+      end
+
+      its(:status) { is_expected.to eq :ignored }
     end
+
+    context "that is remote" do
+
+      subject(:resource) { Middleman::S3Sync::Resource.new(nil, remote) }
+
+      let(:remote) { mock_s3_object('ignored/path/to/resource.html') }
+
+      before do
+        resource.full_s3_resource = remote
+        options.ignore_paths = [/^ignored/]
+      end
+
+      its(:status) { is_expected.to eq :ignored }
+    end
+
   end
+
 end

data/spec/spec_helper.rb

@@ -8,6 +8,9 @@
 require 'middleman-s3_sync'
 require 'timerizer'
 require 'rspec/its'
+require 'rspec/support'
+require 'digest/md5'
+require 'cgi'
 
 RSpec.configure do |config|
   config.run_all_when_everything_filtered = true
@@ -20,6 +23,43 @@ RSpec.configure do |config|
   config.order = 'random'
 
   config.before :all do
-    Fog.mock!
+    Aws.config.update(
+      region: 'us-east-1',
+      credentials: Aws::Credentials.new('access_key_id', 'secret_access_key'),
+      stub_responses: true
+    )
+  end
+  
+  # Helper method to create a mock S3 object
+  def mock_s3_object(key, metadata = {})
+    # Ensure key has no leading slash to match test expectations
+    key = key.sub(/^\//, '')
+    
+    obj = double(
+      key: key,
+      metadata: metadata,
+      etag: "\"#{Digest::MD5.hexdigest('test content')}\"",
+      content_encoding: nil,
+      cache_control: nil,
+      website_redirect_location: nil
+    )
+    
+    # Allow head method to return self for testing
+    allow(obj).to receive(:head).and_return(obj)
+    allow(obj).to receive(:put).and_return(true)
+    allow(obj).to receive(:delete).and_return(true)
+    
+    obj
+  end
+  
+  # Helper method to create a mock HeadObjectOutput
+  def mock_head_object(metadata = {})
+    double(
+      metadata: metadata,
+      etag: "\"#{Digest::MD5.hexdigest('test content')}\"",
+      content_encoding: nil,
+      cache_control: nil,
+      website_redirect_location: nil
+    )
   end
 end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: middleman-s3_sync
 version: !ruby/object:Gem::Version
-  version: 4.0.2
+  version: 4.5.0
 platform: ruby
 authors:
 - Frederic Jean
 - Will Koehler
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-07 00:00:00.000000000 Z
+date: 2025-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
@@ -17,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: middleman-cli
   requirement: !ruby/object:Gem::Requirement
@@ -54,19 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: fog-aws
+  name: aws-sdk-s3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: map
   requirement: !ruby/object:Gem::Requirement
@@ -123,6 +122,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.5.0
+- !ruby/object:Gem::Dependency
+  name: mime-types
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !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
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.18.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.18.4
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -171,16 +212,16 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-its
+  name: rspec-support
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -194,7 +235,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-mocks
+  name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -208,7 +249,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: timerizer
+  name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -222,7 +263,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: travis
+  name: timerizer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -236,7 +277,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: travis-lint
+  name: webrick
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -268,6 +309,7 @@ files:
 - lib/middleman-s3_sync.rb
 - lib/middleman-s3_sync/commands.rb
 - lib/middleman-s3_sync/extension.rb
+- lib/middleman/redirect.rb
 - lib/middleman/s3_sync.rb
 - lib/middleman/s3_sync/caching_policy.rb
 - lib/middleman/s3_sync/options.rb
@@ -283,7 +325,6 @@ homepage: http://github.com/fredjean/middleman-s3_sync
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -298,9 +339,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
-signing_key: 
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Tries really, really hard not to push files to S3.
 test_files: