middleman-s3_sync 3.0.24 → 3.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b9b84a585a23ac844820e4d660bced854f25d01
-  data.tar.gz: 1a8472d86f42ba7de9818c611f557027fc80faef
+  metadata.gz: 53f0c96631ec71ebe886bd3ced01e219472f1f84
+  data.tar.gz: b21736f5dc8297323c381d7e1aec408840ded0d1
 SHA512:
-  metadata.gz: 7074b97dad9f286539473433f04b639e247a055de8b5daba4e23cf0efb65405d46d44ecdca6f286ee3d53e3c3f5405f013e6ecfada90ec7586c31893b41711be
-  data.tar.gz: dfa596b0827285c4101c0b4890adaa414f9b7aba311b9d64c2b08660a5d5851e62660389186b23915afb748120fd46dcee807a4f413d6730f34934cf348615f7
+  metadata.gz: d7af119cda3ba1ef4f4ad99575450c7d2c42760dd2625efd2cfd7d93ec1bfab79ca5e03ec1935e929bf065587ddeaef032dee108145d4eac1f2da4e7e6abd8d2
+  data.tar.gz: 3acc9be46d830b93d01c8b66c94ea30eb72eb09b519589458ccf5617e8bb9f44600328a74e2184828e070e52129b438154512d655fe0f34fd32ce52d9749250e

data/README.md

@@ -231,7 +231,7 @@ compressed version of the resource.
 I used Middleman Sync as a template for building a Middleman extension.
 The code is well structured and easy to understand and it was easy to
 extend it to add my synchronization code. My gratitude goes to @karlfreeman
-and is work on Middleman sync.
+and his work on Middleman sync.
 
 Many thanks to [Gnip](http://gnip.com) and [dojo4](http://dojo4.com) for
 supporting and sponsoring work on middleman-s3_sync.

data/lib/middleman/s3_sync/resource.rb

@@ -6,7 +6,7 @@ module Middleman
       CONTENT_MD5_KEY = 'x-amz-meta-content-md5'
 
       include Status
-      
+
       def s3_resource
         @full_s3_resource || @partial_s3_resource
       end
@@ -135,7 +135,7 @@ module Middleman
       def to_create?
         status == :new
       end
-      
+
       def alternate_encoding?
         status == :alternate_encoding
       end
@@ -170,12 +170,14 @@ module Middleman
                         if !gzipped
                           # we're not gzipped, object hashes being different indicates updated content
                           :updated
-                        elsif (local_content_md5 != remote_content_md5)
+                        elsif local_content_md5 != remote_content_md5
                           # we're gzipped, so we checked the content MD5, and it also changed
                           :updated
+                        elsif !encoding_match?
+                          :updated
                         else
                           # we're gzipped, the object hashes differ, but the content hashes are equal
-                          # this means the gzipped bits changed while the compressed bits did not
+                          # this means the gzipped bits changed while the original bits did not
                           # what's more, we spent a HEAD request to find out
                           :alternate_encoding
                         end
@@ -188,7 +190,7 @@ module Middleman
                       :deleted
                     end
       end
-      
+
       def local?
         File.exist?(local_path)
       end
@@ -208,11 +210,15 @@ module Middleman
       def relative_path
         @relative_path ||= local_path.gsub(/#{build_dir}/, '')
       end
-      
+
       def remote_object_md5
         s3_resource.etag
       end
-      
+
+      def encoding_match?
+        (gzipped && full_s3_resource.content_encoding == 'gzip') || (!gzipped && !full_s3_resource.content_encoding )
+      end
+
       def remote_content_md5
         full_s3_resource.metadata[CONTENT_MD5_KEY]
       end
@@ -220,7 +226,7 @@ module Middleman
       def local_object_md5
         @local_object_md5 ||= Digest::MD5.hexdigest(File.read(local_path))
       end
-      
+
       def local_content_md5
         @local_content_md5 ||= Digest::MD5.hexdigest(File.read(original_path))
       end

data/lib/middleman/s3_sync/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module S3Sync
-    VERSION = "3.0.24"
+    VERSION = "3.0.25"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-s3_sync
 version: !ruby/object:Gem::Version
-  version: 3.0.24
+  version: 3.0.25
 platform: ruby
 authors:
 - Frederic Jean
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-14 00:00:00.000000000 Z
+date: 2014-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core