shorturl 0.8.2 → 0.8.3

data/ChangeLog

@@ -1,3 +1,6 @@
+0.8.3:
+    - Fixed and removed services.  Used APIs as much as possible.
+    - Default method is GET, not POST anymore.
 0.8.2:
     - Fixed unit tests
     - Added shurl.org

data/README

@@ -1,4 +1,4 @@
-= ShortURL 0.8.2
+= ShortURL 0.8.3
 
 == Summary 
 ShortURL is a very simple library to use URL shortening services such as
@@ -13,24 +13,20 @@ 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://snipurl.com
-* http://metamark.net
-* http://makeashorterlink.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
-* http://shortify.com
-* http://0rz.net
-* http://skinnylink.com
-* http://shurl.org
+* d62
+* fyad
+* linktrim
+* littlink
+* lns
+* metamark
+* minilink
+* orz
+* rubyurl
+* shiturl
+* shorterlink
+* shortify
+* shurl
+* tinyurl
 
 == Usage: 
 

data/doc/classes/WWW/Service.html

@@ -172,7 +172,7 @@ long URL, and the block of what to do with the HTML code you get.
 23:       <span class="ruby-ivar">@hostname</span> = <span class="ruby-identifier">hostname</span>
 24:       <span class="ruby-ivar">@port</span> = <span class="ruby-value">80</span>
 25:       <span class="ruby-ivar">@code</span> = <span class="ruby-value">200</span>
-26:       <span class="ruby-ivar">@method</span> = <span class="ruby-identifier">:post</span>
+26:       <span class="ruby-ivar">@method</span> = <span class="ruby-identifier">:get</span>
 27:       <span class="ruby-ivar">@action</span> = <span class="ruby-value str">&quot;/&quot;</span>
 28:       <span class="ruby-ivar">@field</span> = <span class="ruby-value str">&quot;url&quot;</span>
 29:       <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> }

data/doc/classes/WWW/ShortURL.html

@@ -129,58 +129,46 @@ an ArgumentError exception
 Valid <tt>service</tt> values:
 </p>
 <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><tt>:d62</tt>
 
 </li>
-<li><tt>:makeashorterlink</tt>
+<li><tt>:fyad</tt>
 
 </li>
-<li><tt>:skinnylink</tt>
+<li><tt>:linktrim</tt>
 
 </li>
-<li><tt>:linktrim</tt>
+<li><tt>:littlink</tt>
 
 </li>
-<li><tt>:shorterlink</tt>
+<li><tt>:lns</tt>
 
 </li>
-<li><tt>:minlink</tt>
+<li><tt>:metamark</tt>
 
 </li>
-<li><tt>:lns</tt>
+<li><tt>:minilink</tt>
 
 </li>
-<li><tt>:fyad</tt>
+<li><tt>:orz</tt>
 
 </li>
-<li><tt>:d62</tt>
+<li><tt>:rubyurl</tt>
 
 </li>
 <li><tt>:shiturl</tt>
 
 </li>
-<li><tt>:littlink</tt>
+<li><tt>:shorterlink</tt>
 
 </li>
-<li><tt>:clipurl</tt>
+<li><tt>:shortify</tt>
 
 </li>
-<li><tt>:shortify</tt>
+<li><tt>:shurl</tt>
 
 </li>
-<li><tt>:orz</tt>
+<li><tt>:tinyurl</tt>
 
 </li>
 </ul>
@@ -195,14 +183,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 202</span>
-202:     <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>)
-203:       <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>
-204:         <span class="ruby-ivar">@@services</span>[<span class="ruby-identifier">service</span>].<span class="ruby-identifier">call</span>(<span class="ruby-identifier">url</span>)
-205:       <span class="ruby-keyword kw">else</span>
-206:         <span class="ruby-identifier">raise</span> <span class="ruby-constant">InvalidService</span>
-207:       <span class="ruby-keyword kw">end</span>
-208:     <span class="ruby-keyword kw">end</span>
+     <span class="ruby-comment cmt"># File lib/shorturl.rb, line 166</span>
+166:     <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>)
+167:       <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>
+168:         <span class="ruby-ivar">@@services</span>[<span class="ruby-identifier">service</span>].<span class="ruby-identifier">call</span>(<span class="ruby-identifier">url</span>)
+169:       <span class="ruby-keyword kw">else</span>
+170:         <span class="ruby-identifier">raise</span> <span class="ruby-constant">InvalidService</span>
+171:       <span class="ruby-keyword kw">end</span>
+172:     <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
         </div>
