RubyGems - shorturl - Versions diffs - 0.2.1 → 0.3.0 - Mend

shorturl 0.2.1 → 0.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (17) hide show

data/ChangeLog +3 -0
data/README +10 -0
data/TODO +2 -3
data/doc/classes/Service.html +238 -0
data/doc/classes/ShortURL.html +39 -263
data/doc/created.rid +1 -1
data/doc/files/ChangeLog.html +9 -2
data/doc/files/README.html +23 -2
data/doc/files/TODO.html +4 -6
data/doc/files/lib/shorturl_rb.html +1 -1
data/doc/fr_class_index.html +1 -0
data/doc/fr_method_index.html +2 -7
data/lib/shorturl.rb +107 -104
data/test/tc_service.rb +41 -0
data/test/tc_shorturl.rb +3 -62
data/test/ts_all.rb +1 -0
metadata +4 -2

data/ChangeLog CHANGED Viewed

@@ -1,3 +1,6 @@
+0.3.0:
+	- Added linktrim.com and shorterlink.com
+	- Replaced get_short_url and all the private class methods in favor of a Service class, which makes things clearer
 0.2.1:
 	- Added makeashorterlink.com and skinnylink.com
 	- Refactored get_short_url

data/README CHANGED Viewed

@@ -5,8 +5,12 @@ ShortURL is a very simple library to use URL shortening services such as
 TinyURL or RubyURL.
 == Installation
+ShortURL is available as a gem, installation is just like any other gem:
 <tt>$ gem install -r shorturl</tt>
+You can also download the tar.bz2 archive at
+http://rubyforge.org/frs/?group_id=732 if you do not want to use the gem.
 == Usage:
 call-seq:
   require "shorturl"
@@ -21,6 +25,12 @@ The second parameter represents the service you want to use.  These are:
 - <tt>:metamark</tt>
 - <tt>:makeashorterlink</tt>
 - <tt>:skinnylink</tt>
+- <tt>:linktrim</tt>
+- <tt>:shorterlink</tt>
+Note that you can use <tt>ShortURL.valid_services</tt> to obtain a
+list of the valid services (in case I forget to update the
+documentation)
 == Thanks
 - Marcel Molina Jr., Devin Mullins for some ideas

data/TODO CHANGED Viewed

@@ -1,5 +1,4 @@
 = Todo
-* Catch exceptions
-* More tests
-* More robust HTML scraping
+* Make services an instance of a Service class
+* Check out WWW::Mecanize

data/doc/classes/Service.html ADDED Viewed

