shorturl 0.5.0 → 0.6.0

data/ChangeLog

@@ -1,3 +1,10 @@
+0.6.0:
+    - Changed the method for getting the URL for ln-s.net to use their
+      API.  So basically, this means the new additional argument attribute
+      in the Service class is now useless, because no service uses it.  I've
+      removed it along with the Hash#to_html_args method.
+    - Added d62.net, shiturl.com, littlink.com and clipurl.com
+	
 0.5.0:
     - Added two services: fyad.org and ln-s.net (thanks to Daniel
       Dipaolo)

data/README

@@ -11,6 +11,25 @@ ShortURL is available as a gem, installation is just like any other gem:
 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.
 
+== Supported services
+Here is the list of the services supported by ShortURL:
+* http://rubyurl.com
+* http://tinyurl.com
+* http://shorl.com
+* http://snipurl.com
+* http://metamark.net
+* http://makeashorterlink.com
+* http://skinnylink.com
+* http://linktrim.com
+* http://shorterlink.com
+* http://minilink.org
+* http://ln-s.net
+* http://fyad.org
+* http://d62.net
+* http://shiturl.com
+* http://littlink.com
+* http://clipurl.com
+
 == Usage: 
 call-seq:
   require "shorturl"
@@ -18,18 +37,23 @@ call-seq:
   puts ShortURL.shorten("http://mypage.com", :tinyurl)
 
 The second parameter represents the service you want to use.  These are:
-- <tt>:rubyurl</tt>
-- <tt>:tinyurl</tt>
-- <tt>:snorl</tt>
-- <tt>:snipurl</tt>
-- <tt>:metamark</tt>
-- <tt>:makeashorterlink</tt>
-- <tt>:skinnylink</tt>
-- <tt>:linktrim</tt>
-- <tt>:shorterlink</tt>
-- <tt>:minilink</tt>
-- <tt>:lns</tt>
-- <tt>:fyad</tt>
+* <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>
+* <tt>:minlink</tt>
+* <tt>:lns</tt>
+* <tt>:fyad</tt>
+* <tt>:d62</tt>
+* <tt>:shiturl</tt>
+* <tt>:littlink</tt>
+* <tt>:clipurl</tt>
+
 
 You can use <tt>ShortURL.valid_services</tt> to obtain a
 list of the valid services (in case I forget to update the

data/doc/classes/Service.html

@@ -86,8 +86,8 @@
       <h3 class="section-bar">Methods</h3>
 
       <div class="name-list">
-      <a href="#M000005">call</a>&nbsp;&nbsp;
-      <a href="#M000004">new</a>&nbsp;&nbsp;
+      <a href="#M000004">call</a>&nbsp;&nbsp;
+      <a href="#M000003">new</a>&nbsp;&nbsp;
       </div>
     </div>
 
@@ -112,11 +112,6 @@
           <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">args</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>
@@ -152,11 +147,11 @@
     <div id="methods">
       <h3 class="section-bar">Public Class methods</h3>
 
-      <div id="method-M000004" class="method-detail">
-        <a name="M000004"></a>
+      <div id="method-M000003" class="method-detail">
+        <a name="M000003"></a>
 
         <div class="method-heading">
-          <a href="#M000004" class="method-signature">
+          <a href="#M000003" class="method-signature">
           <span class="method-name">new</span><span class="method-args">(hostname) {|service| ...}</span>
           </a>
         </div>
@@ -166,28 +161,26 @@
 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, optional additional arguments to send to a GET method and the
-block of what to do with the HTML code you get.
+long URL, and the block of what to do with the HTML code you get.
 </p>
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000004-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000004-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 35</span>
-35:   <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>
-36:     <span class="ruby-ivar">@hostname</span> = <span class="ruby-identifier">hostname</span>
-37:     <span class="ruby-ivar">@port</span> = <span class="ruby-value">80</span>
-38:     <span class="ruby-ivar">@code</span> = <span class="ruby-value">200</span>
-39:     <span class="ruby-ivar">@method</span> = <span class="ruby-identifier">:post</span>
-40:     <span class="ruby-ivar">@action</span> = <span class="ruby-value str">&quot;/&quot;</span>
-41:     <span class="ruby-ivar">@field</span> = <span class="ruby-value str">&quot;url&quot;</span>
-42:     <span class="ruby-ivar">@args</span> = {}
-43:     <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> }
-44: 
-45:     <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">block_given?</span>
-46:       <span class="ruby-keyword kw">yield</span> <span class="ruby-keyword kw">self</span>
-47:     <span class="ruby-keyword kw">end</span>
-48:   <span class="ruby-keyword kw">end</span>
+    <span class="ruby-comment cmt"># File lib/shorturl.rb, line 21</span>
+21:   <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>
+22:     <span class="ruby-ivar">@hostname</span> = <span class="ruby-identifier">hostname</span>
+23:     <span class="ruby-ivar">@port</span> = <span class="ruby-value">80</span>
+24:     <span class="ruby-ivar">@code</span> = <span class="ruby-value">200</span>
+25:     <span class="ruby-ivar">@method</span> = <span class="ruby-identifier">:post</span>
+26:     <span class="ruby-ivar">@action</span> = <span class="ruby-value str">&quot;/&quot;</span>
+27:     <span class="ruby-ivar">@field</span> = <span class="ruby-value str">&quot;url&quot;</span>
+28:     <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> }
+29: 
+30:     <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">block_given?</span>
+31:       <span class="ruby-keyword kw">yield</span> <span class="ruby-keyword kw">self</span>
+32:     <span class="ruby-keyword kw">end</span>
+33:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
         </div>
