shorturl 0.6.0 → 0.7.0

data/ChangeLog

@@ -1,3 +1,8 @@
+0.7.0:
+    - Added shortify.com, 0rz.net
+    - Modified unit tests
+    - Started using CVS on RubyForge
+	
 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

data/README

@@ -1,4 +1,4 @@
-= ShortURL 0.5.0
+= ShortURL 0.7.0
 
 == Summary 
 ShortURL is a very simple library to use URL shortening services such as
@@ -29,6 +29,8 @@ Here is the list of the services supported by ShortURL:
 * http://shiturl.com
 * http://littlink.com
 * http://clipurl.com
+* http://shortify.com
+* http://0rz.net
 
 == Usage: 
 call-seq:
@@ -53,6 +55,8 @@ The second parameter represents the service you want to use.  These are:
 * <tt>:shiturl</tt>
 * <tt>:littlink</tt>
 * <tt>:clipurl</tt>
+* <tt>:shortify</tt>
+* <tt>:orz</tt>
 
 
 You can use <tt>ShortURL.valid_services</tt> to obtain a
@@ -61,7 +65,7 @@ documentation)
 
 == Thanks
 - Marcel Molina Jr., Devin Mullins for some ideas
-- imperator from #ruby-lang (don't know your real name, sorry) for
+- imperator from #ruby-lang (I don't know your real name, sorry) for
   helping me with creating and uploading a RubyGem
 - Daniel Dipaolo for telling me about ln-s.net and fyad.org
   

data/doc/classes/Service.html

@@ -210,8 +210,8 @@ Now that our service is set up, call it with all the parameters to
 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>)
+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">post</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">get</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>)

data/doc/classes/ShortURL.html

@@ -176,6 +176,12 @@ Valid <tt>service</tt> values:
 </li>
 <li><tt>:clipurl</tt>
 
+</li>
+<li><tt>:shortify</tt>
+
+</li>
+<li><tt>:orz</tt>
+
 </li>
 </ul>
 <p>
@@ -189,14 +195,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 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>
+     <span class="ruby-comment cmt"># File lib/shorturl.rb, line 197</span>
+197:   <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>)
+198:     <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">valid_services</span>.<span class="ruby-identifier">include?</span> <span class="ruby-identifier">service</span>
+199:       <span class="ruby-ivar">@@services</span>[<span class="ruby-identifier">service</span>].<span class="ruby-identifier">call</span>(<span class="ruby-identifier">url</span>)
+200:     <span class="ruby-keyword kw">else</span>
+201:       <span class="ruby-identifier">raise</span> <span class="ruby-constant">InvalidService</span>
+202:     <span class="ruby-keyword kw">end</span>
+203:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
         </div>
@@ -219,10 +225,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 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>
+     <span class="ruby-comment cmt"># File lib/shorturl.rb, line 164</span>
+164:   <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">valid_services</span>
+165:     <span class="ruby-ivar">@@valid_services</span>
+166:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
         </div>

data/doc/created.rid

@@ -1 +1 @@
-Wed Jun 29 21:33:29 EDT 2005
+Mon Sep 26 19:17:22 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 21:28:47 EDT 2005</td>
+      <td>Mon Sep 26 18:49:23 EDT 2005</td>
     </tr>
     </table>
   </div>
@@ -70,6 +70,13 @@
 
     <div id="description">
       <p>
+0.7.0:
+</p>
+<pre>
+    - Added shortify.com, 0rz.net
+    - Modified unit tests
+</pre>
+<p>
 0.6.0:
 </p>
 <pre>

data/doc/files/MIT-LICENSE.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Wed Jun 29 00:31:55 EDT 2005</td>
+      <td>Fri Jul 15 15:31:20 EDT 2005</td>
     </tr>
     </table>
   </div>

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 21:33:23 EDT 2005</td>
+      <td>Mon Sep 26 18:53:49 EDT 2005</td>
     </tr>
     </table>
   </div>
@@ -69,7 +69,7 @@
   <div id="contextContent">
 
     <div id="description">
-      <h1><a href="../classes/ShortURL.html">ShortURL</a> 0.5.0</h1>
+      <h1><a href="../classes/ShortURL.html">ShortURL</a> 0.7.0</h1>
 <h2>Summary</h2>
 <p>
 <a href="../classes/ShortURL.html">ShortURL</a> is a very simple library to
@@ -138,6 +138,12 @@ href="../classes/ShortURL.html">ShortURL</a>:
 </li>
 <li><a href="http://clipurl.com">clipurl.com</a>
 
+</li>
+<li><a href="http://shortify.com">shortify.com</a>
+
+</li>
+<li><a href="http://0rz.net">0rz.net</a>
+
 </li>
 </ul>
 <h2>Usage:</h2>
@@ -159,7 +165,7 @@ The second parameter represents the service you want to use. These are:
 <li><tt>:tinyurl</tt>
 
 </li>
-<li><tt>:snorl</tt>
+<li><tt>:shorl</tt>
 
 </li>
 <li><tt>:snipurl</tt>
@@ -180,7 +186,7 @@ The second parameter represents the service you want to use. These are:
 <li><tt>:shorterlink</tt>
 
 </li>
-<li><tt>:minilink</tt>
+<li><tt>:minlink</tt>
 
 </li>
 <li><tt>:lns</tt>
@@ -200,6 +206,12 @@ The second parameter represents the service you want to use. These are:
 </li>
 <li><tt>:clipurl</tt>
 
