Merge pull request #55 from RajeshHegde/feature/caching

Support caching headers, metadata, expiry
Vinelab · May 26, 2015 · 59414c6 · 59414c6
2 parents 51060f2 + 3ef3452
commit 59414c6
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 1 deletion.
diff --git a/src/Vinelab/Cdn/Providers/AwsS3Provider.php b/src/Vinelab/Cdn/Providers/AwsS3Provider.php
@@ -217,6 +217,10 @@ public function upload($assets)
                     'ACL'    => $this->acl,
                     // the permission of the file
 
+					'CacheControl' => $this->default['providers']['aws']['s3']['cache-control'],
+                    'MetaData' => $this->default['providers']['aws']['s3']['metadata'],
+                    "Expires" => $this->default['providers']['aws']['s3']['expires']
+
                 ]));
             } catch(S3Exception $e) {
                 $this->console->writeln("<fg=red>Error while uploading: ($file->getRealpath())</fg=red>");

diff --git a/src/config/cdn.php b/src/config/cdn.php
@@ -125,6 +125,30 @@
                     'version'   => '',
                 ],
 
+                /*
+                |--------------------------------------------------------------------------
+                | Add metadata to each s3 file
+                |--------------------------------------------------------------------------
+                |   Add metadata to each s3 file
+                */
+                'metadata' => [],
+
+                /*
+                |--------------------------------------------------------------------------
+                | Add expiry data to file
+                |--------------------------------------------------------------------------
+                |   Add expiry data to file
+                */
+                'expires' => gmdate("D, d M Y H:i:s T", strtotime("+5 years")),
+
+                /*
+                |--------------------------------------------------------------------------
+                | Add browser level cache
+                |--------------------------------------------------------------------------
+                |   Add browser level cache
+                */
+                'cache-control' => 'max-age=2628000',
+
             ],
 
         ],

diff --git a/tests/Vinelab/Cdn/CdnTest.php b/tests/Vinelab/Cdn/CdnTest.php
@@ -97,7 +97,12 @@ public function testPushCommand()
                             'use'     => false,
                             'cdn_url' => '',
                             'version' => '',
-                        ]
+                        ],
+						'metadata' => [],
+
+                        'expires' => gmdate("D, d M Y H:i:s T", strtotime("+5 years")),
+
+                        'cache-control' => 'max-age=2628000',
                     ],
                 ],
             ],

diff --git a/tests/Vinelab/Cdn/Providers/AwsS3ProviderTest.php b/tests/Vinelab/Cdn/Providers/AwsS3ProviderTest.php
@@ -87,6 +87,11 @@ public function testInitializingObject()
                             'cdn_url' => null,
                             'version' => null,
                         ],
+						'metadata' => [],
+
+                        'expires' => gmdate("D, d M Y H:i:s T", strtotime("+5 years")),
+
+                        'cache-control' => 'max-age=2628000',
                     ],
                 ],
             ],
@@ -119,6 +124,11 @@ public function testUploadingAssets()
                             'cdn_url' => null,
                             'version' => null,
                         ],
+						'metadata' => [],
+
+                        'expires' => gmdate("D, d M Y H:i:s T", strtotime("+5 years")),
+
+                        'cache-control' => 'max-age=2628000',
                     ],
                 ],
             ],
@@ -153,6 +163,11 @@ public function testUrlGenerator()
                             'cdn_url' => null,
                             'version' => null,
                         ],
+						'metadata' => [],
+
+                        'expires' => gmdate("D, d M Y H:i:s T", strtotime("+5 years")),
+
+                        'cache-control' => 'max-age=2628000',
                     ],
                 ],
             ],
@@ -187,6 +202,11 @@ public function testEmptyUrlGenerator()
                             'cdn_url' => null,
                             'version' => null,
                         ],
+						'metadata' => [],
+
+                        'expires' => gmdate("D, d M Y H:i:s T", strtotime("+5 years")),
+
+                        'cache-control' => 'max-age=2628000',
                     ],
                 ],
             ],