@@ -195,11 +188,11 @@ block of what to do with the HTML code you get.
 
       <h3 class="section-bar">Public Instance methods</h3>
 
-      <div id="method-M000005" class="method-detail">
-        <a name="M000005"></a>
+      <div id="method-M000004" class="method-detail">
+        <a name="M000004"></a>
 
         <div class="method-heading">
-          <a href="#M000005" class="method-signature">
+          <a href="#M000004" class="method-signature">
           <span class="method-name">call</span><span class="method-args">(url)</span>
           </a>
         </div>
@@ -210,21 +203,21 @@ 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('M000005-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000005-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 52</span>
-52:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">call</span>(<span class="ruby-identifier">url</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-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>
-54:       <span class="ruby-identifier">response</span> = <span class="ruby-keyword kw">case</span> <span class="ruby-ivar">@method</span>
-55:                  <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>)
-56:                  <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)}&amp;#{@args.to_html_args}&quot;</span>)
-57:                  <span class="ruby-keyword kw">end</span>
-58:       <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>
-59:         <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>)
-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 37</span>
+37:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">call</span>(<span class="ruby-identifier">url</span>)
+38:     <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>
+39:       <span class="ruby-identifier">response</span> = <span class="ruby-keyword kw">case</span> <span class="ruby-ivar">@method</span>
+40:                  <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>)
+41:                  <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>)
+42:                  <span class="ruby-keyword kw">end</span>
+43:       <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>
+44:         <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>)
+45:       <span class="ruby-keyword kw">end</span>
+46:     }
+47:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
         </div>

data/doc/classes/ShortURL.html

@@ -158,6 +158,24 @@ Valid <tt>service</tt> values:
 </li>
 <li><tt>:minlink</tt>
 
+</li>
+<li><tt>:lns</tt>
+
+</li>
+<li><tt>:fyad</tt>
+
+</li>
+<li><tt>:d62</tt>
+
+</li>
+<li><tt>:shiturl</tt>
+
+</li>
+<li><tt>:littlink</tt>
+
+</li>
+<li><tt>:clipurl</tt>
+
 </li>
 </ul>
 <p>
