Use Horde_Http_Client in place of HTTP_Response

diff --git a/framework/Service_Vimeo/lib/Horde/Service/Vimeo.php b/framework/Service_Vimeo/lib/Horde/Service/Vimeo.php
index 1801f5d..9f723a0 100644 (file)
--- a/framework/Service_Vimeo/lib/Horde/Service/Vimeo.php
+++ b/framework/Service_Vimeo/lib/Horde/Service/Vimeo.php
@@ -14,7 +14,7 @@ require_once 'HTTP/Request.php';
  *
  * @author Michael J. Rubinsky <mrubinsk@horde.org>
  */
-class Service_Vimeo {
+class Horde_Service_Vimeo {
 
     protected $_format = 'php';
 
@@ -57,7 +57,7 @@ class Service_Vimeo {
         $driver = basename($driver);
 
         include_once dirname(__FILE__) . '/Vimeo/' . $driver . '.php';
-        $class = 'Horde_Services_Vimeo_' . $driver;
+        $class = 'Horde_Service_Vimeo_' . $driver;
         if (class_exists($class)) {
             return new $class($params);
         } else {

diff --git a/framework/Service_Vimeo/lib/Horde/Service/Vimeo/Simple.php b/framework/Service_Vimeo/lib/Horde/Service/Vimeo/Simple.php
index b4cce91..129d4b5 100644 (file)
--- a/framework/Service_Vimeo/lib/Horde/Service/Vimeo/Simple.php
+++ b/framework/Service_Vimeo/lib/Horde/Service/Vimeo/Simple.php
@@ -10,7 +10,7 @@
  *
  * @author Michael J. Rubinsky <mrubinsk@horde.org>
  */
-class Service_Vimeo_Simple extends Service_Vimeo {
+class Horde_Service_Vimeo_Simple extends Horde_Service_Vimeo {
 
     protected $_api_endpoint = 'http://www.vimeo.com/api/';
     protected $_oembed_endpoint = 'http://www.vimeo.com/api/oembed.json';
@@ -30,10 +30,6 @@ class Service_Vimeo_Simple extends Service_Vimeo {
      *
      *     Groups
      *       groupClips: clips in this group
-     *
-     *
-     *
-     * @param unknown_type $criteria
      */
     public function getClips($criteria)
     {
@@ -45,12 +41,9 @@ class Service_Vimeo_Simple extends Service_Vimeo {
             break;
         }
 
-        $req = new HTTP_Request($this->_api_endpoint . $method);
-        if (is_a($req, 'PEAR_Error')) {
-            return $req;
-        }
-        $req->sendRequest();
-        return $req->getResponseBody();
+        $req = $this->getHttpClient();
+        $response = $req->request('GET', $this->_api_endpoint . $method);
+        return $response->getBody();
     }
 
     public function getActivity($criteria)
@@ -81,14 +74,11 @@ class Service_Vimeo_Simple extends Service_Vimeo {
     public function getEmbedJSON($clipUrl)
     {
         $url = $this->_oembed_endpoint . '?url=' . rawurlencode($clipUrl);
-        $req = new HTTP_Request($url);
-        //@TODO: We should probably throw an exception here.
-        if (is_a($req, 'PEAR_Error')) {
-            return $req;
-        }
-        $req->sendRequest();
-        $response = $req->getResponseBody();
-        return $response;
+        $req = $this->getHttpClient();
+        $response = $req->request('GET', $url);
+        $results = $response->getBody();
+
+        return $results;
     }
 
 }
\ No newline at end of file

diff --git a/framework/Service_Vimeo/package.xml b/framework/Service_Vimeo/package.xml
new file mode 100644 (file)
index 0000000..78e7110
--- /dev/null
+++ b/framework/Service_Vimeo/package.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<package packagerversion="1.4.9" version="2.0" xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0
+http://pear.php.net/dtd/tasks-1.0.xsd
+http://pear.php.net/dtd/package-2.0
+http://pear.php.net/dtd/package-2.0.xsd">
+ <name>Service_Vimeo</name>
+ <channel>pear.horde.org</channel>
+ <summary>Horde Vimeo client</summary>
+ <description>This package provides client libraries for the Vimeo API
+ </description>
+ <lead>
+  <name>Michael J. Rubinsky</name>
+  <user>mrubinsk</user>
+  <email>mrubinsk@horde.org</email>
+  <active>yes</active>
+ </lead>
+ <date>2008-12-26</date>
+ <version>
+  <release>0.1.0</release>
+  <api>0.1.0</api>
+ </version>
+ <stability>
+  <release>alpha</release>
+  <api>alpha</api>
+ </stability>
+ <license uri="http://opensource.org/licenses/bsd-license.php">BSD</license>
+ <notes>
+* Initial release
+ </notes>
+ <contents>
+  <dir name="/">
+   <dir name="lib">
+    <dir name="Horde">
+     <dir name="Service">
+      <dir name="Vimeo">
+       <file name="Simple.php" role="php" />
+      </dir> <!-- /lib/Horde/Service/Scribd -->
+      <file name="Vimeo.php" role="php" />
+     </dir> <!-- /lib/Horde/Service -->
+    </dir> <!-- /lib/Horde -->
+   </dir> <!-- /lib -->
+  </dir> <!-- / -->
+ </contents>
+ <dependencies>
+  <required>
+   <php>
+    <min>5.2.0</min>
+   </php>
+   <pearinstaller>
+    <min>1.5.0</min>
+   </pearinstaller>
+   <package>
+    <name>Http_Client</name>
+    <channel>pear.horde.org</channel>
+   </package>
+  </required>
+ </dependencies>
+ <phprelease>
+  <filelist>
+   <install name="lib/Horde/Service/Vimeo/Simple.php" as="Horde/Service/Vimeo/Simple.php" />
+   <install name="lib/Horde/Service/Vimeo.php" as="Horde/Service/Vimeo.php" />
+  </filelist>
+ </phprelease>
+</package>