Skip to content
This repository has been archived by the owner on Jan 31, 2020. It is now read-only.

Commit

Permalink
Merge branch 'hotfix/2615'
Browse files Browse the repository at this point in the history 
Introduce AcceptableViewModelSelector, and remove Accept matching from
JsonStrategy and FeedStrategy

Close zendframework/zendframework#2615
Close zendframework/zendframework#2410
  • Loading branch information
@weierophinney
weierophinney committed Nov 7, 2012
86 parents ac4b6c0 + a19a8c2 + 188fa4d + a41bbf0 + a29bbbc + 941280d + d691226 + e547023 + d91c234 + 006ef75 + 69d1518 + 7dc0d1a + a995715 + e780008 + e810876 + 9e4090a + 269bf01 + 3a1f2fd + 0cab32d + 704cc7f + e20c9e6 + a0dfc1a + 76b3e1c + fd429e8 + 187ea79 + 2b43ea6 + e3b1be1 + 19f0ef6 + 33bf9c0 + 3729984 + a5ce396 + 698dbe0 + 0efca0b + 08b2a78 + ddaa846 + 7fe4493 + 0da7331 + 7226b1d + 851904c + a2eb795 + f658a03 + de83270 + 806df8a + 4e7ff23 + 409b768 + 1b97191 + d2649e3 + f0162d1 + 6f01416 + a2b3753 + 1786961 + d157fcb + 4444c37 + 192d20c + 811122b + 3a2cf9b + eb2029b + 7a6edab + 8d8a05d + c1ddf21 + 0090b4d + ef80e35 + 59b30de + 4656098 + 377b920 + ccba82c + 5d2770e + 41714a1 + 8adef43 + a78628f + b35fa7a + 3953c79 + aa28e42 + 38f9a49 + 47ed633 + 0a6bf6e + b61d89d + a1fbb6f + 238512b + f40a328 + 62dc143 + 328df3b + e12fe2d + e34a942 + 04e956d + e5e7ffb commit 0ebadc5
Show file tree
Hide file tree
Showing 4 changed files with 38 additions and 98 deletions.
30 changes: 5 additions & 25 deletions src/Strategy/FeedStrategy.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,33 +84,13 @@ public function selectRenderer(ViewEvent $e)
{
$model = $e->getModel();

$request = $e->getRequest();
if (!$request instanceof HttpRequest) {
// Not an HTTP request; cannot autodetermine
return ($model instanceof Model\FeedModel) ? $this->renderer : null;
}

$headers = $request->getHeaders();
if (!$headers->has('accept')) {
return ($model instanceof Model\FeedModel) ? $this->renderer : null;
}

$accept = $headers->get('accept');
if (($match = $accept->match('application/rss+xml, application/atom+xml')) == false) {
return ($model instanceof Model\FeedModel) ? $this->renderer : null;
}

if ($match->getTypeString() == 'application/rss+xml') {
$this->renderer->setFeedType('rss');
return $this->renderer;
}

if ($match->getTypeString() == 'application/atom+xml') {
$this->renderer->setFeedType('atom');
return $this->renderer;
if (!$model instanceof Model\FeedModel) {
// no FeedModel present; do nothing
return;
}

return ($model instanceof Model\FeedModel) ? $this->renderer : null;
// FeedModel found
return $this->renderer;
}

/**
Expand Down
33 changes: 5 additions & 28 deletions src/Strategy/JsonStrategy.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,36 +83,13 @@ public function selectRenderer(ViewEvent $e)
{
$model = $e->getModel();

$request = $e->getRequest();
if (!$request instanceof HttpRequest) {
// Not an HTTP request; cannot autodetermine
return ($model instanceof Model\JsonModel) ? $this->renderer : null;
}

$headers = $request->getHeaders();
if (!$headers->has('accept')) {
return ($model instanceof Model\JsonModel) ? $this->renderer : null;
}

$accept = $headers->get('Accept');
if (($match = $accept->match('application/json, application/javascript')) == false) {
return ($model instanceof Model\JsonModel) ? $this->renderer : null;
}

if ($match->getTypeString() == 'application/json') {
// application/json Accept header found
return $this->renderer;
}

if ($match->getTypeString() == 'application/javascript') {
// application/javascript Accept header found
if (false != ($callback = $request->getQuery()->get('callback'))) {
$this->renderer->setJsonpCallback($callback);
}
return $this->renderer;
if (!$model instanceof Model\JsonModel) {
// no JsonModel; do nothing
return;
}

return ($model instanceof Model\JsonModel) ? $this->renderer : null;
// JsonModel found
return $this->renderer;
}

/**
Expand Down
28 changes: 12 additions & 16 deletions test/Strategy/FeedStrategyTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,43 +44,39 @@ public function testFeedModelSelectsFeedStrategy()
$this->assertSame($this->renderer, $result);
}

public function testRssAcceptHeaderSelectsFeedStrategy()
/**
* @group #2410
*/
public function testRssAcceptHeaderDoesNotSelectFeedStrategy()
{
$request = new HttpRequest();
$request->getHeaders()->addHeaderLine('Accept', 'application/rss+xml');
$this->event->setRequest($request);
$result = $this->strategy->selectRenderer($this->event);
$this->assertSame($this->renderer, $result);
$this->assertNotSame($this->renderer, $result);
}

public function testAtomAcceptHeaderSelectsFeedStrategy()
/**
* @group #2410
*/
public function testAtomAcceptHeaderDoesNotSelectFeedStrategy()
{
$request = new HttpRequest();
$request->getHeaders()->addHeaderLine('Accept', 'application/atom+xml');
$this->event->setRequest($request);
$result = $this->strategy->selectRenderer($this->event);
$this->assertSame($this->renderer, $result);
}

public function testViewModelMatchedAcceptHeaderMatchSelectsFeedStrategy()
{
$this->event->setModel(new FeedModel());
$request = new HttpRequest();
$request->getHeaders()->addHeaderLine('Accept', '*/*');
$this->event->setRequest($request);
$result = $this->strategy->selectRenderer($this->event);
$this->assertSame($this->renderer, $result);
$this->assertNotSame($this->renderer, $result);
}

public function testViewModelAcceptHeaderSelectsFeedStrategyAndSetsFeedtype()
public function testAcceptHeaderDoesNotSetFeedtype()
{
$this->event->setModel(new FeedModel());
$request = new HttpRequest();
$request->getHeaders()->addHeaderLine('Accept', 'application/atom+xml');
$this->event->setRequest($request);
$result = $this->strategy->selectRenderer($this->event);
$this->assertSame($this->renderer, $result);
$this->assertSame('atom', $result->getFeedType());
$this->assertNotSame('atom', $result->getFeedType());
}

public function testLackOfFeedModelOrAcceptHeaderDoesNotSelectFeedStrategy()
Expand Down
45 changes: 16 additions & 29 deletions test/Strategy/JsonStrategyTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,36 +44,34 @@ public function testJsonModelSelectsJsonStrategy()
$this->assertSame($this->renderer, $result);
}