@@ -225,10 +213,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 169</span>
-169:     <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">valid_services</span>
-170:       <span class="ruby-ivar">@@valid_services</span>
-171:     <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">valid_services</span>
+138:       <span class="ruby-ivar">@@valid_services</span>
+139:     <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
         </div>

data/doc/created.rid

@@ -1 +1 @@
-Sun Oct 02 18:54:32 EDT 2005
+Wed Mar 15 20:44:35 EST 2006

data/doc/files/ChangeLog.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Sun Oct 02 18:42:01 EDT 2005</td>
+      <td>Wed Mar 15 20:37:02 EST 2006</td>
     </tr>
     </table>
   </div>
@@ -70,6 +70,23 @@
 
     <div id="description">
       <p>
+0.8.3:
+</p>
+<pre>
+    - Fixed and removed services.  Used APIs as much as possible.
+    - Default method is GET, not POST anymore.
+</pre>
+<p>
+0.8.2:
+</p>
+<pre>
+    - Fixed unit tests
+    - Added shurl.org
+    - Added &quot;random&quot; service to bin/shorturl to pick a random one
+    - Removed shorl.com and skinnylink.com because they no longer seem to
+      be up and running
+</pre>
+<p>
 0.8.1:
 </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>Fri Jul 15 15:31:20 EDT 2005</td>
+      <td>Wed Mar 15 19:43:09 EST 2006</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>Sun Oct 02 18:45:01 EDT 2005</td>
+      <td>Wed Mar 15 20:41:54 EST 2006</td>
     </tr>
     </table>
   </div>
@@ -69,7 +69,7 @@
   <div id="contextContent">
 
     <div id="description">
-      <h1>ShortURL 0.8.1</h1>
+      <h1>ShortURL 0.8.3</h1>
 <h2>Summary</h2>
 <p>
 ShortURL is a very simple library to use URL shortening services such as
@@ -90,61 +90,46 @@ if you do not want to use the gem.
 Here is the list of the services supported by ShortURL:
 </p>
 <ul>
-<li><a href="http://rubyurl.com">rubyurl.com</a>
+<li>d62
 
 </li>
-<li><a href="http://tinyurl.com">tinyurl.com</a>
+<li>fyad
 
 </li>
-<li><a href="http://shorl.com">shorl.com</a>
+<li>linktrim
 
 </li>
-<li><a href="http://snipurl.com">snipurl.com</a>
+<li>littlink
 
 </li>
-<li><a href="http://metamark.net">metamark.net</a>
+<li>lns
 
 </li>
-<li><a href="http://makeashorterlink.com">makeashorterlink.com</a>
+<li>metamark
 
 </li>
-<li><a href="http://skinnylink.com">skinnylink.com</a>
+<li>minilink
 
 </li>
-<li><a href="http://linktrim.com">linktrim.com</a>
+<li>orz
 
 </li>
-<li><a href="http://shorterlink.com">shorterlink.com</a>
+<li>rubyurl
 
 </li>
-<li><a href="http://minilink.org">minilink.org</a>
+<li>shiturl
 
 </li>
-<li><a href="http://ln-s.net">ln-s.net</a>
+<li>shorterlink
 
 </li>
-<li><a href="http://fyad.org">fyad.org</a>
+<li>shortify
 
 </li>
-<li><a href="http://d62.net">d62.net</a>
+<li>shurl
 
 </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>
-<li><a href="http://shortify.com">shortify.com</a>
-
-</li>
-<li><a href="http://0rz.net">0rz.net</a>
-
-</li>
-<li><a href="http://skinnylink.com">skinnylink.com</a>
+<li>tinyurl
 
 </li>
 </ul>
