s3_website 1.4.4 → 1.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46b9acd801794609373680934e09e07552a90894
-  data.tar.gz: cb28b546a1e74db949e5583f39561aeee9a129d5
+  metadata.gz: 3cec0056627295c72fd85c41c1f4da128e6bf4ff
+  data.tar.gz: 8a55567ae2b010aa8bea43b33bd2efdfd3287d99
 SHA512:
-  metadata.gz: 27a47e5a17eea3fef9e5b0a7c64bf9b06666263ed8ce7893fdf5942e9e8ce674054f688593cac9b80b6d9f3b222da619cc4ffb0199de063ccd7abefc7393ff73
-  data.tar.gz: 29ca62a70b449c1e6c9e171ceb7b6d5fd5f396e41830be3d046273808e7e8a9399f7137a9aebe79382a78fc8eb7f04d2c24ff242dbcbdbc9cb6dc15356ca46b5
+  metadata.gz: 8b6fc00e2687748a152d3f7f031a20a6813b5dff2861f2203bc6574524c07883df9eea1f7779982fced473da3276fee79ec1e246297535b1a540467c8cadf05c
+  data.tar.gz: b6e30b9096746a2cff6a208f5e913e8388fffeaf46dad53c70c009320e77ded02dab72decc9807542077c0ca4539d61f0a77bf752bb549f2b1a600c17038961f

data/README.md

@@ -34,15 +34,11 @@ Here's how you can get started:
 
 ### For Jekyll users
 
-Run the `s3_website cfg create` in the root directory of your Jekyll project.
-`s3_website` will automatically look for the site output in the *_site*
-directory.
+S3_website will automatically discover your website in the *_site* directory.
 
 ### For Nanoc users
 
-Run the `s3_website cfg create` in the root directory of your Nanoc project.
-`s3_website` will automatically look for the site output in the *public/output*
-directory.
+S3_website will automatically discover your website in the *public/output* directory.
 
 ### For others
 
@@ -338,7 +334,7 @@ See
 
 ## Known issues
 
-None. Please send a pull request if you spot any.
+Please create an issue and send a pull request if you spot any.
 
 ## Development
 

data/changelog.md

@@ -2,6 +2,10 @@
 
 This project uses [Semantic Versioning](http://semver.org).
 
+## 1.4.5
+
+* If max-age=0, set `Cache-Control: no-cache, max-age=0`
+
 ## 1.4.4
 
 * Add support for eu-west-1 as a location constraint

data/lib/s3_website/upload.rb

@@ -70,11 +70,19 @@ module S3Website
 
       opts[:content_type] = "text/html; charset=utf-8" if mime_type == 'text/html'
       opts[:content_encoding] = "gzip" if gzip?
-      opts[:cache_control] = "max-age=#{max_age}" if cache_control?
+      opts[:cache_control] = cache_control_value if cache_control?
 
       opts
     end
 
+    def cache_control_value
+      if max_age == 0
+        "no-cache, max-age=0"
+      else
+        "max-age=#{max_age}"
+      end
+    end
+
     def cache_control?
       !!config['max_age']
     end

data/s3_website.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "s3_website"
-  s.version     = "1.4.4"
+  s.version     = "1.4.5"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Lauri Lehmijoki"]
   s.email       = ["lauri.lehmijoki@iki.fi"]

data/spec/lib/upload_spec.rb

@@ -144,6 +144,16 @@ describe S3Website::Upload do
       end
     end
 
+    context 'the user specifies max-age as zero' do
+      let(:config) {{
+        'max_age' => 0
+      }}
+
+      it 'includes the no-cache declaration in the cache-control metadata' do
+        subject.send(:upload_options)[:cache_control].should == 'no-cache, max-age=0'
+      end
+    end
+
     describe '#max_age' do
       it 'should be the universal value if one is set' do
         subject.send(:max_age).should == 300

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: s3_website
 version: !ruby/object:Gem::Version
-  version: 1.4.4
+  version: 1.4.5
 platform: ruby
 authors:
 - Lauri Lehmijoki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-03 00:00:00.000000000 Z
+date: 2013-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk