RubyGems - shorturl - Versions diffs - 0.0.1 → 0.1.0 - Mend

shorturl 0.0.1 → 0.1.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 (12) hide show

data/ChangeLog +10 -0
data/README +9 -0
data/doc/classes/ShortURL.html +82 -45
data/doc/created.rid +1 -1
data/doc/files/ChangeLog.html +121 -0
data/doc/files/README.html +20 -1
data/doc/files/lib/shorturl_rb.html +11 -1
data/doc/fr_file_index.html +1 -0
data/doc/fr_method_index.html +3 -2
data/lib/shorturl.rb +46 -24
data/test/tc_shorturl.rb +38 -0
metadata +6 -2

data/ChangeLog ADDED Viewed

@@ -0,0 +1,10 @@
+0.1.0:
+	- Refactored the tinyurl and rubyurl methods
+	- URI.extract to get URLs instead of regular expressions
+	- Added exception handling to get_short_url to return nil in case
+	  of a network error
+	- More thorough unit tests
+	- Made tinyurl, rubyurl and get_short_url private class methods
+0.0.1:
+	- Initial Version

data/README CHANGED Viewed

@@ -4,10 +4,19 @@
 ShortURL is a very simple library to use URL shortening services such as
 TinyURL or RubyURL.
+== Installation
+<tt>$ gem install -r shorturl</tt>
 == Usage:
 call-seq:
   require "shorturl"
   puts ShortURL.shorten("http://mypage.com")
+  puts ShortURL.shorten("http://mypage.com", :tinyurl)
+== Thanks
+- Marcel Molina Jr., Devin Mullins for some ideas
+- imperator from #ruby-lang (don't know your real name, sorry) for
+  helping me with creating and uploading a RubyGem
 == Author
 Vincent Foley

data/doc/classes/ShortURL.html CHANGED Viewed

@@ -86,9 +86,10 @@
       <h3 class="section-bar">Methods</h3>
       <div class="name-list">
-      <a href="#M000002">rubyurl</a>&nbsp;&nbsp;
+      <a href="#M000002">get_short_url</a>&nbsp;&nbsp;
+      <a href="#M000003">rubyurl</a>&nbsp;&nbsp;
       <a href="#M000001">shorten</a>&nbsp;&nbsp;
-      <a href="#M000003">tinyurl</a>&nbsp;&nbsp;
+      <a href="#M000004">tinyurl</a>&nbsp;&nbsp;
       </div>
     </div>
@@ -148,26 +149,72 @@ call-seq:
             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 19</span>
-19:   <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>)
-20:     <span class="ruby-keyword kw">case</span> <span class="ruby-identifier">service</span>
-21:     <span class="ruby-keyword kw">when</span> <span class="ruby-identifier">:rubyurl</span> <span class="ruby-keyword kw">then</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">new</span>.<span class="ruby-identifier">rubyurl</span>(<span class="ruby-identifier">url</span>)
-22:     <span class="ruby-keyword kw">when</span> <span class="ruby-identifier">:tinyurl</span> <span class="ruby-keyword kw">then</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">new</span>.<span class="ruby-identifier">tinyurl</span>(<span class="ruby-identifier">url</span>)
-23:     <span class="ruby-keyword kw">else</span> <span class="ruby-identifier">raise</span> <span class="ruby-constant">ArgumentError</span>, <span class="ruby-value str">&quot;Invalid service&quot;</span>
-24:     <span class="ruby-keyword kw">end</span>
-25:   <span class="ruby-keyword kw">end</span>
+    <span class="ruby-comment cmt"># File lib/shorturl.rb, line 26</span>
+26:   <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>)
+27:     <span class="ruby-keyword kw">case</span> <span class="ruby-identifier">service</span>
+28:     <span class="ruby-keyword kw">when</span> <span class="ruby-identifier">:rubyurl</span> <span class="ruby-keyword kw">then</span> <span class="ruby-identifier">rubyurl</span>(<span class="ruby-identifier">url</span>)
+29:     <span class="ruby-keyword kw">when</span> <span class="ruby-identifier">:tinyurl</span> <span class="ruby-keyword kw">then</span> <span class="ruby-identifier">tinyurl</span>(<span class="ruby-identifier">url</span>)
+30:     <span class="ruby-keyword kw">else</span> <span class="ruby-identifier">raise</span> <span class="ruby-constant">ArgumentError</span>, <span class="ruby-value str">&quot;Invalid service&quot;</span>
+31:     <span class="ruby-keyword kw">end</span>
+32:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
         </div>
       </div>
