middleman-s3_sync 3.3.5 → 3.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b5f5838b4a56e989bd9417e8c4397ce72b90bcc
-  data.tar.gz: 0961a7992383b6cb33a20a8f22bdfdcd042a927b
+  metadata.gz: 3b9f5ece891e9dbddd91b614c8d49ef1e734e39e
+  data.tar.gz: 2441ef3bf923065c7b13c8b3f44117301d05f559
 SHA512:
-  metadata.gz: caf6c9d2d2e9959f9f2904fe6873c213f381ae76bc84c71e98af239a642b0452f8374de2a4d0174d5934fecd998cb8d5adc8df0e6d996560aad6dd0e16ee1a8d
-  data.tar.gz: 8dd4605c11e79ea8f8451c65e5b678cc7d17e0f130b5800e5463dfe930bf286ce92c656b875d09e83621a809f2ada526ee29227bfaa3f2d7ed712fe67715df0c
+  metadata.gz: 31f4b4ee2d16237c81f82979862f77fe10182e61b56393fc6d9a73fdeee6be5791ba73ff2a2259e71aec4963dd015aacc7d270fdc16ad0688c8e3ccb55af81f1
+  data.tar.gz: 0ecc8e6b6bb67412c680928b9264da7323b80a4719c6f5bbb2ea318c9228a035dd0708f104f0f8d2501abe9367f2b9487183d53d6345f1061478210407543397

data/README.md

@@ -47,8 +47,8 @@ activate :s3_sync do |s3_sync|
   s3_sync.encryption                 = false
   s3_sync.prefix                     = ''
   s3_sync.version_bucket             = false
+  s3_sync.index_document             = 'index.html'
   s3_sync.error_document             = '404.html'
-  s3_sync.index_suffix               = 'index.html'
 end
 ```
 
@@ -71,7 +71,6 @@ The following defaults apply to the configuration items:
 | encryption                 | ```false```                        |
 | acl                        | ```'public-read'```                |
 | version_bucket             | ```false```                        |
-| index_suffix               | ```index.html```                   |
 
 You do not need to specify the settings that match the defaults. This
 simplify the configuration of the extension:
@@ -306,11 +305,11 @@ headers will be set correctly. This will cause Amazon to serve the
 compressed version of the resource. In order for this to work, you need to
 have the `:gzip` extension activated in your `config.rb`.
 
-#### Custom index suffix and error document
+#### Custom S3 Index and Error Documents
 
-You can enable a custom [index suffix](http://docs.aws.amazon.com/AmazonS3/latest/dev/IndexDocumentSupport.html)
+You can enable a custom [index document](http://docs.aws.amazon.com/AmazonS3/latest/dev/IndexDocumentSupport.html)
 and [error document](http://docs.aws.amazon.com/AmazonS3/latest/dev/CustomErrorDocSupport.html)
-settings. The ```index_suffix``` option tells which file name gets used as
+settings. The ```index_document``` option tells which file name gets used as
 the index document of a directory (typically, ```index.html```), while
 ```error_document``` specifies the document to display for 4xx errors (ie,
 the 404 page).

data/lib/middleman-s3_sync/extension.rb

@@ -23,8 +23,8 @@ module Middleman
     option :version_bucket, false, 'Whether to enable versionning on the S3 bucket content'
     option :verbose, false, 'Whether to provide more verbose output'
     option :dry_run, false, 'Whether to perform a dry-run'
-    option :index_suffix, nil, 'Path of S3 directory index document'
-    option :error_document, nil, 'Path of S3 custom error document'
+    option :index_document, nil, 'S3 custom index document path'
+    option :error_document, nil, 'S3 custom error document path'
 
     def initialize(app, options_hash = {}, &block)
       super

data/lib/middleman/s3_sync.rb

@@ -82,10 +82,14 @@ module Middleman
 
       def update_bucket_website
         opts = {}
-        opts[:ErrorDocument] = s3_sync_options.error_document unless s3_sync_options.error_document.nil?
-        opts[:IndexDocument] = s3_sync_options.index_suffix unless s3_sync_options.index_suffix.nil?
+        opts[:IndexDocument] = s3_sync_options.index_document if s3_sync_options.index_document
+        opts[:ErrorDocument] = s3_sync_options.error_document if s3_sync_options.error_document
+
+        if opts[:ErrorDocument] && !opts[:IndexDocument]
+          raise 'S3 requires `index_document` if `error_document` is specified'
+        end
+
         unless opts.empty?
-          opts[:IndexDocument] ||= 'index.html' # IndexDocument is mandatory in put_bucket_website
           say_status "Putting bucket website: #{opts.to_json}"
           connection.put_bucket_website(s3_sync_options.bucket, opts)
         end

data/lib/middleman/s3_sync/options.rb

@@ -22,7 +22,7 @@ module Middleman
         :dry_run,
         :verbose,
         :content_types,
-        :index_suffix,
+        :index_document,
         :error_document
       ]
       attr_accessor *OPTIONS

data/lib/middleman/s3_sync/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module S3Sync
-    VERSION = "3.3.5"
+    VERSION = "3.3.6"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-s3_sync
 version: !ruby/object:Gem::Version
-  version: 3.3.5
+  version: 3.3.6
 platform: ruby
 authors:
 - Frederic Jean
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-29 00:00:00.000000000 Z
+date: 2015-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core