middleman-s3_sync 3.3.6 → 3.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b9f5ece891e9dbddd91b614c8d49ef1e734e39e
-  data.tar.gz: 2441ef3bf923065c7b13c8b3f44117301d05f559
+  metadata.gz: d14f4fb3014e030baf26085c24f89a852c15f264
+  data.tar.gz: b8c70ecb06640c69606de373237584b51951d9dd
 SHA512:
-  metadata.gz: 31f4b4ee2d16237c81f82979862f77fe10182e61b56393fc6d9a73fdeee6be5791ba73ff2a2259e71aec4963dd015aacc7d270fdc16ad0688c8e3ccb55af81f1
-  data.tar.gz: 0ecc8e6b6bb67412c680928b9264da7323b80a4719c6f5bbb2ea318c9228a035dd0708f104f0f8d2501abe9367f2b9487183d53d6345f1061478210407543397
+  metadata.gz: c203dd97741209ceedf3de39354f2bcb8c1d4e00b65bc09f4db4aba26479a027a4e67e0e8c69ea4b08523011ea3ba4ee8319c59a77362bea836b81682004b2c4
+  data.tar.gz: 984fba641f37c53cf8c5da14e0b5a1fa2e0044cdb7fb5da997b010772bb58fc3f3a2061ef76afee11597d7d2117a7884593af271acd399907863dd7e36447398

data/lib/middleman/s3_sync/caching_policy.rb

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

data/lib/middleman/s3_sync/version.rb

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

data/spec/caching_policy_spec.rb

@@ -2,79 +2,97 @@ require 'spec_helper'
 require 'middleman/s3_sync/caching_policy'
 
 describe Middleman::S3Sync::BrowserCachePolicy do
-  let(:options) { Hash.new }
-  subject(:policy) { Middleman::S3Sync::BrowserCachePolicy.new(options) }
-
-  it "should be blank" do
-    policy.should_not be_nil
-
-    policy.to_s.should_not =~ /max-age=/
-    policy.to_s.should_not =~ /s-maxage=/
-    policy.to_s.should_not =~ /public/
-    policy.to_s.should_not =~ /private/
-    policy.to_s.should_not =~ /no-cache/
-    policy.to_s.should_not =~ /no-store/
-    policy.to_s.should_not =~ /must-revalidate/
-    policy.to_s.should_not =~ /proxy-revalidate/
-    policy.expires.should be_nil
-  end
+  context "building the policy" do
+    let(:options) { Hash.new }
+    subject(:policy) { Middleman::S3Sync::BrowserCachePolicy.new(options) }
+
+    it "should be blank" do
+      policy.should_not be_nil
+
+      policy.to_s.should_not =~ /max-age=/
+      policy.to_s.should_not =~ /s-maxage=/
+      policy.to_s.should_not =~ /public/
+      policy.to_s.should_not =~ /private/
+      policy.to_s.should_not =~ /no-cache/
+      policy.to_s.should_not =~ /no-store/
+      policy.to_s.should_not =~ /must-revalidate/
+      policy.to_s.should_not =~ /proxy-revalidate/
+      policy.expires.should be_nil
+    end
 
-  context "setting max-age" do
-    let(:options) { { max_age: 300 } }
+    context "setting max-age" do
+      let(:options) { { max_age: 300 } }
 
-    its(:to_s) { should =~ /max-age=300/ }
-  end
+      its(:to_s) { should =~ /max-age=300/ }
+    end
 
-  context "setting s-maxage" do
-    let(:options) { { s_maxage: 300 } }
+    context "setting s-maxage" do
+      let(:options) { { s_maxage: 300 } }
 
-    its(:to_s) { should =~ /s-maxage=300/ }
-  end
+      its(:to_s) { should =~ /s-maxage=300/ }
+    end
 
-  context "set public flag" do
-    let(:options) { { public: true } }
-    its(:to_s) { should =~ /public/ }
-  end
+    context "set public flag" do
+      let(:options) { { public: true } }
+      its(:to_s) { should =~ /public/ }
+    end
 
-  context "it should set the private flag if it is set to true" do
-    let(:options) { { private: true } }
-    its(:to_s) { should =~ /private/ }
-  end
+    context "it should set the private flag if it is set to true" do
+      let(:options) { { private: true } }
+      its(:to_s) { should =~ /private/ }
+    end
 
-  context "it should set the no-cache flag when set property" do
-    let(:options) { { no_cache: true }}
-    its(:to_s) { should =~ /no-cache/ }
-  end
+    context "it should set the no-cache flag when set property" do
+      let(:options) { { no_cache: true }}
+      its(:to_s) { should =~ /no-cache/ }
+    end
 
-  context "setting the no-store flag" do
-    let(:options) { { no_store: true } }
-    its(:to_s) { should =~ /no-store/ }
-  end
+    context "setting the no-store flag" do
+      let(:options) { { no_store: true } }
+      its(:to_s) { should =~ /no-store/ }
+    end
 
-  context "setting the must-revalidate policy" do
-    let(:options) { { must_revalidate: true } }
-    its(:to_s) { should =~ /must-revalidate/ }
-  end
+    context "setting the must-revalidate policy" do
+      let(:options) { { must_revalidate: true } }
+      its(:to_s) { should =~ /must-revalidate/ }
+    end
 
-  context "setting the proxy-revalidate policy" do
-    let(:options) { { proxy_revalidate: true } }
-    its(:to_s) { should =~ /proxy-revalidate/ }
-  end
+    context "setting the proxy-revalidate policy" do
+      let(:options) { { proxy_revalidate: true } }
+      its(:to_s) { should =~ /proxy-revalidate/ }
+    end
+
+    context "divide caching policiies with a comma and a space" do
+      let(:options) { { :max_age => 300, :public => true } }
 
-  context "divide caching policiies with a comma and a space" do
-    let(:options) { { :max_age => 300, :public => true } }
+      it "splits policies eith commans and spaces" do
+        policies = policy.to_s.split(/, /)
+        policies.length.should == 2
+        policies.first.should == 'max-age=300'
+        policies.last.should == 'public'
+      end
+    end
+
+    context "set the expiration date" do
+      let(:options) { { expires: 1.years.from_now } }
 
-    it "splits policies eith commans and spaces" do
-      policies = policy.to_s.split(/, /)
-      policies.length.should == 2
-      policies.first.should == 'max-age=300'
-      policies.last.should == 'public'
+      its(:expires) { should == CGI.rfc1123_date(1.year.from_now )}
     end
   end
+end
+
+describe "Storing and retrieving policies" do
+  class CachingPolicy
+    include Middleman::S3Sync::CachingPolicy
+  end
+
+  let(:caching_policy) { CachingPolicy.new }
+  let(:policy) { caching_policy.caching_policy_for("text/html; charset=utf-8") }
 
-  context "set the expiration date" do
-    let(:options) { { expires: 1.years.from_now } }
+  it "finds the policies by the mime-type excluding the parameters" do
+    caching_policy.add_caching_policy("text/html", max_age: 300)
 
-    its(:expires) { should == CGI.rfc1123_date(1.year.from_now )}
+    expect(policy).to_not be_nil
+    expect(policy.policies.max_age).to eq(300)
   end
 end

metadata

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