Fix issue ZF-12207: Remove Zend_Service_Simpy

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@24837 44c647ce-9c0f-0410-b52a-842ac1e357ba

documentation/manual/cs/module_specs/Zend_Service.xml

@@ -44,11 +44,6 @@
         </listitem>
         <listitem>
             <para>
-                <link linkend="zend.service.simpy">Simpy</link>
-            </para>
-        </listitem>
-        <listitem>
-            <para>
                 <link linkend="zend.service.slideshare">SlideShare</link>
             </para>
         </listitem>

documentation/manual/cs/ref/requirements.xml

@@ -139,7 +139,6 @@
                             <ulink url="http://framework.zend.com/manual/en/zend.service.amazon.html"><code>Zend_Service_Amazon</code></ulink>,
                             <ulink url="http://framework.zend.com/manual/en/zend.service.delicious.html"><code>Zend_Service_Delicious</code></ulink>,
                             <ulink url="http://framework.zend.com/manual/en/zend.service.flickr.html"><code>Zend_Service_Flickr</code></ulink>,
-                            <ulink url="http://framework.zend.com/manual/en/zend.service.simpy.html"><code>Zend_Service_Simpy</code></ulink>,
                             <ulink url="http://framework.zend.com/manual/en/zend.service.yahoo.html"><code>Zend_Service_Yahoo</code></ulink>,
                             <ulink url="http://framework.zend.com/manual/en/zend.xmlrpc.html"><code>Zend_XmlRpc</code></ulink>
                         </entry>
@@ -860,17 +859,6 @@
                         </entry>
                     </row>
                     <row>
-                        <entry><ulink url="http://framework.zend.com/manual/en/zend.service.simpy.html"><code>Zend_Service_Simpy</code></ulink></entry>
-                        <entry>
-                            <ulink url="http://www.php.net/manual/en/ref.dom.php"><code>dom</code></ulink>
-                            ( Závislost )
-                            <ulink url="http://www.php.net/manual/en/ref.libxml.php"><code>libxml</code></ulink>
-                            ( Závislost )
-                            <ulink url="http://www.php.net/manual/en/ref.libxml.php"><code>libxml</code></ulink>
-                            ( Závislost )
-                        </entry>
-                    </row>
-                    <row>
                         <entry><ulink url="http://framework.zend.com/manual/en/zend.service.strikeiron.html"><code>Zend_Service_StrikeIron</code></ulink></entry>
                         <entry>
                             <ulink url="http://www.php.net/manual/en/ref.soap.php"><code>soap</code></ulink>

documentation/manual/de/module_specs/Zend_Service.xml

@@ -31,18 +31,17 @@
 
         <listitem><para><link linkend="zend.service.delicious">Del.icio.us</link></para></listitem>
         <listitem><para><link linkend="zend.service.flickr">Flickr</link></para></listitem>
-        <listitem><para><link linkend="zend.service.livedocx">LiveDocx</link></para></listitem>
-        <listitem><para><link linkend="zend.service.nirvanix">Nirvanix</link></para></listitem>
-        <listitem><para><link linkend="zend.service.recaptcha">ReCaptcha</link></para></listitem>
-        <listitem><para><link linkend="zend.service.simpy">Simpy</link></para></listitem>
+        <listitem><para><link linkend="zend.service.livedocx">LiveDocx</link></para></listitem>
+        <listitem><para><link linkend="zend.service.nirvanix">Nirvanix</link></para></listitem>
+        <listitem><para><link linkend="zend.service.recaptcha">ReCaptcha</link></para></listitem>
         <listitem><para><link linkend="zend.service.slideshare">SlideShare</link></para></listitem>
         <listitem><para><link linkend="zend.service.strikeiron">StrikeIron</link></para></listitem>
-        <listitem><para><link linkend="zend.service.technorati">Technorati</link></para></listitem>
-        <listitem><para><link linkend="zend.service.twitter">Twitter</link></para></listitem>
-
+        <listitem><para><link linkend="zend.service.technorati">Technorati</link></para></listitem>
+        <listitem><para><link linkend="zend.service.twitter">Twitter</link></para></listitem>
+
         <listitem>
             <para><link linkend="zend.service.windowsazure">Windows Azure</link></para>
-        </listitem>
+        </listitem>
 
         <listitem><para><link linkend="zend.service.yahoo">Yahoo!</link></para></listitem>
     </itemizedlist>

documentation/manual/de/module_specs/Zend_Service_Simpy.xml

@@ -1,326 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- EN-Revision: 24249 -->
-<!-- Reviewed: no -->
-<sect1 id="zend.service.simpy">
-    <title>Zend_Service_Simpy</title>
-
-    <sect2 id="zend.service.simpy.introduction">
-        <title>Einführung</title>
-
-        <para>
-            <classname>Zend_Service_Simpy</classname> ist ein schlanker Wrapper für das freie REST
-            <acronym>API</acronym> des Simpy Lesezeichen-Services.
-        </para>
-
-        <para>
-            Um <classname>Zend_Service_Simpy</classname> zu nutzen, solltest du bereits ein
-            Simpy-Konto besitzen. Falls dies nicht der Fall ist, kannst du dies auf der
-            <ulink url="http://simpy.com">Simpy Webseite</ulink> tun. Für weitere Informationen über
-            das Simpy REST <acronym>API</acronym>, kannst du in der
-            <ulink url="http://www.simpy.com/doc/api/rest">Simpy REST <acronym>API</acronym>
-                Dokumentation</ulink> nachlesen.
-        </para>
-
-        <para>
-            Das Simpy REST <acronym>API</acronym> erlaubt es dem Entwickler, mit verschiedenen
-            Aspekten des Services, welche die Simpy Webseite bietet, zu interagieren. Diese
-            Sektionen zeigen dir, wie man <classname>Zend_Service_Simpy</classname> in jedem dieser
-            Bereiche nutzen kann.
-
-            <itemizedlist>
-                <listitem>
-                    <para>Links: Erstellen, Laden, Aktualisieren, Löschen</para>
-                </listitem>
-
-                <listitem>
-                    <para>Tags: Laden, Löschen, Umbenennen, Zusammenfassen, Splitten</para>
-                </listitem>
-
-                <listitem>
-                    <para>Notes: Erstellen, Laden, Aktualisieren, Löschen</para>
-                </listitem>
-
-                <listitem>
-                    <para>Watchlists: Holen, Alle holen</para>
-                </listitem>
-            </itemizedlist>
-        </para>
-    </sect2>
-
-    <sect2 id="zend.service.simpy.links">
-        <title>Links</title>
-
-        <para>
-            Beim Anfragen von Links, werden diese absteigend nach deren Datum - wann es
-            hinzugefügt wurde - sortiert. Es kann nach Links anhand des Titels, des Spitznamens,
-            der Tags, der Notizen oder sogar des Inhalts der verknüpften Webseite gesucht werden.
-            Simpy erlaubt es, jegliche oder alle dieser Felder mit Phrasen, booleschen
-            Operatoren und Wildcards zu durchsuchen. Siehe in den
-            <ulink url="http://www.simpy.com/faq#searchSyntax">Suchsyntax</ulink>- und
-            <ulink url="http://www.simpy.com/faq#searchFieldsLinks">Suchfelder</ulink>-Sektionen
-            der Simipy FAQ für weitere Informationen.
-        </para>
-
-        <example id="zend.service.simpy.links.querying">
-            <title>Abfragen von Links</title>
-
-            <programlisting language="php"><![CDATA[
-$simpy = new Zend_Service_Simpy('yourusername', 'yourpassword');
-
-/* Suche nach den 10 letzten hinzugefügten Links */
-$linkQuery = new Zend_Service_Simpy_LinkQuery();
-$linkQuery->setLimit(10);
-
-/* Holen und darstellen */
-$linkSet = $simpy->getLinks($linkQuery);
-foreach ($linkSet as $link) {
-    echo '<a href="';
-    echo $link->getUrl();
-    echo '">';
-    echo $link->getTitle();
-    echo '</a><br />';
-}
-
-/* Suche nach den 5 letzten hinzugefügten Links mit 'PHP'
-im Titel */
-$linkQuery->setQueryString('title:PHP');
-$linkQuery->setLimit(5);
-
-/* Suche nach allen Links mit 'French' im Titel und
-'lanuage' in den Tags */
-$linkQuery->setQueryString('+title:French +tags:language');
-
-/* Suche nach allen Links mit 'French' im Titel und ohne
-'travel' in den Tags */
-$linkQuery->setQueryString('+title:French -tags:travel');
-
-/* Suche nach allen Links, die am 9.12.2006 hinzugefügt wurden */
-$linkQuery->setDate('2006-12-09');
-
-/* Suche nach allen Links, die nach dem 9.12.2006 hinzugefügt wurden (
-das Datum ist nicht eingeschlossen) */
-$linkQuery->setAfterDate('2006-12-09');
-
-/* Suche nach allen Links, die vom dem 9.12.2006 hinzugefügt wurden (
-das angegebene Datum ist ausgeschlossen) */
-$linkQuery->setBeforeDate('2006-12-09');
-
-/* Suche nach allen Links, die zwischen dem 1.12.2006 und dem 9.12.2006
-hinzugefügt wurden (die beiden Daten sind dabei ausgeschlossen) */
-$linkQuery->setBeforeDate('2006-12-01');
-$linkQuery->setAfterDate('2006-12-09');
-]]></programlisting>
-        </example>
-
-        <para>
-            Links werden eindeutig durch ihren <acronym>URL</acronym> angezeigt. In anderen Worten,
-            falls ein Versuch gemacht wird, einen Link zu speichern, der denselben
-            <acronym>URL</acronym> hat wie ein bereits existierender Link, werden die Daten des
-            alten Links mit den neuen Daten überschrieben.
-        </para>
-
-        <example id="zend.service.simpy.links.modifying">
-            <title>Modifizieren von Links</title>
-
-            <programlisting language="php"><![CDATA[
-$simpy = new Zend_Service_Simpy('yourusername', 'yourpassword');
-
-/* Speichern eines link */
-$simpy->saveLink(
-    'Zend Framework' // Titel
-    'http://framework.zend.com', // URL
-    Zend_Service_Simpy_Link::ACCESSTYPE_PUBLIC, // Zugriffstyp
-    'zend, framework, php' // Tags
-    'Zend Framework home page' // Alternativer Titel
-    'This site rocks!' // Notiz
-);
-
-/* Überschreibe den existierenden Link mit neuen Daten */
-$simpy->saveLink(
-    'Zend Framework'
-    'http://framework.zend.com',
-    // der Zugriffstyp wurde geändert
-    Zend_Service_Simpy_Link::ACCESSTYPE_PRIVATE,
-    // Die Reihenfolge der Tags hat sich geändert
-    'php, zend, framework'
-    // Alternativer Titel wurde geändert
-    'Zend Framework'
-    // Notiz hat sich geändert
-    'This site REALLY rocks!'
-);
-
-/* Den Link löschen */
-$simpy->deleteLink('http://framework.zend.com');
-
-/* Ein wirklich einfacher Weg den Frühjahrsputz
-   bei deinen Links zu machen ;-) */
-$linkSet = $this->_simpy->getLinks();
-foreach ($linkSet as $link) {
-    $this->_simpy->deleteLink($link->getUrl());
-}
-]]></programlisting>
-        </example>
-    </sect2>
-
-    <sect2 id="zend.service.simpy.tags">
-        <title>Tags</title>
-
-        <para>
-            Wenn die Tags zurückgegeben werden, werden sie in absteigender
-            Reihenfolge (d.h. der größte zuerst) nach der Häufigkeit der
-            Benutzung durch die Links sortiert.
-        </para>
-
-        <example id="zend.service.simpy.tags.working">
-            <title>Arbeiten mit Tags</title>
-
-            <programlisting language="php"><![CDATA[
-$simpy = new Zend_Service_Simpy('yourusername', 'yourpassword');
-
-/* Speicher einen Link mit Tags */
-$simpy->saveLink(
-    'Zend Framework' // Titel
-    'http://framework.zend.com', // URL
-    Zend_Service_Simpy_Link::ACCESSTYPE_PUBLIC, // Zugriffstyp
-    'zend, framework, php' // Tags
-);
-
-/* Hole eine Liste mit allen Tags, die von Links und
-Notizen genutzt werden */
-$tagSet = $simpy->getTags();
-
-/* Stelle jeden Tag mit der Anzahl der Links, die ihn nutzen, dar */
-foreach ($tagSet as $tag) {
-    echo $tag->getTag();
-    echo ' - ';
-    echo $tag->getCount();
-    echo '<br />';
-}
-
-/* Entferne das 'zend'-Tag von allen Links, die es benutzen */
-$simpy->removeTag('zend');
-
-/* Nenne das 'framework'-Tag zu 'frameworks' um */
-$simpy->renameTag('framework', 'frameworks');
-
-/* Splitte das 'frameworks'-Tag in 'framework' und
-'development' auf. D.h. dass alle Links, die 'frameworks'
-als Tag besitzen, nunmehr stattdessen 'framework' und 'development'
-besitzen */
-$simpy->splitTag('frameworks', 'framework', 'development');
-
-/* Fasse 'framework' und 'development' wieder zu 'frameworks'
-zusammen; vereinfacht ist es das Gegenteil, ein Tag zu splitten */
-$simpy->mergeTags('framework', 'development', 'frameworks');
-]]></programlisting>
-        </example>
-    </sect2>
-
-    <sect2 id="zend.service.simpy.notes">
-        <title>Notizen</title>
-
-        <para>
-            Notizen können gespeichert, geladen und gelöscht werden. Sie sind
-            eindeutig durch eine numerische ID definiert.
-        </para>
-
-        <example id="zend.service.simpy.notes.working">
-            <title>Arbeiten mit Notizen</title>
-
-            <programlisting language="php"><![CDATA[
-$simpy = new Zend_Service_Simpy('yourusername', 'yourpassword');
-
-/* Eine Notiz speichern */
-$simpy->saveNote(
-    'Test Note', // Titel
-    'test,note', // Tags
-    'This is a test note.' // Beschreibung
-);
-
-/* Eine bereits existierende Notiz überschreiben */
-$simpy->saveNote(
-    'Updated Test Note', // Titel
-    'test,note,updated', // Tags
-    'This is an updated test note.', // Beschreibung
-    $note->getId() // Eindeutige ID
-);
-
-/* Suche nach den 10 letzten hinzugefügten Notizen */
-$noteSet = $simpy->getNotes(null, 10);
-
-/* Zeige diese Notizen an */
-foreach ($noteSet as $note) {
-    echo '<p>';
-    echo $note->getTitle();
-    echo '<br />';
-    echo $note->getDescription();
-    echo '<br >';
-    echo $note->getTags();
-    echo '</p>';
-}
-
-/* Suche nach allen Notizen mit 'PHP' im Titel */
-$noteSet = $simpy->getNotes('title:PHP');
-
-/* Suche nach allen Notizen mit 'PHP' im Titel und ohne
-'framework' in der Beschreibung */
-$noteSet = $simpy->getNotes('+title:PHP -description:framework');
-
-/* Löschen einer Notiz */
-$simpy->deleteNote($note->getId());
-]]></programlisting>
-        </example>
-    </sect2>
-
-    <sect2 id="zend.service.simpy.watchlists">
-        <title>Watchlists</title>
-
-        <para>
-            Watchlisten können durch das <acronym>API</acronym> nicht erstellt oder entfernt
-            werden, sondern lediglich zurückgegeben. Folglich musst du eine
-            Watchlist über die Simpy Webseite erstellen, bevor du diese
-            über das <acronym>API</acronym> nutzt.
-        </para>
-
-        <example id="zend.service.simpy.watchlists.retrieving">
-            <title>Zurückgeben von Watchlisten</title>
-
-            <programlisting language="php"><![CDATA[
-$simpy = new Zend_Service_Simpy('yourusername', 'yourpassword');
-
-/* Hole eine Liste von allen Watchlisten */
-$watchlistSet = $simpy->getWatchlists();
-
-/* Zeige die Daten jeder Watchlist an */
-foreach ($watchlistSet as $watchlist) {
-    echo $watchlist->getId();
-    echo '<br />';
-    echo $watchlist->getName();
-    echo '<br />';
-    echo $watchlist->getDescription();
-    echo '<br />';
-    echo $watchlist->getAddDate();
-    echo '<br />';
-    echo $watchlist->getNewLinks();
-    echo '<br />';
-
-    foreach ($watchlist->getUsers() as $user) {
-        echo $user;
-        echo '<br />';
-    }
-
-    foreach ($watchlist->getFilters() as $filter) {
-        echo $filter->getName();
-        echo '<br />';
-        echo $filter->getQuery();
-        echo '<br />';
-    }
-}
-
-/* Hole eine spezielle Watchlist anhand einer ID */
-$watchlist = $simpy->getWatchlist($watchlist->getId());
-$watchlist = $simpy->getWatchlist(1);
-]]></programlisting>
-        </example>
-    </sect2>
-</sect1>

documentation/manual/en/module_specs/Zend_Service.xml

@@ -83,12 +83,6 @@
 
         <listitem>
             <para>
-                <link linkend="zend.service.simpy">Simpy</link>
-            </para>
-        </listitem>
-
-        <listitem>
-            <para>
                 <link linkend="zend.service.slideshare">SlideShare</link>
             </para>
         </listitem>

documentation/manual/en/module_specs/Zend_Service_Simpy.xml

