middleman-s3_sync 3.3.7 → 3.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d14f4fb3014e030baf26085c24f89a852c15f264
-  data.tar.gz: b8c70ecb06640c69606de373237584b51951d9dd
+  metadata.gz: 7d6f64bd4cc8bd531a509a39d8016cf6547cb688
+  data.tar.gz: b39d69cf55120f47993514293c8a8d003a9e2530
 SHA512:
-  metadata.gz: c203dd97741209ceedf3de39354f2bcb8c1d4e00b65bc09f4db4aba26479a027a4e67e0e8c69ea4b08523011ea3ba4ee8319c59a77362bea836b81682004b2c4
-  data.tar.gz: 984fba641f37c53cf8c5da14e0b5a1fa2e0044cdb7fb5da997b010772bb58fc3f3a2061ef76afee11597d7d2117a7884593af271acd399907863dd7e36447398
+  metadata.gz: febf95daf6aae730a306717f84b39da170ee0a3156ed4c756a93877df21fc864e71c1222b1e6ddfaca55688a2d847d1f5673812b744e14692a3be0e78135e481
+  data.tar.gz: 8285acbdcf71288e8cdd3f6996f9fb552e80303f132b21af752644ffc52f32febf3de8928c31f29ece87168d6b2cf6c6f359af198978a6bc07d8ab36870dc8ae

data/lib/middleman/s3_sync/caching_policy.rb

@@ -8,6 +8,7 @@ module Middleman
       end
 
       def caching_policy_for(content_type)
+        return default_caching_policy if content_type.nil? || content_type.empty?
         caching_policies.fetch(content_type.to_s.split(';').first.strip, caching_policies[:default])
       end
 

data/lib/middleman/s3_sync/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module S3Sync
-    VERSION = "3.3.7"
+    VERSION = "3.3.8"
   end
 end

data/spec/caching_policy_spec.rb

@@ -96,3 +96,25 @@ describe "Storing and retrieving policies" do
     expect(policy.policies.max_age).to eq(300)
   end
 end
+
+describe "Handling situations where the content type is nil" do
+  class CachingPolicy
+    include Middleman::S3Sync::CachingPolicy
+  end
+
+  let(:caching_policy) { CachingPolicy.new }
+
+  it "returns the default caching policy when the content type is nil" do
+    caching_policy.add_caching_policy(:default, max_age:(60 * 60 * 24 * 365))
+
+    expect(caching_policy.caching_policy_for(nil)).to_not be_nil
+    expect(caching_policy.caching_policy_for(nil).policies[:max_age]).to eq(60 * 60 * 24 * 365)
+  end
+
+  it "returns the default caching policy when the content type is blank" do
+    caching_policy.add_caching_policy(:default, max_age:(60 * 60 * 24 * 365))
+
+    expect(caching_policy.caching_policy_for("")).to_not be_nil
+    expect(caching_policy.caching_policy_for("").policies[:max_age]).to eq(60 * 60 * 24 * 365)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-s3_sync
 version: !ruby/object:Gem::Version
-  version: 3.3.7
+  version: 3.3.8
 platform: ruby
 authors:
 - Frederic Jean
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-04 00:00:00.000000000 Z
+date: 2016-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core