Merge pull request #98 from netgen/Add-upload-prefix-param-in-config

Enable changing cloudinary upload prefix in configuration

Author: RandyCupic

bundle/DependencyInjection/Configuration.php

@@ -50,6 +50,9 @@ protected function addProviderSection(ArrayNodeDefinition $rootNode)
                     ->isRequired()
                     ->defaultNull()
                 ->end()
+                ->scalarNode('upload_prefix')
+                    ->defaultValue('https://api.cloudinary.com')
+                ->end()
                 ->booleanNode('remove_unused')
                     ->defaultValue(false)
                 ->end()

bundle/DependencyInjection/NetgenRemoteMediaExtension.php

@@ -47,6 +47,10 @@ public function load(array $configs, ContainerBuilder $container)
             sprintf('netgen_remote_media.parameters.%s.account_secret', $config['provider']),
             $config['account_secret']
         );
+        $container->setParameter(
+            sprintf('netgen_remote_media.parameters.%s.upload_prefix', $config['provider']),
+            $config['upload_prefix']
+        );
 
         $container->setParameter('netgen_remote_media.remove_unused_resources', $config['remove_unused']);
         $container->setAlias('netgen_remote_media.provider', 'netgen_remote_media.provider.' . $config['provider']);

bundle/RemoteMedia/Provider/Cloudinary/Gateway/CloudinaryApiGateway.php

@@ -61,15 +61,17 @@ class CloudinaryApiGateway extends Gateway
      * @param $apiKey
      * @param $apiSecret
      * @param bool $useSubdomains
+     * @param mixed $uploadPrefix
      */
-    public function initCloudinary($cloudName, $apiKey, $apiSecret, $useSubdomains = false)
+    public function initCloudinary($cloudName, $apiKey, $apiSecret, $uploadPrefix, $useSubdomains = false)
     {
         $this->cloudinary = new Cloudinary();
         $this->cloudinary->config(
             [
                 'cloud_name' => $cloudName,
                 'api_key' => $apiKey,
                 'api_secret' => $apiSecret,
+                'upload_prefix' => $uploadPrefix,
                 'cdn_subdomain' => $useSubdomains,
             ]
         );

bundle/Resources/config/services.yml

@@ -20,7 +20,7 @@ services:
     netgen_remote_media.provider.cloudinary.gateway:
         class: Netgen\Bundle\RemoteMediaBundle\RemoteMedia\Provider\Cloudinary\Gateway\CloudinaryApiGateway
         calls:
-            - [initCloudinary, ['%netgen_remote_media.parameters.cloudinary.account_name%', '%netgen_remote_media.parameters.cloudinary.account_key%', "%netgen_remote_media.parameters.cloudinary.account_secret%", "%netgen_remote_media.parameters.use_subdomains%"]]
+            - [initCloudinary, ['%netgen_remote_media.parameters.cloudinary.account_name%', '%netgen_remote_media.parameters.cloudinary.account_key%', "%netgen_remote_media.parameters.cloudinary.account_secret%", "%netgen_remote_media.parameters.cloudinary.upload_prefix%", "%netgen_remote_media.parameters.use_subdomains%"]]
             - [setInternalLimit, ["%netgen_remote_media.cloudinary.internal_limit%"]]
 
     netgen_remote_media.provider.cloudinary:

docs/INSTALL.md

@@ -83,6 +83,16 @@ php app/console doctrine:schema:update --force
 
 This bundle has a few parameters that can be overridden through YAML configuration in your own site, if needed.
 
+
+#### Upoad prefix
+
+If you need to change Cloudinary API url (to use eg. GEO specific URLs), there's a parameter `upload_prefix` (set to `https://api.cloudinary.com` by default):
+
+```yaml
+netgen_remote_media:
+    upload_prefix: 'https://api.cloudinary.com'
+```
+
 #### Audio waveform image
 
 If you set the following parameter `netgen_remote_media.default.parameters.audio.enable_waveform` to `true` (default: `false`), audio files will be rendered with `<video>` tag instead and their waveform image will be shown instead of video.