@@ -1,326 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Reviewed: no -->
-<sect1 id="zend.service.simpy">
-    <title>Zend_Service_Simpy</title>
-
-    <sect2 id="zend.service.simpy.introduction">
-        <title>Introduction</title>
-
-        <para>
-            <classname>Zend_Service_Simpy</classname> is a lightweight wrapper for the free REST
-            <acronym>API</acronym> available for the Simpy social bookmarking service.
-        </para>
-
-        <para>
-            In order to use <classname>Zend_Service_Simpy</classname>, you should already have a
-            Simpy account. To get an account, visit the <ulink
-                url="http://simpy.com">Simpy web site</ulink>. For more information on the Simpy
-            REST <acronym>API</acronym>, refer to the <ulink
-                url="http://www.simpy.com/doc/api/rest">Simpy REST <acronym>API</acronym>
-                documentation</ulink>.
-        </para>
-
-        <para>
-            The Simpy REST <acronym>API</acronym> allows developers to interact with specific
-            aspects of the service that the Simpy web site offers. The sections following will
-            outline the use of <classname>Zend_Service_Simpy</classname> for each of these areas.
-
-            <itemizedlist>
-                <listitem>
-                    <para>
-                        Links: Create, Retrieve, Update, Delete
-                    </para>
-                </listitem>
-
-                <listitem>
-                    <para>
-                        Tags: Retrieve, Delete, Rename, Merge, Split
-                    </para>
-                </listitem>
-
-                <listitem>
-                    <para>
-                        Notes: Create, Retrieve, Update, Delete
-                    </para>
-                </listitem>
-
-                <listitem>
-                    <para>
-                        Watchlists: Get, Get All
-                    </para>
-                </listitem>
-            </itemizedlist>
-        </para>
-    </sect2>
-
-    <sect2 id="zend.service.simpy.links">
-        <title>Links</title>
-
-        <para>
-            When querying links, results are returned in descending order by date added. Links can
-            be searched by title, nickname, tags, note, or even the content of the web page
-            associated with the link. Simpy offers searching by any or all of these fields with
-            phrases, boolean operators, and wildcards. See the
-            <ulink url="http://www.simpy.com/faq#searchSyntax">search syntax</ulink> and
-            <ulink url="http://www.simpy.com/faq#searchFieldsLinks">search fields</ulink>
-            sections of the Simpy FAQ for more information.
-        </para>
-
-        <example id="zend.service.simpy.links.querying">
-            <title>Querying Links</title>
-
-            <programlisting language="php"><![CDATA[
-$simpy = new Zend_Service_Simpy('yourusername', 'yourpassword');
-
-/* Search for the 10 links added most recently */
-$linkQuery = new Zend_Service_Simpy_LinkQuery();
-$linkQuery->setLimit(10);
-
-/* Get and display the links */
-$linkSet = $simpy->getLinks($linkQuery);
-foreach ($linkSet as $link) {
-    echo '<a href="';
-    echo $link->getUrl();
-    echo '">';
-    echo $link->getTitle();
-    echo '</a><br />';
-}
-
-/* Search for the 5 links added most recently with 'PHP' in
-the title */
-$linkQuery->setQueryString('title:PHP');
-$linkQuery->setLimit(5);
-
-/* Search for all links with 'French' in the title and
-'language' in the tags */
-$linkQuery->setQueryString('+title:French +tags:language');
-
-/* Search for all links with 'French' in the title and without
-'travel' in the tags */
-$linkQuery->setQueryString('+title:French -tags:travel');
-
-/* Search for all links added on 12/9/06 */
-$linkQuery->setDate('2006-12-09');
-
-/* Search for all links added after 12/9/06 (excluding that
-date) */
-$linkQuery->setAfterDate('2006-12-09');
-
-/* Search for all links added before 12/9/06 (excluding that
-date) */
-$linkQuery->setBeforeDate('2006-12-09');
-
-/* Search for all links added between 12/1/06 and 12/9/06
-(excluding those two dates) */
-$linkQuery->setBeforeDate('2006-12-01');
-$linkQuery->setAfterDate('2006-12-09');
-]]></programlisting>
-        </example>
-
-        <para>
-            Links are represented uniquely by their <acronym>URL</acronym>s. In other words, if an
-            attempt is made to save a link that has the same <acronym>URL</acronym> as an existing
-            link, data for the existing link will be overwritten with the data specified in the save
-            attempt.
-        </para>
-
-        <example id="zend.service.simpy.links.modifying">
-            <title>Modifying Links</title>
-
-            <programlisting language="php"><![CDATA[
-$simpy = new Zend_Service_Simpy('yourusername', 'yourpassword');
-
-/* Save a link */
-$simpy->saveLink(
-    'Zend Framework' // Title
-    'http://framework.zend.com', // URL
-    Zend_Service_Simpy_Link::ACCESSTYPE_PUBLIC, // Access Type
-    'zend, framework, php' // Tags
-    'Zend Framework home page' // Alternative title
-    'This site rocks!' // Note
-);
-
-/* Overwrite the existing link with new data */
-$simpy->saveLink(
-    'Zend Framework'
-    'http://framework.zend.com',
-    Zend_Service_Simpy_Link::ACCESSTYPE_PRIVATE, // Access Type has changed
-    'php, zend, framework' // Tags have changed order
-    'Zend Framework' // Alternative title has changed
-    'This site REALLY rocks!' // Note has changed
-);
-
-/* Delete the link */
-$simpy->deleteLink('http://framework.zend.com');
-
-/* A really easy way to do spring cleaning on your links ;) */
-$linkSet = $this->_simpy->getLinks();
-foreach ($linkSet as $link) {
-    $this->_simpy->deleteLink($link->getUrl());
-}
-]]></programlisting>
-        </example>
-    </sect2>
-
-    <sect2 id="zend.service.simpy.tags">
-        <title>Tags</title>
-
-        <para>
-            When retrieved, tags are sorted in decreasing order (i.e. highest
-            first) by the number of links that use the tag.
-        </para>
-
-        <example id="zend.service.simpy.tags.working">
-            <title>Working With Tags</title>
-
-            <programlisting language="php"><![CDATA[
-$simpy = new Zend_Service_Simpy('yourusername', 'yourpassword');
-
-/* Save a link with tags */
-$simpy->saveLink(
-    'Zend Framework' // Title
-    'http://framework.zend.com', // URL
-    Zend_Service_Simpy_Link::ACCESSTYPE_PUBLIC, // Access Type
-    'zend, framework, php' // Tags
-);
-
-/* Get a list of all tags in use by links and notes */
-$tagSet = $simpy->getTags();
-
-/* Display each tag with the number of links using it */
-foreach ($tagSet as $tag) {
-    echo $tag->getTag();
-    echo ' - ';
-    echo $tag->getCount();
-    echo '<br />';
-}
-
-/* Remove the 'zend' tag from all links using it */
-$simpy->removeTag('zend');
-
-/* Rename the 'framework' tag to 'frameworks' */
-$simpy->renameTag('framework', 'frameworks');
-
-/* Split the 'frameworks' tag into 'framework' and
-'development', which will remove the 'frameworks' tag for
-all links that use it and add the tags 'framework' and
-'development' to all of those links */
-$simpy->splitTag('frameworks', 'framework', 'development');
-
-/* Merge the 'framework' and 'development' tags back into
-'frameworks', basically doing the opposite of splitting them */
-$simpy->mergeTags('framework', 'development', 'frameworks');
-]]></programlisting>
-        </example>
-    </sect2>
-
-    <sect2 id="zend.service.simpy.notes">
-        <title>Notes</title>
-
-        <para>
-            Notes can be saved, retrieved, and deleted. They are uniquely
-            identified by a numeric ID value.
-        </para>
-
-        <example id="zend.service.simpy.notes.working">
-            <title>Working With Notes</title>
-
-            <programlisting language="php"><![CDATA[
-$simpy = new Zend_Service_Simpy('yourusername', 'yourpassword');
-
-/* Save a note */
-$simpy->saveNote(
-    'Test Note', // Title
-    'test,note', // Tags
-    'This is a test note.' // Description
-);
-
-/* Overwrite an existing note */
-$simpy->saveNote(
-    'Updated Test Note', // Title
-    'test,note,updated', // Tags
-    'This is an updated test note.', // Description
-    $note->getId() // Unique identifier
-);
-
-/* Search for the 10 most recently added notes */
-$noteSet = $simpy->getNotes(null, 10);
-
-/* Display the notes */
-foreach ($noteSet as $note) {
-    echo '<p>';
-    echo $note->getTitle();
-    echo '<br />';
-    echo $note->getDescription();
-    echo '<br >';
-    echo $note->getTags();
-    echo '</p>';
-}
-
-/* Search for all notes with 'PHP' in the title */
-$noteSet = $simpy->getNotes('title:PHP');
-
-/* Search for all notes with 'PHP' in the title and
-without 'framework' in the description */
-$noteSet = $simpy->getNotes('+title:PHP -description:framework');
-
-/* Delete a note */
-$simpy->deleteNote($note->getId());
-]]></programlisting>
-        </example>
-    </sect2>
-
-    <sect2 id="zend.service.simpy.watchlists">
-        <title>Watchlists</title>
-
-        <para>
-            Watchlists cannot be created or removed using the <acronym>API</acronym>, only
-            retrieved. Thus, you must set up a watchlist via the Simpy web
-            site prior to attempting to access it using the <acronym>API</acronym>.
-        </para>
-
-        <example id="zend.service.simpy.watchlists.retrieving">
-            <title>Retrieving Watchlists</title>
-
-            <programlisting language="php"><![CDATA[
-$simpy = new Zend_Service_Simpy('yourusername', 'yourpassword');
-
-/* Get a list of all watchlists */
-$watchlistSet = $simpy->getWatchlists();
-
-/* Display data for each watchlist */
-foreach ($watchlistSet as $watchlist) {
-    echo $watchlist->getId();
-    echo '<br />';
-    echo $watchlist->getName();
-    echo '<br />';
-    echo $watchlist->getDescription();
-    echo '<br />';
-    echo $watchlist->getAddDate();
-    echo '<br />';
-    echo $watchlist->getNewLinks();
-    echo '<br />';
-
-    foreach ($watchlist->getUsers() as $user) {
-        echo $user;
-        echo '<br />';
-    }
-
-    foreach ($watchlist->getFilters() as $filter) {
-        echo $filter->getName();
-        echo '<br />';
-        echo $filter->getQuery();
-        echo '<br />';
-    }
-}
-
-/* Get an individual watchlist by its identifier */
-$watchlist = $simpy->getWatchlist($watchlist->getId());
-$watchlist = $simpy->getWatchlist(1);
-]]></programlisting>
-        </example>
-    </sect2>
-</sect1>
-<!--
-vim:se ts=4 sw=4 et:
--->

documentation/manual/en/ref/requirements-dependencies-table.xml

@@ -4472,113 +4472,6 @@
                 </entry>
             </row>
             <row>
-                <entry morerows="11" valign="middle">
-                    <emphasis>
-                        <ulink
-                            url="&zf.manual.link;/zend.service.simpy.html">
-                            <classname>Zend_Service_Simpy</classname>
-                        </ulink>
-                    </emphasis>
-                </entry>
-                <entry morerows="2" valign="middle">&requirements.hard;</entry>
-                <entry>
-                    <ulink
-                        url="&zf.manual.link;/zend.exception.html">
-                        <classname>Zend_Exception</classname>
-                    </ulink>
-                </entry>
-            </row>
-            <row>
-                <entry>
-                    <ulink
-                        url="&zf.manual.link;/zend.http.html">
-                        <classname>Zend_Http</classname>
-                    </ulink>
-                </entry>
-            </row>
-            <row>
-                <entry>
-                    <ulink
-                        url="&zf.manual.link;/zend.rest.html">
-                        <classname>Zend_Rest</classname>
-                    </ulink>
-                </entry>
-            </row>
-            <row>
-                <entry morerows="5" valign="middle">&requirements.fix;</entry>
-                <entry>
-                    <ulink
-                        url="&zf.manual.link;/zend.loader.html">
-                        <classname>Zend_Loader</classname>
-                    </ulink>
-                </entry>
-            </row>
-            <row>
-                <entry>
-                    <ulink
-                        url="&zf.manual.link;/zend.locale.html">
-                        <classname>Zend_Locale</classname>
-                    </ulink>
-                </entry>
-            </row>
-            <row>
-                <entry>
-                    <ulink
-                        url="&zf.manual.link;/zend.server.html">
-                        <classname>Zend_Server</classname>
-                    </ulink>
-                </entry>
-            </row>
-            <row>
-                <entry>
-                    <ulink
-                        url="&zf.manual.link;/zend.service.html">
-                        <classname>Zend_Service</classname>
-                    </ulink>
-                </entry>
-            </row>
-            <row>
-                <entry>
-                    <ulink
-                        url="&zf.manual.link;/zend.uri.html">
-                        <classname>Zend_Uri</classname>
-                    </ulink>
-                </entry>
-            </row>
-            <row>
-                <entry>
-                    <ulink
-                        url="&zf.manual.link;/zend.validate.html">
-                        <classname>Zend_Validate</classname>
-                    </ulink>
-                </entry>
-            </row>
-            <row>
-                <entry morerows="2" valign="middle">&requirements.sub;</entry>
-                <entry>
-                    <ulink
-                        url="&zf.manual.link;/zend.date.html">
-                        <classname>Zend_Date</classname>
-                    </ulink>
-                </entry>
-            </row>
-            <row>
-                <entry>
-                    <ulink
-                        url="&zf.manual.link;/zend.filter.html">
-                        <classname>Zend_Filter</classname>
-                    </ulink>
-                </entry>
-            </row>
-            <row>
-                <entry>
-                    <ulink
-                        url="&zf.manual.link;/zend.registry.html">
-                        <classname>Zend_Registry</classname>
-                    </ulink>
-                </entry>
-            </row>
-            <row>
                 <entry morerows="24" valign="middle">
                     <emphasis>
                         <ulink

documentation/manual/en/ref/requirements-php-extensions-table.xml

@@ -331,14 +331,6 @@
             <row>
                 <entry>
                     <ulink
-                        url="&zf.manual.link;/zend.service.simpy.html">
-                        <classname>Zend_Service_Simpy</classname>
-                    </ulink>
-                </entry>
-            </row>
-            <row>
-                <entry>
-                    <ulink
                         url="&zf.manual.link;/zend.service.yahoo.html">
                         <classname>Zend_Service_Yahoo</classname>
                     </ulink>

documentation/manual/en/ref/requirements-zendcomponents-table.xml

@@ -1020,39 +1020,6 @@
                 </entry>
             </row>
             <row>
-                <entry morerows="1" valign="middle">
-                    <emphasis>
-                        <ulink
-                            url="&zf.manual.link;/zend.service.simpy.html">
-                            <classname>Zend_Service_Simpy</classname>
-                        </ulink>
-                    </emphasis>
-                </entry>
-                <entry morerows="1" valign="middle">&requirements.hard;</entry>
-                <entry>
-                    <ulink
-                        url="&php.manual.link;/ref.dom.php">dom</ulink>
-                </entry>
-            </row>
-            <row>
-                <entry>
-                    <ulink
-                        url="&php.manual.link;/ref.libxml.php">libxml</ulink>
-                </entry>
-            </row>
-            <row>
-                <entry>
-                    <emphasis>
-                        <ulink
-                            url="&zf.manual.link;/zend.service.slideshare.html">
-                            <classname>Zend_Service_SlideShare</classname>
-                        </ulink>
-                    </emphasis>
-                </entry>
-                <entry>---</entry>
-                <entry>---</entry>
-            </row>
-            <row>
                 <entry>
                     <emphasis>
                         <ulink

documentation/manual/es/ref/requirements-dependencies-table.xml

@@ -3895,100 +3895,6 @@
                 </entry>
             </row>
             <row>
-                <entry morerows="11" valign="middle">
-                    <emphasis>
-                        <ulink url="http://framework.zend.com/manual/en/zend.service.simpy.html">
-                            <classname>Zend_Service_Simpy</classname>
-                        </ulink>
-                    </emphasis>
-                </entry>
-                <entry morerows="2" valign="middle">Hard</entry>
-                <entry>
-                    <ulink url="http://framework.zend.com/manual/en/zend.exception.html">
-                        <classname>Zend_Exception</classname>
-                    </ulink>
-                </entry>
-            </row>
-            <row>
-                <entry>
-                    <ulink url="http://framework.zend.com/manual/en/zend.http.html">
-                        <classname>Zend_Http</classname>
-                    </ulink>
-                </entry>
-            </row>
-            <row>
-                <entry>
-                    <ulink url="http://framework.zend.com/manual/en/zend.rest.html">
-                        <classname>Zend_Rest</classname>
-                    </ulink>
-                </entry>
-            </row>
-            <row>
-                <entry morerows="5" valign="middle">Fix</entry>
-                <entry>
-                    <ulink url="http://framework.zend.com/manual/en/zend.loader.html">
-                        <classname>Zend_Loader</classname>
-                    </ulink>
-                </entry>
-            </row>
-            <row>
-                <entry>
-                    <ulink url="http://framework.zend.com/manual/en/zend.locale.html">
-                        <classname>Zend_Locale</classname>
-                    </ulink>
-                </entry>
-            </row>
-            <row>
-                <entry>
-                    <ulink url="http://framework.zend.com/manual/en/zend.server.html">
-                        <classname>Zend_Server</classname>
-                    </ulink>
-                </entry>
-            </row>
-            <row>
-                <entry>
-                    <ulink url="http://framework.zend.com/manual/en/zend.service.html">
-                        <classname>Zend_Service</classname>
-                    </ulink>
-                </entry>
-            </row>
-            <row>
-                <entry>
-                    <ulink url="http://framework.zend.com/manual/en/zend.uri.html">
-                        <classname>Zend_Uri</classname>
-                    </ulink>
-                </entry>
-            </row>
-            <row>
-                <entry>
-                    <ulink url="http://framework.zend.com/manual/en/zend.validate.html">
-                        <classname>Zend_Validate</classname>
-                    </ulink>
-                </entry>
-            </row>
-            <row>
-                <entry morerows="2" valign="middle">Sub</entry>
-                <entry>
-                    <ulink url="http://framework.zend.com/manual/en/zend.date.html">
-                        <classname>Zend_Date</classname>
-                    </ulink>
-                </entry>
-            </row>
-            <row>
-                <entry>
-                    <ulink url="http://framework.zend.com/manual/en/zend.filter.html">
-                        <classname>Zend_Filter</classname>
-                    </ulink>
-                </entry>
-            </row>
-            <row>
-                <entry>
-                    <ulink url="http://framework.zend.com/manual/en/zend.registry.html">
-                        <classname>Zend_Registry</classname>
-                    </ulink>
-                </entry>
-            </row>
-            <row>
                 <entry morerows="24" valign="middle">
                     <emphasis>
                         <ulink url="http://framework.zend.com/manual/en/zend.service.slideshare.html">

documentation/manual/es/ref/requirements-php-extensions-table.xml

@@ -284,13 +284,6 @@
             </row>
             <row>
                 <entry>
-                    <ulink url="http://framework.zend.com/manual/en/zend.service.simpy.html">
-                        <classname>Zend_Service_Simpy</classname>
-                    </ulink>
-                </entry>
-            </row>
-            <row>
-                <entry>
                     <ulink url="http://framework.zend.com/manual/en/zend.service.yahoo.html">
                         <classname>Zend_Service_Yahoo</classname>
                     </ulink>

documentation/manual/es/ref/requirements-zendcomponents-table.xml

@@ -854,24 +854,6 @@
                 </entry>
             </row>
             <row>
-                <entry morerows="1" valign="middle">
-                    <emphasis>
-                        <ulink url="http://framework.zend.com/manual/en/zend.service.simpy.html">
-                            <classname>Zend_Service_Simpy</classname>
-                        </ulink>
-                    </emphasis>
-                </entry>
-                <entry morerows="1" valign="middle">Hard</entry>
-                <entry>
-                    <ulink url="http://www.php.net/manual/en/ref.dom.php">dom</ulink>
-                </entry>
-            </row>
-            <row>
-                <entry>
-                    <ulink url="http://www.php.net/manual/en/ref.libxml.php">libxml</ulink>
-                </entry>
-            </row>
-            <row>
                 <entry>
                     <emphasis>
                         <ulink url="http://framework.zend.com/manual/en/zend.service.slideshare.html">