-      <h3 class="section-bar">Public Instance methods</h3>
+      <h3 class="section-bar">Private Class methods</h3>
       <div id="method-M000002" class="method-detail">
         <a name="M000002"></a>
         <div class="method-heading">
           <a href="#M000002" 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 a 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('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 42</span>
+42:   <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>
+43:     <span class="ruby-keyword kw">begin</span>
+44:       <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>
+45:         <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>)
+46:
+47:         <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>
+48:           <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>)
+49:         <span class="ruby-keyword kw">end</span>
+50:       }
+51:     <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>
+52:       <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">nil</span>
+53:     <span class="ruby-keyword kw">end</span>
+54:   <span class="ruby-keyword kw">end</span>
+</pre>
+          </div>
+        </div>
+      </div>
+      <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">rubyurl</span><span class="method-args">(url)</span>
           </a>
         </div>
@@ -181,32 +228,27 @@ our shortened URL plus <em>/rubyurl/show</em>, so we manually remove that
 with gsub.
 </p>
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000002-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000002-source">
+            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 32</span>
-32:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">rubyurl</span>(<span class="ruby-identifier">url</span>)
-33:     <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-value str">&quot;rubyurl.com&quot;</span>, <span class="ruby-value">80</span>) { <span class="ruby-operator">|</span><span class="ruby-identifier">http</span><span class="ruby-operator">|</span>
-34:       <span class="ruby-identifier">response</span> = <span class="ruby-identifier">http</span>.<span class="ruby-identifier">get</span>(<span class="ruby-node">&quot;/rubyurl/create?rubyurl[website_url]=#{CGI.escape(url)}&quot;</span>)
-35:
-36:       <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-value str">&quot;302&quot;</span>
-37:         <span class="ruby-identifier">body</span> = <span class="ruby-identifier">response</span>.<span class="ruby-identifier">read_body</span>
-38:         <span class="ruby-identifier">regex</span> = <span class="ruby-regexp re">/&lt;a href=&quot;(.+)&quot;&gt;/</span>
-39:         <span class="ruby-identifier">short_url</span> = <span class="ruby-identifier">regex</span>.<span class="ruby-identifier">match</span>(<span class="ruby-identifier">body</span>)[<span class="ruby-value">1</span>].<span class="ruby-identifier">gsub</span>(<span class="ruby-regexp re">/rubyurl\/show\//</span>, <span class="ruby-value str">&quot;&quot;</span>)
-40:         <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">short_url</span>
-41:       <span class="ruby-keyword kw">end</span>
-42:     }
-43:   <span class="ruby-keyword kw">end</span>
+    <span class="ruby-comment cmt"># File lib/shorturl.rb, line 62</span>
+62:   <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>)
+63:     <span class="ruby-identifier">get_short_url</span>(<span class="ruby-value str">&quot;rubyurl.com&quot;</span>, <span class="ruby-value">302</span>,
+64:                   <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>
+65:       <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>)
+66:       <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">short_url</span>
+67:     }
+68:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
         </div>
       </div>
-      <div id="method-M000003" class="method-detail">
-        <a name="M000003"></a>
+      <div id="method-M000004" class="method-detail">
+        <a name="M000004"></a>
         <div class="method-heading">
-          <a href="#M000003" class="method-signature">
+          <a href="#M000004" class="method-signature">
           <span class="method-name">tinyurl</span><span class="method-args">(url)</span>
           </a>
         </div>
@@ -219,23 +261,18 @@ 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('M000003-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000003-source">
+            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 50</span>
-50:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">tinyurl</span>(<span class="ruby-identifier">url</span>)
-51:     <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-value str">&quot;tinyurl.com&quot;</span>, <span class="ruby-value">80</span>) { <span class="ruby-operator">|</span><span class="ruby-identifier">http</span><span class="ruby-operator">|</span>
-52:       <span class="ruby-identifier">response</span> = <span class="ruby-identifier">http</span>.<span class="ruby-identifier">post</span>(<span class="ruby-value str">&quot;/create.php&quot;</span>, <span class="ruby-node">&quot;url=#{url}&quot;</span>)
-53:
-54:       <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-value str">&quot;200&quot;</span>
-55:         <span class="ruby-identifier">body</span> = <span class="ruby-identifier">response</span>.<span class="ruby-identifier">read_body</span>
-56:         <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> }
-57:         <span class="ruby-identifier">i1</span> = <span class="ruby-identifier">line</span>.<span class="ruby-identifier">index</span>(<span class="ruby-value str">&quot;http&quot;</span>)
-58:         <span class="ruby-identifier">i2</span> = <span class="ruby-identifier">line</span>.<span class="ruby-identifier">rindex</span>(<span class="ruby-value str">&quot;\&quot;&quot;</span>)
-59:         <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">line</span>[<span class="ruby-identifier">i1</span><span class="ruby-operator">...</span><span class="ruby-identifier">i2</span>]
-60:       <span class="ruby-keyword kw">end</span>
-61:     }
-62:   <span class="ruby-keyword kw">end</span>
+    <span class="ruby-comment cmt"># File lib/shorturl.rb, line 75</span>
+75:   <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>)
+76:     <span class="ruby-identifier">get_short_url</span>(<span class="ruby-value str">&quot;tinyurl.com&quot;</span>, <span class="ruby-value">200</span>,
+77:                   <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>
+78:       <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> }
+79:       <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>]
+80:       <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">short_url</span>
+81:     }
+82:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
         </div>

