Merge branch 'master' of github.com:philsturgeon/codeigniter-restserver

Author: Phil Sturgeon

application/config/rest.php

@@ -61,6 +61,18 @@
 */
 $config['rest_database_group'] = 'default';
 
+/*
+|--------------------------------------------------------------------------
+| REST API Keys Table Name
+|--------------------------------------------------------------------------
+|
+| The table name in your database that stores API Keys.
+|
+|	'keys'
+|
+*/
+$config['rest_keys_table'] = 'keys';
+
 /*
 |--------------------------------------------------------------------------
 | REST Enable Keys
@@ -98,17 +110,28 @@
 
 /*
 |--------------------------------------------------------------------------
-| REST Key Length
+| REST API Key Variable
 |--------------------------------------------------------------------------
 |
-| How long should created keys be? Double check this in your db schema.
+| Which variable will provide us the API Key
 |
-|	Default: 32
-|	Max: 40
+| Default: X-API-KEY
 |
 */
 $config['rest_key_name'] = 'X-API-KEY';
 
+/*
+|--------------------------------------------------------------------------
+| REST API Logs Table Name
+|--------------------------------------------------------------------------
+|
+| The table name in your database that stores logs.
+|
+|	'logs'
+|
+*/
+$config['rest_logs_table'] = 'logs';
+
 /*
 |--------------------------------------------------------------------------
 | REST Enable Logging
@@ -135,6 +158,18 @@
 */
 $config['rest_enable_logging'] = FALSE;
 
+/*
+|--------------------------------------------------------------------------
+| REST API Limits Table Name
+|--------------------------------------------------------------------------
+|
+| The table name in your database that stores limits.
+|
+|	'logs'
+|
+*/
+$config['rest_limits_table'] = 'limits';
+
 /*
 |--------------------------------------------------------------------------
 | REST Enable Limits

application/libraries/REST_Controller.php

@@ -22,6 +22,7 @@ class REST_Controller extends Controller
 		'xml' 		=> 'application/xml',
 		'rawxml' 	=> 'application/xml',
 		'json' 		=> 'application/json',
+		'jsonp' 	=> 'application/json',
 		'serialize' => 'application/vnd.php.serialized',
 		'php' 		=> 'text/plain',
 		'html' 		=> 'text/html',
@@ -95,17 +96,17 @@ function __construct()
     	// Which format should the data be returned in?
 	    $this->request->lang = $this->_detect_lang();
 
-		// Load DB if its enabled
-		if (config_item('rest_database_group') AND (config_item('rest_enable_keys') OR config_item('rest_enable_logging')))
-		{
-			$this->rest->db = $this->load->database(config_item('rest_database_group'), TRUE);
-		}
-
-		// Checking for keys? GET TO WORK!
-		if (config_item('rest_enable_keys'))
-		{
-			$this->_allow = $this->_detect_api_key();
-		}
+      // Load DB if its enabled
+      if (config_item('rest_database_group') AND (config_item('rest_enable_keys') OR config_item('rest_enable_logging')))
+      {
+        $this->rest->db = $this->load->database(config_item('rest_database_group'), TRUE);
+      }
+
+      // Checking for keys? GET TO WORK!
+      if (config_item('rest_enable_keys'))
+      {
+        $this->_allow = $this->_detect_api_key();
+      }
     }
 
     /*
@@ -319,7 +320,7 @@ private function _detect_api_key()
 		// Find the key from server or arguments
     	if ($key = isset($this->_args['API-Key']) ? $this->_args['API-Key'] : $this->input->server($key_name))
 		{
-			if ( ! $row = $this->rest->db->where('key', $key)->get('keys')->row())
+			if ( ! $row = $this->rest->db->where('key', $key)->get(config_item('rest_keys_table'))->row())
 			{
 				return FALSE;
 			}
@@ -377,7 +378,7 @@ private function _detect_lang()
      */
     private function _log_request($authorized = FALSE)
     {
-		return $this->rest->db->insert('logs', array(
+		return $this->rest->db->insert(config_item('rest_logs_table'), array(
 			'uri' => $this->uri->uri_string(),
 			'method' => $this->request->method,
 			'params' => serialize($this->_args),
@@ -410,7 +411,7 @@ private function _check_limit($controller_method)
 		$result = $this->rest->db
 			->where('uri', $this->uri->uri_string())
 			->where('api_key', $this->rest->key)
-			->get('limits')
+			->get(config_item('rest_limits_table'))
 			->row();
 
 		// No calls yet, or been an hour since they called
@@ -438,7 +439,7 @@ private function _check_limit($controller_method)
 				->where('uri', $this->uri->uri_string())
 				->where('api_key', $this->rest->key)
 				->set('count', 'count + 1', FALSE)
-				->update('limits');
+				->update(config_item('limits'));
 		}
 
 		return TRUE;
@@ -816,6 +817,12 @@ private function _format_json($data = array())
     {
     	return json_encode($data);
     }
+	
+	// Encode as JSONP
+    private function _format_jsonp($data = array())
+    {
+    	return $this->get('callback').'('.json_encode($data).')';
+    }
 
     // Encode as Serialized array
     private function _format_serialize($data = array())