@@ -0,0 +1,238 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html
+     PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+  <title>Class: Service</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+  <meta http-equiv="Content-Script-Type" content="text/javascript" />
+  <link rel="stylesheet" href=".././rdoc-style.css" type="text/css" media="screen" />
+  <script type="text/javascript">
+  // <![CDATA[
+  function popupCode( url ) {
+    window.open(url, "Code", "resizable=yes,scrollbars=yes,toolbar=no,status=no,height=150,width=400")
+  }
+  function toggleCode( id ) {
+    if ( document.getElementById )
+      elem = document.getElementById( id );
+    else if ( document.all )
+      elem = eval( "document.all." + id );
+    else
+      return false;
+    elemStyle = elem.style;
+    if ( elemStyle.display != "block" ) {
+      elemStyle.display = "block"
+    } else {
+      elemStyle.display = "none"
+    }
+    return true;
+  }
+  // Make codeblocks hidden by default
+  document.writeln( "<style type=\"text/css\">div.method-source-code { display: none }</style>" )
+  // ]]>
+  </script>
+</head>
+<body>
+    <div id="classHeader">
+        <table class="header-table">
+        <tr class="top-aligned-row">
+          <td><strong>Class</strong></td>
+          <td class="class-name-in-header">Service</td>
+        </tr>
+        <tr class="top-aligned-row">
+            <td><strong>In:</strong></td>
+            <td>
+                <a href="../files/lib/shorturl_rb.html">
+                lib/shorturl.rb
+                </a>
+        <br />
+            </td>
+        </tr>
+        <tr class="top-aligned-row">
+            <td><strong>Parent:</strong></td>
+            <td>
+                Object
+            </td>
+        </tr>
+        </table>
+    </div>
+  <!-- banner header -->
+  <div id="bodyContent">
+  <div id="contextContent">
+   </div>
+    <div id="method-list">
+      <h3 class="section-bar">Methods</h3>
+      <div class="name-list">
+      <a href="#M000004">call</a>&nbsp;&nbsp;
+      <a href="#M000003">new</a>&nbsp;&nbsp;
+      </div>
+    </div>
+  </div>
+    <!-- if includes -->
+    <div id="section">
+    <div id="attribute-list">
+      <h3 class="section-bar">Attributes</h3>
+      <div class="name-list">
+        <table>
+        <tr class="top-aligned-row context-row">
+          <td class="context-item-name">action</td>
+          <td class="context-item-value">&nbsp;[RW]&nbsp;</td>
+          <td class="context-item-desc"></td>
+        </tr>
+        <tr class="top-aligned-row context-row">
+          <td class="context-item-name">block</td>
+          <td class="context-item-value">&nbsp;[RW]&nbsp;</td>
+          <td class="context-item-desc"></td>
+        </tr>
+        <tr class="top-aligned-row context-row">
+          <td class="context-item-name">code</td>
+          <td class="context-item-value">&nbsp;[RW]&nbsp;</td>
+          <td class="context-item-desc"></td>
+        </tr>
+        <tr class="top-aligned-row context-row">
+          <td class="context-item-name">field</td>
+          <td class="context-item-value">&nbsp;[RW]&nbsp;</td>
+          <td class="context-item-desc"></td>
+        </tr>
+        <tr class="top-aligned-row context-row">
+          <td class="context-item-name">method</td>
+          <td class="context-item-value">&nbsp;[RW]&nbsp;</td>
+          <td class="context-item-desc"></td>
+        </tr>
+        <tr class="top-aligned-row context-row">
+          <td class="context-item-name">port</td>
+          <td class="context-item-value">&nbsp;[RW]&nbsp;</td>
+          <td class="context-item-desc"></td>
+        </tr>
+        </table>
+      </div>
+    </div>
+    <!-- if method_list -->
+    <div id="methods">
+      <h3 class="section-bar">Public Class methods</h3>
+      <div id="method-M000003" class="method-detail">
+        <a name="M000003"></a>
+        <div class="method-heading">
+          <a href="#M000003" class="method-signature">
+          <span class="method-name">new</span><span class="method-args">(hostname) {|service| ...}</span>
+          </a>
+        </div>
+        <div class="method-description">
+          <p>
+Intialize the service with a hostname (required parameter) and you can
+override the default values for the HTTP port, expected HTTP return code,
+the form method to use, the form action, the form field which contains the
+long URL and the block of what to do with the HTML code you get.
+</p>
+          <p><a class="source-toggle" href="#"
+            onclick="toggleCode('M000003-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000003-source">
+<pre>
+    <span class="ruby-comment cmt"># File lib/shorturl.rb, line 18</span>
+18:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span>(<span class="ruby-identifier">hostname</span>) <span class="ruby-comment cmt"># :yield: service</span>
+19:     <span class="ruby-ivar">@hostname</span> = <span class="ruby-identifier">hostname</span>
+20:     <span class="ruby-ivar">@port</span> = <span class="ruby-value">80</span>
+21:     <span class="ruby-ivar">@code</span> = <span class="ruby-value">200</span>
+22:     <span class="ruby-ivar">@method</span> = <span class="ruby-identifier">:post</span>
+23:     <span class="ruby-ivar">@action</span> = <span class="ruby-value str">&quot;/&quot;</span>
+24:     <span class="ruby-ivar">@field</span> = <span class="ruby-value str">&quot;url&quot;</span>
+25:     <span class="ruby-ivar">@block</span> = <span class="ruby-identifier">lambda</span> { <span class="ruby-operator">|</span><span class="ruby-identifier">body</span><span class="ruby-operator">|</span> }
+26:
+27:     <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">block_given?</span>
+28:       <span class="ruby-keyword kw">yield</span> <span class="ruby-keyword kw">self</span>
+29:     <span class="ruby-keyword kw">end</span>
+30:   <span class="ruby-keyword kw">end</span>
+</pre>
+          </div>
+        </div>
+      </div>
+      <h3 class="section-bar">Public Instance methods</h3>
+      <div id="method-M000004" class="method-detail">
+        <a name="M000004"></a>
+        <div class="method-heading">
+          <a href="#M000004" class="method-signature">
+          <span class="method-name">call</span><span class="method-args">(url)</span>
+          </a>
+        </div>
+        <div class="method-description">
+          <p>
+Now that our service is set up, call it with all the parameters to
+(hopefully) return only the shortened URL.
+</p>
+          <p><a class="source-toggle" href="#"
+            onclick="toggleCode('M000004-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000004-source">
+<pre>
+    <span class="ruby-comment cmt"># File lib/shorturl.rb, line 34</span>
+34:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">call</span>(<span class="ruby-identifier">url</span>)
+35:     <span class="ruby-constant">Net</span><span class="ruby-operator">::</span><span class="ruby-constant">HTTP</span>.<span class="ruby-identifier">start</span>(<span class="ruby-ivar">@hostname</span>, <span class="ruby-ivar">@port</span>) { <span class="ruby-operator">|</span><span class="ruby-identifier">http</span><span class="ruby-operator">|</span>
+36:       <span class="ruby-identifier">response</span> = <span class="ruby-keyword kw">case</span> <span class="ruby-ivar">@method</span>
+37:                  <span class="ruby-keyword kw">when</span> <span class="ruby-identifier">:post</span><span class="ruby-operator">:</span> <span class="ruby-identifier">http</span>.<span class="ruby-identifier">send</span>(<span class="ruby-ivar">@method</span>, <span class="ruby-ivar">@action</span>, <span class="ruby-node">&quot;#@field=#{url}&quot;</span>)
+38:                  <span class="ruby-keyword kw">when</span> <span class="ruby-identifier">:get</span><span class="ruby-operator">:</span> <span class="ruby-identifier">http</span>.<span class="ruby-identifier">send</span>(<span class="ruby-ivar">@method</span>, <span class="ruby-node">&quot;#@action?#@field=#{CGI.escape(url)}&quot;</span>)
+39:                  <span class="ruby-keyword kw">end</span>
+40:       <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">response</span>.<span class="ruby-identifier">code</span> <span class="ruby-operator">==</span> <span class="ruby-ivar">@code</span>.<span class="ruby-identifier">to_s</span>
+41:         <span class="ruby-ivar">@block</span>.<span class="ruby-identifier">call</span>(<span class="ruby-identifier">response</span>.<span class="ruby-identifier">read_body</span>)
+42:       <span class="ruby-keyword kw">end</span>
+43:     }
+44:   <span class="ruby-keyword kw">end</span>
+</pre>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+<div id="validator-badges">
+  <p><small><a href="http://validator.w3.org/check/referer">[Validate]</a></small></p>
+</div>
+</body>
+</html>

data/doc/classes/ShortURL.html CHANGED Viewed

@@ -86,14 +86,7 @@
       <h3 class="section-bar">Methods</h3>
       <div class="name-list">
-      <a href="#M000003">get_short_url</a>&nbsp;&nbsp;
-      <a href="#M000009">makeashorterlink</a>&nbsp;&nbsp;
-      <a href="#M000008">metamark</a>&nbsp;&nbsp;
-      <a href="#M000004">rubyurl</a>&nbsp;&nbsp;
-      <a href="#M000006">shorl</a>&nbsp;&nbsp;
       <a href="#M000002">shorten</a>&nbsp;&nbsp;
-      <a href="#M000007">snipurl</a>&nbsp;&nbsp;
-      <a href="#M000005">tinyurl</a>&nbsp;&nbsp;
       <a href="#M000001">valid_services</a>&nbsp;&nbsp;
       </div>
     </div>
@@ -116,131 +109,6 @@
     <div id="methods">
       <h3 class="section-bar">Public Class methods</h3>
-      <div id="method-M000009" class="method-detail">
-        <a name="M000009"></a>
-        <div class="method-heading">
-          <a href="#M000009" class="method-signature">
-          <span class="method-name">makeashorterlink</span><span class="method-args">(url)</span>
-          </a>
-        </div>
-        <div class="method-description">
-          <p>
-Shorten an URL with makeashortlink.com.
-</p>
-          <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000009-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000009-source">
-<pre>
-     <span class="ruby-comment cmt"># File lib/shorturl.rb, line 123</span>
-123:   <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">makeashorterlink</span>(<span class="ruby-identifier">url</span>)
-124:     <span class="ruby-identifier">get_short_url</span>(<span class="ruby-value str">&quot;makeashorterlink.com&quot;</span>, <span class="ruby-value">200</span>,
-125:                   <span class="ruby-node">&quot;post('/index.php', 'url=#{url}')&quot;</span>) { <span class="ruby-operator">|</span><span class="ruby-identifier">body</span><span class="ruby-operator">|</span>
-126:       <span class="ruby-identifier">short_url</span> = <span class="ruby-constant">URI</span>.<span class="ruby-identifier">extract</span>(<span class="ruby-identifier">body</span>).<span class="ruby-identifier">grep</span>(<span class="ruby-regexp re">/makeashorter/</span>)[<span class="ruby-value">0</span>]
-127:       <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">short_url</span>
-128:     }
-129:   <span class="ruby-keyword kw">end</span>
-</pre>
-          </div>
-        </div>
-      </div>
-      <div id="method-M000008" class="method-detail">
-        <a name="M000008"></a>
-        <div class="method-heading">
-          <a href="#M000008" class="method-signature">
-          <span class="method-name">metamark</span><span class="method-args">(url)</span>
-          </a>
-        </div>
-        <div class="method-description">
-          <p>
-Shorten an URL with metamark.com. Same technique as TinyURL
-</p>
-          <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000008-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000008-source">
-<pre>
-     <span class="ruby-comment cmt"># File lib/shorturl.rb, line 113</span>
-113:   <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">metamark</span>(<span class="ruby-identifier">url</span>)
-114:     <span class="ruby-identifier">get_short_url</span>(<span class="ruby-value str">&quot;metamark.net&quot;</span>, <span class="ruby-value">200</span>,
-115:                   <span class="ruby-node">&quot;post('/add', 'long_url=#{url}')&quot;</span>) { <span class="ruby-operator">|</span><span class="ruby-identifier">body</span><span class="ruby-operator">|</span>
-116:       <span class="ruby-identifier">line</span> = <span class="ruby-identifier">body</span>.<span class="ruby-identifier">split</span>(<span class="ruby-value str">&quot;\n&quot;</span>).<span class="ruby-identifier">find</span> { <span class="ruby-operator">|</span><span class="ruby-identifier">l</span><span class="ruby-operator">|</span> <span class="ruby-identifier">l</span> <span class="ruby-operator">=~</span> <span class="ruby-regexp re">/xrl\.us/</span> }
-117:       <span class="ruby-identifier">short_url</span> = <span class="ruby-constant">URI</span>.<span class="ruby-identifier">extract</span>(<span class="ruby-identifier">line</span>)[<span class="ruby-value">0</span>]
-118:       <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">short_url</span>
-119:     }
-120:   <span class="ruby-keyword kw">end</span>
-</pre>
-          </div>
-        </div>
-      </div>
-      <div id="method-M000004" class="method-detail">
-        <a name="M000004"></a>
-        <div class="method-heading">
-          <a href="#M000004" class="method-signature">
-          <span class="method-name">rubyurl</span><span class="method-args">(url)</span>
-          </a>
-        </div>
-        <div class="method-description">
-          <p>
-Shortens an URL with RubyURL.com. Since RubyURL uses a redirection (code
-302), instead of using HTTP#post, we send our data directly to the
-<em>create</em> action. The response is a small HTML line which contains
-our shortened URL plus <em>/rubyurl/show</em>, so we manually remove that
-with gsub.
-</p>
-          <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000004-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000004-source">
-<pre>
-    <span class="ruby-comment cmt"># File lib/shorturl.rb, line 71</span>
-71:   <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">rubyurl</span>(<span class="ruby-identifier">url</span>)
-72:     <span class="ruby-identifier">get_short_url</span>(<span class="ruby-value str">&quot;rubyurl.com&quot;</span>, <span class="ruby-value">302</span>,
-73:                   <span class="ruby-node">&quot;get('/rubyurl/create?rubyurl[website_url]=#{CGI.escape(url)}')&quot;</span>) { <span class="ruby-operator">|</span><span class="ruby-identifier">body</span><span class="ruby-operator">|</span>
-74:       <span class="ruby-identifier">short_url</span> = <span class="ruby-constant">URI</span>.<span class="ruby-identifier">extract</span>(<span class="ruby-identifier">body</span>)[<span class="ruby-value">0</span>].<span class="ruby-identifier">gsub</span>(<span class="ruby-value str">&quot;rubyurl/show/&quot;</span>, <span class="ruby-value str">&quot;&quot;</span>)
-75:       <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">short_url</span>
-76:     }
-77:   <span class="ruby-keyword kw">end</span>
-</pre>
-          </div>
-        </div>
-      </div>
-      <div id="method-M000006" class="method-detail">
-        <a name="M000006"></a>
-        <div class="method-heading">
-          <a href="#M000006" class="method-signature">
-          <span class="method-name">shorl</span><span class="method-args">(url)</span>
-          </a>
-        </div>
-        <div class="method-description">
-          <p>
-Shorten an URL through with shorl.com. Same technique as TinyURL
-</p>
-          <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000006-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000006-source">
-<pre>
-     <span class="ruby-comment cmt"># File lib/shorturl.rb, line 94</span>
- 94:   <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">shorl</span>(<span class="ruby-identifier">url</span>)
- 95:     <span class="ruby-identifier">get_short_url</span>(<span class="ruby-value str">&quot;shorl.com&quot;</span>, <span class="ruby-value">200</span>,
- 96:                   <span class="ruby-node">&quot;post('/create.php', 'url=#{url}')&quot;</span>) { <span class="ruby-operator">|</span><span class="ruby-identifier">body</span><span class="ruby-operator">|</span>
- 97:       <span class="ruby-identifier">short_url</span> = <span class="ruby-constant">URI</span>.<span class="ruby-identifier">extract</span>(<span class="ruby-identifier">body</span>)[<span class="ruby-value">2</span>]
- 98:       <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">short_url</span>
- 99:     }
-100:   <span class="ruby-keyword kw">end</span>
-</pre>
-          </div>
-        </div>
-      </div>
       <div id="method-M000002" class="method-detail">
         <a name="M000002"></a>
@@ -260,14 +128,35 @@ an ArgumentError exception
 <p>
 Valid <tt>service</tt> values:
 </p>
-<table>
-<tr><td valign="top"><tt>:rubyurl</tt>:</td><td>uses RubyURL.com
+<ul>
+<li><tt>:rubyurl</tt>
+</li>
+<li><tt>:tinyurl</tt>
+</li>
+<li><tt>:shorl</tt>
+</li>
+<li><tt>:snipurl</tt>
+</li>
+<li><tt>:metamark</tt>
+</li>
+<li><tt>:makeashorterlink</tt>
+</li>
+<li><tt>:skinnylink</tt>
+</li>
+<li><tt>:linktrim</tt>
-</td></tr>
-<tr><td valign="top"><tt>:tinyurl</tt>:</td><td>uses TinyURL.com
+</li>
+<li><tt>:shorterlink</tt>
-</td></tr>
-</table>
+</li>
+</ul>
 <p>
 call-seq:
 </p>
@@ -279,79 +168,14 @@ call-seq:
             onclick="toggleCode('M000002-source');return false;">[Source]</a></p>
           <div class="method-source-code" id="M000002-source">
 <pre>
-    <span class="ruby-comment cmt"># File lib/shorturl.rb, line 35</span>
-35:   <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">shorten</span>(<span class="ruby-identifier">url</span>, <span class="ruby-identifier">service</span> = <span class="ruby-identifier">:rubyurl</span>)
-36:     <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@@valid_services</span>.<span class="ruby-identifier">include?</span> <span class="ruby-identifier">service</span>
-37:       <span class="ruby-identifier">send</span>(<span class="ruby-identifier">service</span>, <span class="ruby-identifier">url</span>)
-38:     <span class="ruby-keyword kw">else</span>
-39:       <span class="ruby-identifier">raise</span> <span class="ruby-constant">ArgumentError</span>, <span class="ruby-value str">&quot;Invalid service&quot;</span>
-40:     <span class="ruby-keyword kw">end</span>
-41:   <span class="ruby-keyword kw">end</span>
-</pre>
-          </div>
-        </div>
-      </div>
-      <div id="method-M000007" class="method-detail">
-        <a name="M000007"></a>
-        <div class="method-heading">
-          <a href="#M000007" class="method-signature">
-          <span class="method-name">snipurl</span><span class="method-args">(url)</span>
-          </a>
-        </div>
-        <div class="method-description">
-          <p>
-Shorten an URL with snipurl.com. Same technique as TinyURL
-</p>
-          <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000007-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000007-source">
-<pre>
-     <span class="ruby-comment cmt"># File lib/shorturl.rb, line 103</span>
-103:   <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">snipurl</span>(<span class="ruby-identifier">url</span>)
-104:     <span class="ruby-identifier">get_short_url</span>(<span class="ruby-value str">&quot;snipurl.com&quot;</span>, <span class="ruby-value">200</span>,
-105:                   <span class="ruby-node">&quot;post('/index.php', 'link=#{url}')&quot;</span>) { <span class="ruby-operator">|</span><span class="ruby-identifier">body</span><span class="ruby-operator">|</span>
-106:       <span class="ruby-identifier">line</span> = <span class="ruby-identifier">body</span>.<span class="ruby-identifier">split</span>(<span class="ruby-value str">&quot;\n&quot;</span>).<span class="ruby-identifier">grep</span>(<span class="ruby-regexp re">/txt/</span>)[<span class="ruby-value">0</span>]
-107:       <span class="ruby-identifier">short_url</span> = <span class="ruby-constant">URI</span>.<span class="ruby-identifier">extract</span>(<span class="ruby-identifier">line</span>)[<span class="ruby-value">1</span>][<span class="ruby-value">0</span><span class="ruby-operator">..</span><span class="ruby-value">-2</span>] <span class="ruby-comment cmt"># Remove trailing '</span>
-108:       <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">short_url</span>
-109:     }
-110:   <span class="ruby-keyword kw">end</span>
-</pre>
-          </div>
-        </div>
-      </div>
-      <div id="method-M000005" class="method-detail">
-        <a name="M000005"></a>
-        <div class="method-heading">
-          <a href="#M000005" class="method-signature">
-          <span class="method-name">tinyurl</span><span class="method-args">(url)</span>
-          </a>
-        </div>
-        <div class="method-description">
-          <p>
-Shortens an URL with TinyURL.com. We post a request to the
-<em>create.php</em> action with our URL as a parameter. We then read the
-HTML code, split it into an array, find an element that contains our
-shortened URL and extract it.
-</p>
-          <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000005-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000005-source">
-<pre>
-    <span class="ruby-comment cmt"># File lib/shorturl.rb, line 84</span>
-84:   <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">tinyurl</span>(<span class="ruby-identifier">url</span>)
-85:     <span class="ruby-identifier">get_short_url</span>(<span class="ruby-value str">&quot;tinyurl.com&quot;</span>, <span class="ruby-value">200</span>,
-86:                   <span class="ruby-node">&quot;post('/create.php', 'url=#{url}')&quot;</span>) { <span class="ruby-operator">|</span><span class="ruby-identifier">body</span><span class="ruby-operator">|</span>
-87:       <span class="ruby-identifier">line</span> = <span class="ruby-identifier">body</span>.<span class="ruby-identifier">split</span>(<span class="ruby-value str">&quot;\n&quot;</span>).<span class="ruby-identifier">find</span> { <span class="ruby-operator">|</span><span class="ruby-identifier">l</span><span class="ruby-operator">|</span> <span class="ruby-identifier">l</span> <span class="ruby-operator">=~</span> <span class="ruby-regexp re">/hidden name=tinyurl/</span> }
-88:       <span class="ruby-identifier">short_url</span> = <span class="ruby-constant">URI</span>.<span class="ruby-identifier">extract</span>(<span class="ruby-identifier">line</span>)[<span class="ruby-value">0</span>]
-89:       <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">short_url</span>
-90:     }
-91:   <span class="ruby-keyword kw">end</span>
+     <span class="ruby-comment cmt"># File lib/shorturl.rb, line 137</span>
+137:   <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">shorten</span>(<span class="ruby-identifier">url</span>, <span class="ruby-identifier">service</span> = <span class="ruby-identifier">:rubyurl</span>)
+138:     <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@@valid_services</span>.<span class="ruby-identifier">include?</span> <span class="ruby-identifier">service</span>
+139:       <span class="ruby-ivar">@@services</span>[<span class="ruby-identifier">service</span>].<span class="ruby-identifier">call</span>(<span class="ruby-identifier">url</span>)
+140:     <span class="ruby-keyword kw">else</span>
+141:       <span class="ruby-identifier">raise</span> <span class="ruby-constant">ArgumentError</span>, <span class="ruby-value str">&quot;Invalid service&quot;</span>
+142:     <span class="ruby-keyword kw">end</span>
+143:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
         </div>
@@ -374,58 +198,10 @@ Returns @@<a href="ShortURL.html#M000001">valid_services</a>
             onclick="toggleCode('M000001-source');return false;">[Source]</a></p>
           <div class="method-source-code" id="M000001-source">
 <pre>
-    <span class="ruby-comment cmt"># File lib/shorturl.rb, line 18</span>
-18:   <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">valid_services</span>
-19:     <span class="ruby-ivar">@@valid_services</span>
-20:   <span class="ruby-keyword kw">end</span>
-</pre>
-          </div>
-        </div>
-      </div>
-      <h3 class="section-bar">Private Class methods</h3>
-      <div id="method-M000003" class="method-detail">
-        <a name="M000003"></a>
-        <div class="method-heading">
-          <a href="#M000003" class="method-signature">
-          <span class="method-name">get_short_url</span><span class="method-args">(hostname, code, action) {|html_body| ...}</span>
-          </a>
-        </div>
-        <div class="method-description">
-          <p>
-Abstract method to shorten an URL. Respects the DRY principle. In case of a
-network-related exception, return <tt>nil</tt>.
-</p>
-<p>
-Parameters:
-</p>
-<pre>
-  hostname: hostname of the service
-  code: expected return code (200, 302, etc.)  Converted to a string
-  action: string representing the action to be executed on the HTTP object with +instance_eval+
-  block: block of code which scrapes the HTML and returns the shortened URL.  Takes one parameter.
-</pre>
-          <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000003-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000003-source">
-<pre>
-    <span class="ruby-comment cmt"># File lib/shorturl.rb, line 51</span>
-51:   <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">get_short_url</span>(<span class="ruby-identifier">hostname</span>, <span class="ruby-identifier">code</span>, <span class="ruby-identifier">action</span>, <span class="ruby-operator">&amp;</span><span class="ruby-identifier">block</span>) <span class="ruby-comment cmt"># :yields: html_body</span>
-52:     <span class="ruby-keyword kw">begin</span>
-53:       <span class="ruby-constant">Net</span><span class="ruby-operator">::</span><span class="ruby-constant">HTTP</span>.<span class="ruby-identifier">start</span>(<span class="ruby-identifier">hostname</span>, <span class="ruby-value">80</span>) { <span class="ruby-operator">|</span><span class="ruby-identifier">http</span><span class="ruby-operator">|</span>
-54:         <span class="ruby-identifier">response</span> = <span class="ruby-identifier">http</span>.<span class="ruby-identifier">instance_eval</span>(<span class="ruby-identifier">action</span>)
-55:
-56:         <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">response</span>.<span class="ruby-identifier">code</span> <span class="ruby-operator">==</span> <span class="ruby-identifier">code</span>.<span class="ruby-identifier">to_s</span>
-57:           <span class="ruby-identifier">block</span>.<span class="ruby-identifier">call</span>(<span class="ruby-identifier">response</span>.<span class="ruby-identifier">read_body</span>)
-58:         <span class="ruby-keyword kw">end</span>
-59:       }
-60:     <span class="ruby-keyword kw">rescue</span> <span class="ruby-constant">SocketError</span>, <span class="ruby-constant">Net</span><span class="ruby-operator">::</span><span class="ruby-constant">HTTPExceptions</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">e</span>
-61:       <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">nil</span>
-62:     <span class="ruby-keyword kw">end</span>
-63:   <span class="ruby-keyword kw">end</span>
+     <span class="ruby-comment cmt"># File lib/shorturl.rb, line 113</span>
+113:   <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">valid_services</span>
+114:     <span class="ruby-ivar">@@valid_services</span>
+115:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
         </div>

data/doc/created.rid CHANGED Viewed

	@@ -1 +1 @@
1	- ~~Sat~~ Jun 04 15:14:15 EDT 2005
1	+ Sun Jun 05 15:37:07 EDT 2005

data/doc/files/ChangeLog.html CHANGED Viewed

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Sat Jun 04 15:06:47 EDT 2005</td>
+      <td>Sun Jun 05 15:31:15 EDT 2005</td>
     </tr>
     </table>
   </div>
@@ -70,10 +70,17 @@
     <div id="description">
       <p>
+0.3.0:
+</p>
+<pre>
+        - Added linktrim.com and shorterlink.com
+        - Replaced get_short_url and all the private class methods in favor of a Service class, which makes things clearer
+</pre>
+<p>
 0.2.1:
 </p>
 <pre>
-        - Added makeashorterlink.com
+        - Added makeashorterlink.com and skinnylink.com
         - Refactored get_short_url
 </pre>
 <p>

data/doc/files/README.html CHANGED Viewed

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Sat Jun 04 15:07:27 EDT 2005</td>
+      <td>Sun Jun 05 15:37:02 EDT 2005</td>
     </tr>
     </table>
   </div>
@@ -77,7 +77,13 @@ use URL shortening services such as TinyURL or RubyURL.
 </p>
 <h2>Installation</h2>
 <p>
-<tt>$ gem install -r shorturl</tt>
+<a href="../classes/ShortURL.html">ShortURL</a> is available as a gem,
+installation is just like any other gem: <tt>$ gem install -r shorturl</tt>
+</p>
+<p>
+You can also download the tar.bz2 archive at <a
+href="http://rubyforge.org/frs/?group_id=732">rubyforge.org/frs/?group_id=732</a>
+if you do not want to use the gem.
 </p>
 <h2>Usage:</h2>
 <p>
@@ -109,8 +115,23 @@ The second parameter represents the service you want to use. These are:
 </li>
 <li><tt>:makeashorterlink</tt>
+</li>
+<li><tt>:skinnylink</tt>
+</li>
+<li><tt>:linktrim</tt>
+</li>
+<li><tt>:shorterlink</tt>
 </li>
 </ul>
+<p>
+Note that you can use <tt><a
+href="../classes/ShortURL.html#M000001">ShortURL.valid_services</a></tt> to
+obtain a list of the valid services (in case I forget to update the
+documentation)
+</p>
 <h2>Thanks</h2>
 <ul>
 <li>Marcel Molina Jr., Devin Mullins for some ideas

data/doc/files/TODO.html CHANGED Viewed

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Wed Jun 01 08:35:56 EDT 2005</td>
+      <td>Sat Jun 04 23:12:24 EDT 2005</td>
     </tr>
     </table>
   </div>
@@ -71,13 +71,11 @@
     <div id="description">
       <h1>Todo</h1>
 <ul>
-<li>Catch exceptions
+<li>Make services an instance of a <a
+href="../classes/Service.html">Service</a> class
 </li>
-<li>More tests
-</li>
-<li>More robust HTML scraping
+<li>Check out WWW::Mecanize
 </li>
 </ul>

data/doc/files/lib/shorturl_rb.html CHANGED Viewed

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Sat Jun 04 15:05:31 EDT 2005</td>
+      <td>Sun Jun 05 15:32:04 EDT 2005</td>
     </tr>
     </table>
   </div>

data/doc/fr_class_index.html CHANGED Viewed

@@ -20,6 +20,7 @@
 <div id="index">
   <h1 class="section-bar">Classes</h1>
   <div id="index-entries">
+    <a href="classes/Service.html">Service</a><br />
     <a href="classes/ShortURL.html">ShortURL</a><br />
   </div>
 </div>

data/doc/fr_method_index.html CHANGED Viewed

@@ -20,14 +20,9 @@
 <div id="index">
   <h1 class="section-bar">Methods</h1>
   <div id="index-entries">
-    <a href="classes/ShortURL.html#M000003">get_short_url (ShortURL)</a><br />
-    <a href="classes/ShortURL.html#M000009">makeashorterlink (ShortURL)</a><br />
-    <a href="classes/ShortURL.html#M000008">metamark (ShortURL)</a><br />
-    <a href="classes/ShortURL.html#M000004">rubyurl (ShortURL)</a><br />
-    <a href="classes/ShortURL.html#M000006">shorl (ShortURL)</a><br />
+    <a href="classes/Service.html#M000004">call (Service)</a><br />
+    <a href="classes/Service.html#M000003">new (Service)</a><br />
     <a href="classes/ShortURL.html#M000002">shorten (ShortURL)</a><br />
-    <a href="classes/ShortURL.html#M000007">snipurl (ShortURL)</a><br />
-    <a href="classes/ShortURL.html#M000005">tinyurl (ShortURL)</a><br />
     <a href="classes/ShortURL.html#M000001">valid_services (ShortURL)</a><br />
   </div>
 </div>

data/lib/shorturl.rb CHANGED Viewed

@@ -7,12 +7,107 @@ require "net/http"
 require "cgi"
 require "uri"
+class Service
+  attr_accessor :port, :code, :method, :action, :field, :block
+  # Intialize the service with a hostname (required parameter) and you
+  # can override the default values for the HTTP port, expected HTTP
+  # return code, the form method to use, the form action, the form
+  # field which contains the long URL and the block of what to do with
+  # the HTML code you get.
+  def initialize(hostname) # :yield: service
+    @hostname = hostname
+    @port = 80
+    @code = 200
+    @method = :post
+    @action = "/"
+    @field = "url"
+    @block = lambda { |body| }
+    if block_given?
+      yield self
+    end
+  end
+  # Now that our service is set up, call it with all the parameters to
+  # (hopefully) return only the shortened URL.
+  def call(url)
+    Net::HTTP.start(@hostname, @port) { |http|
+      response = case @method
+                 when :post: http.send(@method, @action, "#@field=#{url}")
+                 when :get: http.send(@method, "#@action?#@field=#{CGI.escape(url)}")
+                 end
+      if response.code == @code.to_s
+        @block.call(response.read_body)
+      end
+    }
+  end
+end
 class ShortURL
+  @@services = {
+    :rubyurl => Service.new("rubyurl.com") { |s|
+      s.code = 302
+      s.method = :get
+      s.action = "/rubyurl/create"
+      s.field = "rubyurl[website_url]"
+      s.block = lambda { |body| URI.extract(body)[0].gsub("rubyurl/show/", "") }
+    },
+    :tinyurl => Service.new("tinyurl.com") { |s|
+      s.action = "/create.php"
+      s.block = lambda { |body|
+        URI.extract(body).grep(/tinyurl/)[-1]
+      }
+    },
+    :shorl => Service.new("shorl.com") { |s|
+      s.action = "/create.php"
+      s.block = lambda { |body| URI.extract(body)[2] }
+    },
+    :snipurl => Service.new("snipurl.com") { |s|
+      s.action = "/index.php"
+      s.field = "link"
+      s.block = lambda { |body|
+        line = body.split("\n").grep(/txt/)[0]
+        short_url = URI.extract(line)[1][0..-2] # Remove trailing '
+      }
+    },
+    :metamark => Service.new("metamark.net") { |s|
+      s.action = "/add"
+      s.field = "long_url"
+      s.block = lambda { |body|
+        URI.extract(body).grep(/xrl.us/)[0]
+      }
+    },
+    :makeashorterlink => Service.new("makeashorterlink.com") { |s|
+      s.action = "/index.php"
+      s.block = lambda { |body| URI.extract(body).grep(/makeashorterlink/)[0] }
+    },
+    :skinnylink => Service.new("skinnylink.com") { |s|
+      s.block = lambda { |body| URI.extract(body).grep(/skinnylink/)[0] }
+    },
+    :linktrim => Service.new("linktrim.com") { |s|
+      s.method = :get
+      s.action = "/lt/generate"
+      s.block = lambda { |body| URI.extract(body).grep(/\/linktrim/)[1] }
+    },
+    :shorterlink => Service.new("shorterlink.com") { |s|
+      s.method = :get
+      s.action = "/add_url.html"
+      s.block = lambda { |body| URI.extract(body).grep(/shorterlink/)[0] }
+    }
+  }
   # Array containing symbols representing all the implemented URL
   # shortening services
-  @@valid_services = [:rubyurl, :tinyurl, :shorl, :snipurl, :metamark, :makeashorterlink, :skinnylink]
+  @@valid_services = @@services.keys
   # Returns @@valid_services
   def self.valid_services
@@ -26,116 +121,24 @@ class ShortURL
   #
   # Valid +service+ values:
   #
-  # <tt>:rubyurl</tt>:: uses RubyURL.com
-  # <tt>:tinyurl</tt>:: uses TinyURL.com
+  # * <tt>:rubyurl</tt>
+  # * <tt>:tinyurl</tt>
+  # * <tt>:shorl</tt>
+  # * <tt>:snipurl</tt>
+  # * <tt>:metamark</tt>
+  # * <tt>:makeashorterlink</tt>
+  # * <tt>:skinnylink</tt>
+  # * <tt>:linktrim</tt>
+  # * <tt>:shorterlink</tt>
   #
   # call-seq:
   #   ShortURL.shorten("http://mypage.com") => Uses RubyURL
   #   ShortURL.shorten("http://mypage.com", :tinyurl)
   def self.shorten(url, service = :rubyurl)
     if @@valid_services.include? service
-      send(service, url)
+      @@services[service].call(url)
     else
       raise ArgumentError, "Invalid service"
     end
   end
-  # Abstract method to shorten an URL.  Respects the DRY principle.  In
-  # case of a network-related exception, return +nil+.
-  #
-  # Parameters:
-  #   hostname: hostname of the service
-  #   code: expected return code (200, 302, etc.)  Converted to a string
-  #   action: string representing the action to be executed on the HTTP object with +instance_eval+
-  #   block: block of code which scrapes the HTML and returns the shortened URL.  Takes one parameter.
-  def self.get_short_url(hostname, code, action, &block) # :yields: html_body
-    begin
-      Net::HTTP.start(hostname, 80) { |http|
-        response = http.instance_eval(action)
-        if response.code == code.to_s
-          block.call(response.read_body)
-        end
-      }
-    rescue SocketError, Net::HTTPExceptions => e
-      return nil
-    end
-  end
-  # Shortens an URL with RubyURL.com.  Since RubyURL uses a
-  # redirection (code 302), instead of using HTTP#post, we send our
-  # data directly to the _create_ action.  The response is a small
-  # HTML line which contains our shortened URL plus
-  # <em>/rubyurl/show</em>, so we manually remove that with gsub.
-  def self.rubyurl(url)
-    get_short_url("rubyurl.com", 302,
-                  "get('/rubyurl/create?rubyurl[website_url]=#{CGI.escape(url)}')") { |body|
-      short_url = URI.extract(body)[0].gsub("rubyurl/show/", "")
-      return short_url
-    }
-  end
-  # Shortens an URL with TinyURL.com.  We post a request to the
-  # <em>create.php</em> action with our URL as a parameter.  We then
-  # read the HTML code, split it into an array, find an element that
-  # contains our shortened URL and extract it.
-  def self.tinyurl(url)
-    get_short_url("tinyurl.com", 200,
-                  "post('/create.php', 'url=#{url}')") { |body|
-      line = body.split("\n").find { |l| l =~ /hidden name=tinyurl/ }
-      short_url = URI.extract(line)[0]
-      return short_url
-    }
-  end
-  # Shorten an URL through with shorl.com.  Same technique as TinyURL
-  def self.shorl(url)
-    get_short_url("shorl.com", 200,
-                  "post('/create.php', 'url=#{url}')") { |body|
-      short_url = URI.extract(body)[2]
-      return short_url
-    }
-  end
-  # Shorten an URL with snipurl.com.  Same technique as TinyURL
-  def self.snipurl(url)
-    get_short_url("snipurl.com", 200,
-                  "post('/index.php', 'link=#{url}')") { |body|
-      line = body.split("\n").grep(/txt/)[0]
-      short_url = URI.extract(line)[1][0..-2] # Remove trailing '
-      return short_url
-    }
-  end
-  # Shorten an URL with metamark.com.  Same technique as TinyURL
-  def self.metamark(url)
-    get_short_url("metamark.net", 200,
-                  "post('/add', 'long_url=#{url}')") { |body|
-      line = body.split("\n").find { |l| l =~ /xrl\.us/ }
-      short_url = URI.extract(line)[0]
-      return short_url
-    }
-  end
-  # Shorten an URL with makeashortlink.com.
-  def self.makeashorterlink(url)
-    get_short_url("makeashorterlink.com", 200,
-                  "post('/index.php', 'url=#{url}')") { |body|
-      short_url = URI.extract(body).grep(/makeashorter/)[0]
-      return short_url
-    }
-  end
-  # Shorten an URL with skinnylink.com.
-  def self.skinnylink(url)
-    get_short_url("skinnylink.com", 200,
-                  "post('/', 'url=#{url}')") { |body|
-      short_url = URI.extract(body).grep(/skinnylink/)[0]
-      return short_url
-    }
-  end
-  private_class_method(:get_short_url, *@@valid_services)
 end

data/test/tc_service.rb ADDED Viewed

@@ -0,0 +1,41 @@
+# tc_ervicerb
+#
+#   Created by Vincent Foley on 2005-06-01
+$test_lib_dir = File.join(File.dirname(__FILE__), "..", "lib")
+$:.unshift($test_lib_dir)
+require "test/unit"
+require "shorturl"
+class TestService < Test::Unit::TestCase
+  def test_call
+    service = Service.new("oasdasobf")
+    assert_raise(SocketError) { service.call(nil) }
+  end
+  def test_initialize
+    service = Service.new("rubyurl.com")
+    assert_equal(service.port, 80)
+    assert_equal(service.code, 200)
+    assert_equal(service.method, :post)
+    assert_equal(service.action, "/")
+    assert_equal(service.field, "url")
+    service = Service.new("rubyurl.com") { |s|
+      s.port = 8080
+      s.code = 302
+      s.method = :get
+      s.action = "/create.php"
+      s.field = "link"
+    }
+    assert_equal(service.port, 8080)
+    assert_equal(service.code, 302)
+    assert_equal(service.method, :get)
+    assert_equal(service.action, "/create.php")
+    assert_equal(service.field, "link")
+  end
+end

data/test/tc_shorturl.rb CHANGED Viewed

@@ -8,12 +8,6 @@ $:.unshift($test_lib_dir)
 require "test/unit"
 require "shorturl"
-# Make +get_short_url+ public so we can test it
-class ShortURLModified < ShortURL
-  public_class_method :get_short_url
-end
 class TestShortURL < Test::Unit::TestCase
   def setup
@@ -24,67 +18,14 @@ class TestShortURL < Test::Unit::TestCase
     assert ShortURL.shorten(@url) == "http://rubyurl.com/Q9ToW"
     assert ShortURL.shorten(@url, :rubyurl) == "http://rubyurl.com/Q9ToW"
     assert ShortURL.shorten(@url, :tinyurl) == "http://tinyurl.com/9mop8"
-    # The short URL for shorl is never the same, so I just check to
-    # see if the URL begins with their domain name
-    assert ShortURL.shorten(@url, :shorl) =~ /^http:\/\/shorl.com\//
+    assert ShortURL.shorten(@url, :shorl) =~ /^http:\/\/shorl.com/  # Never the same URL
     assert ShortURL.shorten(@url, :snipurl) == "http://snipurl.com/fbkl"
     assert ShortURL.shorten(@url, :metamark) == "http://xrl.us/ga8c"
     assert ShortURL.shorten(@url, :makeashorterlink) == "http://makeashorterlink.com/?O1752235A"
     assert ShortURL.shorten(@url, :skinnylink) == "http://skinnylink.com?nqvcce"
+    assert ShortURL.shorten(@url, :linktrim) =~ /http:\/\/linktrim/ # Never the same URL
+    assert ShortURL.shorten(@url, :shorterlink) == "http://shorterlink.com/?PQD096"
     assert_raise(ArgumentError) { ShortURL.shorten(@url, :foobar) }
   end
-  def test_get_short_url
-    post_string = "post('/create.php', 'url=#@url')"
-    assert_raise(NoMethodError) { ShortURL.get_short_url(nil, nil, nil) {} }
-    assert_nothing_raised do
-      ShortURLModified.get_short_url("tinyurl.com",
-                                     200,
-                                     post_string) { |body| }
-    end
-    assert_nil(ShortURLModified.get_short_url("askjldakjsbfk",
-                                              200,
-                                              "") { |body| } )
-    assert_nil(ShortURLModified.get_short_url("tinyurl.com",
-                                              404,
-                                              post_string) { |body| } )
-    assert_nil(ShortURLModified.get_short_url("tinyurl.com",
-                                              200,
-                                              "post('/foobar.php', nil)") { |body| } )
-  end
-  def test_rubyurl
-    assert_raise(NoMethodError) { ShortURL.rubyurl(@url) }
-  end
-  def test_tinyurl
-    assert_raise(NoMethodError) { ShortURL.tinyurl(@url) }
-  end
-  def test_shorl
-    assert_raise(NoMethodError) { ShortURL.shorl(@url) }
-  end
-  def test_snipurl
-    assert_raise(NoMethodError) { ShortURL.snipurl(@url) }
-  end
-  def test_metamark
-    assert_raise(NoMethodError) { ShortURL.metamark(@url) }
-  end
-  def test_makeashorterlink
-    assert_raise(NoMethodError) { ShortURL.makeashorterlink(@url) }
-  end
-  def test_skinnylink
-    assert_raise(NoMethodError) { ShortURL.skinnylink(@url) }
-  end
 end

data/test/ts_all.rb CHANGED Viewed

@@ -8,3 +8,4 @@ $:.unshift($test_lib_dir)
 require "test/unit"
 require "tc_shorturl"
+require "tc_service"

metadata CHANGED Viewed

@@ -3,8 +3,8 @@ rubygems_version: 0.8.10
 specification_version: 1
 name: shorturl
 version: !ruby/object:Gem::Version
-  version: 0.2.1
-date: 2005-06-04
+  version: 0.3.0
+date: 2005-06-05
 summary: Shortens URLs using services such as TinyURL and RubyURL
 require_paths:
   - lib
@@ -36,6 +36,7 @@ files:
   - doc/fr_method_index.html
   - doc/index.html
   - doc/rdoc-style.css
+  - doc/classes/Service.html
   - doc/classes/ShortURL.html
   - doc/files/ChangeLog.html
   - doc/files/lib
@@ -43,6 +44,7 @@ files:
   - doc/files/README.html
   - doc/files/TODO.html
   - doc/files/lib/shorturl_rb.html
+  - test/tc_service.rb
   - test/tc_shorturl.rb
   - test/ts_all.rb
   - README