Merge pull request #146 from alexdebril/issue/145

force_refresh can be set from app/config.yml

Controller/StreamController.php

@@ -19,12 +19,6 @@ class StreamController extends Controller
      */
     const DEFAULT_SOURCE = 'debril.provider.default';
 
-    /**
-     * parameter used to force refresh at every hit (skips 'If-Modified-Since' usage).
-     * set it to true for debug purpose.
-     */
-    const FORCE_PARAM_NAME = 'force_refresh';
-
     /**
      * @var \DateTime
      */
@@ -162,11 +156,7 @@ protected function getContent(array $options, $source)
      */
     protected function mustForceRefresh()
     {
-        if ($this->container->hasParameter(self::FORCE_PARAM_NAME)) {
-            return $this->container->getParameter(self::FORCE_PARAM_NAME);
-        }
-
-        return false;
+        return $this->container->getParameter('debril_rss_atom.force_refresh');
     }
 
     /**

DependencyInjection/Configuration.php

@@ -25,6 +25,10 @@ public function getConfigTreeBuilder()
                         ->info('Change cache headers so the RSS feed is not cached by public caches (like reverse-proxies...).')
                         ->defaultValue(false)
                     ->end()
+                    ->booleanNode('force_refresh')
+                    ->info('Do not send 304 status if the feed has not been modified since last hit')
+                    ->defaultValue(false)
+                    ->end()
                     ->arrayNode('date_formats')
                         ->prototype('scalar')->end()
                     ->end()

DependencyInjection/DebrilRssAtomExtension.php

@@ -46,6 +46,7 @@ public function load(array $configs, ContainerBuilder $container)
 
         $this->setDateFormats($container, $config);
         $container->setParameter('debril_rss_atom.private_feeds', $config['private']);
+        $container->setParameter('debril_rss_atom.force_refresh', $config['force_refresh']);
     }
 
     /**

README.md

@@ -242,29 +242,15 @@ You can follow either `services.xml` or `CompilerPass` but with services, you ha
 ### Skipping 304 HTTP Code
 
 
-The HTTP cache handling can be annoying during development process, you can skip it through configuration in your app/config/parameters.yml file :
+The HTTP cache handling can be annoying during development process, you can skip it through configuration in your app/config/config.yml file :
 
 ```yml
-parameters:
-    force_refresh:     true
+debril_rss_atom:
+    force_refresh: true
 ```
 
 This way, the `StreamController` will always display your feed's content and return a 200 HTTP code.
 
-### Choosing your own provider
-
-Need to keep the existing routes and add one mapped to a different FeedProvider ? add it own in your routing file :
-
-```xml
-    <route id="your_route_name" pattern="/your/route/{contentId}">
-        <default key="_controller">DebrilRssAtomBundle:Stream:index</default>
-        <default key="format">rss</default>
-        <default key="source">your.provider.service</default>
-    </route>
-```
-
-The `source` parameter must contain a valid service name defined in your application.
-
 ### Private feeds
 
 You may have private feeds, user-specific or behind some authentication.  
@@ -287,7 +273,21 @@ debril_rss_atom:
       - 'Y/M/d'
 ```
 
-### Fetching the repository
+### Choosing your own provider
+
+Need to keep the existing routes and add one mapped to a different FeedProvider ? add it own in your routing file :
+
+```xml
+    <route id="your_route_name" pattern="/your/route/{contentId}">
+        <default key="_controller">DebrilRssAtomBundle:Stream:index</default>
+        <default key="format">rss</default>
+        <default key="source">your.provider.service</default>
+    </route>
+```
+
+The `source` parameter must contain a valid service name defined in your application.
+
+## Fetching the repository
 
 Do this if you want to contribute (and you're welcome to do so):
 

Tests/Controller/StreamControllerTest.php

@@ -29,7 +29,7 @@ public function testIndex()
             new \DateTimeZone(date_default_timezone_get())
         );
 
-        $lastModified->add(new \DateInterval('PT1S'));
+        $lastModified->add(new \DateInterval('PT10S'));
         $this->assertInstanceOf('\DateTime', $lastModified);
         $this->assertGreaterThan(0, $response->getMaxAge());
         $this->assertGreaterThan(0, strlen($response->getContent()));