documentation/manual/fr/module_specs/Zend_Service.xml

@@ -85,12 +85,6 @@
 
         <listitem>
             <para>
-                <link linkend="zend.service.simpy">Simpy</link>
-            </para>
-        </listitem>
-
-        <listitem>
-            <para>
                 <link linkend="zend.service.slideshare">SlideShare</link>
             </para>
         </listitem>

documentation/manual/fr/module_specs/Zend_Service_Simpy.xml

@@ -1,311 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- EN-Revision: 24249 -->
-<!-- Reviewed: no -->
-<sect1 id="zend.service.simpy">
-    <title>Zend_Service_Simpy</title>
-
-    <sect2 id="zend.service.simpy.introduction">
-        <title>Introduction</title>
-
-        <para>
-            <classname>Zend_Service_Simpy</classname> permet l'interaction avec les services
-            Web du réseau social de partage de 'marque-pages' (de 'favoris', de 'liens')
-            Simpy.
-        </para>
-
-        <para>
-            Pour utiliser <classname>Zend_Service_Simpy</classname>, vous devez posséder un
-            compte. Pour ceci, voyez <ulink url="http://simpy.com">le site Web de Simpy</ulink>.
-            Pour plus d'informations sur l'API REST de Simpy, voyez <ulink
-            url="http://www.simpy.com/doc/api/rest">sa documentation </ulink>.
-        </para>
-
-        <para>
-            Les sections qui suivent vont vous indiquer les éléments sur lesquels vous pouvez
-            agir en utilisant l'API de Simpy, via <classname>Zend_Service_Simpy</classname>.
-            <itemizedlist>
-                    <listitem>
-                        <para>Liens: Créer, requêter, mettre à jour, supprimer</para>
-                    </listitem>
-
-                    <listitem>
-                        <para>Mots-clés: requêter, supprimer, renommer, fusionner, éclater</para>
-                    </listitem>
-
-                    <listitem>
-                        <para>Notes: Créer, requêter, mettre à jour, supprimer</para>
-                    </listitem>
-
-                    <listitem>
-                        <para>Listes: récupérer, récupérer tout</para>
-                    </listitem>
-                </itemizedlist>
-            </para>
-    </sect2>
-
-    <sect2 id="zend.service.simpy.links">
-        <title>Liens</title>
-
-        <para>
-            Lors d'interactions avec les liens, ceux-ci sont retournées dans l'ordre
-            descendant par date d'ajout. Vous pouvez les chercher par titre, auteur, mots-clés,
-            notes ou même via le contenu de leur page. Vous pouvez chercher selon tous ces critères
-            avec des phrases, des booléens ou des jokers. Voyez la <ulink
-            url="http://www.simpy.com/faq#searchSyntax">syntaxe de recherche</ulink> et <ulink
-            url="http://www.simpy.com/faq#searchFieldsLinks">les champs de recherche</ulink> depuis
-            la FAQ de Simpy, pour plus d'informations.
-        </para>
-
-        <example id="zend.service.simpy.links.querying">
-            <title>Requêter des liens</title>
-
-            <programlisting language="php"><![CDATA[
-$simpy = new Zend_Service_Simpy('yourusername', 'yourpassword');
-
-/* Recherche les 10 liens les plus récents */
-$linkQuery = new Zend_Service_Simpy_LinkQuery();
-$linkQuery->setLimit(10);
-
-/* Récupère et affiche les liens */
-$linkSet = $simpy->getLinks($linkQuery);
-foreach ($linkSet as $link) {
-    echo '<a href="';
-    echo $link->getUrl();
-    echo '">';
-    echo $link->getTitle();
-    echo '</a><br />';
-}
-
-/* Recherche les 5 derniers liens ajoutés,
-contenant 'PHP' dans leur titre */
-$linkQuery->setQueryString('title:PHP');
-$linkQuery->setLimit(5);
-
-/* Cherche tous les liens avec le mot 'French' dans le titre
-et le mot-clé 'language' */
-$linkQuery->setQueryString('+title:French +tags:language');
-
-/* Cherche tous les liens avec le mot 'French' dans le titre
-et pas le mot-clé 'travel' */
-$linkQuery->setQueryString('+title:French -tags:travel');
-
-/* Cherche tous les liens ajoutés le 9/12/06 */
-$linkQuery->setDate('2006-12-09');
-
-/* Cherche tous les liens ajoutés après le 9/12/06 (exclu)*/
-$linkQuery->setAfterDate('2006-12-09');
-
-/* Cherche tous les liens ajoutés avant le 9/12/06 (exclu)*/
-$linkQuery->setBeforeDate('2006-12-09');
-
-/* Cherche tous les liens ajoutés entre le 1/12/06 et le 9/12/06 (exclues) */
-$linkQuery->setBeforeDate('2006-12-01');
-$linkQuery->setAfterDate('2006-12-09');
-]]></programlisting>
-        </example>
-
-        <para>
-            Les liens sont représentés de manière unique par leur <acronym>URL</acronym>. Ainsi tenter de
-            sauvegarder un lien ayant le même <acronym>URL</acronym> qu'un lien existant va l'écraser.
-        </para>
-
-        <example id="zend.service.simpy.links.modifying">
-            <title>Modifier des liens</title>
-
-            <programlisting language="php"><![CDATA[
-$simpy = new Zend_Service_Simpy('yourusername', 'yourpassword');
-
-/* Sauvegarde un lien */
-$simpy->saveLink(
-    'Zend Framework' // Title
-    'http://framework.zend.com', // URL
-    Zend_Service_Simpy_Link::ACCESSTYPE_PUBLIC, // Access Type
-    'zend, framework, php' // Tags
-    'Zend Framework home page' // Alternative title
-    'This site rocks!' // Note
-);
-
-/* Ecrase le lien avec les nouvelles données */
-$simpy->saveLink(
-    'Zend Framework'
-    'http://framework.zend.com',
-    Zend_Service_Simpy_Link::ACCESSTYPE_PRIVATE, // Access Type has changed
-    'php, zend, framework' // Tags have changed order
-    'Zend Framework' // Alternative title has changed
-    'This site REALLY rocks!' // Note has changed
-);
-
-/* Effacement du lien */
-$simpy->deleteLink('http://framework.zend.com');
-
-/* Effacement de plusieurs liens */
-$linkSet = $this->_simpy->getLinks();
-foreach ($linkSet as $link) {
-    $this->_simpy->deleteLink($link->getUrl());
-}
-]]></programlisting>
-        </example>
-    </sect2>
-
-    <sect2 id="zend.service.simpy.tags">
-        <title>Mots-clés</title>
-
-        <para>
-            Les mots-clés sont récupérés dans l'ordre descendant, par le nombre de liens
-            utilisant le mot-clé.
-        </para>
-
-        <example id="zend.service.simpy.tags.working">
-            <title>Travailler avec les mots-clés</title>
-
-            <programlisting language="php"><![CDATA[
-$simpy = new Zend_Service_Simpy('yourusername', 'yourpassword');
-
-/* Sauvegarde d'un lien avec des mots-clés */
-$simpy->saveLink(
-    'Zend Framework' // Title
-    'http://framework.zend.com', // URL
-    Zend_Service_Simpy_Link::ACCESSTYPE_PUBLIC, // Access Type
-    'zend, framework, php' // Tags
-);
-
-/* Récupère la liste de tous les mots-clés utilisés par les liens
-et les notes */
-$tagSet = $simpy->getTags();
-
-/* Affiche chaque mot-clé avec le nombre de liens les utilisant */
-foreach ($tagSet as $tag) {
-    echo $tag->getTag();
-    echo ' - ';
-    echo $tag->getCount();
-    echo '<br />';
-}
-
-/* Efface le mot-clé 'zend' de tous les liens l'utilisant */
-$simpy->removeTag('zend');
-
-/* Renome le mot-clé 'framework' vers 'frameworks' */
-$simpy->renameTag('framework', 'frameworks');
-
-/* Eclate le mot-clé 'frameworks' en 'framework' et 'development',
-ce qui va effacer le mot-clé 'frameworks' et ajouter les mots-clés
-'framework' et 'development' pour tous les liens l'utilisant
-anciennement */
-$simpy->splitTag('frameworks', 'framework', 'development');
-
-/* Cette opération de fusion est l'opposé de l'opération ci-dessus */
-$simpy->mergeTags('framework', 'development', 'frameworks');
-]]></programlisting>
-        </example>
-    </sect2>
-
-    <sect2 id="zend.service.simpy.notes">
-        <title>Notes</title>
-
-        <para>
-            Les notes peuvent être sauvées, récupérées, effacées. Elles possèdent un
-            identifiant numérique unique.
-        </para>
-
-        <example id="zend.service.simpy.notes.working">
-            <title>Travailler avec les notes</title>
-
-            <programlisting language="php"><![CDATA[
-$simpy = new Zend_Service_Simpy('yourusername', 'yourpassword');
-
-/* Sauvegarde une note */
-$simpy->saveNote(
-    'Test Note', // Title
-    'test,note', // Tags
-    'This is a test note.' // Description
-);
-
-/* Ecrase une note existante */
-$simpy->saveNote(
-    'Updated Test Note', // Title
-    'test,note,updated', // Tags
-    'This is an updated test note.', // Description
-    $note->getId() // Unique identifier
-);
-
-/* Recherche les 10 notes les plus récentes */
-$noteSet = $simpy->getNotes(null, 10);
-
-/* Affiche ces notes */
-foreach ($noteSet as $note) {
-    echo '<p>';
-    echo $note->getTitle();
-    echo '<br />';
-    echo $note->getDescription();
-    echo '<br >';
-    echo $note->getTags();
-    echo '</p>';
-}
-
-/* Cherche les notes avec le mot 'PHP' dans leur titre */
-$noteSet = $simpy->getNotes('title:PHP');
-
-/* Cherche les notes avec le mot 'PHP' dans leur titre et pas le mot
-'framework' dans leur description */
-$noteSet = $simpy->getNotes('+title:PHP -description:framework');
-
-/* Efface une note */
-$simpy->deleteNote($note->getId());
-]]></programlisting>
-        </example>
-    </sect2>
-
-    <sect2 id="zend.service.simpy.watchlists">
-        <title>Listes de surveillance</title>
-
-        <para>
-            Les listes de surveillance ne peuvent qu'être requêtées via l'API Simpy. Vous
-            devez donc vous assurer qu'elles sont correctement créées, depuis le site Web de Simpy,
-            il n'est pas possible de les créer ou les supprimer depuis l'API.
-        </para>
-
-        <example id="zend.service.simpy.watchlists.retrieving">
-            <title>Récupérer des listes de surveillance</title>
-
-            <programlisting language="php"><![CDATA[
-$simpy = new Zend_Service_Simpy('yourusername', 'yourpassword');
-
-/* Récupérer une liste de listes de surveillance */
-$watchlistSet = $simpy->getWatchlists();
-
-/* Affiche les données de chaque liste */
-foreach ($watchlistSet as $watchlist) {
-    echo $watchlist->getId();
-    echo '<br />';
-    echo $watchlist->getName();
-    echo '<br />';
-    echo $watchlist->getDescription();
-    echo '<br />';
-    echo $watchlist->getAddDate();
-    echo '<br />';
-    echo $watchlist->getNewLinks();
-    echo '<br />';
-
-    foreach ($watchlist->getUsers() as $user) {
-        echo $user;
-        echo '<br />';
-    }
-
-    foreach ($watchlist->getFilters() as $filter) {
-        echo $filter->getName();
-        echo '<br />';
-        echo $filter->getQuery();
-        echo '<br />';
-    }
-}
-
-/* Récupère une liste de surveillance par son identifiant */
-$watchlist = $simpy->getWatchlist($watchlist->getId());
-$watchlist = $simpy->getWatchlist(1);
-]]></programlisting>
-        </example>
-    </sect2>
-</sect1>
-<!--
-vim:se ts=4 sw=4 et:
--->

documentation/manual/he/module_specs/Zend_Service.xml

@@ -39,11 +39,6 @@
         </listitem>
         <listitem>
             <para>
-                <link linkend="zend.service.simpy">Simpy</link>
-            </para>
-        </listitem>
-        <listitem>
-            <para>
                 <link linkend="zend.service.slideshare">SlideShare</link>
             </para>
         </listitem>

documentation/manual/he/ref/requirements.xml

@@ -175,9 +175,6 @@
                             <entry><ulink url="http://framework.zend.com/manual/en/zend.service.flickr.html"><code>Zend_Service_Flickr</code></ulink></entry>
                         </row>
                         <row>
-                            <entry><ulink url="http://framework.zend.com/manual/en/zend.service.simpy.html"><code>Zend_Service_Simpy</code></ulink></entry>
-                        </row>
-                        <row>
                             <entry><ulink url="http://framework.zend.com/manual/en/zend.service.yahoo.html"><code>Zend_Service_Yahoo</code></ulink></entry>
                         </row>
                         <row>
@@ -1042,14 +1039,6 @@
                             <entry><emphasis role="strong"><ulink url="http://www.php.net/manual/en/ref.mcrypt.php"><code>mcrypt</code></ulink></emphasis></entry>
                         </row>
                         <row>
-                            <entry morerows="1" valign="middle"><emphasis role="strong"><ulink url="http://framework.zend.com/manual/en/zend.service.simpy.html"><code>Zend_Service_Simpy</code></ulink></emphasis></entry>
-                            <entry morerows="1" valign="middle">תלוי מאוד</entry>
-                            <entry><ulink url="http://www.php.net/manual/en/ref.dom.php"><code>dom</code></ulink></entry>
-                        </row>
-                        <row>
-                            <entry><ulink url="http://www.php.net/manual/en/ref.libxml.php"><code>libxml</code></ulink></entry>
-                        </row>
-                        <row>
                             <entry><emphasis role="strong"><ulink url="http://framework.zend.com/manual/en/zend.service.slideshare.html"><code>Zend_Service_SlideShare</code></ulink></emphasis></entry>
                             <entry>---</entry>
                             <entry>---</entry>
@@ -2839,46 +2828,6 @@
                             <entry><ulink url="http://framework.zend.com/manual/en/zend.registry.html"><code>Zend_Registry</code></ulink></entry>
                         </row>
                         <row>
-                            <entry morerows="11" valign="middle"><emphasis role="strong"><ulink url="http://framework.zend.com/manual/en/zend.service.simpy.html"><code>Zend_Service_Simpy</code></ulink></emphasis></entry>
-                            <entry morerows="2" valign="middle">תלוי מאוד</entry>
-                            <entry><ulink url="http://framework.zend.com/manual/en/zend.exception.html"><code>Zend_Exception</code></ulink></entry>
-                        </row>
-                        <row>
-                            <entry><ulink url="http://framework.zend.com/manual/en/zend.http.html"><code>Zend_Http</code></ulink></entry>
-                        </row>
-                        <row>
-                            <entry><ulink url="http://framework.zend.com/manual/en/zend.rest.html"><code>Zend_Rest</code></ulink></entry>
-                        </row>
-                        <row>
-                            <entry morerows="5" valign="middle">תיקון</entry>
-                            <entry><ulink url="http://framework.zend.com/manual/en/zend.loader.html"><code>Zend_Loader</code></ulink></entry>
-                        </row>
-                        <row>
-                            <entry><ulink url="http://framework.zend.com/manual/en/zend.locale.html"><code>Zend_Locale</code></ulink></entry>
-                        </row>
-                        <row>
-                            <entry><ulink url="http://framework.zend.com/manual/en/zend.server.html"><code>Zend_Server</code></ulink></entry>
-                        </row>
-                        <row>
-                            <entry><ulink url="http://framework.zend.com/manual/en/zend.service.html"><code>Zend_Service</code></ulink></entry>
-                        </row>
-                        <row>
-                            <entry><ulink url="http://framework.zend.com/manual/en/zend.uri.html"><code>Zend_Uri</code></ulink></entry>
-                        </row>
-                        <row>
-                            <entry><ulink url="http://framework.zend.com/manual/en/zend.validate.html"><code>Zend_Validate</code></ulink></entry>
-                        </row>
-                        <row>
-                            <entry morerows="2" valign="middle">תת</entry>
-                            <entry><ulink url="http://framework.zend.com/manual/en/zend.date.html"><code>Zend_Date</code></ulink></entry>
-                        </row>
-                        <row>
-                            <entry><ulink url="http://framework.zend.com/manual/en/zend.filter.html"><code>Zend_Filter</code></ulink></entry>
-                        </row>
-                        <row>
-                            <entry><ulink url="http://framework.zend.com/manual/en/zend.registry.html"><code>Zend_Registry</code></ulink></entry>
-                        </row>
-                        <row>
                             <entry morerows="24" valign="middle"><emphasis role="strong"><ulink url="http://framework.zend.com/manual/en/zend.service.slideshare.html"><code>Zend_Service_SlideShare</code></ulink></emphasis></entry>
                             <entry morerows="2" valign="middle">תלוי מאוד</entry>
                             <entry><ulink url="http://framework.zend.com/manual/en/zend.cache.html"><code>Zend_Cache</code></ulink></entry>
@@ -3573,12 +3522,12 @@ vim:se ts=4 sw=4 et:
 
 Note:
 Tables related to Release 1.7.2
-
-1Zend_Db
-1Zend_Dojo
-1Zend_Form
-1Zend_Layout
-1Zend_Session
+
+1Zend_Db
+1Zend_Dojo
+1Zend_Form
+1Zend_Layout
+1Zend_Session
 -->
 
 

documentation/manual/hu/ref/requirements-dependencies-table.xml

@@ -4422,113 +4422,6 @@
                 </entry>
             </row>
             <row>