data/doc/created.rid CHANGED Viewed

	@@ -1 +1 @@
1	- ~~Wed~~ Jun 01 11:08:51 EDT 2005
1	+ Thu Jun 02 18:25:20 EDT 2005

data/doc/files/ChangeLog.html ADDED Viewed

@@ -0,0 +1,121 @@
+<?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>File: ChangeLog</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="fileHeader">
+    <h1>ChangeLog</h1>
+    <table class="header-table">
+    <tr class="top-aligned-row">
+      <td><strong>Path:</strong></td>
+      <td>ChangeLog
+      </td>
+    </tr>
+    <tr class="top-aligned-row">
+      <td><strong>Last Update:</strong></td>
+      <td>Thu Jun 02 17:27:57 EDT 2005</td>
+    </tr>
+    </table>
+  </div>
+  <!-- banner header -->
+  <div id="bodyContent">
+  <div id="contextContent">
+    <div id="description">
+      <p>
+0.1.0:
+</p>
+<pre>
+        - Refactored the tinyurl and rubyurl methods
+        - URI.extract to get URLs instead of regular expressions
+        - Added exception handling to get_short_url to return nil in case
+          of a network error
+        - More thorough unit tests
+        - Made tinyurl, rubyurl and get_short_url private class methods
+</pre>
+<p>
+0.0.1:
+</p>
+<pre>
+        - Initial Version
+</pre>
+    </div>
+   </div>
+  </div>
+    <!-- if includes -->
+    <div id="section">
+    <!-- if method_list -->
+  </div>
+<div id="validator-badges">
+  <p><small><a href="http://validator.w3.org/check/referer">[Validate]</a></small></p>
+</div>
+</body>
+</html>

data/doc/files/README.html CHANGED Viewed

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Wed Jun 01 10:23:54 EDT 2005</td>
+      <td>Thu Jun 02 18:25:07 EDT 2005</td>
     </tr>
     </table>
   </div>
@@ -75,6 +75,10 @@
 <a href="../classes/ShortURL.html">ShortURL</a> is a very simple library to
 use URL shortening services such as TinyURL or RubyURL.
 </p>
+<h2>Installation</h2>
+<p>
+<tt>$ gem install -r shorturl</tt>
+</p>
 <h2>Usage:</h2>
 <p>
 call-seq:
