middleman-s3_sync 3.0.35 → 3.0.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 848d685a2b477752bdc883d970aa2c789d91e25c
-  data.tar.gz: 3acb75102dbb81bd100e36e1aa17ffbbe581a402
+  metadata.gz: 0a3d596b258f8ad284fe69c1ec98d9a81d012095
+  data.tar.gz: 19f15e444a731602a38c004ca41216f3296de52c
 SHA512:
-  metadata.gz: d7dc75dc122a0844707a03d59ec4c94ba52a233c9cc35ccab24ef4fa91b0802a9b787823c3a1ce7300b2348b0ae52008a628ee7c7d739922c421ac4dacab3e89
-  data.tar.gz: 181cc8ca6f555c242f9ce665c3dfc619f66f7175d56fe86aa4c868a0aac56a34bdb9f5acd275296249d1eb9c6fd5b480a4a045befa1b05ab0193fc0b079f023a
+  metadata.gz: ab5b04bc4666c9c14bcfe9d24e51690ab542b78ad3e1e8f9453773f2f76ada44bcf622cc23dee4f1f760b100cff6b51a3b4e74b35584cd8302f71be7eeb1a60f
+  data.tar.gz: 690186a84248f7fe826708a8bd64be308e5a8581b0cdc5a0f8a7f0742b32d3a7dcb66f1e7b8a86f39c9f33c0b4d3b433b06afd27da101867a5c0533dc52335c4

data/README.md

@@ -273,7 +273,8 @@ You can set the ```prefer_gzip``` option to look for a gzipped version
 of a resource. The gzipped version of the resource will be pushed to S3
 instead of the original and the ```Content-Encoding``` and ```Content-Type```
 headers will be set correctly. This will cause Amazon to serve the
-compressed version of the resource.
+compressed version of the resource. In order for this to work, you need to
+have the `:gzip` extension activated in your `config.rb`.
 
 ## A Debt of Gratitude
 

data/lib/middleman/s3_sync/resource.rb

@@ -56,7 +56,7 @@ module Middleman
       alias :attributes :to_h
 
       def update!
-        body { |body|
+        local_content { |body|
           say_status "Updating".blue + " #{remote_path}#{ gzipped ? ' (gzipped)'.white : ''}"
           if options.verbose
             say_status "Original:    #{original_path.white}"
@@ -64,28 +64,9 @@ module Middleman
             say_status "remote md5:  #{remote_object_md5.white} / #{remote_content_md5}"
             say_status "content md5: #{local_object_md5.white} / #{local_content_md5}"
           end
-          s3_resource.body = body
-
-          s3_resource.acl = options.acl
-          s3_resource.content_type = content_type
-          s3_resource.metadata = { CONTENT_MD5_KEY => local_content_md5 }
-
-          if caching_policy
-            s3_resource.cache_control = caching_policy.cache_control
-            s3_resource.expires = caching_policy.expires
-          end
-
-          if options.prefer_gzip && gzipped
-            s3_resource.content_encoding = "gzip"
-          end
-
-          if options.reduced_redundancy_storage
-            s3_resource.storage_class = 'REDUCED_REDUNDANCY'
-          end
 
-          if options.encryption
-            s3_resource.encryption = 'AES256'
-          end
+          s3_resource.merge_attributes(to_h)
+          s3_resource.body = body
 
           s3_resource.save
         }
@@ -112,8 +93,8 @@ module Middleman
           say_status "Local Path:  #{local_path.white}"
           say_status "content md5: #{local_content_md5.white}"
         end
-        body { |body|
-          bucket.files.create(to_h.merge(:body => body))
+        local_content { |body|
+          bucket.files.create(to_h.merge(body: body))
         }
       end
 
@@ -152,7 +133,7 @@ module Middleman
         status == :ignored || status == :alternate_encoding
       end
 
-      def body(&block)
+      def local_content(&block)
         File.open(local_path, &block)
       end
 

data/lib/middleman/s3_sync/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module S3Sync
-    VERSION = "3.0.35"
+    VERSION = "3.0.37"
   end
 end

data/middleman-s3_sync.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |gem|
 
   gem.add_runtime_dependency 'middleman-core', '>= 3.0.0'
   gem.add_runtime_dependency 'unf'
-  gem.add_runtime_dependency 'fog', '>= 1.10.1'
+  gem.add_runtime_dependency 'fog', '>= 1.25.0'
   gem.add_runtime_dependency 'map'
   gem.add_runtime_dependency 'pmap'
   gem.add_runtime_dependency 'ruby-progressbar'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-s3_sync
 version: !ruby/object:Gem::Version
-  version: 3.0.35
+  version: 3.0.37
 platform: ruby
 authors:
 - Frederic Jean
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-08 00:00:00.000000000 Z
+date: 2014-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
@@ -45,14 +45,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.10.1
+        version: 1.25.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.10.1
+        version: 1.25.0
 - !ruby/object:Gem::Dependency
   name: map
   requirement: !ruby/object:Gem::Requirement