-                <entry morerows="11" valign="middle">
-                    <emphasis>
-                        <ulink
-                            url="http://framework.zend.com/manual/en/zend.service.simpy.html">
-                            <classname>Zend_Service_Simpy</classname>
-                        </ulink>
-                    </emphasis>
-                </entry>
-                <entry morerows="2" valign="middle">Erős</entry>
-                <entry>
-                    <ulink
-                        url="http://framework.zend.com/manual/en/zend.exception.html">
-                        <classname>Zend_Exception</classname>
-                    </ulink>
-                </entry>
-            </row>
-            <row>
-                <entry>
-                    <ulink
-                        url="http://framework.zend.com/manual/en/zend.http.html">
-                        <classname>Zend_Http</classname>
-                    </ulink>
-                </entry>
-            </row>
-            <row>
-                <entry>
-                    <ulink
-                        url="http://framework.zend.com/manual/en/zend.rest.html">
-                        <classname>Zend_Rest</classname>
-                    </ulink>
-                </entry>
-            </row>
-            <row>
-                <entry morerows="5" valign="middle">Állandó</entry>
-                <entry>
-                    <ulink
-                        url="http://framework.zend.com/manual/en/zend.loader.html">
-                        <classname>Zend_Loader</classname>
-                    </ulink>
-                </entry>
-            </row>
-            <row>
-                <entry>
-                    <ulink
-                        url="http://framework.zend.com/manual/en/zend.locale.html">
-                        <classname>Zend_Locale</classname>
-                    </ulink>
-                </entry>
-            </row>
-            <row>
-                <entry>
-                    <ulink
-                        url="http://framework.zend.com/manual/en/zend.server.html">
-                        <classname>Zend_Server</classname>
-                    </ulink>
-                </entry>
-            </row>
-            <row>
-                <entry>
-                    <ulink
-                        url="http://framework.zend.com/manual/en/zend.service.html">
-                        <classname>Zend_Service</classname>
-                    </ulink>
-                </entry>
-            </row>
-            <row>
-                <entry>
-                    <ulink
-                        url="http://framework.zend.com/manual/en/zend.uri.html">
-                        <classname>Zend_Uri</classname>
-                    </ulink>
-                </entry>
-            </row>
-            <row>
-                <entry>
-                    <ulink
-                        url="http://framework.zend.com/manual/en/zend.validate.html">
-                        <classname>Zend_Validate</classname>
-                    </ulink>
-                </entry>
-            </row>
-            <row>
-                <entry morerows="2" valign="middle">Al-</entry>
-                <entry>
-                    <ulink
-                        url="http://framework.zend.com/manual/en/zend.date.html">
-                        <classname>Zend_Date</classname>
-                    </ulink>
-                </entry>
-            </row>
-            <row>
-                <entry>
-                    <ulink
-                        url="http://framework.zend.com/manual/en/zend.filter.html">
-                        <classname>Zend_Filter</classname>
-                    </ulink>
-                </entry>
-            </row>
-            <row>
-                <entry>
-                    <ulink
-                        url="http://framework.zend.com/manual/en/zend.registry.html">
-                        <classname>Zend_Registry</classname>
-                    </ulink>
-                </entry>
-            </row>
-            <row>
                 <entry morerows="24" valign="middle">
                     <emphasis>
                         <ulink

documentation/manual/hu/ref/requirements-php-extensions-table.xml

@@ -322,14 +322,6 @@
             <row>
                 <entry>
                     <ulink
-                        url="http://framework.zend.com/manual/en/zend.service.simpy.html">
-                        <classname>Zend_Service_Simpy</classname>
-                    </ulink>
-                </entry>
-            </row>
-            <row>
-                <entry>
-                    <ulink
                         url="http://framework.zend.com/manual/en/zend.service.yahoo.html">
                         <classname>Zend_Service_Yahoo</classname>
                     </ulink>

documentation/manual/hu/ref/requirements-zendcomponents-table.xml

@@ -960,27 +960,6 @@
                 </entry>
             </row>
             <row>
-                <entry morerows="1" valign="middle">
-                    <emphasis>
-                        <ulink
-                            url="http://framework.zend.com/manual/en/zend.service.simpy.html">
-                            <classname>Zend_Service_Simpy</classname>
-                        </ulink>
-                    </emphasis>
-                </entry>
-                <entry morerows="1" valign="middle">Erős</entry>
-                <entry>
-                    <ulink
-                        url="http://www.php.net/manual/en/ref.dom.php">dom</ulink>
-                </entry>
-            </row>
-            <row>
-                <entry>
-                    <ulink
-                        url="http://www.php.net/manual/en/ref.libxml.php">libxml</ulink>
-                </entry>
-            </row>
-            <row>
                 <entry>
                     <emphasis>
                         <ulink

documentation/manual/id/ref/requirements.xml

@@ -173,9 +173,6 @@
                         <entry><ulink url="http://framework.zend.com/manual/en/zend.service.flickr.html"><code>Zend_Service_Flickr</code></ulink></entry>
                     </row>
                     <row>
-                        <entry><ulink url="http://framework.zend.com/manual/en/zend.service.simpy.html"><code>Zend_Service_Simpy</code></ulink></entry>
-                    </row>
-                    <row>
                         <entry><ulink url="http://framework.zend.com/manual/en/zend.service.yahoo.html"><code>Zend_Service_Yahoo</code></ulink></entry>
                     </row>
                     <row>
@@ -1053,15 +1050,6 @@
                         <entry>---</entry>
                     </row>
                     <row>
-                        <entry morerows="1" valign="middle"><emphasis role="strong"><ulink url="http://framework.zend.com/manual/en/zend.service.simpy.html"><code>Zend_Service_Simpy</code></ulink></emphasis></entry>
-                        <entry morerows="1" valign="middle">Hard</entry>
-                        <entry morerows="1" valign="middle">---</entry>
-                        <entry><ulink url="http://www.php.net/manual/en/ref.dom.php"><code>dom</code></ulink></entry>
-                    </row>
-                    <row>
-                        <entry><ulink url="http://www.php.net/manual/en/ref.libxml.php"><code>libxml</code></ulink></entry>
-                    </row>
-                    <row>
                         <entry><emphasis role="strong"><ulink url="http://framework.zend.com/manual/en/zend.service.slideshare.html"><code>Zend_Service_SlideShare</code></ulink></emphasis></entry>
                         <entry>---</entry>
                         <entry>---</entry>
@@ -1629,17 +1617,6 @@
                         <entry><ulink url="http://framework.zend.com/manual/en/zend.loader.html"><code>Zend_Loader</code></ulink></entry>
                     </row>
                     <row>
-                        <entry morerows="2" valign="middle"><emphasis role="strong"><ulink url="http://framework.zend.com/manual/en/zend.service.simpy.html"><code>Zend_Service_Simpy</code></ulink></emphasis></entry>
-                        <entry morerows="2" valign="middle">Hard</entry>
-                        <entry><ulink url="http://framework.zend.com/manual/en/zend.exception.html"><code>Zend_Exception</code></ulink></entry>
-                    </row>
-                    <row>
-                        <entry><ulink url="http://framework.zend.com/manual/en/zend.http.html"><code>Zend_Http</code></ulink></entry>
-                    </row>
-                    <row>
-                        <entry><ulink url="http://framework.zend.com/manual/en/zend.rest.html"><code>Zend_Rest</code></ulink></entry>
-                    </row>
-                    <row>
                         <entry morerows="2" valign="middle"><emphasis role="strong"><ulink url="http://framework.zend.com/manual/en/zend.service.slideshare.html"><code>Zend_Service_SlideShare</code></ulink></emphasis></entry>
                         <entry morerows="2" valign="middle">Hard</entry>
                         <entry><ulink url="http://framework.zend.com/manual/en/zend.cache.html"><code>Zend_Cache</code></ulink></entry>
@@ -1849,7 +1826,6 @@ Service_Audioscrobbler
 Service_Delicious
 Service_Flickr
 Service_Nirvanix
-Service_Simpy
 Service_SlideShare
 Service_StrikeIron
 Service_Technorati

documentation/manual/ja/module_specs/Zend_Service.xml

@@ -79,11 +79,6 @@
 
         <listitem>
             <para>
-                <link linkend="zend.service.simpy">Simpy</link>
-            </para>
-        </listitem>
-        <listitem>
-            <para>
                 <link linkend="zend.service.slideshare">SlideShare</link>
             </para>
         </listitem>

documentation/manual/ja/module_specs/Zend_Service_Simpy.xml

@@ -1,329 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Reviewed: no -->
-<!-- EN-Revision: 24249 -->
-<sect1 id="zend.service.simpy">
-    <title>Zend_Service_Simpy(日本語)</title>
-
-    <sect2 id="zend.service.simpy.introduction">
-        <title>導入</title>
-
-        <para>
-            <classname>Zend_Service_Simpy</classname> は、ソーシャルブックマークサービスである
-            Simpy 用のフリーな REST <acronym>API</acronym> の、軽量なラッパーです。
-        </para>
-
-        <para>
-            <classname>Zend_Service_Simpy</classname> を使用するには
-            Simpy アカウントが必要です。アカウントを取得するには、
-            <ulink url="http://simpy.com">Simpy のウェブサイト</ulink> にいきます。
-            Simpy REST <acronym>API</acronym> についての詳細な情報は
-            <ulink url="http://www.simpy.com/doc/api/rest">Simpy REST <acronym>API</acronym> ドキュメント</ulink>
-            を参照ください。
-        </para>
-
-        <para>
-            Simpy REST <acronym>API</acronym> を使用すると、Simpy
-            のウェブサイトが提供するサービスを利用できます。
-            以下の節は、<classname>Zend_Service_Simpy</classname>
-            で利用できる機能の概要をまとめたものです。
-
-            <itemizedlist>
-                <listitem>
-                    <para>
-                        リンク: 作成、取得、更新、削除
-                    </para>
-                </listitem>
-
-                <listitem>
-                    <para>
-                        タグ: 取得、削除、名前の変更、統合、分割
-                    </para>
-                </listitem>
-
-                <listitem>
-                    <para>
-                        メモ: 作成、取得、更新、削除
-                    </para>
-                </listitem>
-
-                <listitem>
-                    <para>
-                        ウォッチリスト: 取得、すべてを取得
-                    </para>
-                </listitem>
-            </itemizedlist>
-        </para>
-    </sect2>
-
-    <sect2 id="zend.service.simpy.links">
-        <title>リンク</title>
-
-        <para>
-            リンクを問い合わせると、登録日の降順で結果が返されます。
-            リンクの検索は、タイトルやニックネーム、タグ、メモ
-            そしてリンクに関連付けられたウェブページの内容にもとづいて行うことができます。
-            Simpy の検索は、これらのフィールドのいずれかあるいはすべてを対象に
-            フレーズや論理演算子、ワイルドカードを使用して行うことができます。
-            詳細な情報は、Simpy FAQ の
-            <ulink url="http://www.simpy.com/faq#searchSyntax">検索構文</ulink> や
-            <ulink url="http://www.simpy.com/faq#searchFieldsLinks">検索フィールド</ulink>
-            といった節を参照ください。
-        </para>
-
-        <example id="zend.service.simpy.links.querying">
-            <title>リンクの問い合わせ</title>
-
-            <programlisting language="php"><![CDATA[
-$simpy = new Zend_Service_Simpy('あなたのユーザ名', 'あなたのパスワード');
-
-/* 直近に追加された 10 件のリンクを探します */
-$linkQuery = new Zend_Service_Simpy_LinkQuery();
-$linkQuery->setLimit(10);
-
-/* リンクを取得し、表示します */
-$linkSet = $simpy->getLinks($linkQuery);
-foreach ($linkSet as $link) {
-    echo '<a href="';
-    echo $link->getUrl();
-    echo '">';
-    echo $link->getTitle();
-    echo '</a><br />';
-}
-
-/* 直近に追加されたリンクのうち、タイトルに 'PHP' が含まれるものを
-   5 件まで探します */
-$linkQuery->setQueryString('title:PHP');
-$linkQuery->setLimit(5);
-
-/* タイトルに 'French'、タグに 'language' が含まれる
-   すべてのリンクを探します */
-$linkQuery->setQueryString('+title:French +tags:language');
-
-/* タイトルに 'French' を含み、タグに 'travel' を含まない
-   すべてのリンクを探します */
-$linkQuery->setQueryString('+title:French -tags:travel');
-
-/* 2006/12/09 に追加されたすべてのリンクを探します */
-$linkQuery->setDate('2006-12-09');
-
-/* 2006/12/09 より後 (その日を含まない) に追加された
-   すべてのリンクを探します */
-$linkQuery->setAfterDate('2006-12-09');
-
-/* 2006/12/09 より前 (その日を含まない) に追加された
-   すべてのリンクを探します */
-$linkQuery->setBeforeDate('2006-12-09');
-
-/* 2006/12/01 から 2006/12/09 (両端の日を含まない) に追加された
-   すべてのリンクを探します */
-$linkQuery->setBeforeDate('2006-12-01');
-$linkQuery->setAfterDate('2006-12-09');
-]]></programlisting>
-        </example>
-
-        <para>
-            リンクの識別は、<acronym>URL</acronym> によって行います。言い換えると、
-            既存のリンクと同じ <acronym>URL</acronym> のリンクを保存しようとすると
-            既存のリンクが新しいデータで上書きされるということです。
-        </para>
-
-        <example id="zend.service.simpy.links.modifying">
-            <title>リンクの変更</title>
-
-            <programlisting language="php"><![CDATA[
-$simpy = new Zend_Service_Simpy('あなたのユーザ名', 'あなたのパスワード');
-
-/* リンクを保存します */
-$simpy->saveLink(
-    'Zend Framework' // タイトル
-    'http://framework.zend.com', // URL
-    Zend_Service_Simpy_Link::ACCESSTYPE_PUBLIC, // アクセス形式
-    'zend, framework, php' // タグ
-    'Zend Framework home page' // 別のタイトル
-    'This site rocks!' // メモ
-);
-
-/* 既存のリンクを新しいデータで上書きします */
-$simpy->saveLink(
-    'Zend Framework'
-    'http://framework.zend.com',
-    Zend_Service_Simpy_Link::ACCESSTYPE_PRIVATE, // アクセス形式を変更しました
-    'php, zend, framework' // タグの順番を変更しました
-    'Zend Framework' // 別のタイトルを変更しました
-    'This site REALLY rocks!' // メモを変更しました
-);
-
-/* リンクを削除します */
-$simpy->deleteLink('http://framework.zend.com');
-
-/* あなたのリンクを大掃除する簡単な方法 (^o^) */
-$linkSet = $this->_simpy->getLinks();
-foreach ($linkSet as $link) {
-    $this->_simpy->deleteLink($link->getUrl());
-}
-]]></programlisting>
-        </example>
-    </sect2>
-
-    <sect2 id="zend.service.simpy.tags">
-        <title>タグ</title>
-
-        <para>
-            取得時に、そのタグを使用しているリンク数の降順
-            (多いものが先) でタグが並べ替えられます。
-        </para>
-
-        <example id="zend.service.simpy.tags.working">
-            <title>タグの処理</title>
-
-            <programlisting language="php"><![CDATA[
-$simpy = new Zend_Service_Simpy('あなたのユーザ名', 'あなたのパスワード');
-
-/* タグつきでリンクを保存します */
-$simpy->saveLink(
-    'Zend Framework' // タイトル
-    'http://framework.zend.com', // URL
-    Zend_Service_Simpy_Link::ACCESSTYPE_PUBLIC, // アクセス形式
-    'zend, framework, php' // タグ
-);
-
-/* リンクおよびメモで使用しているすべてのタグの一覧を取得します */
-$tagSet = $simpy->getTags();
-
-/* 各タグと、それを使用しているリンク数を表示します */
-foreach ($tagSet as $tag) {
-    echo $tag->getTag();
-    echo ' - ';
-    echo $tag->getCount();
-    echo '<br />';
-}
-
-/* 'zend' タグを使用しているすべてのリンクから、そのタグを削除します */
-$simpy->removeTag('zend');
-
-/* 'framework' タグの名前を 'frameworks' に変更します */
-$simpy->renameTag('framework', 'frameworks');
-
-/* 'frameworks' タグを 'framework' および
-'development' に分割します。つまり、'frameworks' タグを
-使用しているすべてのリンクからこのタグを削除し、'framework'
-および 'development' をそれらのリンクに追加します */
-$simpy->splitTag('frameworks', 'framework', 'development');
-
-/* 'framework' および 'development' のふたつのタグを
-'frameworks' に統合します。これは分割の反対の作業です */
-$simpy->mergeTags('framework', 'development', 'frameworks');
-]]></programlisting>
-        </example>
-    </sect2>
-
-    <sect2 id="zend.service.simpy.notes">
-        <title>メモ</title>
-
-        <para>
-            メモの保存、取得および削除が可能です。
-            メモは、数値 ID によって識別されます。
-        </para>
-
-        <example id="zend.service.simpy.notes.working">
-            <title>メモの扱い</title>
-
-            <programlisting language="php"><![CDATA[
-$simpy = new Zend_Service_Simpy('あなたのユーザ名', 'あなたのパスワード');
-
-/* メモを保存します */
-$simpy->saveNote(
-    'Test Note', // タイトル
-    'test,note', // タグ
-    'This is a test note.' // 説明
-);
-
-/* 既存のメモを上書きします */
-$simpy->saveNote(
-    'Updated Test Note', // タイトル
-    'test,note,updated', // タグ
-    'This is an updated test note.', // 説明
-    $note->getId() // 一意な ID
-);
-
-/* 直近に追加された 10 件のメモを探します */
-$noteSet = $simpy->getNotes(null, 10);
-
-/* メモを表示します */
-foreach ($noteSet as $note) {
-    echo '<p>';
-    echo $note->getTitle();
-    echo '<br />';
-    echo $note->getDescription();
-    echo '<br >';
-    echo $note->getTags();
-    echo '</p>';
-}
-
-/* タイトルに 'PHP' が含まれるすべてのメモを探します */
-$noteSet = $simpy->getNotes('title:PHP');
-
-/* タイトルに 'PHP' が含まれ、説明に 'framework' が含まれない
-   すべてのメモを探します */
-$noteSet = $simpy->getNotes('+title:PHP -description:framework');
-
-/* メモを削除します */
-$simpy->deleteNote($note->getId());
-]]></programlisting>
-        </example>
-    </sect2>
-
-    <sect2 id="zend.service.simpy.watchlists">
-        <title>ウォッチリスト</title>
-
-        <para>
-            ウォッチリストは、<acronym>API</acronym> を用いて作成したり削除したりすることはできません。
-            取得のみが可能です。したがって、<acronym>API</acronym> を使用してアクセスする前には
-            Simpy のウェブサイトでウォッチリストを作成しておく必要があります。
-        </para>
-
-        <example id="zend.service.simpy.watchlists.retrieving">
-            <title>ウォッチリストの取得</title>
-
-            <programlisting language="php"><![CDATA[
-$simpy = new Zend_Service_Simpy('あなたのユーザ名', 'あなたのパスワード');
-
-/* すべてのウォッチリストの一覧を取得します */
-$watchlistSet = $simpy->getWatchlists();
-
-/* 各ウォッチリストのデータを表示します */
-foreach ($watchlistSet as $watchlist) {
-    echo $watchlist->getId();
-    echo '<br />';
-    echo $watchlist->getName();
-    echo '<br />';
-    echo $watchlist->getDescription();
-    echo '<br />';
-    echo $watchlist->getAddDate();
-    echo '<br />';
-    echo $watchlist->getNewLinks();
-    echo '<br />';
-
-    foreach ($watchlist->getUsers() as $user) {
-        echo $user;
-        echo '<br />';
-    }
-
-    foreach ($watchlist->getFilters() as $filter) {
-        echo $filter->getName();
-        echo '<br />';
-        echo $filter->getQuery();
-        echo '<br />';
-    }
-}
-
-/* 個々のウォッチリストを、ID を指定して取得します */
-$watchlist = $simpy->getWatchlist($watchlist->getId());
-$watchlist = $simpy->getWatchlist(1);
-]]></programlisting>
-        </example>
-    </sect2>
-</sect1>
-<!--
-vim:se ts=4 sw=4 et:
--->