@@ -82,7 +86,22 @@ call-seq:
 <pre>
   require &quot;shorturl&quot;
   puts ShortURL.shorten(&quot;http://mypage.com&quot;)
+  puts ShortURL.shorten(&quot;http://mypage.com&quot;, :tinyurl)
 </pre>
+<h2>Thanks</h2>
+<ul>
+<li>Marcel Molina Jr., Devin Mullins for some ideas
+</li>
+<li>imperator from ruby-lang (don&#8217;t know your real name, sorry) for
+helping me with creating and uploading a RubyGem
+</li>
+</ul>
+<h2>Author</h2>
+<p>
+Vincent Foley
+</p>
     </div>

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>Wed Jun 01 08:47:02 EDT 2005</td>
+      <td>Thu Jun 02 18:23:38 EDT 2005</td>
     </tr>
     </table>
   </div>
@@ -68,6 +68,15 @@
   <div id="contextContent">
+    <div id="description">
+      <p>
+shorturl.rb
+</p>
+<pre>
+  Created by Vincent Foley on 2005-06-02
+</pre>
+    </div>
     <div id="requires-list">
       <h3 class="section-bar">Required files</h3>
@@ -75,6 +84,7 @@
       <div class="name-list">
       net/http&nbsp;&nbsp;
       cgi&nbsp;&nbsp;
+      uri&nbsp;&nbsp;
       </div>
     </div>

data/doc/fr_file_index.html CHANGED Viewed

@@ -20,6 +20,7 @@
 <div id="index">
   <h1 class="section-bar">Files</h1>
   <div id="index-entries">
+    <a href="files/ChangeLog.html">ChangeLog</a><br />
     <a href="files/MIT-LICENSE.html">MIT-LICENSE</a><br />
     <a href="files/README.html">README</a><br />
     <a href="files/TODO.html">TODO</a><br />

data/doc/fr_method_index.html CHANGED Viewed

@@ -20,9 +20,10 @@
 <div id="index">
   <h1 class="section-bar">Methods</h1>
   <div id="index-entries">
-    <a href="classes/ShortURL.html#M000002">rubyurl (ShortURL)</a><br />
+    <a href="classes/ShortURL.html#M000002">get_short_url (ShortURL)</a><br />
+    <a href="classes/ShortURL.html#M000003">rubyurl (ShortURL)</a><br />
     <a href="classes/ShortURL.html#M000001">shorten (ShortURL)</a><br />
-    <a href="classes/ShortURL.html#M000003">tinyurl (ShortURL)</a><br />
+    <a href="classes/ShortURL.html#M000004">tinyurl (ShortURL)</a><br />
   </div>
 </div>
 </body>

data/lib/shorturl.rb CHANGED Viewed

@@ -1,8 +1,15 @@
+# shorturl.rb
+#
+#   Created by Vincent Foley on 2005-06-02
+#
 require "net/http"
 require "cgi"
+require "uri"
-class ShortURL
+class ShortURL
   # Main method of ShortURL, its usage is quite simple, just give a
   # url to shorten and an optional service.  If no service is
   # selected, RubyURL.com will be used.  An invalid service symbol
@@ -18,27 +25,45 @@ class ShortURL
   #   ShortURL.shorten("http://mypage.com", :tinyurl)
   def self.shorten(url, service = :rubyurl)
     case service
-    when :rubyurl then self.new.rubyurl(url)
-    when :tinyurl then self.new.tinyurl(url)
+    when :rubyurl then rubyurl(url)
+    when :tinyurl then tinyurl(url)
     else raise ArgumentError, "Invalid service"
     end
   end
+  # Abstract method to shorten a 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 rubyurl(url)
-    Net::HTTP.start("rubyurl.com", 80) { |http|
-      response = http.get("/rubyurl/create?rubyurl[website_url]=#{CGI.escape(url)}")
-      if response.code == "302"
-        body = response.read_body
-        regex = /<a href="(.+)">/
-        short_url = regex.match(body)[1].gsub(/rubyurl\/show\//, "")
-        return short_url
-      end
+  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
@@ -47,17 +72,14 @@ class ShortURL
   # <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 tinyurl(url)
-    Net::HTTP.start("tinyurl.com", 80) { |http|
-      response = http.post("/create.php", "url=#{url}")
-      if response.code == "200"
-        body = response.read_body
-        line = body.split("\n").find { |l| l =~ /hidden name=tinyurl/ }
-        i1 = line.index("http")
-        i2 = line.rindex("\"")
-        return line[i1...i2]
-      end
+  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
+  private_class_method :get_short_url, :tinyurl, :rubyurl
 end

data/test/tc_shorturl.rb CHANGED Viewed

@@ -8,6 +8,13 @@ $:.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
     @url = "http://darkhost.mine.nu:81/~vince/rails/tutorial.html"
@@ -19,4 +26,35 @@ class TestShortURL < Test::Unit::TestCase
     assert ShortURL.shorten(@url, :tinyurl) == "http://tinyurl.com/9mop8"
     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
 end

metadata CHANGED Viewed

@@ -3,8 +3,8 @@ rubygems_version: 0.8.10
 specification_version: 1
 name: shorturl
 version: !ruby/object:Gem::Version
-  version: 0.0.1
-date: 2005-06-01
+  version: 0.1.0
+date: 2005-06-02
 summary: Shortens URLs using services such as TinyURL and RubyURL
 require_paths:
   - lib
@@ -37,6 +37,7 @@ files:
   - doc/index.html
   - doc/rdoc-style.css
   - doc/classes/ShortURL.html
+  - doc/files/ChangeLog.html
   - doc/files/lib
   - doc/files/MIT-LICENSE.html
   - doc/files/README.html
@@ -47,6 +48,7 @@ files:
   - README
   - TODO
   - MIT-LICENSE
+  - ChangeLog
 test_files:
   - test/ts_all.rb
 rdoc_options:
@@ -56,10 +58,12 @@ rdoc_options:
   - README
   - "-S"
   - "-N"
+  - "--all"
 extra_rdoc_files:
   - README
   - TODO
   - MIT-LICENSE
+  - ChangeLog
 executables: []
 extensions: []
 requirements: []