jekyll-s3 2.3.0 → 2.4.0

data/Gemfile

@@ -1,4 +1,4 @@
 source "http://rubygems.org"
 
 # Specify your gem's dependencies in jekyll-s3.gemspec
-gemspec
+gemspec

data/README.md

@@ -33,6 +33,56 @@ s3_bucket: your.blog.bucket.com
 
 ## Additional features
 
+### Cache Control
+
+You can use the `max_age` configuration option to enable more effective browser
+caching of your static assets. There are two possible ways to use the option:
+you can specify a single age (in seconds) like so:
+
+```yaml
+max_age: 300
+```
+
+Or you can specify a hash of globs, and all files matching those globs will have
+the specified age:
+
+```yaml
+max_age:
+  "assets/*": 6000
+  "*": 300
+```
+
+Place the configuration into the file `_jekyll_s3.yml`.
+
+### Gzip Compression
+
+If you choose, you can use compress certain file types before uploading them to
+S3. This is a recommended practice for maximizing page speed and minimizing
+bandwidth usage.
+
+To enable Gzip compression, simply add a `gzip` option to your `_jekyll_s3.yml`
+configuration file:
+
+```yaml
+gzip: true
+```
+
+Note that you can additionally specify the file extensions you want to Gzip
+(`.html`, `.css`, `.js`, and `.txt` will be compressed when `gzip: true`):
+
+```yaml
+gzip:
+  - .html
+  - .css
+  - .md
+```
+
+Remember that the extensions here are referring to the *compiled* extensions,
+not the pre-processed extensions.
+
+The gzip'ed files are always re-uploaded (see the issue
+[#29](https://github.com/laurilehmijoki/jekyll-s3/issues/29) for more info).
+
 ### Using non-standard AWS regions
 
 By default, `jekyll-s3` uses the US Standard Region. You can upload your Jekyll
@@ -42,7 +92,9 @@ site to other regions by adding the setting `s3_endpoint` into the
 For example, the following line in `_jekyll_s3.yml` will instruct `jekyll_s3` to
 push your site into the Tokyo region:
 
-    s3_endpoint: ap-northeast-1
+```yaml
+s3_endpoint: ap-northeast-1
+```
 
 The valid `s3_endpoint` values consist of the [S3 location constraint
 values](http://docs.amazonwebservices.com/general/latest/gr/rande.html#s3_region).
@@ -78,12 +130,7 @@ Enable the headless mode by adding the `--headless` or `-h` argument after
 
 ## Known issues
 
-### Only S3 buckets in the US Standard region work
-
-Jekyll-s3 supports only S3 buckets that are in the US Standard region. If your
-bucket is currently on some other region, you can set a non-existing bucket in
-`_jekyll_s3.yml` and then run `configure-s3-website --config-file
-_jekyll_s3.yml`. This creates you a bucket in the US Standard region.
+None. Please send a pull request if you spot any.
 
 ## Development
 
@@ -126,4 +173,6 @@ Contributors (in alphabetical order)
 * Chris Moos
 * Lauri Lehmijoki
 * Mason Turner
+* Michael Bleigh
+* Shigeaki Matsumura
 * stanislas

data/changelog.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 2.4.0
+
+* Add gzip support
+* Add support for specifying `Cache-Control: max-age` HTTP header
+
 ## 2.3.0
 
 * Add support for non-standard AWS regions

data/features/jekyll-s3-website-performance.feature

@@ -0,0 +1,62 @@
+Feature: improve response times of your Jekyll website
+
+  As a blogger
+  I want to benefit from HTTP performance optimisations
+  So that my readers would not have to wait long for my website to load
+
+  @new-files
+  Scenario: Set Cache-Control: max-age for all uploaded files
+    When my Jekyll site is in "features/support/test_site_dirs/site.with.maxage.com"
+    Then jekyll-s3 will push my blog to S3
+    And the output should equal
+      """
+      Deploying _site/* to jekyll-s3-test.net
+      Uploading 2 new file(s)
+      Upload css/styles.css [max-age=120]: Success!
+      Upload index.html [max-age=120]: Success!
+      Done! Go visit: http://jekyll-s3-test.net.s3-website-us-east-1.amazonaws.com/index.html
+
+      """
+
+  @new-files
+  Scenario: Set Cache-Control: max-age for CSS files only
+    When my Jekyll site is in "features/support/test_site_dirs/site.with.css-maxage.com"
+    Then jekyll-s3 will push my blog to S3
+    And the output should equal
+      """
+      Deploying _site/* to jekyll-s3-test.net
+      Uploading 2 new file(s)
+      Upload css/styles.css [max-age=100]: Success!
+      Upload index.html [max-age=0]: Success!
+      Done! Go visit: http://jekyll-s3-test.net.s3-website-us-east-1.amazonaws.com/index.html
+
+      """
+
+  @new-files
+  Scenario: Set Content-Encoding: gzip HTTP header
+    When my Jekyll site is in "features/support/test_site_dirs/site.with.gzipped-html.com"
+    Then jekyll-s3 will push my blog to S3
+    And the output should equal
+      """
+      Deploying _site/* to jekyll-s3-test.net
+      Uploading 2 new file(s)
+      Upload css/styles.css: Success!
+      Upload index.html [gzipped]: Success!
+      Done! Go visit: http://jekyll-s3-test.net.s3-website-us-east-1.amazonaws.com/index.html
+
+      """
+
+  @new-files
+  @wip
+  Scenario: Set both the Content-Encoding: gzip and Cache-Control: max-age headers
+    When my Jekyll site is in "features/support/test_site_dirs/site.with.gzipped-and-max-aged-content.com"
+    Then jekyll-s3 will push my blog to S3
+    And the output should equal
+      """
+      Deploying _site/* to jekyll-s3-test.net
+      Uploading 2 new file(s)
+      Upload css/styles.css [gzipped] [max-age=300]: Success!
+      Upload index.html [gzipped] [max-age=300]: Success!
+      Done! Go visit: http://jekyll-s3-test.net.s3-website-us-east-1.amazonaws.com/index.html
+
+      """

data/features/support/test_site_dirs/site.with.css-maxage.com/_jekyll_s3.yml

@@ -0,0 +1,5 @@
+s3_id: key
+s3_secret: pass
+s3_bucket: jekyll-s3-test.net
+max_age:
+  "css/*": 100

data/features/support/test_site_dirs/site.with.css-maxage.com/_site/css/styles.css

@@ -0,0 +1,3 @@
+body {
+
+}

data/features/support/test_site_dirs/site.with.css-maxage.com/_site/index.html

@@ -0,0 +1,5 @@
+<html>
+  <head>
+    <title>hello!</title>
+  </head>
+</html>

data/features/support/test_site_dirs/site.with.gzipped-and-max-aged-content.com/_jekyll_s3.yml

@@ -0,0 +1,5 @@
+s3_id: key
+s3_secret: pass
+s3_bucket: jekyll-s3-test.net
+gzip: true
+max_age: 300

data/features/support/test_site_dirs/site.with.gzipped-and-max-aged-content.com/_site/css/styles.css

@@ -0,0 +1,3 @@
+body {
+
+}

data/features/support/test_site_dirs/site.with.gzipped-and-max-aged-content.com/_site/index.html

@@ -0,0 +1,5 @@
+<html>
+  <head>
+    <title>hello!</title>
+  </head>
+</html>

data/features/support/test_site_dirs/site.with.gzipped-html.com/_jekyll_s3.yml

@@ -0,0 +1,5 @@
+s3_id: key
+s3_secret: pass
+s3_bucket: jekyll-s3-test.net
+gzip:
+  - .html

data/features/support/test_site_dirs/site.with.gzipped-html.com/_site/css/styles.css

@@ -0,0 +1,3 @@
+body {
+
+}

data/features/support/test_site_dirs/site.with.gzipped-html.com/_site/index.html

@@ -0,0 +1,5 @@
+<html>
+  <head>
+    <title>hello!</title>
+  </head>
+</html>

data/features/support/test_site_dirs/site.with.maxage.com/_jekyll_s3.yml

@@ -0,0 +1,4 @@
+s3_id: key
+s3_secret: pass
+s3_bucket: jekyll-s3-test.net
+max_age: 120

data/features/support/test_site_dirs/site.with.maxage.com/_site/css/styles.css

@@ -0,0 +1,3 @@
+body {
+
+}

data/features/support/test_site_dirs/site.with.maxage.com/_site/index.html

@@ -0,0 +1,5 @@
+<html>
+  <head>
+    <title>hello!</title>
+  </head>
+</html>

data/jekyll-s3.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "jekyll-s3"
-  s.version     = "2.3.0"
+  s.version     = "2.4.0"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Philippe Creux", "Lauri Lehmijoki"]
   s.email       = ["pcreux@gmail.com", "lauri.lehmijoki@iki.fi"]

data/lib/jekyll-s3.rb

@@ -8,10 +8,11 @@ require 'mime/types'
 
 module Jekyll
   module S3
+  	DEFAULT_GZIP_EXTENSIONS = %w(.html .css .js .svg .txt)
   end
 end
 
-%w{errors uploader cli config_loader retry keyboard diff_helper endpoint}.each do |file|
+%w{errors upload uploader cli config_loader retry keyboard diff_helper endpoint}.each do |file|
   require File.dirname(__FILE__) + "/jekyll-s3/#{file}"
 end
 

data/lib/jekyll-s3/upload.rb

@@ -0,0 +1,89 @@
+require 'tempfile'
+require 'zlib'
+
+module Jekyll
+  module S3
+    class Upload
+      attr_reader :config, :file, :path, :full_path, :s3
+
+      def initialize(path, s3, config, site_dir)
+        @path = path
+        @full_path = "#{site_dir}/#{path}"
+        @file = File.open("#{site_dir}/#{path}")
+        @s3 = s3
+        @config = config
+      end
+
+      def perform!
+        success = s3.buckets[config['s3_bucket']].objects[path].write(upload_file, upload_options)
+        upload_file.close
+        success
+      end
+
+      def upload_file
+        @upload_file ||= gzip? ? gzipped_file : file
+      end
+
+      def gzip?
+        return false unless !!config['gzip']
+
+        extensions = config['gzip'].is_a?(Array) ? config['gzip'] : Jekyll::S3::DEFAULT_GZIP_EXTENSIONS
+        extensions.include?(File.extname(path))
+      end
+
+      def gzipped_file
+        tempfile = Tempfile.new(File.basename(path))
+        
+        gz = Zlib::GzipWriter.new(tempfile, Zlib::BEST_COMPRESSION, Zlib::DEFAULT_STRATEGY)
+        
+        gz.mtime = File.mtime(full_path)
+        gz.orig_name = File.basename(path)
+        gz.write(file.read)
+        
+        gz.flush
+        tempfile.flush
+        
+        gz.close
+        tempfile.open
+
+        tempfile
+      end
+
+      def details
+        "#{path}#{" [gzipped]" if gzip?}#{" [max-age=#{max_age}]" if cache_control?}"
+      end
+
+      def upload_options
+        opts = {
+          :content_type => mime_type,
+          :reduced_redundancy => config['s3_reduced_redundancy']
+        }
+
+        opts[:content_encoding] = "gzip" if gzip?
+        opts[:cache_control] = "max-age=#{max_age}" if cache_control?
+        
+        opts
+      end
+
+      def cache_control?
+        !!config['max_age']
+      end
+
+      def max_age
+        if config['max_age'].is_a?(Hash)
+          config['max_age'].each_pair do |glob, age|
+            return age if File.fnmatch(glob, path)
+          end
+        else
+          return config['max_age']
+        end
+
+        return 0
+      end
+
+      def mime_type
+        MIME::Types.type_for(path).first
+      end
+    end
+  end
+end

data/lib/jekyll-s3/uploader.rb

@@ -53,16 +53,12 @@ module Jekyll
 
       def self.upload_file(file, s3, config, site_dir)
         Retry.run_with_retry do
-          mime_type = MIME::Types.type_for(file)
-          upload_succeeded = s3.buckets[config['s3_bucket']].objects[file].write(
-            File.read("#{site_dir}/#{file}"),
-            :content_type => mime_type.first,
-            :reduced_redundancy => config['s3_reduced_redundancy']
-          )
-          if upload_succeeded
-            puts("Upload #{file}: Success!")
+          upload = Upload.new(file, s3, config, site_dir)
+
+          if upload.perform!
+            puts "Upload #{upload.details}: Success!"
           else
-            puts("Upload #{file}: FAILURE!")
+            puts "Upload #{upload.details}: FAILURE!"
           end
         end
       end

data/spec/lib/upload_spec.rb

@@ -1,104 +1,166 @@
 require 'spec_helper'
 
-describe Jekyll::S3::Uploader do
-  context '#upload_file' do
-    describe 'reduced redundancy setting' do
-      let(:config) {
-        { 's3_reduced_redundancy' => true }
-      }
+describe Jekyll::S3::Upload do
+  describe 'reduced redundancy setting' do
+    let(:config) {
+      { 's3_reduced_redundancy' => true }
+    }
 
-      it 'allows storing a file under the Reduced Redundancy Storage' do
-        file_to_upload = 'index.html'
-        s3_client = create_verifying_s3_client(file_to_upload) do |s3_object|
-          s3_object.should_receive(:write).with(
-            anything(),
-            :content_type => 'text/html',
-            :reduced_redundancy => true
-          )
-        end
-        Jekyll::S3::Uploader.send(:upload_file,
-                                  file_to_upload,
-                                  s3_client,
-                                  config,
-                                  'features/support/test_site_dirs/my.blog.com/_site')
+    it 'allows storing a file under the Reduced Redundancy Storage' do
+      file_to_upload = 'index.html'
+      s3_client = create_verifying_s3_client(file_to_upload) do |s3_object|
+        s3_object.should_receive(:write).with(
+          anything(),
+          :content_type => 'text/html',
+          :reduced_redundancy => true
+        )
       end
+      Jekyll::S3::Upload.new(file_to_upload,
+                             s3_client,
+                             config,
+                             'features/support/test_site_dirs/my.blog.com/_site').perform!
     end
+  end
 
-    describe 'content type resolving' do
-      let(:config) {
-        { 's3_reduced_redundancy' => false }
-      }
+  describe 'content type resolving' do
+    let(:config) {
+      { 's3_reduced_redundancy' => false }
+    }
 
-      it 'adds the content type of the uploaded CSS file into the S3 object' do
-        file_to_upload = 'css/styles.css'
-        s3_client = create_verifying_s3_client(file_to_upload) do |s3_object|
-          s3_object.should_receive(:write).with(
-            anything(),
-            :content_type => 'text/css',
-            :reduced_redundancy => false
-          )
-        end
-        Jekyll::S3::Uploader.send(:upload_file,
-                                  file_to_upload,
-                                  s3_client,
-                                  config,
-                                  'features/support/test_site_dirs/my.blog.com/_site')
+    it 'adds the content type of the uploaded CSS file into the S3 object' do
+      file_to_upload = 'css/styles.css'
+      s3_client = create_verifying_s3_client(file_to_upload) do |s3_object|
+        s3_object.should_receive(:write).with(
+          anything(),
+          :content_type => 'text/css',
+          :reduced_redundancy => false
+        )
       end
+      Jekyll::S3::Upload.new(file_to_upload,
+                             s3_client,
+                             config,
+                             'features/support/test_site_dirs/my.blog.com/_site').perform!
+    end
 
-      it 'adds the content type of the uploaded HTML file into the S3 object' do
-        file_to_upload = 'index.html'
-        s3_client = create_verifying_s3_client(file_to_upload) do |s3_object|
-          s3_object.should_receive(:write).with(
-            anything(),
-            :content_type => 'text/html',
-            :reduced_redundancy => false
-          )
-        end
-        Jekyll::S3::Uploader.send(:upload_file,
-                                  file_to_upload,
-                                  s3_client,
-                                  config,
-                                  'features/support/test_site_dirs/my.blog.com/_site')
+    it 'adds the content type of the uploaded HTML file into the S3 object' do
+      file_to_upload = 'index.html'
+      s3_client = create_verifying_s3_client(file_to_upload) do |s3_object|
+        s3_object.should_receive(:write).with(
+          anything(),
+          :content_type => 'text/html',
+          :reduced_redundancy => false
+        )
       end
+      Jekyll::S3::Upload.new(file_to_upload,
+                             s3_client,
+                             config,
+                             'features/support/test_site_dirs/my.blog.com/_site').perform!
     end
+  end
+
+  describe 'gzip compression' do
+    let(:config){
+      {
+        's3_reduced_redundancy' => false,
+        'gzip' => true
+      }
+    }
+
+    subject{ Jekyll::S3::Upload.new("index.html", mock(), config, 'features/support/test_site_dirs/my.blog.com/_site') }
 
-    def create_verifying_s3_client(file_to_upload, &block)
-      def create_objects(file_to_upload, &block)
-        def create_html_s3_object(file_to_upload, &block)
-          s3_object = stub('s3_object')
-          yield s3_object
-          s3_object
-        end
-        objects = {}
-        objects[file_to_upload] = create_html_s3_object(file_to_upload, &block)
-        objects
+    describe '#gzip?' do
+      it 'should be false if the config does not specify gzip' do
+        config.delete 'gzip'
+        subject.should_not be_gzip
       end
-      def create_bucket(file_to_upload, &block)
-        bucket = stub('bucket')
-        bucket.stub(:objects => create_objects(file_to_upload, &block))
-        bucket
+
+      it 'should be false if gzip is true but does not match a default extension' do
+        subject.stub(:path).and_return("index.bork")
+        subject.should_not be_gzip
+      end
+
+      it 'should be true if gzip is true and file extension matches' do
+        subject.should be_gzip
+      end
+
+      it 'should be true if gzip is true and file extension matches custom supplied' do
+        config['gzip'] = %w(.bork)
+        subject.stub(:path).and_return('index.bork')
+        subject.should be_gzip
+      end
+    end
+
+    describe '#gzipped_file' do
+      it 'should return a gzipped version of the file' do
+        gz = Zlib::GzipReader.new(subject.gzipped_file)
+        gz.read.should == File.read('features/support/test_site_dirs/my.blog.com/_site/index.html')
       end
-      buckets = stub('buckets')
-      buckets.stub(:[] => create_bucket(file_to_upload, &block))
-      s3 = stub('s3')
-      s3.stub(:buckets => buckets)
-      s3
     end
   end
 
-  context '#load_all_local_files' do
-    let(:files) {
-      Jekyll::S3::Uploader.send(:load_all_local_files,
-                                'spec/sample_files/hyde_site/_site')
+  describe 'cache control' do
+    let(:config){
+      {
+        's3_reduced_redundancy' => false,
+        'max_age' => 300
+      }
     }
 
-    it 'loads regular files' do
-      files.should include('css/styles.css')
-      files.should include('index.html')
+    subject{ Jekyll::S3::Upload.new("index.html", mock(), config, 'features/support/test_site_dirs/my.blog.com/_site') }
+
+    describe '#cache_control?' do
+      it 'should be false if max_age is missing' do
+        config.delete 'max_age'
+        subject.should_not be_cache_control
+      end
+
+      it 'should be true if max_age is present' do
+        subject.should be_cache_control
+      end
+
+      it 'should be true if max_age is a hash' do
+        config['max_age'] = {'*' => 300}
+        subject.should be_cache_control
+      end
+    end
+
+    describe '#max_age' do
+      it 'should be the universal value if one is set' do
+        subject.max_age.should == 300
+      end
+
+      it 'should be the file-specific value if one is set' do
+        config['max_age'] = {'*index.html' => 500}
+        subject.max_age.should == 500
+      end
+
+      it 'should be zero if no file-specific value hit' do
+        config['max_age'] = {'*.js' => 500}
+        subject.max_age.should == 0
+      end
     end
+  end
 
-    it 'loads also dotfiles' do
-      files.should include('.vimrc')
+  def create_verifying_s3_client(file_to_upload, &block)
+    def create_objects(file_to_upload, &block)
+      def create_html_s3_object(file_to_upload, &block)
+        s3_object = stub('s3_object')
+        yield s3_object
+        s3_object
+      end
+      objects = {}
+      objects[file_to_upload] = create_html_s3_object(file_to_upload, &block)
+      objects
+    end
+    def create_bucket(file_to_upload, &block)
+      bucket = stub('bucket')
+      bucket.stub(:objects => create_objects(file_to_upload, &block))
+      bucket
     end
+    buckets = stub('buckets')
+    buckets.stub(:[] => create_bucket(file_to_upload, &block))
+    s3 = stub('s3')
+    s3.stub(:buckets => buckets)
+    s3
   end
-end
+end

data/spec/lib/uploader_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+describe Jekyll::S3::Uploader do
+  context '#upload_file' do
+  end
+
+  context '#load_all_local_files' do
+    let(:files) {
+      Jekyll::S3::Uploader.send(:load_all_local_files,
+                                'spec/sample_files/hyde_site/_site')
+    }
+
+    it 'loads regular files' do
+      files.should include('css/styles.css')
+      files.should include('index.html')
+    end
+
+    it 'loads also dotfiles' do
+      files.should include('.vimrc')
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-s3
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-12 00:00:00.000000000 Z
+date: 2013-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -253,6 +253,7 @@ files:
 - features/jekyll-s3-cloudfront.feature
 - features/jekyll-s3-delete.feature
 - features/jekyll-s3-upload.feature
+- features/jekyll-s3-website-performance.feature
 - features/step_definitions/steps.rb
 - features/support/env.rb
 - features/support/test_site_dirs/cdn-powered.blog.fi/_jekyll_s3.yml
@@ -276,6 +277,18 @@ files:
 - features/support/test_site_dirs/only-changed-files.com/_jekyll_s3.yml
 - features/support/test_site_dirs/only-changed-files.com/_site/css/styles.css
 - features/support/test_site_dirs/only-changed-files.com/_site/index.html
+- features/support/test_site_dirs/site.with.css-maxage.com/_jekyll_s3.yml
+- features/support/test_site_dirs/site.with.css-maxage.com/_site/css/styles.css
+- features/support/test_site_dirs/site.with.css-maxage.com/_site/index.html
+- features/support/test_site_dirs/site.with.gzipped-and-max-aged-content.com/_jekyll_s3.yml
+- features/support/test_site_dirs/site.with.gzipped-and-max-aged-content.com/_site/css/styles.css
+- features/support/test_site_dirs/site.with.gzipped-and-max-aged-content.com/_site/index.html
+- features/support/test_site_dirs/site.with.gzipped-html.com/_jekyll_s3.yml
+- features/support/test_site_dirs/site.with.gzipped-html.com/_site/css/styles.css
+- features/support/test_site_dirs/site.with.gzipped-html.com/_site/index.html
+- features/support/test_site_dirs/site.with.maxage.com/_jekyll_s3.yml
+- features/support/test_site_dirs/site.with.maxage.com/_site/css/styles.css
+- features/support/test_site_dirs/site.with.maxage.com/_site/index.html
 - features/support/test_site_dirs/unpublish-a-post.com/_jekyll_s3.yml
 - features/support/test_site_dirs/unpublish-a-post.com/_site/css/styles.css
 - features/support/vcr.rb
@@ -289,11 +302,13 @@ files:
 - lib/jekyll-s3/errors.rb
 - lib/jekyll-s3/keyboard.rb
 - lib/jekyll-s3/retry.rb
+- lib/jekyll-s3/upload.rb
 - lib/jekyll-s3/uploader.rb
 - spec/lib/config_loader_spec.rb
 - spec/lib/keyboard_spec.rb
 - spec/lib/retry_spec.rb
 - spec/lib/upload_spec.rb
+- spec/lib/uploader_spec.rb
 - spec/sample_files/hyde_site/_jekyll_s3.yml
 - spec/sample_files/hyde_site/_site/.vimrc
 - spec/sample_files/hyde_site/_site/css/styles.css
@@ -341,6 +356,7 @@ test_files:
 - features/jekyll-s3-cloudfront.feature
 - features/jekyll-s3-delete.feature
 - features/jekyll-s3-upload.feature
+- features/jekyll-s3-website-performance.feature
 - features/step_definitions/steps.rb
 - features/support/env.rb
 - features/support/test_site_dirs/cdn-powered.blog.fi/_jekyll_s3.yml
@@ -364,6 +380,18 @@ test_files:
 - features/support/test_site_dirs/only-changed-files.com/_jekyll_s3.yml
 - features/support/test_site_dirs/only-changed-files.com/_site/css/styles.css
 - features/support/test_site_dirs/only-changed-files.com/_site/index.html
+- features/support/test_site_dirs/site.with.css-maxage.com/_jekyll_s3.yml
+- features/support/test_site_dirs/site.with.css-maxage.com/_site/css/styles.css
+- features/support/test_site_dirs/site.with.css-maxage.com/_site/index.html
+- features/support/test_site_dirs/site.with.gzipped-and-max-aged-content.com/_jekyll_s3.yml
+- features/support/test_site_dirs/site.with.gzipped-and-max-aged-content.com/_site/css/styles.css
+- features/support/test_site_dirs/site.with.gzipped-and-max-aged-content.com/_site/index.html
+- features/support/test_site_dirs/site.with.gzipped-html.com/_jekyll_s3.yml
+- features/support/test_site_dirs/site.with.gzipped-html.com/_site/css/styles.css
+- features/support/test_site_dirs/site.with.gzipped-html.com/_site/index.html
+- features/support/test_site_dirs/site.with.maxage.com/_jekyll_s3.yml
+- features/support/test_site_dirs/site.with.maxage.com/_site/css/styles.css
+- features/support/test_site_dirs/site.with.maxage.com/_site/index.html
 - features/support/test_site_dirs/unpublish-a-post.com/_jekyll_s3.yml
 - features/support/test_site_dirs/unpublish-a-post.com/_site/css/styles.css
 - features/support/vcr.rb
@@ -371,6 +399,7 @@ test_files:
 - spec/lib/keyboard_spec.rb
 - spec/lib/retry_spec.rb
 - spec/lib/upload_spec.rb
+- spec/lib/uploader_spec.rb
 - spec/sample_files/hyde_site/_jekyll_s3.yml
 - spec/sample_files/hyde_site/_site/.vimrc
 - spec/sample_files/hyde_site/_site/css/styles.css