documentation/manual/pl/module_specs/Zend_Service.xml

@@ -44,11 +44,6 @@
         </listitem>
         <listitem>
             <para>
-                <link linkend="zend.service.simpy">Simpy</link>
-            </para>
-        </listitem>
-        <listitem>
-            <para>
                 <link linkend="zend.service.slideshare">SlideShare</link>
             </para>
         </listitem>

documentation/manual/pl/ref/requirements.xml

@@ -181,9 +181,6 @@
                         <entry><ulink url="http://framework.zend.com/manual/en/zend.service.flickr.html"><code>Zend_Service_Flickr</code></ulink></entry>
                     </row>
                     <row>
-                        <entry><ulink url="http://framework.zend.com/manual/en/zend.service.simpy.html"><code>Zend_Service_Simpy</code></ulink></entry>
-                    </row>
-                    <row>
                         <entry><ulink url="http://framework.zend.com/manual/en/zend.service.yahoo.html"><code>Zend_Service_Yahoo</code></ulink></entry>
                     </row>
                     <row>
@@ -1062,15 +1059,6 @@
                         <entry>---</entry>
                     </row>
                     <row>
-                        <entry morerows="1" valign="middle"><emphasis role="strong"><ulink url="http://framework.zend.com/manual/en/zend.service.simpy.html"><code>Zend_Service_Simpy</code></ulink></emphasis></entry>
-                        <entry morerows="1" valign="middle">Silna</entry>
-                        <entry morerows="1" valign="middle">---</entry>
-                        <entry><ulink url="http://www.php.net/manual/en/ref.dom.php"><code>dom</code></ulink></entry>
-                    </row>
-                    <row>
-                        <entry><ulink url="http://www.php.net/manual/en/ref.libxml.php"><code>libxml</code></ulink></entry>
-                    </row>
-                    <row>
                         <entry><emphasis role="strong"><ulink url="http://framework.zend.com/manual/en/zend.service.slideshare.html"><code>Zend_Service_SlideShare</code></ulink></emphasis></entry>
                         <entry>---</entry>
                         <entry>---</entry>
@@ -1638,17 +1626,6 @@
                         <entry><ulink url="http://framework.zend.com/manual/en/zend.loader.html"><code>Zend_Loader</code></ulink></entry>
                     </row>
                     <row>
-                        <entry morerows="2" valign="middle"><emphasis role="strong"><ulink url="http://framework.zend.com/manual/en/zend.service.simpy.html"><code>Zend_Service_Simpy</code></ulink></emphasis></entry>
-                        <entry morerows="2" valign="middle">Silna</entry>
-                        <entry><ulink url="http://framework.zend.com/manual/en/zend.exception.html"><code>Zend_Exception</code></ulink></entry>
-                    </row>
-                    <row>
-                        <entry><ulink url="http://framework.zend.com/manual/en/zend.http.html"><code>Zend_Http</code></ulink></entry>
-                    </row>
-                    <row>
-                        <entry><ulink url="http://framework.zend.com/manual/en/zend.rest.html"><code>Zend_Rest</code></ulink></entry>
-                    </row>
-                    <row>
                         <entry morerows="2" valign="middle"><emphasis role="strong"><ulink url="http://framework.zend.com/manual/en/zend.service.slideshare.html"><code>Zend_Service_SlideShare</code></ulink></emphasis></entry>
                         <entry morerows="2" valign="middle">Silna</entry>
                         <entry><ulink url="http://framework.zend.com/manual/en/zend.cache.html"><code>Zend_Cache</code></ulink></entry>
@@ -1858,7 +1835,6 @@ Service_Audioscrobbler
 Service_Delicious
 Service_Flickr
 Service_Nirvanix
-Service_Simpy
 Service_SlideShare
 Service_StrikeIron
 Service_Technorati

documentation/manual/pt-br/module_specs/Zend_Service.xml

@@ -85,12 +85,6 @@
 
         <listitem>
             <para>
-                <link linkend="zend.service.simpy">Simpy</link>
-            </para>
-        </listitem>
-
-        <listitem>
-            <para>
                 <link linkend="zend.service.slideshare">SlideShare</link>
             </para>
         </listitem>

documentation/manual/sk/module_specs/Zend_Service.xml

@@ -43,11 +43,6 @@
         </listitem>
         <listitem>
             <para>
-                <link linkend="zend.service.simpy">Simpy</link>
-            </para>
-        </listitem>
-        <listitem>
-            <para>
                 <link linkend="zend.service.strikeiron">StrikeIron</link>
             </para>
         </listitem>

documentation/manual/tr/ref/requirements.xml

@@ -122,7 +122,6 @@
                 <ulink url="http://framework.zend.com/manual/tr/zend.service.amazon.html"><code>Zend_Service_Amazon</code></ulink>,
                 <ulink url="http://framework.zend.com/manual/tr/zend.service.delicious.html"><code>Zend_Service_Delicious</code></ulink>,
                 <ulink url="http://framework.zend.com/manual/tr/zend.service.flickr.html"><code>Zend_Service_Flickr</code></ulink>,
-                <ulink url="http://framework.zend.com/manual/tr/zend.service.simpy.html"><code>Zend_Service_Simpy</code></ulink>,
                 <ulink url="http://framework.zend.com/manual/tr/zend.service.yahoo.html"><code>Zend_Service_Yahoo</code></ulink>,
                 <ulink url="http://framework.zend.com/manual/tr/zend.xmlrpc.html"><code>Zend_XmlRpc</code></ulink>
             </entry>

documentation/manual/zh/ref/requirements.xml

@@ -133,7 +133,6 @@
                             <ulink url="http://framework.zend.com/manual/en/zend.service.amazon.html"><code>Zend_Service_Amazon</code></ulink>,
                             <ulink url="http://framework.zend.com/manual/en/zend.service.delicious.html"><code>Zend_Service_Delicious</code></ulink>,
                             <ulink url="http://framework.zend.com/manual/en/zend.service.flickr.html"><code>Zend_Service_Flickr</code></ulink>,
-                            <ulink url="http://framework.zend.com/manual/en/zend.service.simpy.html"><code>Zend_Service_Simpy</code></ulink>,
                             <ulink url="http://framework.zend.com/manual/en/zend.service.yahoo.html"><code>Zend_Service_Yahoo</code></ulink>,
                             <ulink url="http://framework.zend.com/manual/en/zend.xmlrpc.html"><code>Zend_XmlRpc</code></ulink>
                         </entry>
@@ -850,17 +849,6 @@
                         </entry>
                     </row>
                     <row>
-                        <entry><ulink url="http://framework.zend.com/manual/en/zend.service.simpy.html"><code>Zend_Service_Simpy</code></ulink></entry>
-                        <entry>
-                            <ulink url="http://www.php.net/manual/zh/ref.dom.php"><code>dom</code></ulink>
-                            ( 依赖 )
-                            <ulink url="http://www.php.net/manual/zh/ref.libxml.php"><code>libxml</code></ulink>
-                            ( 依赖 )
-                            <ulink url="http://www.php.net/manual/zh/ref.libxml.php"><code>libxml</code></ulink>
-                            ( 依赖 )
-                        </entry>
-                    </row>
-                    <row>
                         <entry><ulink url="http://framework.zend.com/manual/en/zend.service.strikeiron.html"><code>Zend_Service_StrikeIron</code></ulink></entry>
                         <entry>
                             <ulink url="http://www.php.net/manual/zh/ref.soap.php"><code>soap</code></ulink>

library/Zend/Service/Simpy.php

@@ -1,433 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Simpy
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Http_Client
- */
-require_once 'Zend/Http/Client.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Simpy
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @link       http://www.simpy.com/doc/api/rest/
- */
-class Zend_Service_Simpy
-{
-    /**
-     * Base URI to which API methods and parameters will be appended
-     *
-     * @var string
-     */
-    protected $_baseUri = 'http://simpy.com/simpy/api/rest/';
-
-    /**
-     * HTTP client for use in making web service calls
-     *
-     * @var Zend_Http_Client
-     */
-    protected $_http;
-
-    /**
-     * Constructs a new Simpy (free) REST API Client
-     *
-     * @param  string $username Username for the Simpy user account
-     * @param  string $password Password for the Simpy user account
-     * @return void
-     */
-    public function __construct($username, $password)
-    {
-        $this->_http = new Zend_Http_Client;
-        $this->_http->setAuth($username, $password);
-    }
-
-    /**
-     * Returns the HTTP client currently in use by this class for REST API
-     * calls, intended mainly for testing.
-     *
-     * @return Zend_Http_Client
-     */
-    public function getHttpClient()
-    {
-        return $this->_http;
-    }
-
-    /**
-     * Sends a request to the REST API service and does initial processing
-     * on the response.
-     *
-     * @param  string $op    Name of the operation for the request
-     * @param  array  $query Query data for the request (optional)
-     * @throws Zend_Service_Exception
-     * @return DOMDocument Parsed XML response
-     */
-    protected function _makeRequest($op, $query = null)
-    {
-        if ($query != null) {
-            $query = array_diff($query, array_filter($query, 'is_null'));
-            $query = '?' . http_build_query($query);
-        }
-
-        $this->_http->setUri($this->_baseUri . $op . '.do' . $query);
-        $response = $this->_http->request('GET');
-
-        if ($response->isSuccessful()) {
-            $doc = new DOMDocument();
-            $doc->loadXML($response->getBody());
-            $xpath = new DOMXPath($doc);
-            $list = $xpath->query('/status/code');
-
-            if ($list->length > 0) {
-                $code = $list->item(0)->nodeValue;
-
-                if ($code != 0) {
-                    $list = $xpath->query('/status/message');
-                    $message = $list->item(0)->nodeValue;
-                    /**
-                     * @see Zend_Service_Exception
-                     */
-                    require_once 'Zend/Service/Exception.php';
-                    throw new Zend_Service_Exception($message, $code);
-                }
-            }
-
-            return $doc;
-        }
-
-        /**
-         * @see Zend_Service_Exception
-         */
-        require_once 'Zend/Service/Exception.php';
-        throw new Zend_Service_Exception($response->getMessage(), $response->getStatus());
-    }
-
-    /**
-     * Returns a list of all tags and their counts, ordered by count in
-     * decreasing order
-     *
-     * @param  int $limit Limits the number of tags returned (optional)
-     * @link   http://www.simpy.com/doc/api/rest/GetTags
-     * @throws Zend_Service_Exception
-     * @return Zend_Service_Simpy_TagSet
-     */
-    public function getTags($limit = null)
-    {
-        $query = array(
-            'limit' => $limit
-        );
-
-        $doc = $this->_makeRequest('GetTags', $query);
-
-        /**
-         * @see Zend_Service_Simpy_TagSet
-         */
-        require_once 'Zend/Service/Simpy/TagSet.php';
-        return new Zend_Service_Simpy_TagSet($doc);
-    }
-
-    /**
-     * Removes a tag.
-     *
-     * @param  string $tag Tag to be removed
-     * @link   http://www.simpy.com/doc/api/rest/RemoveTag
-     * @return Zend_Service_Simpy Provides a fluent interface
-     */
-    public function removeTag($tag)
-    {
-        $query = array(
-            'tag' => $tag
-        );
-
-        $this->_makeRequest('RemoveTag', $query);
-
-        return $this;
-    }
-
-    /**
-     * Renames a tag.
-     *
-     * @param  string $fromTag Tag to be renamed
-     * @param  string $toTag   New tag name
-     * @link   http://www.simpy.com/doc/api/rest/RenameTag
-     * @return Zend_Service_Simpy Provides a fluent interface
-     */
-    public function renameTag($fromTag, $toTag)
-    {
-        $query = array(
-            'fromTag' => $fromTag,
-            'toTag' => $toTag
-        );
-
-        $this->_makeRequest('RenameTag', $query);
-
-        return $this;
-    }
-
-    /**
-     * Merges two tags into a new tag.
-     *
-     * @param  string $fromTag1 First tag to merge.
-     * @param  string $fromTag2 Second tag to merge.
-     * @param  string $toTag    Tag to merge the two tags into.
-     * @link   http://www.simpy.com/doc/api/rest/MergeTags
-     * @return Zend_Service_Simpy Provides a fluent interface
-     */
-    public function mergeTags($fromTag1, $fromTag2, $toTag)
-    {
-        $query = array(
-            'fromTag1' => $fromTag1,
-            'fromTag2' => $fromTag2,
-            'toTag' => $toTag
-        );
-
-        $this->_makeRequest('MergeTags', $query);
-
-        return $this;
-    }
-
-    /**
-     * Splits a single tag into two separate tags.
-     *
-     * @param  string $tag    Tag to split
-     * @param  string $toTag1 First tag to split into
-     * @param  string $toTag2 Second tag to split into
-     * @link   http://www.simpy.com/doc/api/rest/SplitTag
-     * @return Zend_Service_Simpy Provides a fluent interface
-     */
-    public function splitTag($tag, $toTag1, $toTag2)
-    {
-        $query = array(
-            'tag' => $tag,
-            'toTag1' => $toTag1,
-            'toTag2' => $toTag2
-        );
-
-        $this->_makeRequest('SplitTag', $query);
-
-        return $this;
-    }
-
-    /**
-     * Performs a query on existing links and returns the results or returns all
-     * links if no particular query is specified (which should be used sparingly
-     * to prevent overloading Simpy servers)
-     *
-     * @param  Zend_Service_Simpy_LinkQuery $q Query object to use (optional)
-     * @return Zend_Service_Simpy_LinkSet
-     */
-    public function getLinks(Zend_Service_Simpy_LinkQuery $q = null)
-    {
-        if ($q != null) {
-            $query = array(
-                'q'          => $q->getQueryString(),
-                'limit'      => $q->getLimit(),
-                'date'       => $q->getDate(),
-                'afterDate'  => $q->getAfterDate(),
-                'beforeDate' => $q->getBeforeDate()
-            );
-
-            $doc = $this->_makeRequest('GetLinks', $query);
-        } else {
-            $doc = $this->_makeRequest('GetLinks');
-        }
-
-        /**
-         * @see Zend_Service_Simpy_LinkSet
-         */
-        require_once 'Zend/Service/Simpy/LinkSet.php';
-        return new Zend_Service_Simpy_LinkSet($doc);
-    }
-
-    /**
-     * Saves a given link.
-     *
-     * @param  string $title       Title of the page to save
-     * @param  string $href        URL of the page to save
-     * @param  int    $accessType  ACCESSTYPE_PUBLIC or ACCESSTYPE_PRIVATE
-     * @param  mixed  $tags        String containing a comma-separated list of
-     *                             tags or array of strings containing tags
-     *                             (optional)
-     * @param  string $urlNickname Alternative custom title (optional)
-     * @param  string $note        Free text note (optional)
-     * @link   Zend_Service_Simpy::ACCESSTYPE_PUBLIC
-     * @link   Zend_Service_Simpy::ACCESSTYPE_PRIVATE
-     * @link   http://www.simpy.com/doc/api/rest/SaveLink
-     * @return Zend_Service_Simpy Provides a fluent interface
-     */
-    public function saveLink($title, $href, $accessType, $tags = null, $urlNickname = null, $note = null)
-    {
-        if (is_array($tags)) {
-            $tags = implode(',', $tags);
-        }
-
-        $query = array(
-            'title'       => $title,
-            'href'        => $href,
-            'accessType'  => $accessType,
-            'tags'        => $tags,
-            'urlNickname' => $urlNickname,
-            'note'        => $note
-        );
-
-        $this->_makeRequest('SaveLink', $query);
-
-        return $this;
-    }
-
-    /**
-     * Deletes a given link.
-     *
-     * @param  string $href URL of the bookmark to delete
-     * @link   http://www.simpy.com/doc/api/rest/DeleteLink
-     * @return Zend_Service_Simpy Provides a fluent interface
-     */
-    public function deleteLink($href)
-    {
-        $query = array(
-            'href' => $href
-        );
-
-        $this->_makeRequest('DeleteLink', $query);
-
-        return $this;
-    }
-
-    /**
-     * Return a list of watchlists and their meta-data, including the number
-     * of new links added to each watchlist since last login.
-     *
-     * @link   http://www.simpy.com/doc/api/rest/GetWatchlists
-     * @return Zend_Service_Simpy_WatchlistSet
-     */
-    public function getWatchlists()
-    {
-        $doc = $this->_makeRequest('GetWatchlists');
-
-        /**
-         * @see Zend_Service_Simpy_WatchlistSet
-         */
-        require_once 'Zend/Service/Simpy/WatchlistSet.php';
-        return new Zend_Service_Simpy_WatchlistSet($doc);
-    }
-
-    /**
-     * Returns the meta-data for a given watchlist.
-     *
-     * @param  int $watchlistId ID of the watchlist to retrieve
-     * @link   http://www.simpy.com/doc/api/rest/GetWatchlist
-     * @return Zend_Service_Simpy_Watchlist
-     */
-    public function getWatchlist($watchlistId)
-    {
-        $query = array(
-            'watchlistId' => $watchlistId
-        );
-
-        $doc = $this->_makeRequest('GetWatchlist', $query);
-
-        /**
-         * @see Zend_Service_Simpy_Watchlist
-         */
-        require_once 'Zend/Service/Simpy/Watchlist.php';
-        return new Zend_Service_Simpy_Watchlist($doc->documentElement);
-    }
-
-    /**
-     * Returns all notes in reverse chronological order by add date or by
-     * rank.
-     *
-     * @param  string $q     Query string formatted using Simpy search syntax
-     *                       and search fields (optional)
-     * @param  int    $limit Limits the number notes returned (optional)
-     * @link   http://www.simpy.com/doc/api/rest/GetNotes
-     * @link   http://www.simpy.com/simpy/FAQ.do#searchSyntax
-     * @link   http://www.simpy.com/simpy/FAQ.do#searchFieldsLinks
-     * @return Zend_Service_Simpy_NoteSet
-     */
-    public function getNotes($q = null, $limit = null)
-    {
-        $query = array(
-            'q'     => $q,
-            'limit' => $limit
-        );
-
-        $doc = $this->_makeRequest('GetNotes', $query);
-
-        /**
-         * @see Zend_Service_Simpy_NoteSet
-         */
-        require_once 'Zend/Service/Simpy/NoteSet.php';
-        return new Zend_Service_Simpy_NoteSet($doc);
-    }
-
-    /**
-     * Saves a note.
-     *
-     * @param  string $title       Title of the note
-     * @param  mixed  $tags        String containing a comma-separated list of
-     *                             tags or array of strings containing tags
-     *                             (optional)
-     * @param  string $description Free-text note (optional)
-     * @param  int    $noteId      Unique identifier for an existing note to
-     *                             update (optional)
-     * @link   http://www.simpy.com/doc/api/rest/SaveNote
-     * @return Zend_Service_Simpy Provides a fluent interface
-     */
-    public function saveNote($title, $tags = null, $description = null, $noteId = null)
-    {
-        if (is_array($tags)) {
-            $tags = implode(',', $tags);
-        }
-
-        $query = array(
-            'title'       => $title,
-            'tags'        => $tags,
-            'description' => $description,
-            'noteId'      => $noteId
-        );
-
-        $this->_makeRequest('SaveNote', $query);
-
-        return $this;
-    }
-
-    /**
-     * Deletes a given note.
-     *
-     * @param  int $noteId ID of the note to delete
-     * @link   http://www.simpy.com/doc/api/rest/DeleteNote
-     * @return Zend_Service_Simpy Provides a fluent interface
-     */
-    public function deleteNote($noteId)
-    {
-        $query = array(
-            'noteId' => $noteId
-        );
-
-        $this->_makeRequest('DeleteNote', $query);
-
-        return $this;
-    }
-}

