Merge pull request #1 from jolicode/simplify-config

simplify configuration
jolicode · Feb 25, 2016 · f0d75ca · f0d75ca
2 parents 1342ef8 + 782364f
commit f0d75ca
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 32 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -14,8 +14,9 @@ env:
         - deps=high
 
 before_script:
-    - \[ -f $HOME/build/jolicode/ApacheTikaBundle/Tests/bin/tika-app.jar \] || wget -O $HOME/build/jolicode/ApacheTikaBundle/Tests/bin/tika-app.jar http://apache.mirrors.ovh.net/ftp.apache.org/dist/tika/tika-app-1.11.jar
-    - \[ -f $HOME/build/jolicode/ApacheTikaBundle/Tests/bin/tika-server.jar \] || wget -O $HOME/build/jolicode/ApacheTikaBundle/Tests/bin/tika-server.jar -nc http://apache.mirrors.ovh.net/ftp.apache.org/dist/tika/tika-server-1.11.jar
+    - if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then phpenv config-rm xdebug.ini; fi
+    - \[ -f $HOME/build/jolicode/ApacheTikaBundle/Tests/bin/tika-app.jar \] || wget -O $HOME/build/jolicode/ApacheTikaBundle/Tests/bin/tika-app.jar http://archive.apache.org/dist/tika/tika-app-1.11.jar
+    - \[ -f $HOME/build/jolicode/ApacheTikaBundle/Tests/bin/tika-server.jar \] || wget -O $HOME/build/jolicode/ApacheTikaBundle/Tests/bin/tika-server.jar -nc http://archive.apache.org/dist/tika/tika-server-1.11.jar
     - java -jar $HOME/build/jolicode/ApacheTikaBundle/Tests/bin/tika-server.jar &
     - sleep 5
 

diff --git a/DependencyInjection/ApacheTikaExtension.php b/DependencyInjection/ApacheTikaExtension.php
@@ -25,21 +25,21 @@ public function load(array $configs, ContainerBuilder $container)
         $configuration = new Configuration();
         $config = $this->processConfiguration($configuration, $configs);
 
-        $container->setParameter('apache_tika.config.tika_path', isset($config['config']['tika_path']) ? $config['config']['tika_path'] : null);
-        $container->setParameter('apache_tika.config.tika_host', isset($config['config']['tika_host']) ? $config['config']['tika_host'] : null);
-        $container->setParameter('apache_tika.config.tika_port', isset($config['config']['tika_port']) ? $config['config']['tika_port'] : null);
+        $container->setParameter('apache_tika.tika_path', isset($config['tika_path']) ? $config['tika_path'] : null);
+        $container->setParameter('apache_tika.tika_host', isset($config['tika_host']) ? $config['tika_host'] : null);
+        $container->setParameter('apache_tika.tika_port', isset($config['tika_port']) ? $config['tika_port'] : null);
 
-        if ($container->getParameter('apache_tika.config.tika_path')) {
+        if ($container->getParameter('apache_tika.tika_path')) {
             $client = new Definition('Vaites\ApacheTika\Clients\CLIClient');
-            $client->setArguments(array(
-                'apache_tika.config.tika_path' => isset($config['config']['tika_path']) ? $config['config']['tika_path'] : null,
-            ));
+            $client->setArguments([
+                'apache_tika.tika_path' => $container->getParameter('apache_tika.tika_path') ?: null,
+            ]);
         } else {
             $client = new Definition('Vaites\ApacheTika\Clients\WebClient');
-            $client->setArguments(array(
-                'apache_tika.config.tika_host' => isset($config['config']['tika_host']) ? $config['config']['tika_host'] : '127.0.0.1',
-                'apache_tika.config.tika_port' => isset($config['config']['tika_port']) ? $config['config']['tika_port'] : '9998',
-            ));
+            $client->setArguments([
+                'apache_tika.tika_host' => $container->getParameter('apache_tika.tika_host') ?: '127.0.0.1',
+                'apache_tika.tika_port' => $container->getParameter('apache_tika.tika_port') ?: '9998',
+            ]);
         }
 
         $container->setDefinition('apache_tika.client', $client);

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -28,13 +28,9 @@ public function getConfigTreeBuilder()
 
         $rootNode
             ->children()
-                ->arrayNode('config')
-                    ->children()
-                        ->scalarNode('tika_path')->end()
-                        ->scalarNode('tika_host')->end()
-                        ->scalarNode('tika_port')->end()
-                    ->end()
-                ->end() // tika_config
+                ->scalarNode('tika_path')->end()
+                ->scalarNode('tika_host')->end()
+                ->scalarNode('tika_port')->end()
             ->end()
         ;
 

diff --git a/README.md b/README.md
@@ -49,14 +49,23 @@ class AppKernel extends Kernel
 
 Step 3: Configuration
 -------------------------
+For tika-server :
 
 Add configuration in the `app/config/config.yml` file:
 
 ```yaml
 apache_tika:
-    config:
-        tika_host: 127.0.0.1
-        tika_port: 9998
+    tika_host: 127.0.0.1
+    tika_port: 9998
+```
+
+For tika-app :
+
+Add configuration in the `app/config/config.yml` file:
+
+```yaml
+apache_tika:
+    tika_path: path/to/tika.jar
 ```
 
 Step 4: Instantiate a client

diff --git a/Resources/config/services.yml b/Resources/config/services.yml
@@ -1,6 +1,5 @@
 parameters:
     apache_tika:
-        config:
-            tika_path: %apache_tika.config.tika_path%
-            tika_host: %apache_tika.config.tika_host%
-            tika_port: %apache_tika.config.tika_port%
+        tika_path: %apache_tika.tika_path%
+        tika_host: %apache_tika.tika_host%
+        tika_port: %apache_tika.tika_port%
diff --git a/Tests/app/config/apache_tika_cli.yml b/Tests/app/config/apache_tika_cli.yml
@@ -1,3 +1,2 @@
 apache_tika:
-    config:
-        tika_path: Tests/bin/tika-app.jar
+    tika_path: Tests/bin/tika-app.jar
diff --git a/Tests/app/config/apache_tika_web.yml b/Tests/app/config/apache_tika_web.yml
@@ -1,4 +1,3 @@
 apache_tika:
-    config:
-        tika_host: localhost
-        tika_port: 9998
+    tika_host: 127.0.0.1
+    tika_port: 9998