@@ -158,67 +143,10 @@ call-seq:
   puts WWW::ShortURL.shorten(&quot;http://mypage.com&quot;, :tinyurl)
 </pre>
 <p>
-The second parameter represents the service you want to use. These are:
+The second parameter represents the service you want to use. See the
+documentation for <a href="../classes/WWW/ShortURL.html">WWW::ShortURL</a>
+for a complete list
 </p>
-<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>
-
-</li>
-<li><tt>:shorterlink</tt>
-
-</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>
-<li><tt>:shortify</tt>
-
-</li>
-<li><tt>:orz</tt>
-
-</li>
-<li><tt>:skinnylink</tt>
-
-</li>
-</ul>
 <p>
 You can use <tt>ShortURL.valid_services</tt> to obtain a list of the valid
 services (in case I forget to update the documentation)
@@ -232,7 +160,8 @@ command line: call-seq:
   http://rubyurl.com/fuuUw
   $ shorturl -s tinyurl www.google.com
   http://tinyurl.com/1c2
-  $
+  $ shorturl -s random www.google.com
+  http://linktrim.com/42k
 </pre>
 <h2>Thanks</h2>
 <ul>

data/doc/files/TODO.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Fri Jul 15 15:31:20 EDT 2005</td>
+      <td>Wed Mar 15 19:43:09 EST 2006</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>Sun Oct 02 17:56:50 EDT 2005</td>
+      <td>Wed Mar 15 20:44:00 EST 2006</td>
     </tr>
     </table>
   </div>

data/lib/shorturl.rb

@@ -23,7 +23,7 @@ module WWW
       @hostname = hostname
       @port = 80
       @code = 200
-      @method = :post
+      @method = :get
       @action = "/"
       @field = "url"
       @block = lambda { |body| }
@@ -61,72 +61,55 @@ module WWW
     @@services = {
       :rubyurl => Service.new("rubyurl.com") { |s|
         s.code = 302
-        s.method = :get
-        s.action = "/rubyurl/create"
-        s.field = "rubyurl[website_url]"
+        s.action = "/rubyurl/remote"
+        s.field = "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] }
+        s.action = "/api-create.php"
+        s.block = lambda { |body| body }
       },
       
-      :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.action = "/api/rest/simple"
         s.field = "long_url"
-        s.block = lambda { |body| URI.extract(body).grep(/xrl.us/)[0] }
+        s.block = lambda { |body| body }
       },
 
-      :makeashorterlink => Service.new("makeashorterlink.com") { |s|
-        s.action = "/index.php"
-        s.block = lambda { |body| URI.extract(body).grep(/makeashorterlink/)[0] }
+      :orz => Service.new("0rz.net") { |s|
+        s.action = "/createget.php"
+        s.block = lambda { |body| URI.extract(body).grep(/0rz.net/)[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] }
       },
 
       :minilink => Service.new("minilink.org") { |s|
-        s.method = :get
         s.block = lambda { |body| URI.extract(body)[-1] }
       },
 
       :lns => Service.new("ln-s.net") { |s|
-        s.method = :get
         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] }
       },
@@ -135,23 +118,13 @@ module WWW
         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] }
-      },
-
       :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] }
-      },
-
       :shurl => Service.new("shurl.org") { |s|
+        s.method = :post
         s.block = lambda { |body| URI.extract(body).grep(/shurl/)[0] }
       }
     }
@@ -172,23 +145,20 @@ module WWW
     #
     # Valid +service+ values:
     #
-    # * <tt>:rubyurl</tt>
-    # * <tt>:tinyurl</tt>
-    # * <tt>:snipurl</tt>
-    # * <tt>:metamark</tt>
-    # * <tt>:makeashorterlink</tt>
+    # * <tt>:d62</tt>
+    # * <tt>:fyad</tt>
     # * <tt>:linktrim</tt>
-    # * <tt>:shorterlink</tt>
-    # * <tt>:minlink</tt>
+    # * <tt>:littlink</tt>
     # * <tt>:lns</tt>
-    # * <tt>:fyad</tt>
-    # * <tt>:d62</tt>
+    # * <tt>:metamark</tt>
+    # * <tt>:minilink</tt>
+    # * <tt>:orz</tt>
+    # * <tt>:rubyurl</tt>
     # * <tt>:shiturl</tt>
-    # * <tt>:littlink</tt>
-    # * <tt>:clipurl</tt>
+    # * <tt>:shorterlink</tt>
     # * <tt>:shortify</tt>
-    # * <tt>:orz</tt>
     # * <tt>:shurl</tt>