@@ -171,14 +189,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 175</span>
-175:   <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>)
-176:     <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>
-177:       <span class="ruby-ivar">@@services</span>[<span class="ruby-identifier">service</span>].<span class="ruby-identifier">call</span>(<span class="ruby-identifier">url</span>)
-178:     <span class="ruby-keyword kw">else</span>
-179:       <span class="ruby-identifier">raise</span> <span class="ruby-constant">InvalidService</span>
-180:     <span class="ruby-keyword kw">end</span>
-181:   <span class="ruby-keyword kw">end</span>
+     <span class="ruby-comment cmt"># File lib/shorturl.rb, line 185</span>
+185:   <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>)
+186:     <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>
+187:       <span class="ruby-ivar">@@services</span>[<span class="ruby-identifier">service</span>].<span class="ruby-identifier">call</span>(<span class="ruby-identifier">url</span>)
+188:     <span class="ruby-keyword kw">else</span>
+189:       <span class="ruby-identifier">raise</span> <span class="ruby-constant">InvalidService</span>
+190:     <span class="ruby-keyword kw">end</span>
+191:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
         </div>
@@ -201,10 +219,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 150</span>
-150:   <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">valid_services</span>
-151:     <span class="ruby-ivar">@@valid_services</span>
-152:   <span class="ruby-keyword kw">end</span>
+     <span class="ruby-comment cmt"># File lib/shorturl.rb, line 154</span>
+154:   <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">valid_services</span>
+155:     <span class="ruby-ivar">@@valid_services</span>
+156:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
         </div>

data/doc/created.rid

@@ -1 +1 @@
-Wed Jun 29 01:54:03 EDT 2005
+Wed Jun 29 21:33:29 EDT 2005

data/doc/files/ChangeLog.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Wed Jun 29 01:52:05 EDT 2005</td>
+      <td>Wed Jun 29 21:28:47 EDT 2005</td>
     </tr>
     </table>
   </div>
@@ -70,6 +70,16 @@
 
     <div id="description">
       <p>
+0.6.0:
+</p>
+<pre>
+    - Changed the method for getting the URL for ln-s.net to use their
+      API.  So basically, this means the new additional argument attribute
+      in the Service class is now useless, because no service uses it.  I've
+      removed it along with the Hash#to_html_args method.
+    - Added d62.net, shiturl.com, littlink.com and clipurl.com
+</pre>
+<p>
 0.5.0:
 </p>
 <pre>

data/doc/files/README.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Wed Jun 29 01:53:41 EDT 2005</td>
+      <td>Wed Jun 29 21:33:23 EDT 2005</td>
     </tr>
     </table>
   </div>
@@ -85,6 +85,61 @@ 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>Supported services</h2>
+<p>
+Here is the list of the services supported by <a
+href="../classes/ShortURL.html">ShortURL</a>:
+</p>
+<ul>
+<li><a href="http://rubyurl.com">rubyurl.com</a>
+
+</li>
+<li><a href="http://tinyurl.com">tinyurl.com</a>
+
+</li>
+<li><a href="http://shorl.com">shorl.com</a>
+
+</li>
+<li><a href="http://snipurl.com">snipurl.com</a>
+
+</li>
+<li><a href="http://metamark.net">metamark.net</a>
+
+</li>
+<li><a href="http://makeashorterlink.com">makeashorterlink.com</a>
+
+</li>
+<li><a href="http://skinnylink.com">skinnylink.com</a>
+
+</li>
+<li><a href="http://linktrim.com">linktrim.com</a>
+
+</li>
+<li><a href="http://shorterlink.com">shorterlink.com</a>
+
+</li>
+<li><a href="http://minilink.org">minilink.org</a>
+
+</li>
+<li><a href="http://ln-s.net">ln-s.net</a>
+
+</li>
+<li><a href="http://fyad.org">fyad.org</a>
+
+</li>
+<li><a href="http://d62.net">d62.net</a>
+
+</li>
+<li><a href="http://shiturl.com">shiturl.com</a>
+
+</li>
+<li><a href="http://littlink.com">littlink.com</a>
+
+</li>
+<li><a href="http://clipurl.com">clipurl.com</a>
+
+</li>
+</ul>
 <h2>Usage:</h2>
 <p>
 call-seq:
