add support for Amazon S3

dramentol · Mar 27, 2011 · 52a74a5 · 52a74a5
1 parent ff6f7f5
commit 52a74a5
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 2 deletions.
diff --git a/DependencyInjection/SonataMediaExtension.php b/DependencyInjection/SonataMediaExtension.php
@@ -138,6 +138,21 @@ public function configureFilesystemAdapter(ContainerBuilder $container, $config)
             $definition->addArgument($configuration['passive']);
             $definition->addArgument($configuration['create']);
         }
+
+        // add the default configuration for the S3 filesystem
+        if($container->hasDefinition('sonata.media.adapter.filesystem.s3') && isset($config['filesystem']['sonata.media.adapter.filesystem.s3'])) {
+            $configuration =  $config['filesystem']['sonata.media.adapter.filesystem.s3'];
+
+            $definition = $container->getDefinition('sonata.media.adapter.filesystem.s3');
+            $definition->setArgument(0, new Reference('sonata.media.adapter.service.s3'));
+            $definition->setArgument(1, $configuration['bucket']);
+            $definition->setArgument(2, $configuration['create']);
+
+            $definition = $container->getDefinition('sonata.media.adapter.service.s3');
+            $definition->setArgument(0, $configuration['accessKey']);
+            $definition->setArgument(1, $configuration['secretKey']);
+            $definition->setArgument(2, $configuration['region']);
+        }
     }
 
     /**

diff --git a/README.md b/README.md
@@ -36,7 +36,7 @@ Available services
 
     - sonata.media.filesystem.local       : The local filesystem (default)
     - sonata.media.filesystem.ftp         : FTP
-
+    - sonata.media.filesystem.s3          : Amazon S3
 
  CDN
 

diff --git a/Resources/config/media.xml b/Resources/config/media.xml
@@ -21,7 +21,18 @@
 
         <!-- filesystem abstraction service -->
         <service id="sonata.media.adapter.filesystem.local" class="Gaufrette\Filesystem\Adapter\Local" />
-        <service id="sonata.media.adapter.filesystem.ftp" class="Gaufrette\Filesystem\Adapter\Ftp" />
+        <service id="sonata.media.adapter.filesystem.ftp"   class="Gaufrette\Filesystem\Adapter\Ftp" />
+        <service id="sonata.media.adapter.service.s3"       class="Zend\Service\Amazon\S3\S3" >
+            <argument />
+            <argument />
+            <argument />
+        </service>
+        <service id="sonata.media.adapter.filesystem.s3"    class="Gaufrette\Filesystem\Adapter\AmazonS3" >
+            <argument />
+            <argument />
+            <argument />
+        </service>
+
 
         <service id="sonata.media.filesystem.ftp" class="Gaufrette\Filesystem\Filesystem" >
             <argument type="service" id="sonata.media.adapter.filesystem.ftp" />
@@ -31,6 +42,10 @@
             <argument type="service" id="sonata.media.adapter.filesystem.local" />
         </service>
 
+        <service id="sonata.media.filesystem.s3" class="Gaufrette\Filesystem\Filesystem">
+            <argument type="service" id="sonata.media.adapter.filesystem.s3" />
+        </service>
+
         <!-- CDN abstraction service -->
         <service id="sonata.media.cdn.server" class="Sonata\MediaBundle\CDN\Server">
             <argument />

diff --git a/Resources/doc/index.rst b/Resources/doc/index.rst
@@ -35,6 +35,7 @@ Available services
 
     - sonata.media.filesystem.local       : The local filesystem (default)
     - sonata.media.filesystem.ftp         : FTP
+    - sonata.media.filesystem.s3          : Amazon S3
 
  CDN
 

diff --git a/Resources/doc/reference/advanced_configuration.rst b/Resources/doc/reference/advanced_configuration.rst
@@ -64,6 +64,13 @@ Full configuration option
                 passive:  false
                 create:   false
 
+            sonata.media.adapter.filesystem.s3:
+                bucket:     
+                accessKey:
+                secretKey:
+                create:     false
+                region:     # this settings does not seems to be implemented with Zend Framework
+                
         providers:
             sonata.media.provider.file:
                 resizer:    false
-Original file line number
+Diff line change
@@ Expand Up / @@ -36,7 +36,7 @@ Available services @@
         - sonata.media.filesystem.local       : The local filesystem (default)
         - sonata.media.filesystem.ftp         : FTP
+        - sonata.media.filesystem.s3          : Amazon S3
      CDN
@@ Expand Down @@