Switch to using exception handling for errors.

.gitignore

@@ -1 +1,2 @@
-lib/curl_cookie.txt
+lib/curl_cookie.txt
+.DS_Store

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "test/ztest"]
+	path = test/ztest
+	url = git://github.com/jaz303/ztest.git

MIT-LICENSE

@@ -1,16 +1,16 @@
 Copyright (c) 2008 Sean Huber - shuber@huberry.com
- 
+
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
 "Software"), to deal in the Software without restriction, including
 without limitation the rights to use, copy, modify, merge, publish,
 distribute, sublicense, and/or sell copies of the Software, and to
 permit persons to whom the Software is furnished to do so, subject to
 the following conditions:
- 
+
 The above copyright notice and this permission notice shall be
 included in all copies or substantial portions of the Software.
- 
+
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

README.markdown

@@ -14,23 +14,23 @@ Click the `download` link above or `git clone git://github.com/shuber/curl.git`
 
 Simply require and initialize the `Curl` class like so:
 
-	require_once 'curl.php';
+	require_once 'autoload.php';
 	$curl = new Curl;
 
 
 ### Performing a Request
 
-The Curl object supports 5 types of requests: HEAD, GET, POST, PUT, and DELETE. You must specify a url to request and optionally specify an associative array or string of variables to send along with it.
+The Curl object supports 5 types of requests: HEAD, GET, POST, PUT, and DELETE. You must specify a url to request and optionally specify an associative array or string of variables to send along with it. The Curl object will append the array of $vars to the $url as a query string for all methods except POST.
 
 	$response = $curl->head($url, $vars = array());
-	$response = $curl->get($url, $vars = array()); # The Curl object will append the array of $vars to the $url as a query string
+	$response = $curl->get($url, $vars = array());
 	$response = $curl->post($url, $vars = array());
-	$response = $curl->put($url, $vars = array());
+	$response = $curl->put($url, $put_data, $vars = array());
 	$response = $curl->delete($url, $vars = array());
 
 To use a custom request methods, you can call the `request` method:
 
-	$response = $curl->request('YOUR_CUSTOM_REQUEST_TYPE', $url, $vars = array());
+	$response = $curl->request('YOUR_CUSTOM_REQUEST_TYPE', $url, $vars = array(), $put_data = null);
 
 All of the built in request methods like `put` and `get` simply wrap the `request` method. For example, the `post` method is implemented like:
 
@@ -44,7 +44,7 @@ Examples:
 
 	# The Curl object will append '&some_variable=some_value' to the url
 	$response = $curl->get('google.com?q=test', array('some_variable' => 'some_value'));
-	
+
 	$response = $curl->post('test.com/posts', array('title' => 'Test', 'body' => 'This is a test'));
 
 All requests return a CurlResponse object (see below) or false if an error occurred. You can access the error string with the `$curl->error()` method.
@@ -82,7 +82,7 @@ Which would display something like
 	    [Server] => gws
 	    [Connection] => close
 	)
-	
+
 The CurlResponse class defines the magic [__toString()](http://php.net/__toString) method which will return the response body, so `echo $response` is the same as `echo $response->body`
 
 
@@ -109,8 +109,8 @@ You may even set these headers manually if you wish (see below)
 
 You can set custom headers to send with the request
 
-	$curl->headers['Host'] = 12.345.678.90;
-	$curl->headers['Some-Custom-Header'] = 'Some Custom Value';
+	$curl->setHeader('Host', 12.345.678.90);
+	$curl->setHeader('Some-Custom-Header', 'Some Custom Value');
 
 
 ### Setting Custom CURL request options
@@ -122,10 +122,9 @@ By default, the `Curl` object will follow redirects. You can disable this by set
 You can set/override many different options for CURL requests (see the [curl_setopt documentation](http://php.net/curl_setopt) for a list of them)
 
 	# any of these will work
-	$curl->options['AUTOREFERER'] = true;
-	$curl->options['autoreferer'] = true;
-	$curl->options['CURLOPT_AUTOREFERER'] = true;
-	$curl->options['curlopt_autoreferer'] = true;
+	$curl->setOption('AUTOREFERER', true);
+	$curl->setOption('CURLOPT_AUTOREFERER', true);
+	$curl->setOption(CURLOPT_AUTOREFERER, true);
 
 
 ## Testing

autoload.php

@@ -0,0 +1,21 @@
+<?php
+
+function curl_autoload($className)
+{
+  $prefix = dirname(__FILE__).DIRECTORY_SEPARATOR.'lib'.DIRECTORY_SEPARATOR;
+  switch ($className)
+  {
+    case 'Curl':
+      require_once $prefix.'curl.php';
+      break;
+    case 'CurlResponse':
+      require_once $prefix.'curl_response.php';
+      break;
+    case 'CurlPutData':
+      require_once $prefix.'curl_put_data.php';
+      break;
+  }
+}
+
+spl_autoload_register('curl_autoload');
+

composer.json

@@ -0,0 +1,72 @@
+{
+    "name": "Shuber\/Curl",
+    "description": "A basic CURL wrapper for PHP (see [http:\/\/php.net\/curl](http:\/\/php.net\/curl) for more information about the libcurl extension for PHP)",
+    "version": "1.0.5",
+    "type": "library",
+    "time": "2015-03-06 9:06:37",
+    "homepage": "",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Adrian Pemsel",
+            "email": "adrian@adrianpemsel.de"
+        },
+        {
+            "name": "Ben Jeavons",
+            "email": "benjamin.jeavons@colorado.edu"
+        },
+        {
+            "name": "Hugo Chinchilla Carbonell",
+            "email": "hugo@bulma.net"
+        },
+        {
+            "name": "Jordi Rivero",
+            "email": "jrivero24@yahoo.es"
+        },
+        {
+            "name": "Kendall Hopkins",
+            "email": "softwareelves@gmail.com"
+        },
+        {
+            "name": "Sean Huber",
+            "email": "shuber@huberry.com"
+        },
+        {
+            "name": "Sebastian M. Alvarez",
+            "email": "sebastianmalvarez@gmail.com"
+        },
+        {
+            "name": "Simone Carletti",
+            "email": "weppos@weppos.net"
+        },
+        {
+            "name": "fabeat",
+            "email": "fg@linkable.de"
+        },
+        {
+            "name": "ide user ide_hamstar",
+            "email": "hamstar@telescum.co.nz"
+        },
+        {
+            "name": "nickl-",
+            "email": "nick@jigsoft.co.za"
+        },
+        {
+            "name": "shuber",
+            "email": "sean.huber@cox.net"
+        },
+        {
+            "name": "Matthew Leffler",
+            "email": "matthew@simpleupdates.com"
+        },
+        {
+            "name": "Carl Brugger",
+            "email": "carl@simpleupdates.com"
+        }
+    ],
+    "autoload": {
+        "psr-0": {
+            "Shuber\\Curl": "lib\/"
+        }
+    }
+}

curl.php

@@ -1,4 +1,3 @@
 <?php
 
-require_once 'lib'.DIRECTORY_SEPARATOR.'curl.php';
-require_once 'lib'.DIRECTORY_SEPARATOR.'curl_response.php';
+require_once dirname(__FILE__).DIRECTORY_SEPARATOR.'autoload.php';