@@ -133,6 +188,18 @@ The second parameter represents the service you want to use. These are:
 </li>
 <li><tt>:fyad</tt>
 
+</li>
+<li><tt>:d62</tt>
+
+</li>
+<li><tt>:shiturl</tt>
+
+</li>
+<li><tt>:littlink</tt>
+
+</li>
+<li><tt>:clipurl</tt>
+
 </li>
 </ul>
 <p>

data/doc/files/lib/shorturl_rb.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Wed Jun 29 01:03:40 EDT 2005</td>
+      <td>Wed Jun 29 21:27:27 EDT 2005</td>
     </tr>
     </table>
   </div>

data/doc/fr_class_index.html

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

data/doc/fr_method_index.html

@@ -20,10 +20,9 @@
 <div id="index">
   <h1 class="section-bar">Methods</h1>
   <div id="index-entries">
-    <a href="classes/Service.html#M000005">call (Service)</a><br />
-    <a href="classes/Service.html#M000004">new (Service)</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/Hash.html#M000003">to_html_args (Hash)</a><br />
     <a href="classes/ShortURL.html#M000001">valid_services (ShortURL)</a><br />
   </div>
 </div>

data/lib/shorturl.rb

@@ -7,31 +7,17 @@ require "net/http"
 require "cgi"
 require "uri"
 
-class Hash
-  # Returns a string with the format key1=value1&key2=value2 for
-  # usage in HTTP requests
-  def to_html_args
-    if self.empty?
-      ""
-    else
-      args = self.collect { |k, v| "#{k}=#{CGI.escape(v)}" }
-      args.join("&")
-    end
-  end
-end
-
 class InvalidService < Exception
 end
 
 class Service
-  attr_accessor :port, :code, :method, :action, :field, :args, :block
+  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, optional additional arguments
-  # to send to a GET method and the block of what to do with the HTML
-  # code you get.
+  # 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
@@ -39,7 +25,6 @@ class Service
     @method = :post
     @action = "/"
     @field = "url"
-    @args = {}
     @block = lambda { |body| }
 
     if block_given?
@@ -53,7 +38,7 @@ class Service
     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)}&#{@args.to_html_args}")
+                 when :get: http.send(@method, "#@action?#@field=#{CGI.escape(url)}")
                  end
       if response.code == @code.to_s
         @block.call(response.read_body)
@@ -132,14 +117,33 @@ class ShortURL
 
     :lns => Service.new("ln-s.net") { |s|
       s.method = :get
-      s.action = "/home/index.jsp"
-      s.args = { "submitted" => "true" }
-      s.block = lambda { |body| URI.extract(body).grep(/ln-s/)[0] }
+      s.action = "/home/api.jsp"
+      s.block = lambda { |body| URI.extract(body)[0] }
     },
 
     :fyad => Service.new("fyad.org") { |s|
       s.method = :get
       s.block = lambda { |body| URI.extract(body).grep(/fyad.org/)[2] }
+    },
+
+    :d62 => Service.new("d62.net") { |s|
+      s.method = :get
+      s.block = lambda { |body| URI.extract(body)[0] }
+    },
+
+    :shiturl => Service.new("shiturl.com") { |s|
+      s.method = :get
+      s.action = "/make.php"
+      s.block = lambda { |body| URI.extract(body).grep(/shiturl/)[0] }
+    },
+
+    :littlink => Service.new("littlink.com") { |s|
+      s.block = lambda { |body| URI.extract(body).grep(/littlink/)[0] }
+    },
+
+    :clipurl => Service.new("clipurl.com") { |s|
+      s.action = "/create.asp"
+      s.block = lambda { |body| URI.extract(body).grep(/clipurl/)[0] }
     }
   }
   # Array containing symbols representing all the implemented URL
@@ -168,6 +172,12 @@ class ShortURL
   # * <tt>:linktrim</tt>
   # * <tt>:shorterlink</tt>
   # * <tt>:minlink</tt>
