Added jsonp support

src/Exception/ResourceException.php

@@ -8,14 +8,14 @@ class ResourceException extends HttpException {
 
 	/**
 	 * MessageBag errors.
-	 * 
+	 *
 	 * @var \Illuminate\Support\MessageBag
 	 */
 	protected $errors;
 
 	/**
 	 * Create a new resource exception instance.
-	 * 
+	 *
 	 * @param  int  $statusCode
 	 * @param  string  $message
 	 * @param  \Illuminate\Support\MessageBag|array  $errors
@@ -35,12 +35,12 @@ public function __construct($message = null, $errors = null, Exception $previous
 			$this->errors = is_array($errors) ? new MessageBag($errors) : $errors;
 		}
 
-		parent::__construct(422, $message, $previous, $headers, $code);
+		parent::__construct(400, $message, $previous, $headers, $code);
 	}
 
 	/**
 	 * Get the errors message bag.
-	 * 
+	 *
 	 * @return \Illuminate\Support\MessageBag
 	 **/
 	public function errors()
@@ -50,7 +50,7 @@ public function errors()
 
 	/**
 	 * Get the errors message bag.
-	 * 
+	 *
 	 * @return \Illuminate\Support\MessageBag
 	 **/
 	public function getErrors()
@@ -60,7 +60,7 @@ public function getErrors()
 
 	/**
 	 * Determine if message bag has any errors.
-	 * 
+	 *
 	 * @return bool
 	 */
 	public function hasErrors()

src/Http/ResponseFormat/ResponseFormatInterface.php → src/Http/ResponseFormat/AbstractResponseFormat.php

@@ -1,60 +1,67 @@
 <?php namespace Dingo\Api\Http\ResponseFormat;
 
-interface ResponseFormatInterface {
+abstract class AbstractResponseFormat {
 
 	/**
 	 * Format an Eloquent model.
-	 * 
+	 *
 	 * @param  \Illuminate\Database\Eloquent\Model  $model
 	 * @return string
 	 */
-	public function formatEloquentModel($model);
+	abstract public function formatEloquentModel($model);
 
 	/**
 	 * Format an Eloquent collection.
-	 * 
+	 *
 	 * @param  \Illuminate\Database\Eloquent\Collection  $collection
 	 * @return string
 	 */
-	public function formatEloquentCollection($collection);
+	abstract public function formatEloquentCollection($collection);
 
 	/**
 	 * Format a string.
-	 * 
+	 *
 	 * @param  string  $string
 	 * @return string
 	 */
-	public function formatString($string);
+	abstract public function formatString($string);
 
 	/**
 	 * Format an array or instance implementing ArrayableInterface.
-	 * 
+	 *
 	 * @param  \Illuminate\Support\Contracts\ArrayableInterface  $response
 	 * @return string
 	 */
-	public function formatArrayableInterface($response);
+	abstract public function formatArrayableInterface($response);
 
 	/**
 	 * Format an instance implementing JsonableInterface.
-	 * 
+	 *
 	 * @param  \Illuminate\Support\Contracts\JsonableInterface  $response
 	 * @return string
 	 */
-	public function formatJsonableInterface($response);
+	abstract public function formatJsonableInterface($response);
 
 	/**
 	 * Format an unknown type.
-	 * 
+	 *
 	 * @param  mixed  $response
 	 * @return string
 	 */
-	public function formatUnknown($response);
+	abstract public function formatUnknown($response);
 
 	/**
 	 * Get the response content type.
-	 * 
+	 *
 	 * @return string
 	 */
-	public function getContentType();
-
+	abstract public function getContentType();
+
+	/**
+	 * Set the response content type.
+	 *
+	 * @return string
+	 */
+	abstract public function setRequest($request);
+
 }

src/Http/ResponseFormat/JsonResponseFormat.php

@@ -2,11 +2,24 @@
 
 use Illuminate\Support\Contracts\ArrayableInterface;
 
-class JsonResponseFormat implements ResponseFormatInterface {
+class JsonResponseFormat extends AbstractResponseFormat {
+
+	/**
+	 * The original request
+	 *
+	 * @param \Illuminate\Http\Request $request
+	 * @return void
+	 */
+	protected $request;
+
+	public function setRequest($request)
+	{
+		$this->request = $request;
+	}
 
 	/**
 	 * Format an Eloquent model.
-	 * 
+	 *
 	 * @param  \Illuminate\Database\Eloquent\Model  $model
 	 * @return string
 	 */
@@ -19,7 +32,7 @@ public function formatEloquentModel($model)
 
 	/**
 	 * Format an Eloquent collection.
-	 * 
+	 *
 	 * @param  \Illuminate\Database\Eloquent\Collection  $collection
 	 * @return string
 	 */
@@ -37,7 +50,7 @@ public function formatEloquentCollection($collection)
 
 	/**
 	 * Format a string.
-	 * 
+	 *
 	 * @param  string  $string
 	 * @return string
 	 */
@@ -48,7 +61,7 @@ public function formatString($string)
 
 	/**
 	 * Format an array or instance implementing ArrayableInterface.
-	 * 
+	 *
 	 * @param  \Illuminate\Support\Contracts\ArrayableInterface  $response
 	 * @return string
 	 */
@@ -66,7 +79,7 @@ public function formatArrayableInterface($response)
 
 	/**
 	 * Format an instance implementing JsonableInterface.
-	 * 
+	 *
 	 * @param  \Illuminate\Support\Contracts\JsonableInterface  $response
 	 * @return string
 	 */
@@ -77,7 +90,7 @@ public function formatJsonableInterface($response)
 
 	/**
 	 * Format an unknown type.
-	 * 
+	 *
 	 * @param  mixed  $response
 	 * @return string
 	 */
@@ -88,7 +101,7 @@ public function formatUnknown($response)
 
 	/**
 	 * Get the response content type.
-	 * 
+	 *
 	 * @return string
 	 */
 	public function getContentType()
@@ -98,7 +111,7 @@ public function getContentType()
 
 	/**
 	 * Morph a value to an array.
-	 * 
+	 *
 	 * @param  array|\Illuminate\Support\Contracts\ArrayableInterface
 	 * @return array
 	 */
@@ -109,7 +122,7 @@ protected function morphToArray($value)
 
 	/**
 	 * Encode the content to its JSON representation.
-	 * 
+	 *
 	 * @param  string  $content
 	 * @return string
 	 */

src/Http/ResponseFormat/JsonpResponseFormat.php

@@ -0,0 +1,61 @@
+<?php namespace Dingo\Api\Http\ResponseFormat;
+
+use Illuminate\Http\Request as IlluminateRequest;
+use Dingo\Api\Http\ResponseFormat\JsonResponseFormat;
+
+class JsonpResponseFormat extends JsonResponseFormat
+{
+
+	/**
+	 * Name of the parameter to check if we want to issue a jsonp response
+	 * if its not present it will fallback to json
+	 *
+	 * @var string
+	 */
+	protected $callbackName = 'callback';
+
+	/**
+	 * Has a callback parameter been specified in the request ?
+	 * @return bool
+	 */
+	protected function hasValidCallback()
+	{
+		$this->callback = $this->request->input($this->callbackName);
+
+		if (!empty($this->callback)) {
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Get the response content type.
+	 *
+	 * @return string
+	 */
+	public function getContentType()
+	{
+		if ($this->hasValidCallback()) {
+			return 'application/javascript';
+		}
+
+		return parent::getContentType();
+	}
+
+	/**
+	 * Encode the content to its JSON representation.
+	 *
+	 * @param  string  $content
+	 * @return string
+	 */
+	protected function encode($content)
+	{
+		if ($this->hasValidCallback()) {
+			return sprintf('%s(%s);', $this->callback, json_encode($content));
+		}
+
+		return parent::encode($content);
+	}
+
+}