public function testJsonAcceptHeaderSelectsJsonStrategy()
/**
* @group #2410
*/
public function testJsonAcceptHeaderDoesNotSelectJsonStrategy()
{
$request = new HttpRequest();
$request->getHeaders()->addHeaderLine('Accept', 'application/json');
$this->event->setRequest($request);
$result = $this->strategy->selectRenderer($this->event);
$this->assertSame($this->renderer, $result);
$this->assertNotSame($this->renderer, $result);
}

public function testJavascriptAcceptHeaderSelectsJsonStrategy()
/**
* @group #2410
*/
public function testJavascriptAcceptHeaderDoesNotSelectJsonStrategy()
{
$request = new HttpRequest();
$request->getHeaders()->addHeaderLine('Accept', 'application/javascript');
$this->event->setRequest($request);
$result = $this->strategy->selectRenderer($this->event);
$this->assertSame($this->renderer, $result);
$this->assertFalse($result->hasJsonpCallback());
}

public function testJsonModelMatchedAcceptHeaderMatchSelectsJsonStrategy()
{
$this->event->setModel(new JsonModel());
$request = new HttpRequest();
$request->getHeaders()->addHeaderLine('Accept', '*/*');
$this->event->setRequest($request);
$result = $this->strategy->selectRenderer($this->event);
$this->assertSame($this->renderer, $result);
$this->assertNotSame($this->renderer, $result);
}

public function testJsonModelJavascriptAcceptHeaderSetsJsonpCallback()
/**
* @group #2410
*/
public function testJsonModelJavascriptAcceptHeaderDoesNotSetJsonpCallback()
{
$this->event->setModel(new JsonModel());
$request = new HttpRequest();
Expand All @@ -82,21 +80,10 @@ public function testJsonModelJavascriptAcceptHeaderSetsJsonpCallback()
$this->event->setRequest($request);
$result = $this->strategy->selectRenderer($this->event);
$this->assertSame($this->renderer, $result);
$this->assertTrue($result->hasJsonpCallback());
}

public function testJavascriptAcceptHeaderSelectsJsonStrategyAndSetsJsonpCallback()
{
$request = new HttpRequest();
$request->getHeaders()->addHeaderLine('Accept', 'application/javascript');
$request->setQuery(new Parameters(array('callback' => 'foo')));
$this->event->setRequest($request);
$result = $this->strategy->selectRenderer($this->event);
$this->assertSame($this->renderer, $result);
$this->assertTrue($result->hasJsonpCallback());
$this->assertFalse($result->hasJsonpCallback());
}

public function testLackOfJsonModelOrAcceptHeaderDoesNotSelectJsonStrategy()
public function testLackOfJsonModelDoesNotSelectJsonStrategy()
{
$result = $this->strategy->selectRenderer($this->event);
$this->assertNotSame($this->renderer, $result);
Expand Down

0 comments on commit 0ebadc5

Please sign in to comment.