+  # * <tt>:lns</tt>
+  # * <tt>:fyad</tt>
+  # * <tt>:d62</tt>
+  # * <tt>:shiturl</tt>
+  # * <tt>:littlink</tt>
+  # * <tt>:clipurl</tt>
   #
   # call-seq:
   #   ShortURL.shorten("http://mypage.com") => Uses RubyURL

data/test/tc_shorturl.rb

@@ -15,7 +15,10 @@ class TestShortURL < Test::Unit::TestCase
   end
   
   def test_shorten
+    # Default service (RubyURL)
     assert ShortURL.shorten(@url) == "http://rubyurl.com/Q9ToW"
+
+    # All the services (in the order in which they were added)
     assert ShortURL.shorten(@url, :rubyurl) == "http://rubyurl.com/Q9ToW"
     assert ShortURL.shorten(@url, :tinyurl) == "http://tinyurl.com/9mop8"
     assert ShortURL.shorten(@url, :shorl) =~ /^http:\/\/shorl.com/  # Never the same URL
@@ -28,7 +31,12 @@ class TestShortURL < Test::Unit::TestCase
     assert ShortURL.shorten(@url, :minilink) == "http://lnk.nu/darkhost.mine.nu:81/2zr.html"
     assert ShortURL.shorten(@url, :lns) == "http://ln-s.net/5UL"
     assert ShortURL.shorten(@url, :fyad) == "http://fyad.org/15zu"
-
+    assert ShortURL.shorten(@url, :d62) == "http://y5o49.d62.net"
+    assert ShortURL.shorten(@url, :shiturl) == "http://www.shiturl.com/b53b3a"
+    assert ShortURL.shorten(@url, :littlink) == "http://littlink.com/2kc87"
+    assert ShortURL.shorten(@url, :clipurl) == "http://clipurl.com?BH"
+    
+    
     assert_raise(InvalidService) { ShortURL.shorten(@url, :foobar) }
   end
 end

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.8.10
 specification_version: 1
 name: shorturl
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
+  version: 0.6.0
 date: 2005-06-29
 summary: Shortens URLs using services such as TinyURL and RubyURL
 require_paths: 
@@ -45,7 +45,6 @@ files:
   - doc/files/lib/shorturl_rb.html
   - doc/classes/ShortURL.html
   - doc/classes/InvalidService.html
-  - doc/classes/Hash.html
   - doc/classes/Service.html
   - test/tc_service.rb
   - test/tc_shorturl.rb

data/doc/classes/Hash.html

@@ -1,155 +0,0 @@
-<?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: Hash</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">Hash</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="#M000003">to_html_args</a>&nbsp;&nbsp;
-      </div>
-    </div>
-
-  </div>
-
-
-    <!-- if includes -->
-
-    <div id="section">
-
-
-
-
-
-      
-
-
-    <!-- if method_list -->
-    <div id="methods">
-      <h3 class="section-bar">Public Instance 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">to_html_args</span><span class="method-args">()</span>
-          </a>
-        </div>
-      
-        <div class="method-description">
-          <p>
-Returns a string with the format key1=value1&amp;key2=value2 for usage in
-HTTP requests
-</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 13</span>
-13:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">to_html_args</span>
-14:     <span class="ruby-keyword kw">if</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">empty?</span>
-15:       <span class="ruby-value str">&quot;&quot;</span>
-16:     <span class="ruby-keyword kw">else</span>
-17:       <span class="ruby-identifier">args</span> = <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">collect</span> { <span class="ruby-operator">|</span><span class="ruby-identifier">k</span>, <span class="ruby-identifier">v</span><span class="ruby-operator">|</span> <span class="ruby-node">&quot;#{k}=#{CGI.escape(v)}&quot;</span> }
-18:       <span class="ruby-identifier">args</span>.<span class="ruby-identifier">join</span>(<span class="ruby-value str">&quot;&amp;&quot;</span>)
-19:     <span class="ruby-keyword kw">end</span>
-20:   <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>