+</li>
+<li><tt>:shortify</tt>
+
+</li>
+<li><tt>:orz</tt>
+
 </li>
 </ul>
 <p>
@@ -213,7 +225,7 @@ documentation)
 <li>Marcel Molina Jr., Devin Mullins for some ideas
 
 </li>
-<li>imperator from ruby-lang (don&#8217;t know your real name, sorry) for
+<li>imperator from ruby-lang (I don&#8217;t know your real name, sorry) for
 helping me with creating and uploading a RubyGem
 
 </li>

data/doc/files/TODO.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Wed Jun 29 01:39:21 EDT 2005</td>
+      <td>Fri Jul 15 15:31:20 EDT 2005</td>
     </tr>
     </table>
   </div>

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 21:27:27 EDT 2005</td>
+      <td>Mon Sep 26 19:09:28 EDT 2005</td>
     </tr>
     </table>
   </div>

data/lib/shorturl.rb

@@ -37,8 +37,8 @@ class Service
   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)}")
+                 when :post: http.post(@action, "#{@field}=#{url}")
+                 when :get: http.get("#{@action}?#{@field}=#{CGI.escape(url)}")
                  end
       if response.code == @code.to_s
         @block.call(response.read_body)
@@ -64,9 +64,7 @@ class ShortURL
     
     :tinyurl => Service.new("tinyurl.com") { |s|
       s.action = "/create.php"
-      s.block = lambda { |body|
-        URI.extract(body).grep(/tinyurl/)[-1]
-      }
+      s.block = lambda { |body| URI.extract(body).grep(/tinyurl/)[-1] }
     },
     
     :shorl => Service.new("shorl.com") { |s|
@@ -144,8 +142,20 @@ class ShortURL
     :clipurl => Service.new("clipurl.com") { |s|
       s.action = "/create.asp"
       s.block = lambda { |body| URI.extract(body).grep(/clipurl/)[0] }
+    },
+
+    :shortify => Service.new("shortify.com") { |s|
+      s.method = :get
+      s.action = "/shorten.php"
+      s.block = lambda { |body| URI.extract(body).grep(/shortify/)[0] }
+    },
+
+    :orz => Service.new("0rz.net") { |s|
+      s.action = "/create.php"
+      s.block = lambda { |body| URI.extract(body).grep(/0rz/)[0] }
     }
   }
+
   # Array containing symbols representing all the implemented URL
   # shortening services
   @@valid_services = @@services.keys
@@ -178,12 +188,14 @@ class ShortURL
   # * <tt>:shiturl</tt>
   # * <tt>:littlink</tt>
   # * <tt>:clipurl</tt>
+  # * <tt>:shortify</tt>
+  # * <tt>:orz</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
+    if valid_services.include? service
       @@services[service].call(url)
     else
       raise InvalidService

data/test/tc_shorturl.rb

@@ -8,35 +8,28 @@ $:.unshift($test_lib_dir)
 require "test/unit"
 require "shorturl"
 
+class String
+  def url?
+    self[0..6].downcase == "http://"
+  end
+end
 
 class TestShortURL < Test::Unit::TestCase
   def setup
-    @url = "http://darkhost.mine.nu:81/~vince/rails/tutorial.html"
+    @url = "http://groups.google.com/group/comp.lang.ruby/"
   end
   
   def test_shorten
     # Default service (RubyURL)
-    assert ShortURL.shorten(@url) == "http://rubyurl.com/Q9ToW"
+    assert ShortURL.shorten(@url).url?
 
-    # 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
-    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 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"
-    
+    # All the services (I can't test exact URLs since they seem to
+    # change semi regularly)
+    ShortURL.valid_services.each do |service|
+      assert ShortURL.shorten(@url, service).url?
+    end
     
+    # An invalid service
     assert_raise(InvalidService) { ShortURL.shorten(@url, :foobar) }
   end
 end

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.10
+rubygems_version: 0.8.11
 specification_version: 1
 name: shorturl
 version: !ruby/object:Gem::Version 
-  version: 0.6.0
-date: 2005-06-29
+  version: 0.7.0
+date: 2005-09-26 00:00:00 -04:00
 summary: Shortens URLs using services such as TinyURL and RubyURL
 require_paths: 
   - lib
@@ -24,28 +24,30 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
         version: 0.0.0
   version: 
 platform: ruby
+signing_key: 
+cert_chain: 
 authors: 
   - Vincent Foley
 files: 
   - bin/shorturl
   - lib/shorturl.rb
+  - doc/classes
   - doc/created.rid
-  - doc/rdoc-style.css
   - doc/files
-  - doc/classes
-  - doc/fr_file_index.html
   - doc/fr_class_index.html
+  - doc/fr_file_index.html
   - doc/fr_method_index.html
   - doc/index.html
-  - doc/files/README.html
-  - doc/files/TODO.html
-  - doc/files/MIT-LICENSE.html
+  - doc/rdoc-style.css
+  - doc/classes/InvalidService.html
+  - doc/classes/Service.html
+  - doc/classes/ShortURL.html
   - doc/files/ChangeLog.html
   - doc/files/lib
+  - doc/files/MIT-LICENSE.html
+  - doc/files/README.html
+  - doc/files/TODO.html
   - doc/files/lib/shorturl_rb.html
-  - doc/classes/ShortURL.html
-  - doc/classes/InvalidService.html
-  - doc/classes/Service.html
   - test/tc_service.rb
   - test/tc_shorturl.rb
   - test/ts_all.rb