library/Zend/Service/Simpy/Link.php

@@ -1,215 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Simpy
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Simpy
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Simpy_Link
-{
-    /**
-     * Private access type
-     *
-     * @var string
-     */
-    const ACCESSTYPE_PRIVATE = '0';
-
-    /**
-     * Public access type
-     *
-     * @var string
-     */
-    const ACCESSTYPE_PUBLIC  = '1';
-
-    /**
-     * Access type assigned to the link
-     *
-     * @var string
-     */
-    protected $_accessType;
-
-    /**
-     * URL of the link
-     *
-     * @var string
-     */
-    protected $_url;
-
-    /**
-     * Date of the last modification made to the link
-     *
-     * @var string
-     */
-    protected $_modDate;
-
-    /**
-     * Date the link was added
-     *
-     * @var string
-     */
-    protected $_addDate;
-
-    /**
-     * Title assigned to the link
-     *
-     * @var string
-     */
-    protected $_title;
-
-    /**
-     * Nickname assigned to the link
-     *
-     * @var string
-     */
-    protected $_nickname;
-
-    /**
-     * Tags assigned to the link
-     *
-     * @var array
-     */
-    protected $_tags;
-
-    /**
-     * Note assigned to the link
-     *
-     * @var string
-     */
-    protected $_note;
-
-    /**
-     * Constructor to initialize the object with data
-     *
-     * @param  DOMNode $node Individual <link> node from a parsed response from
-     *                       a GetLinks operation
-     * @return void
-     */
-    public function __construct($node)
-    {
-        $this->_accessType = $node->attributes->getNamedItem('accessType')->nodeValue;
-
-        $doc = new DOMDocument();
-        $doc->appendChild($doc->importNode($node, true));
-        $xpath = new DOMXPath($doc);
-
-        $this->_url = $xpath->evaluate('/link/url')->item(0)->nodeValue;
-        $this->_modDate = $xpath->evaluate('/link/modDate')->item(0)->nodeValue;
-        $this->_addDate = $xpath->evaluate('/link/addDate')->item(0)->nodeValue;
-        $this->_title = $xpath->evaluate('/link/title')->item(0)->nodeValue;
-        $this->_nickname = $xpath->evaluate('/link/nickname')->item(0)->nodeValue;
-        $this->_note = $xpath->evaluate('/link/note')->item(0)->nodeValue;
-
-        $list = $xpath->query('/link/tags/tag');
-        $this->_tags = array();
-
-        for ($x = 0; $x < $list->length; $x++) {
-            $this->_tags[$x] = $list->item($x)->nodeValue;
-        }
-    }
-
-    /**
-     * Returns the access type assigned to the link
-     *
-     * @see ACCESSTYPE_PRIVATE
-     * @see ACCESSTYPE_PUBLIC
-     * @return string
-     */
-    public function getAccessType()
-    {
-        return $this->_accessType;
-    }
-
-    /**
-     * Returns the URL of the link
-     *
-     * @return string
-     */
-    public function getUrl()
-    {
-        return $this->_url;
-    }
-
-    /**
-     * Returns the date of the last modification made to the link
-     *
-     * @return string
-     */
-    public function getModDate()
-    {
-        return $this->_modDate;
-    }
-
-    /**
-     * Returns the date the link was added
-     *
-     * @return string
-     */
-    public function getAddDate()
-    {
-        return $this->_addDate;
-    }
-
-    /**
-     * Returns the title assigned to the link
-     *
-     * @return string
-     */
-    public function getTitle()
-    {
-        return $this->_title;
-    }
-
-    /**
-     * Returns the nickname assigned to the link
-     *
-     * @return string
-     */
-    public function getNickname()
-    {
-        return $this->_nickname;
-    }
-
-    /**
-     * Returns the tags assigned to the link
-     *
-     * @return array
-     */
-    public function getTags()
-    {
-        return $this->_tags;
-    }
-
-    /**
-     * Returns the note assigned to the link
-     *
-     * @return string
-     */
-    public function getNote()
-    {
-        return $this->_note;
-    }
-}

library/Zend/Service/Simpy/LinkQuery.php

