middleman-s3_sync 3.0.27 → 3.0.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 400e4e79bd39b1b9c3ec9c54683e82b6d95b359e
-  data.tar.gz: e4365c48e32c38f85300518d27c4eec50dad6195
+  metadata.gz: e216c35299295bd25bf9c095d627a57d3de6ef94
+  data.tar.gz: b12a21e124b649a52c068e3c37c1abd916745490
 SHA512:
-  metadata.gz: 2d4ccc0a530cf8e7a2aa0f32f246faca9d2043011dd58a7a031085f99f92b26f77fa7d7c5a8a0e5ada3bcaf55496ef405f80a63e6630089e816eb240541597da
-  data.tar.gz: 7925f8994ecee2ce274ec6a09c8596751f94dd61aa9b34ba7598277e408691c39bfb9e2b5dd2734487d64dea58373a97d39f0b445093be76b90bc7f7f072ed70
+  metadata.gz: 63df5416f4776612a216ccc61efa9f2350912dcf5e62effa86c09e60992917a8614be91371e0726883fc20460917391312eee4aa185616980f451ebddfe79030
+  data.tar.gz: d47cbba2841bdc2ceed9b0c97cdfb56d6dfdea413373e30be06401e19352e07917e6b054105098d253952377a0e39e34f951fb501b1bbd3c4d447c381ebb9b20

data/README.md

@@ -169,7 +169,7 @@ As a result, the following ```Cache-Control``` header would be set to ```max-age
 
 ### Setting a Default Policy
 
-You can set the default policy by passing an options hash to ```default_caching_policy``` in your ```config.rb``` file:
+You can set the default policy by passing an options hash to ```default_caching_policy``` in your ```config.rb``` file after the ```activate :s3_sync ... end``` block:
 
 ```ruby
 default_caching_policy max_age:(60 * 60 * 24 * 365)

data/lib/middleman/s3_sync/resource.rb

@@ -164,17 +164,17 @@ module Middleman
                         :ignored
                       end
                     elsif local? && remote?
-                      if local_object_md5 == remote_object_md5
+                      if options.force
+                        :updated
+                      elsif local_object_md5 == remote_object_md5
                         :identical
                       else
                         if !gzipped
                           # we're not gzipped, object hashes being different indicates updated content
                           :updated
-                        elsif local_content_md5 != remote_content_md5
+                        elsif !encoding_match? || 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 original bits did not
@@ -216,7 +216,7 @@ module Middleman
       end
 
       def encoding_match?
-        (gzipped && full_s3_resource.content_encoding == 'gzip') || (!gzipped && !full_s3_resource.content_encoding )
+        (options.prefer_gzip && gzipped && full_s3_resource.content_encoding == 'gzip') || (!options.prefer_gzip && !gzipped && !full_s3_resource.content_encoding )
       end
 
       def remote_content_md5

data/lib/middleman/s3_sync/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module S3Sync
-    VERSION = "3.0.27"
+    VERSION = "3.0.28"
   end
 end

data/lib/middleman/s3_sync.rb

@@ -133,8 +133,6 @@ module Middleman
       end
 
       def files_to_update
-        return resources.select { |r| r.local? && !r.to_ignore? } if s3_sync_options.force
-
         @files_to_update ||= resources.select { |r| r.to_update? }
       end
 

data/middleman-s3_sync.gemspec

@@ -29,7 +29,8 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'pry'
   gem.add_development_dependency 'pry-nav'
-  gem.add_development_dependency 'rspec'
+  gem.add_development_dependency 'rspec', '>= 3.0.0'
+  gem.add_development_dependency 'rspec-its'
   gem.add_development_dependency 'timerizer'
   gem.add_development_dependency 'travis'
   gem.add_development_dependency 'travis-lint'

data/spec/options_spec.rb

@@ -4,13 +4,13 @@ require 'middleman/s3_sync/options'
 describe Middleman::S3Sync::Options do
   subject(:options) { Middleman::S3Sync::Options.new }
 
-  its(:delete) { should be_true }
-  its(:after_build) { should be_false }
-  its(:prefer_gzip) { should be_true }
-  its(:aws_secret_access_key) { should == ENV['AWS_SECRET_ACCESS_KEY'] }
-  its(:aws_access_key_id) { should == ENV['AWS_ACCESS_KEY_ID'] }
-  its(:caching_policies) { should be_empty }
-  its(:default_caching_policy) { should be_nil }
+  its(:delete) { is_expected.to eq(true) }
+  its(:after_build) { is_expected.to eq(false)}
+  its(:prefer_gzip) { is_expected.to eq(true) }
+  its(:aws_secret_access_key) { is_expected.to eq(ENV['AWS_SECRET_ACCESS_KEY']) }
+  its(:aws_access_key_id) { is_expected.to eq(ENV['AWS_ACCESS_KEY_ID']) }
+  its(:caching_policies) { is_expected.to be_empty }
+  its(:default_caching_policy) { is_expected.to be_nil }
 
   context "browser caching policy" do
     let(:policy) { options.default_caching_policy }

data/spec/spec_helper.rb

@@ -7,6 +7,7 @@
 
 require 'middleman-s3_sync'
 require 'timerizer'
+require 'rspec/its'
 
 RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-s3_sync
 version: !ruby/object:Gem::Version
-  version: 3.0.27
+  version: 3.0.28
 platform: ruby
 authors:
 - Frederic Jean
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-28 00:00:00.000000000 Z
+date: 2014-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
@@ -153,6 +153,20 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='