+    # * <tt>:tinyurl</tt>
     #
     # call-seq:
     #   ShortURL.shorten("http://mypage.com") => Uses RubyURL

data/test/tc_service.rb

@@ -31,7 +31,7 @@ class TestService < Test::Unit::TestCase
     service = Service.new("rubyurl.com")
     assert_equal(service.port, 80)
     assert_equal(service.code, 200)
-    assert_equal(service.method, :post)
+    assert_equal(service.method, :get)
     assert_equal(service.action, "/")
     assert_equal(service.field, "url")
 

data/test/tc_shorturl.rb

@@ -27,7 +27,6 @@ class TestShortURL < Test::Unit::TestCase
     # All the services (I can't test exact URLs since they seem to
     # change semi regularly)
     ShortURL.valid_services.each do |service|
-      puts "Testing #{service}"
       assert ShortURL.shorten(@url, service).url?
     end
     

metadata

@@ -3,11 +3,11 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: shorturl
 version: !ruby/object:Gem::Version 
-  version: 0.8.2
-date: 2005-12-17 00:00:00 -05:00
+  version: 0.8.3
+date: 2006-03-15 00:00:00 -05:00
 summary: Shortens URLs using services such as TinyURL and RubyURL
 require_paths: 
-  - lib
+- lib
 email: vfoleybourgon@yahoo.ca
 homepage: http://shorturl.rubyforge.org
 rubyforge_project: 
@@ -18,63 +18,65 @@ bindir: bin
 has_rdoc: true
 required_ruby_version: !ruby/object:Gem::Version::Requirement 
   requirements: 
-    - 
-      - ">"
-      - !ruby/object:Gem::Version 
-        version: 0.0.0
+  - - ">"
+    - !ruby/object:Gem::Version 
+      version: 0.0.0
   version: 
 platform: ruby
 signing_key: 
 cert_chain: 
 authors: 
-  - Vincent Foley
+- Vincent Foley
 files: 
-  - bin/shorturl
-  - lib/shorturl.rb
-  - doc/classes
-  - doc/created.rid
-  - doc/files
-  - doc/fr_class_index.html
-  - doc/fr_file_index.html
-  - doc/fr_method_index.html
-  - doc/index.html
-  - doc/rdoc-style.css
-  - doc/classes/WWW
-  - doc/classes/WWW.html
-  - doc/classes/WWW/InvalidService.html
-  - doc/classes/WWW/Service.html
-  - doc/classes/WWW/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
-  - test/tc_service.rb
-  - test/tc_shorturl.rb
-  - test/ts_all.rb
-  - examples/shorten.rb
-  - README
-  - TODO
-  - MIT-LICENSE
-  - ChangeLog
+- bin/shorturl
+- lib/shorturl.rb
+- doc/created.rid
+- doc/rdoc-style.css
+- doc/files
+- doc/classes
+- doc/fr_file_index.html
+- doc/fr_class_index.html
+- doc/fr_method_index.html
+- doc/index.html
+- doc/files/README.html
+- doc/files/TODO.html
+- doc/files/MIT-LICENSE.html
+- doc/files/ChangeLog.html
+- doc/files/lib
+- doc/files/lib/shorturl_rb.html
+- doc/classes/WWW.html
+- doc/classes/WWW
+- doc/classes/WWW/ShortURL.html
+- doc/classes/WWW/InvalidService.html
+- doc/classes/WWW/Service.html
+- test/tc_service.rb
+- test/tc_shorturl.rb
+- test/ts_all.rb
+- examples/shorten.rb
+- README
+- TODO
+- MIT-LICENSE
+- ChangeLog
 test_files: 
-  - test/ts_all.rb
+- test/ts_all.rb
 rdoc_options: 
-  - "--title"
-  - ShortURL Documentation
-  - "--main"
-  - README
-  - "-S"
-  - "-N"
-  - "--all"
+- --title
+- ShortURL Documentation
+- --main
+- README
+- -S
+- -N
+- --all
 extra_rdoc_files: 
-  - README
-  - TODO
-  - MIT-LICENSE
-  - ChangeLog
+- README
+- TODO
+- MIT-LICENSE
+- ChangeLog
 executables: 
-  - shorturl
+- shorturl
 extensions: []
+
 requirements: []
-dependencies: []
+
+dependencies: []
+