@@ -1,200 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Simpy
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Simpy
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Simpy_LinkQuery
-{
-    /**
-     * Query string for the query
-     *
-     * @var string
-     */
-    protected $_query = null;
-
-    /**
-     * Maximum number of search results to return
-     *
-     * @var int
-     */
-    protected $_limit = null;
-
-    /**
-     * Date on which search results must have been added
-     *
-     * @var string
-     */
-    protected $_date = null;
-
-    /**
-     * Date after which search results must have been added
-     *
-     * @var string
-     */
-    protected $_afterDate = null;
-
-    /**
-     * Date before which search results must have been added
-     *
-     * @var string
-     */
-    protected $_beforeDate = null;
-
-    /**
-     * Sets the query string for the query
-     *
-     * @param  string $query Query string in valid Simpy syntax
-     * @see    http://www.simpy.com/faq#searchSyntax
-     * @see    http://www.simpy.com/faq#searchFieldsLinks
-     * @return Zend_Service_Simpy_LinkQuery Provides a fluent interface
-     */
-    public function setQueryString($query)
-    {
-        $this->_query = $query;
-
-        return $this;
-    }
-
-    /**
-     * Returns the query string set for this query
-     *
-     * @return string
-     */
-    public function getQueryString()
-    {
-        return $this->_query;
-    }
-
-    /**
-     * Sets the maximum number of search results to return
-     *
-     * @param  int $limit
-     * @return Zend_Service_Simpy_LinkQuery Provides a fluent interface
-     */
-    public function setLimit($limit)
-    {
-        $this->_limit = intval($limit);
-
-        if ($this->_limit == 0) {
-            $this->_limit = null;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Returns the maximum number of search results to return
-     *
-     * @return int
-     */
-    public function getLimit()
-    {
-        return $this->_limit;
-    }
-
-    /**
-     * Sets the date on which search results must have been added, which will
-     * override any existing values set using setAfterDate() and setBeforeDate()
-     *
-     * @param  string $date
-     * @see    setAfterDate()
-     * @see    setBeforeDate()
-     * @return Zend_Service_Simpy_LinkQuery Provides a fluent interface
-     */
-    public function setDate($date)
-    {
-        $this->_date = $date;
-        $this->_afterDate = null;
-        $this->_beforeDate = null;
-
-        return $this;
-    }
-
-    /**
-     * Returns the date on which search results must have been added
-     *
-     * @return string
-     */
-    public function getDate()
-    {
-        return $this->_date;
-    }
-
-    /**
-     * Sets the date after which search results must have been added, which will
-     * override any existing values set using setDate()
-     *
-     * @param  string $date
-     * @see    setDate()
-     * @return Zend_Service_Simpy_LinkQuery Provides a fluent interface
-     */
-    public function setAfterDate($date)
-    {
-        $this->_afterDate = $date;
-        $this->_date = null;
-
-        return $this;
-    }
-
-    /**
-     * Returns the date after which search results must have been added
-     *
-     * @return string
-     */
-    public function getAfterDate()
-    {
-        return $this->_afterDate;
-    }
-
-    /**
-     * Sets the date before which search results must have been added, which
-     * will override any existing values set using setDate()
-     *
-     * @param  string $date
-     * @see    setDate()
-     * @return Zend_Service_Simpy_LinkQuery Provides a fluent interface
-     */
-    public function setBeforeDate($date)
-    {
-        $this->_beforeDate = $date;
-        $this->_date = null;
-
-        return $this;
-    }
-
-    /**
-     * Returns the date before which search results must have been added
-     *
-     * @return string
-     */
-    public function getBeforeDate()
-    {
-        return $this->_beforeDate;
-    }
-}

library/Zend/Service/Simpy/LinkSet.php

@@ -1,83 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Simpy
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-
-/**
- * @see Zend_Service_Simpy_Link
- */
-require_once 'Zend/Service/Simpy/Link.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Simpy
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Simpy_LinkSet implements IteratorAggregate
-{
-    /**
-     * List of links
-     *
-     * @var array of Zend_Service_Simpy_Link objects
-     */
-    protected $_links;
-
-    /**
-     * Constructor to initialize the object with data
-     *
-     * @param  DOMDocument $doc Parsed response from a GetLinks operation
-     * @return void
-     */
-    public function __construct(DOMDocument $doc)
-    {
-        $xpath = new DOMXPath($doc);
-        $list = $xpath->query('//links/link');
-        $this->_links = array();
-
-        for ($x = 0; $x < $list->length; $x++) {
-            $this->_links[$x] = new Zend_Service_Simpy_Link($list->item($x));
-        }
-    }
-
-    /**
-     * Returns an iterator for the link set
-     *
-     * @return ArrayIterator
-     */
-    public function getIterator()
-    {
-        return new ArrayIterator($this->_links);
-    }
-
-    /**
-     * Returns the number of links in the set
-     *
-     * @return int
-     */
-    public function getLength()
-    {
-        return count($this->_links);
-    }
-}

library/Zend/Service/Simpy/Note.php

@@ -1,215 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Simpy
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Simpy
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Simpy_Note
-{
-    /**
-     * Private access type
-     *
-     * @var string
-     */
-    const ACCESSTYPE_PRIVATE = 'private';
-
-    /**
-     * Public access type
-     *
-     * @var string
-     */
-    const ACCESSTYPE_PUBLIC  = 'public';
-
-    /**
-     * Access type assigned to the note
-     *
-     * @var string
-     */
-    protected $_accessType;
-
-    /**
-     * ID of the note
-     *
-     * @var int
-     */
-    protected $_id;
-
-    /**
-     * URI of the note
-     *
-     * @var string
-     */
-    protected $_uri;
-
-    /**
-     * Date of the last modification made to the note
-     *
-     * @var string
-     */
-    protected $_modDate;
-
-    /**
-     * Date the note was added
-     *
-     * @var string
-     */
-    protected $_addDate;
-
-    /**
-     * Title of to the note
-     *
-     * @var string
-     */
-    protected $_title;
-
-    /**
-     * Tags assigned to the note
-     *
-     * @var array
-     */
-    protected $_tags;
-
-    /**
-     * Description of the note
-     *
-     * @var string
-     */
-    protected $_description;
-
-    /**
-     * Constructor to initialize the object with data
-     *
-     * @param  DOMNode $node Individual <link> node from a parsed response from
-     *                       a GetLinks operation
-     * @return void
-     */
-    public function __construct($node)
-    {
-        $this->_accessType = $node->attributes->getNamedItem('accessType')->nodeValue;
-
-        $doc = new DOMDocument();
-        $doc->appendChild($doc->importNode($node, true));
-        $xpath = new DOMXPath($doc);
-
-        $this->_uri = $xpath->evaluate('/note/uri')->item(0)->nodeValue;
-        $this->_id = substr($this->_uri, strrpos($this->_uri, '=') + 1);
-        $this->_modDate = trim($xpath->evaluate('/note/modDate')->item(0)->nodeValue);
-        $this->_addDate = trim($xpath->evaluate('/note/addDate')->item(0)->nodeValue);
-        $this->_title = $xpath->evaluate('/note/title')->item(0)->nodeValue;
-        $this->_description = $xpath->evaluate('/note/description')->item(0)->nodeValue;
-
-        $list = $xpath->query('/note/tags/tag');
-        $this->_tags = array();
-
-        for ($x = 0; $x < $list->length; $x++) {
-            $this->_tags[$x] = $list->item($x)->nodeValue;
-        }
-    }
-
-    /**
-     * Returns the access type assigned to the note
-     *
-     * @see    ACCESSTYPE_PRIVATE
-     * @see    ACCESSTYPE_PUBLIC
-     * @return string
-     */
-    public function getAccessType()
-    {
-        return $this->_accessType;
-    }
-
-    /**
-     * Returns the ID of the note
-     *
-     * @return int
-     */
-    public function getId()
-    {
-        return $this->_id;
-    }
-
-    /**
-     * Returns the URI of the note
-     *
-     * @return string
-     */
-    public function getUri()
-    {
-        return $this->_uri;
-    }
-
-    /**
-     * Returns the date of the last modification made to the note
-     *
-     * @return string
-     */
-    public function getModDate()
-    {
-        return $this->_modDate;
-    }
-
-    /**
-     * Returns the date the note was added
-     *
-     * @return string
-     */
-    public function getAddDate()
-    {
-        return $this->_addDate;
-    }
-
-    /**
-     * Returns the title assigned to the note
-     *
-     * @return string
-     */
-    public function getTitle()
-    {
-        return $this->_title;
-    }
-
-    /**
-     * Returns the tags assigned to the note
-     *
-     * @return array
-     */
-    public function getTags()
-    {
-        return $this->_tags;
-    }
-
-    /**
-     * Returns the description assigned to the note
-     *
-     * @return string
-     */
-    public function getDescription()
-    {
-        return $this->_description;
-    }
-}

library/Zend/Service/Simpy/NoteSet.php

@@ -1,83 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Simpy
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-
-/**
- * @see Zend_Service_Simpy_Note
- */
-require_once 'Zend/Service/Simpy/Note.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Simpy
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Simpy_NoteSet implements IteratorAggregate
-{
-    /**
-     * List of notes
-     *
-     * @var array of Zend_Service_Simpy_Note objects
-     */
-    protected $_notes;
-
-    /**
-     * Constructor to initialize the object with data
-     *
-     * @param  DOMDocument $doc Parsed response from a GetNotes operation
-     * @return void
-     */
-    public function __construct(DOMDocument $doc)
-    {
-        $xpath = new DOMXPath($doc);
-        $list = $xpath->query('//notes/note');
-        $this->_notes = array();
-
-        for ($x = 0; $x < $list->length; $x++) {
-            $this->_notes[$x] = new Zend_Service_Simpy_Note($list->item($x));
-        }
-    }
-
-    /**
-     * Returns an iterator for the note set
-     *
-     * @return ArrayIterator
-     */
-    public function getIterator()
-    {
-        return new ArrayIterator($this->_notes);
-    }
-
-    /**
-     * Returns the number of notes in the set
-     *
-     * @return int
-     */
-    public function getLength()
-    {
-        return count($this->_notes);
-    }
-}

library/Zend/Service/Simpy/Tag.php

@@ -1,81 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Simpy
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Simpy
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Simpy_Tag
-{
-    /**
-     * Name of the tag
-     *
-     * @var string
-     */
-    protected $_tag;
-
-    /**
-     * Number of links with the tag
-     *
-     * @var int
-     */
-    protected $_count;
-
-    /**
-     * Constructor to initialize the object with data
-     *
-     * @param  DOMNode $node Individual <tag> node from a parsed response from
-     *                       a GetTags operation
-     * @return void
-     */
-    public function __construct($node)
-    {
-        $map =& $node->attributes;
-        $this->_tag = $map->getNamedItem('name')->nodeValue;
-        $this->_count = $map->getNamedItem('count')->nodeValue;
-    }
-
-    /**
-     * Returns the name of the tag
-     *
-     * @return string
-     */
-    public function getTag()
-    {
-        return $this->_tag;
-    }
-
-    /**
-     * Returns the number of links with the tag
-     *
-     * @return int
-     */
-    public function getCount()
-    {
-        return $this->_count;
-    }
-}

library/Zend/Service/Simpy/TagSet.php

@@ -1,83 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Simpy
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-
-/**
- * @see Zend_Service_Simpy_Tag
- */
-require_once 'Zend/Service/Simpy/Tag.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Simpy
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Simpy_TagSet implements IteratorAggregate
-{
-    /**
-     * List of tags
-     *
-     * @var array of Zend_Service_Simpy_Tag objects
-     */
-    protected $_tags;
-
-    /**
-     * Constructor to initialize the object with data
-     *
-     * @param  DOMDocument $doc Parsed response from a GetTags operation
-     * @return void
-     */
-    public function __construct(DOMDocument $doc)
-    {
-        $xpath = new DOMXPath($doc);
-        $list = $xpath->query('//tags/tag');
-        $this->_tags = array();
-
-        for ($x = 0; $x < $list->length; $x++) {
-            $this->_tags[$x] = new Zend_Service_Simpy_Tag($list->item($x));
-        }
-    }
-
-    /**
-     * Returns an iterator for the tag set
-     *
-     * @return ArrayIterator
-     */
-    public function getIterator()
-    {
-        return new ArrayIterator($this->_tags);
-    }
-
-    /**
-     * Returns the number of tags in the set
-     *
-     * @return int
-     */
-    public function getLength()
-    {
-        return count($this->_tags);
-    }
-}

library/Zend/Service/Simpy/Watchlist.php

@@ -1,191 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Simpy
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-
-/**
- * @see Zend_Service_Simpy_WatchlistFilterSet
- */
-require_once 'Zend/Service/Simpy/WatchlistFilterSet.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Simpy
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Simpy_Watchlist
-{
-    /**
-     * Identifier for the watchlist
-     *
-     * @var int
-     */
-    protected $_id;
-
-    /**
-     * Name of the watchlist
-     *
-     * @var string
-     */
-    protected $_name;
-
-    /**
-     * Description of the watchlist
-     *
-     * @var string
-     */
-    protected $_description;
-
-    /**
-     * Timestamp for when the watchlist was added
-     *
-     * @var string
-     */
-    protected $_addDate;
-
-    /**
-     * Number of new links in the watchlist
-     *
-     * @var int
-     */
-    protected $_newLinks;
-
-    /**
-     * List of usernames for users included in the watchlist
-     *
-     * @var array
-     */
-    protected $_users;
-
-    /**
-     * List of filters included in the watchlist
-     *
-     * @var Zend_Service_Simpy_WatchlistFilterSet
-     */
-    protected $_filters;
-
-    /**
-     * Constructor to initialize the object with data
-     *
-     * @param  DOMNode $node Individual <watchlist> node from a parsed
-     *                       response from a GetWatchlists or GetWatchlist
-     *                       operation
-     * @return void
-     */
-    public function __construct($node)
-    {
-        $map =& $node->attributes;
-
-        $this->_id = $map->getNamedItem('id')->nodeValue;
-        $this->_name = $map->getNamedItem('name')->nodeValue;
-        $this->_description = $map->getNamedItem('description')->nodeValue;
-        $this->_addDate = $map->getNamedItem('addDate')->nodeValue;
-        $this->_newLinks = $map->getNamedItem('newLinks')->nodeValue;
-
-        $this->_users = array();
-        $this->_filters = new Zend_Service_Simpy_WatchlistFilterSet();
-
-        $childNode = $node->firstChild;
-        while ($childNode !== null) {
-            if ($childNode->nodeName == 'user') {
-                $this->_users[] = $childNode->attributes->getNamedItem('username')->nodeValue;
-            } elseif ($childNode->nodeName == 'filter') {
-                $filter = new Zend_Service_Simpy_WatchlistFilter($childNode);
-                $this->_filters->add($filter);
-            }
-            $childNode = $childNode->nextSibling;
-        }
-    }
-
-    /**
-     * Returns the identifier for the watchlist
-     *
-     * @return int
-     */
-    public function getId()
-    {
-        return $this->_id;
-    }
-
-    /**
-     * Returns the name of the watchlist
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->_name;
-    }
-
-    /**
-     * Returns the description of the watchlist
-     *
-     * @return string
-     */
-    public function getDescription()
-    {
-        return $this->_description;
-    }
-
-    /**
-     * Returns a timestamp for when the watchlist was added
-     *
-     * @return string
-     */
-    public function getAddDate()
-    {
-        return $this->_addDate;
-    }
-
-    /**
-     * Returns the number of new links in the watchlist
-     *
-     * @return int
-     */
-    public function getNewLinks()
-    {
-        return $this->_newLinks;
-    }
-
-    /**
-     * Returns a list of usernames for users included in the watchlist
-     *
-     * @return array
-     */
-    public function getUsers()
-    {
-        return $this->_users;
-    }
-
-    /**
-     * Returns a list of filters included in the watchlist
-     *
-     * @return Zend_Service_Simpy_WatchlistFilterSet
-     */
-    public function getFilters()
-    {
-        return $this->_filters;
-    }
-}

library/Zend/Service/Simpy/WatchlistFilter.php

@@ -1,81 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Simpy
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Simpy
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Simpy_WatchlistFilter
-{
-    /**
-     * Name of the filter
-     *
-     * @var string
-     */
-    protected $_name;
-
-    /**
-     * Query for the filter
-     *
-     * @var string
-     */
-    protected $_query;
-
-    /**
-     * Constructor to initialize the object with data
-     *
-     * @param  DOMNode $node Individual <filter> node from a parsed response from
-     *                       a GetWatchlists or GetWatchlist operation
-     * @return void
-     */
-    public function __construct($node)
-    {
-        $map =& $node->attributes;
-        $this->_name = $map->getNamedItem('name')->nodeValue;
-        $this->_query = $map->getNamedItem('query')->nodeValue;
-    }
-
-    /**
-     * Returns the name of the filter
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->_name;
-    }
-
-    /**
-     * Returns the query for the filter
-     *
-     * @return string
-     */
-    public function getQuery()
-    {
-        return $this->_query;
-    }
-}

library/Zend/Service/Simpy/WatchlistFilterSet.php

@@ -1,77 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Simpy
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-
-/**
- * @see Zend_Service_Simpy_WatchlistFilter
- */
-require_once 'Zend/Service/Simpy/WatchlistFilter.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Simpy
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Simpy_WatchlistFilterSet implements IteratorAggregate
-{
-    /**
-     * List of filters in the set
-     *
-     * @var array of Zend_Service_Simpy_WatchlistFilter objects
-     */
-    protected $_filters = array();
-
-    /**
-     * Adds a filter to the set
-     *
-     * @param  Zend_Service_Simpy_WatchlistFilter $filter Filter to be added
-     * @return void
-     */
-    public function add(Zend_Service_Simpy_WatchlistFilter $filter)
-    {
-        $this->_filters[] = $filter;
-    }
-
-    /**
-     * Returns an iterator for the watchlist filter set
-     *
-     * @return ArrayIterator
-     */
-    public function getIterator()
-    {
-        return new ArrayIterator($this->_filters);
-    }
-
-    /**
-     * Returns the number of filters in the set
-     *
-     * @return int
-     */
-    public function getLength()
-    {
-        return count($this->_filters);
-    }
-}

library/Zend/Service/Simpy/WatchlistSet.php

@@ -1,82 +0,0 @@
-<?php
-
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Simpy
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-
-/**
- * @see Zend_Service_Simpy_Watchlist
- */
-require_once 'Zend/Service/Simpy/Watchlist.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Service
- * @subpackage Simpy
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Simpy_WatchlistSet implements IteratorAggregate
-{
-    /**
-     * List of watchlists
-     *
-     * @var array of Zend_Service_Simpy_Watchlist objects
-     */
-    protected $_watchlists = array();
-
-    /**
-     * Constructor to initialize the object with data
-     *
-     * @param  DOMDocument $doc Parsed response from a GetWatchlists operation
-     * @return void
-     */
-    public function __construct(DOMDocument $doc)
-    {
-        $xpath = new DOMXPath($doc);
-        $list = $xpath->query('//watchlists/watchlist');
-
-        for ($x = 0; $x < $list->length; $x++) {
-            $this->_watchlists[$x] = new Zend_Service_Simpy_Watchlist($list->item($x));
-        }
-    }
-
-    /**
-     * Returns an iterator for the watchlist set
-     *
-     * @return ArrayIterator
-     */
-    public function getIterator()
-    {
-        return new ArrayIterator($this->_watchlists);
-    }
-
-    /**
-     * Returns the number of watchlists in the set
-     *
-     * @return int
-     */
-    public function getLength()
-    {
-        return count($this->_watchlists);
-    }
-}

tests/Zend/Service/Simpy/AllTests.php

@@ -1,77 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service_Simpy
- * @subpackage UnitTests
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-if (!defined('PHPUnit_MAIN_METHOD')) {
-    define('PHPUnit_MAIN_METHOD', 'Zend_Service_Simpy_AllTests::main');
-}
-
-require_once 'Zend/Service/Simpy/OnlineTests.php';
-require_once 'Zend/Service/Simpy/OfflineTests.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service_Simpy
- * @subpackage UnitTests
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @group      Zend_Service
- * @group      Zend_Service_Simpy
- */
-class Zend_Service_Simpy_AllTests
-{
-    /**
-     * Runs this test suite
-     *
-     * @return void
-     */
-    public static function main()
-    {
-        PHPUnit_TextUI_TestRunner::run(self::suite());
-    }
-
-    /**
-     * Creates and returns this test suite
-     *
-     * @return PHPUnit_Framework_TestSuite
-     */
-    public static function suite()
-    {
-        $suite = new PHPUnit_Framework_TestSuite('Zend Framework - Zend_Service_Simpy');
-
-        $suite->addTestSuite('Zend_Service_Simpy_OfflineTests');
-
-        if (defined('TESTS_ZEND_SERVICE_SIMPY_ENABLED') &&
-            constant('TESTS_ZEND_SERVICE_SIMPY_ENABLED') &&
-            defined('TESTS_ZEND_SERVICE_SIMPY_USERNAME') &&
-            constant('TESTS_ZEND_SERVICE_SIMPY_USERNAME') &&
-            defined('TESTS_ZEND_SERVICE_SIMPY_PASSWORD') &&
-            constant('TESTS_ZEND_SERVICE_SIMPY_PASSWORD')) {
-            $suite->addTestSuite('Zend_Service_Simpy_OnlineTests');
-        }
-
-        return $suite;
-    }
-}
-
-if (PHPUnit_MAIN_METHOD == 'Zend_Service_Simpy_AllTests::main') {
-    Zend_Service_Simpy_AllTests::main();
-}

tests/Zend/Service/Simpy/BaseProxy.php

@@ -1,112 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service_Simpy
- * @subpackage UnitTests
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @see Zend_Service_Simpy
- */
-require_once 'Zend/Service/Simpy.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service_Simpy
- * @subpackage UnitTests
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-abstract class Zend_Service_Simpy_BaseProxy
-{
-    /**
-     * Simpy service consumer
-     *
-     * @var Zend_Service_Simpy
-     */
-    protected $_simpy;
-
-    /**
-     * Name of the current test case being executed
-     *
-     * @var string
-     */
-    protected $_test;
-
-    /**
-     * Mapping of methods to the number of calls made per method for the
-     * current test case being executed
-     *
-     * @var array
-     */
-    protected $_calls;
-
-    /**
-     * Constructor to initialize the service consumer.
-     *
-     * @param string $test Name of the test case currently being executed
-     * @return void
-     */
-    public final function __construct($test)
-    {
-        $this->_test = $test;
-        $this->_calls = array();
-
-        if (defined('TESTS_ZEND_SERVICE_SIMPY_USERNAME')) {
-            $username = TESTS_ZEND_SERVICE_SIMPY_USERNAME;
-            $password = TESTS_ZEND_SERVICE_SIMPY_PASSWORD;
-        } else {
-            $username = null;
-            $password = null;
-        }
-
-        $this->_simpy = new Zend_Service_Simpy($username, $password);
-
-        $this->init();
-    }
-
-    /**
-     * Initialize method to be overridden in subclasses if needed.
-     *
-     * @return void
-     */
-    public function init()
-    {
-    }
-
-    /**
-     * Returns the path to the file intended to contain the service consumer
-     * response for the current method call.
-     *
-     * @param string $name Name of the method being called
-     * @return string File path
-     */
-    protected function _getFilePath($name)
-    {
-        if (!isset($this->_calls[$name])) {
-            $this->_calls[$name] = 0;
-        }
-
-        $this->_calls[$name]++;
-
-        $dir = dirname(__FILE__) . '/_files/';
-        $file = $this->_test . '_' . $name . '_' . $this->_calls[$name];
-
-        return $dir . $file;
-    }
-}

tests/Zend/Service/Simpy/BaseTests.php

@@ -1,572 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service_Simpy
- * @subpackage UnitTests
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-/**
- * @category   Zend
- * @package    Zend_Service_Simpy
- * @subpackage UnitTests
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @group      Zend_Service
- * @group      Zend_Service_Simpy
- */
-abstract class Zend_Service_Simpy_BaseTests extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Simpy service consumer proxy
-     *
-     * @var Zend_Service_Simpy_BaseProxy
-     */
-    protected $_simpy;
-
-    /**
-     * Sample link data
-     *
-     * @var array
-     */
-    protected $_link = array(
-        'title'       => 'Zend Framework',
-        'href'        => 'http://framework.zend.com',
-        'accessType'  => 'public',
-        'tags'        => array('zend', 'framework', 'php'),
-        'urlNickname' => 'Zend Framework web site',
-        'note'        => 'This web site rules!'
-    );
-
-    /**
-     * Sample note data
-     *
-     * @var array
-     */
-    protected $_note = array(
-        'title'       => 'Test Note',
-        'tags'        => array('test'),
-        'description' => 'This is a test note.'
-    );
-
-    public function testException()
-    {
-        try {
-            $this->_simpy->deleteNote(null);
-            $this->fail('Exception not thrown');
-        } catch (Zend_Service_Exception $e) {
-            // success
-        }
-    }
-
-    public function testSaveLink()
-    {
-        try {
-            extract($this->_link);
-
-            /**
-             * Delete the link if it already exists and bypass the exception
-             * that would be thrown as a result
-             */
-            try {
-                $this->_simpy->deleteLink($href);
-            } catch (Zend_Service_Exception $e) {
-                // ignore exception
-            }
-
-            /**
-             * @see Zend_Service_Simpy_Link
-             */
-            require_once 'Zend/Service/Simpy/Link.php';
-
-            $this->_simpy->saveLink(
-                $title,
-                $href,
-                Zend_Service_Simpy_Link::ACCESSTYPE_PUBLIC,
-                $tags,
-                $urlNickname,
-                $note
-            );
-        } catch (Zend_Service_Exception $e) {
-            $this->fail('Could not save link: ' . $e->getMessage());
-        }
-    }
-
-    public function testGetLinks()
-    {
-        $linkSet = $this->_simpy->getLinks();
-
-        $this->assertEquals(
-            $linkSet->getLength(),
-            1,
-            'Link set does not have expected size'
-        );
-
-        $link = $linkSet->getIterator()->current();
-        extract($this->_link);
-
-        $this->assertEquals(
-            $link->getAccessType(),
-            $accessType,
-            'Access type does not match'
-        );
-
-        $this->assertEquals(
-            $link->getUrl(),
-            $href,
-            'URL does not match'
-        );
-
-        $this->assertNotEquals(
-            strtotime($link->getModDate()),
-            false,
-            'Mod date is invalid'
-        );
-
-        $this->assertNotEquals(
-            strtotime($link->getAddDate()),
-            false,
-            'Add date is invalid'
-        );
-
-        $this->assertEquals(
-            $link->getTitle(),
-            $title,
-            'Title does not match'
-        );
-
-        $this->assertEquals(
-            $link->getNickname(),
-            $urlNickname,
-            'Nickname does not match'
-        );
-
-        $this->assertEquals(
-            $link->getTags(),
-            $tags,
-            'Tags do not match'
-        );
-
-        $this->assertEquals(
-            $link->getNote(),
-            $note,
-            'Note does not match'
-        );
-    }
-
-    public function testLinkQuery()
-    {
-        $date = date('Y-m-d');
-
-        /**
-         * @see Zend_Service_Simpy_LinkQuery
-         */
-        require_once 'Zend/Service/Simpy/LinkQuery.php';
-        $linkQuery = new Zend_Service_Simpy_LinkQuery;
-        $linkQuery->setQueryString($this->_link['title']);
-        $linkQuery->setBeforeDate($date);
-
-        $this->assertNull(
-            $linkQuery->getDate(),
-            'Date has been initialized'
-        );
-
-        $linkQuery->setAfterDate($date);
-
-        $this->assertNull(
-            $linkQuery->getDate(),
-            'Date has been initialized'
-        );
-
-        $linkQuery->setDate($date);
-
-        $this->assertNull(
-            $linkQuery->getBeforeDate(),
-            'Before date has retained its value'
-        );
-
-        $this->assertNull(
-            $linkQuery->getAfterDate(),
-            'After date has retained its value'
-        );
-
-        $linkQuery
-            ->setLimit(1)
-            ->setDate(null);
-
-        $this->assertEquals(
-            $linkQuery->getLimit(),
-            1,
-            'Limit was not set'
-        );
-
-        $linkQuery->setLimit(array());
-
-        $this->assertNull(
-            $linkQuery->getLimit(),
-            'Invalid limit value was accepted'
-        );
-
-        $linkSet = $this->_simpy->getLinks($linkQuery);
-
-        $this->assertEquals(
-            $linkSet->getLength(),
-            1,
-            'Link set does not have the expected size'
-        );
-    }
-
-    public function testGetTags()
-    {
-        $tagSet = $this->_simpy->getTags();
-
-        $this->assertEquals(
-            $tagSet->getLength(),
-            count($this->_link['tags']),
-            'Tag set does not have the expected size'
-        );
-
-        foreach ($tagSet as $tag) {
-            $this->assertContains(
-                $tag->getTag(),
-                $this->_link['tags'],
-                'Tag ' . $tag->getTag() . ' does not exist'
-            );
-
-            $this->assertEquals(
-                $tag->getCount(),
-                1,
-                'Tag count does not match'
-            );
-        }
-    }
-
-    public function testRenameTag()
-    {
-        $fromTag = 'framework';
-        $toTag = 'frameworks';
-
-        $tagsArray = $this->_getTagsArray();
-
-        $this->assertContains(
-            $fromTag,
-            $tagsArray,
-            'Source tag was not found'
-        );
-
-        $this->assertNotContains(
-            $toTag,
-            $tagsArray,
-            'Destination tag already exists'
-        );
-
-        $this->_simpy->renameTag($fromTag, $toTag);
-
-        $tagsArray = $this->_getTagsArray();
-
-        $this->assertContains(
-            $toTag,
-            $tagsArray,
-            'Destination tag was not found'
-        );
-    }
-
-    public function testSplitTag()
-    {
-        $fromTag = 'frameworks';
-        $toTag1 = 'framework';
-        $toTag2 = 'frameworks';
-
-        $tagsArray = $this->_getTagsArray();
-
-        $this->assertContains(
-            $fromTag,
-            $tagsArray,
-            'Source tag was not found'
-        );
-
-        $this->_simpy->splitTag($fromTag, $toTag1, $toTag2);
-
-        $tagsArray = $this->_getTagsArray();
-
-        $this->assertContains(
-            $toTag1,
-            $tagsArray,
-            'First destination tag was not found'
-        );
-
-        $this->assertContains(
-            $toTag2,
-            $tagsArray,
-            'Second destination tag was not found'
-        );
-    }
-
-    public function testMergeTags()
-    {
-        $fromTag1 = 'framework';
-        $fromTag2 = 'frameworks';
-        $toTag = 'framework';
-
-        $tagsArray = $this->_getTagsArray();
-
-        $this->assertContains(
-            $fromTag1,
-            $tagsArray,
-            'First source tag was not found'
-        );
-
-        $this->assertContains(
-            $fromTag2,
-            $tagsArray,
-            'Second source tag was not found'
-        );
-
-        $this->_simpy->mergeTags($fromTag1, $fromTag2, $toTag);
-
-        $tagsArray = $this->_getTagsArray();
-
-        $this->assertContains(
-            $toTag,
-            $tagsArray,
-            'Destination tag was not found'
-        );
-    }
-
-    public function testRemoveTag()
-    {
-        $tag = 'zend';
-
-        $tagsArray = $this->_getTagsArray();
-
-        $this->assertContains(
-            $tag,
-            $tagsArray,
-            'Tag to remove was not found'
-        );
-
-        $this->_simpy->removeTag($tag);
-
-        $tagsArray = $this->_getTagsArray();
-
-        $this->assertNotContains(
-            $tag,
-            $tagsArray,
-            'Tag was not removed'
-        );
-    }
-
-    public function testDeleteLink()
-    {
-        $this->_simpy->deleteLink($this->_link['href']);
-
-        $linkSet = $this->_simpy->getLinks();
-
-        $this->assertEquals(
-            $linkSet->getLength(),
-            0,
-            'Link was not deleted'
-        );
-    }
-
-    public function testSaveNote()
-    {
-        try {
-            extract($this->_note);
-
-            $this->_simpy->saveNote(
-                $title,
-                $tags,
-                $description
-            );
-        } catch (Zend_Service_Exception $e) {
-            $this->fail('Could not save note: ' . $e->getMessage());
-        }
-    }
-
-    public function testGetNotes()
-    {
-        $noteSet = $this->_simpy->getNotes();
-
-        $this->assertGreaterThanOrEqual(
-            $noteSet->getLength(),
-            1,
-            'Note set does not have the expected size'
-        );
-
-        $note = $noteSet->getIterator()->current();
-        extract($this->_note);
-
-        $this->assertEquals(
-            $note->getAccessType(),
-            'private',
-            'Access type does not match'
-        );
-
-        $this->assertEquals(
-            $note->getUri(),
-            'http://www.simpy.com/simpy/NoteDetails.do?noteId=' . $note->getId(),
-            'URI does not match'
-        );
-
-        $this->assertEquals(
-            $note->getTitle(),
-            $title,
-            'Title does not match'
-           );
-
-        $this->assertEquals(
-            $note->getTags(),
-            $tags,
-            'Tags do not match'
-        );
-
-        $this->assertEquals(
-            $note->getDescription(),
-            $description,
-            'Description does not match'
-        );
-
-        $this->assertNotEquals(
-            strtotime($note->getAddDate()),
-            false,
-            'Add date is invalid'
-        );
-
-        $this->assertNotEquals(
-            strtotime($note->getModDate()),
-            false,
-            'Mod date is invalid'
-        );
-    }
-
-    public function testDeleteNote()
-    {
-        $noteSet = $this->_simpy->getNotes();
-        $noteId = $noteSet->getIterator()->current()->getId();
-        $this->_simpy->deleteNote($noteId);
-        $noteSet = $this->_simpy->getNotes();
-        foreach ($noteSet as $note) {
-            $this->assertNotEquals(
-                $note->getId(),
-                $noteId,
-                'Note was not deleted'
-            );
-        }
-    }
-
-    private function _getWatchlistIterator()
-    {
-        $watchlistSet = $this->_simpy->getWatchlists();
-        $watchlistSetIterator = $watchlistSet->getIterator();
-
-        if (!count($watchlistSetIterator)) {
-            $this->markTestSkipped('Account has no watchlists');
-        }
-
-        return $watchlistSetIterator;
-    }
-
-    public function testGetWatchlists()
-    {
-        $watchlistSetIterator = $this->_getWatchlistIterator();
-        $watchlist = $watchlistSetIterator->current();
-
-        $this->assertNotNull(
-            $watchlist,
-            'Watchlist is invalid'
-        );
-    }
-
-    public function testGetWatchlist()
-    {
-        $watchlistSetIterator = $this->_getWatchlistIterator();
-        $watchlistId = $watchlistSetIterator->current()->getId();
-
-        $watchlist = $this->_simpy->getWatchlist($watchlistId);
-
-        $this->assertEquals(
-            $watchlist->getId(),
-            $watchlistId,
-            'ID does not match'
-        );
-
-        $watchlistName = $watchlist->getName();
-
-        $this->assertFalse(
-            empty($watchlistName),
-            'Name is empty'
-        );
-
-        $this->assertNotEquals(
-            strtotime($watchlist->getAddDate()),
-            false,
-            'Add date is invalid'
-        );
-
-        $this->assertGreaterThanOrEqual(
-            $watchlist->getNewLinks(),
-            0,
-            'New link count is invalid'
-        );
-
-        $this->assertTrue(
-            is_array($watchlist->getUsers()),
-            'User list is not an array'
-        );
-    }
-
-    public function testWatchlistFilters()
-    {
-        $watchlistSetIterator = $this->_getWatchlistIterator();
-        $watchlistId = $watchlistSetIterator->current()->getId();
-        $watchlist = $this->_simpy->getWatchlist($watchlistId);
-        $filterSet = $watchlist->getFilters();
-
-        if (!$filterSet->getLength()) {
-            $this->markTestSkipped('Watchlist has no filters');
-        }
-
-        $filter = $filterSet->getIterator()->current();
-
-        $filterName = $filter->getName();
-
-        $this->assertFalse(
-            empty($filterName),
-            'Name is invalid'
-        );
-
-        $filterQuery = $filter->getQuery();
-
-        $this->assertFalse(
-            empty($filterQuery),
-            'Query is invalid'
-        );
-    }
-
-    protected function _getTagsArray()
-    {
-        $tagSet = $this->_simpy->getTags();
-        $tagArray = array();
-
-        foreach ($tagSet as $tag) {
-            $tagArray[] = $tag->getTag();
-        }
-
-        return $tagArray;
-    }
-}

tests/Zend/Service/Simpy/OfflineProxy.php

@@ -1,85 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service_Simpy
- * @subpackage UnitTests
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-require_once 'BaseProxy.php';
-
-/**
- * @see Zend_Http_Client_Adapter_Test
- */
-require_once 'Zend/Http/Client/Adapter/Test.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service_Simpy
- * @subpackage UnitTests
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Simpy_OfflineProxy extends Zend_Service_Simpy_BaseProxy
-{
-    /**
-     * Test adapter, stored because Zend_Http_Client provides no accessor
-     * method or public property for it
-     *
-     * @var Zend_Http_Client_Adapter
-     */
-    protected $_adapter;
-
-    /**
-     * Initialize the HTTP client test adapter.
-     *
-     * @return void
-     */
-    public function init()
-    {
-        $this->_adapter = new Zend_Http_Client_Adapter_Test;
-        $this->_simpy->getHttpClient()->setAdapter($this->_adapter);
-    }
-
-    /**
-     * Proxy all method calls to the service consumer object using a test
-     * HTTP client adapter and reading responses from local files.
-     *
-     * @param string $name Name of the method called
-     * @param array $args Arguments passed in the method call
-     * @return mixed Return value of the called method
-     */
-    public function __call($name, array $args)
-    {
-        $file = $this->_getFilePath($name);
-        $body = file_get_contents($file);
-
-        $this->_adapter->setResponse(
-            'HTTP/1.1 200 OK' . "\r\n" .
-            'Content-Type: text/xml' . "\r\n" .
-            "\r\n" .
-            $body
-        );
-
-        $return = call_user_func_array(
-            array($this->_simpy, $name),
-            $args
-        );
-
-        return $return;
-    }
-}

tests/Zend/Service/Simpy/OfflineTests.php

@@ -1,42 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service_Simpy
- * @subpackage UnitTests
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-
-require_once 'BaseTests.php';
-require_once 'OfflineProxy.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service_Simpy
- * @subpackage UnitTests
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @group      Zend_Service
- * @group      Zend_Service_Simpy
- */
-class Zend_Service_Simpy_OfflineTests extends Zend_Service_Simpy_BaseTests
-{
-    public function setUp()
-    {
-        $this->_simpy = new Zend_Service_Simpy_OfflineProxy($this->getName());
-    }
-}

tests/Zend/Service/Simpy/OnlineProxy.php

@@ -1,69 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service_Simpy
- * @subpackage UnitTests
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-require_once 'BaseProxy.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service_Simpy
- * @subpackage UnitTests
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Service_Simpy_OnlineProxy extends Zend_Service_Simpy_BaseProxy
-{
-    /**
-     * Proxy all method calls to the service consumer object and write
-     * responses to local files, regardless of whether service calls result
-     * in an exception being thrown.
-     *
-     * @param string $name Name of the method called
-     * @param array $args Arguments passed in the method call
-     * @return mixed Return value of the called method
-     */
-    public function __call($name, array $args)
-    {
-        sleep(3);
-
-        try {
-            $return = call_user_func_array(
-                array($this->_simpy, $name),
-                $args
-            );
-        } catch (Exception $e) { }
-
-        $response = $this->_simpy
-            ->getHttpClient()
-            ->getLastResponse()
-            ->getBody();
-
-        $file = $this->_getFilePath($name);
-
-        file_put_contents($file, $response);
-
-        if (isset($e)) {
-            throw $e;
-        }
-
-        return $return;
-    }
-}

tests/Zend/Service/Simpy/OnlineTests.php

@@ -1,42 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Service_Simpy
- * @subpackage UnitTests
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-
-require_once 'BaseTests.php';
-require_once 'OnlineProxy.php';
-
-/**
- * @category   Zend
- * @package    Zend_Service_Simpy
- * @subpackage UnitTests
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @group      Zend_Service
- * @group      Zend_Service_Simpy
- */
-class Zend_Service_Simpy_OnlineTests extends Zend_Service_Simpy_BaseTests
-{
-    public function setUp()
-    {
-        $this->_simpy = new Zend_Service_Simpy_OnlineProxy($this->getName());
-    }
-}

tests/Zend/Service/Simpy/_files/testDeleteLink_deleteLink_1

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<status>
-  <code>0</code>
-  <message><![CDATA[Link deleted successfully.]]></message>
-</status>

tests/Zend/Service/Simpy/_files/testDeleteLink_getLinks_1

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-
-  
-    <links/>
-  
-  
-

tests/Zend/Service/Simpy/_files/testDeleteNote_deleteNote_1

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<status>
-  <code>0</code>
-  <message><![CDATA[Note deleted successfully.]]></message>
-</status>

tests/Zend/Service/Simpy/_files/testDeleteNote_getNotes_1

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-
-  
-  
-    <notes>
-      
-        <note accessType="private">
-          <uri><![CDATA[http://www.simpy.com/simpy/NoteDetails.do?noteId=21984]]></uri>
-          <id>21984</id>
-          <modDate>2009-06-04</modDate>
-          <addDate>2009-06-04 </addDate>
-          <title><![CDATA[Test Note]]></title>
-          <tags>
-            
-              <tag><![CDATA[test]]></tag>
-            
-          </tags>
-          <description><![CDATA[This is a test note.]]></description>
-        </note>
-      
-    </notes>
-  
-

tests/Zend/Service/Simpy/_files/testDeleteNote_getNotes_2

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-
-  
-    <notes/>
-  
-  
-

tests/Zend/Service/Simpy/_files/testException_deleteNote_1

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<status>
-  <code>200</code>
-  <message><![CDATA[Unknown Note.]]></message>
-</status>

tests/Zend/Service/Simpy/_files/testGetLinks_getLinks_1

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-
-  
-  
-    <links>
-      
-        <link clicks="1" 
-          
-            
-            accessType="public"
-          
-          >
-          <url><![CDATA[http://framework.zend.com]]></url>
-          <modDate>2009-06-04</modDate>
-          <addDate>2009-06-04 00:14</addDate>
-          <title><![CDATA[Zend Framework]]></title>
-          <nickname><![CDATA[Zend Framework web site]]></nickname>
-          <tags>
-            
-              <tag><![CDATA[zend]]></tag>
-            
-              <tag><![CDATA[framework]]></tag>
-            
-              <tag><![CDATA[php]]></tag>
-            
-          </tags>
-          <note><![CDATA[This web site rules!]]></note>
-        </link>
-      
-    </links>
-  
-

tests/Zend/Service/Simpy/_files/testGetNotes_getNotes_1

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-
-  
-  
-    <notes>
-      
-        <note accessType="private">
-          <uri><![CDATA[http://www.simpy.com/simpy/NoteDetails.do?noteId=21984]]></uri>
-          <id>21984</id>
-          <modDate>2009-06-04</modDate>
-          <addDate>2009-06-04 </addDate>
-          <title><![CDATA[Test Note]]></title>
-          <tags>
-            
-              <tag><![CDATA[test]]></tag>
-            
-          </tags>
-          <description><![CDATA[This is a test note.]]></description>
-        </note>
-      
-    </notes>
-  
-

tests/Zend/Service/Simpy/_files/testGetTags_getTags_1

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-
-  
-  
-    <tags user="syapizend">
-      
-        <tag name="framework" count="1"/>
-      
-        <tag name="php" count="1"/>
-      
-        <tag name="zend" count="1"/>
-      
-    </tags>
-  
-

tests/Zend/Service/Simpy/_files/testGetWatchlist_getWatchlist_1

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-
-
-<watchlist id="1331" name="Test Watchlist"
-       description="This is a watchlist for testing purposes. Please do not remove it."
-       addDate="Fri Dec 08 21:40:56 EST 2006"
-       newLinks="0">
-
-  
-    <user username="otis"/>
-  
-  
-    <filter name="Test Filter" query="zend"/>
-  
-</watchlist>

tests/Zend/Service/Simpy/_files/testGetWatchlist_getWatchlists_1

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-
-  
-  
-    <watchlists>
-      
-        
-        <watchlist id="1331" name="Test Watchlist"
-          description="This is a watchlist for testing purposes. Please do not remove it."
-          addDate="Fri Dec 08 21:40:56 EST 2006" newLinks="0" >
-
-            
-              <user username="otis"/>
-            
-            
-              <filter name="Test Filter"
-                query="zend"/>
-            
-        </watchlist>
-      
-    </watchlists>
-  
-

tests/Zend/Service/Simpy/_files/testGetWatchlists_getWatchlists_1

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-
-  
-  
-    <watchlists>
-      
-        
-        <watchlist id="1331" name="Test Watchlist"
-          description="This is a watchlist for testing purposes. Please do not remove it."
-          addDate="Fri Dec 08 21:40:56 EST 2006" newLinks="0" >
-
-            
-              <user username="otis"/>
-            
-            
-              <filter name="Test Filter"
-                query="zend"/>
-            
-        </watchlist>
-      
-    </watchlists>
-  
-

tests/Zend/Service/Simpy/_files/testLinkQuery_getLinks_1

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-
-  
-  
-    <links>
-      
-        <link clicks="1" 
-          
-            
-            accessType="public"
-          
-          >
-          <url><![CDATA[http://framework.zend.com]]></url>
-          <modDate>2009-06-04</modDate>
-          <addDate>2009-06-04 00:14</addDate>
-          <title><![CDATA[Zend Framework]]></title>
-          <nickname><![CDATA[Zend Framework web site]]></nickname>
-          <tags>
-            
-              <tag><![CDATA[zend]]></tag>
-            
-              <tag><![CDATA[framework]]></tag>
-            
-              <tag><![CDATA[php]]></tag>
-            
-          </tags>
-          <note><![CDATA[This web site rules!]]></note>
-        </link>
-      
-    </links>
-  
-

tests/Zend/Service/Simpy/_files/testMergeTags_getTags_1

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-
-  
-  
-    <tags user="syapizend">
-      
-        <tag name="framework" count="1"/>
-      
-        <tag name="frameworks" count="1"/>
-      
-        <tag name="php" count="1"/>
-      
-        <tag name="zend" count="1"/>
-      
-    </tags>
-  
-

tests/Zend/Service/Simpy/_files/testMergeTags_getTags_2

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-
-  
-  
-    <tags user="syapizend">
-      
-        <tag name="framework" count="1"/>
-      
-        <tag name="php" count="1"/>
-      
-        <tag name="zend" count="1"/>
-      
-    </tags>
-  
-

tests/Zend/Service/Simpy/_files/testMergeTags_mergeTags_1

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<status>
-  <code>0</code>
-  <message><![CDATA[Tags merged successfully.]]></message>
-</status>

tests/Zend/Service/Simpy/_files/testRemoveTag_getTags_1

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-
-  
-  
-    <tags user="syapizend">
-      
-        <tag name="framework" count="1"/>
-      
-        <tag name="php" count="1"/>
-      
-        <tag name="zend" count="1"/>
-      
-    </tags>
-  
-

tests/Zend/Service/Simpy/_files/testRemoveTag_getTags_2

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-
-  
-  
-    <tags user="syapizend">
-      
-        <tag name="framework" count="1"/>
-      
-        <tag name="php" count="1"/>
-      
-    </tags>
-  
-

tests/Zend/Service/Simpy/_files/testRemoveTag_removeTag_1

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<status>
-  <code>0</code>
-  <message><![CDATA[Tag removed successfully.]]></message>
-</status>

tests/Zend/Service/Simpy/_files/testRenameTag_getTags_1

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-
-  
-  
-    <tags user="syapizend">
-      
-        <tag name="framework" count="1"/>
-      
-        <tag name="php" count="1"/>
-      
-        <tag name="zend" count="1"/>
-      
-    </tags>
-  
-

tests/Zend/Service/Simpy/_files/testRenameTag_getTags_2

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-
-  
-  
-    <tags user="syapizend">
-      
-        <tag name="frameworks" count="1"/>
-      
-        <tag name="php" count="1"/>
-      
-        <tag name="zend" count="1"/>
-      
-    </tags>
-  
-

tests/Zend/Service/Simpy/_files/testRenameTag_renameTag_1

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<status>
-  <code>0</code>
-  <message><![CDATA[Tag renamed successfully.]]></message>
-</status>

tests/Zend/Service/Simpy/_files/testSaveLink_deleteLink_1

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<status>
-  <code>200</code>
-  <message><![CDATA[Unknown URL.]]></message>
-</status>

tests/Zend/Service/Simpy/_files/testSaveLink_saveLink_1

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<status>
-  <code>0</code>
-  <message><![CDATA[Link saved successfully.]]></message>
-</status>

tests/Zend/Service/Simpy/_files/testSaveNote_saveNote_1

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<status>
-  <code>0</code>
-  <message><![CDATA[Note saved successfully.]]></message>
-</status>

tests/Zend/Service/Simpy/_files/testSplitTag_getTags_1

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-
-  
-  
-    <tags user="syapizend">
-      
-        <tag name="frameworks" count="1"/>
-      
-        <tag name="php" count="1"/>
-      
-        <tag name="zend" count="1"/>
-      
-    </tags>
-  
-

tests/Zend/Service/Simpy/_files/testSplitTag_getTags_2

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-
-  
-  
-    <tags user="syapizend">
-      
-        <tag name="framework" count="1"/>
-      
-        <tag name="frameworks" count="1"/>
-      
-        <tag name="php" count="1"/>
-      
-        <tag name="zend" count="1"/>
-      
-    </tags>
-  
-

tests/Zend/Service/Simpy/_files/testSplitTag_splitTag_1

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<status>
-  <code>0</code>
-  <message><![CDATA[Tag split successfully.]]></message>
-</status>

tests/Zend/Service/Simpy/_files/testWatchlistFilters_getWatchlist_1

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-
-
-<watchlist id="1331" name="Test Watchlist"
-       description="This is a watchlist for testing purposes. Please do not remove it."
-       addDate="Fri Dec 08 21:40:56 EST 2006"
-       newLinks="0">
-
-  
-    <user username="otis"/>
-  
-  
-    <filter name="Test Filter" query="zend"/>
-  
-</watchlist>

tests/Zend/Service/Simpy/_files/testWatchlistFilters_getWatchlists_1

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-
-  
-  
-    <watchlists>
-      
-        
-        <watchlist id="1331" name="Test Watchlist"
-          description="This is a watchlist for testing purposes. Please do not remove it."
-          addDate="Fri Dec 08 21:40:56 EST 2006" newLinks="0" >
-
-            
-              <user username="otis"/>
-            
-            
-              <filter name="Test Filter"
-                query="zend"/>
-            
-        </watchlist>
-      
-    </watchlists>
-  
-