shorturl 0.8.3 → 0.8.4

data/lib/shorturl.rb

@@ -7,168 +7,210 @@ require "net/http"
 require "cgi"
 require "uri"
 
-module WWW
-  class InvalidService < Exception
-  end
+class InvalidService < Exception
+end
 
-  class Service
-    attr_accessor :port, :code, :method, :action, :field, :block
-
-    # Intialize the service with a hostname (required parameter) and you
-    # can override the default values for the HTTP port, expected HTTP
-    # return code, the form method to use, the form action, the form
-    # field which contains the long URL, and the block of what to do
-    # with the HTML code you get.
-    def initialize(hostname) # :yield: service
-      @hostname = hostname
-      @port = 80
-      @code = 200
-      @method = :get
-      @action = "/"
-      @field = "url"
-      @block = lambda { |body| }
-
-      if block_given?
-        yield self
-      end
+class Service
+  attr_accessor :port, :code, :method, :action, :field, :block
+
+  # Intialize the service with a hostname (required parameter) and you
+  # can override the default values for the HTTP port, expected HTTP
+  # return code, the form method to use, the form action, the form
+  # field which contains the long URL, and the block of what to do
+  # with the HTML code you get.
+  def initialize(hostname) # :yield: service
+    @hostname = hostname
+    @port = 80
+    @code = 200
+    @method = :post
+    @action = "/"
+    @field = "url"
+    @block = lambda { |body| }
+
+    if block_given?
+      yield self
     end
+  end
 
-    # Now that our service is set up, call it with all the parameters to
-    # (hopefully) return only the shortened URL.
-    def call(url)
-      Net::HTTP.start(@hostname, @port) { |http|
-        response = case @method
-                   when :post: http.post(@action, "#{@field}=#{url}")
-                   when :get: http.get("#{@action}?#{@field}=#{CGI.escape(url)}")
-                   end
-        if response.code == @code.to_s
-          begin
-            @block.call(response.read_body)
-          rescue NoMethodError
-            nil
-          end
-        end
-      }
-    end
+  # Now that our service is set up, call it with all the parameters to
+  # (hopefully) return only the shortened URL.
+  def call(url)
+    Net::HTTP.start(@hostname, @port) { |http|
+      response = case @method
+                 when :post: http.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)
+      end
+    }
   end
+end
 
-  class ShortURL
-    # Hash table of all the supported services.  The key is a symbol
-    # representing the service (usually the hostname minus the .com,
-    # .net, etc.)  The value is an instance of Service with all the
-    # parameters set so that when +instance+.call is invoked, the
-    # shortened URL is returned.
-    @@services = {
-      :rubyurl => Service.new("rubyurl.com") { |s|
-        s.code = 302
-        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 = "/api-create.php"
-        s.block = lambda { |body| body }
-      },
-      
-      :metamark => Service.new("metamark.net") { |s|
-        s.action = "/api/rest/simple"
-        s.field = "long_url"
-        s.block = lambda { |body| body }
-      },
-
-      :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.action = "/lt/generate"
-        s.block = lambda { |body| URI.extract(body).grep(/\/linktrim/)[1] }
-      },
-
-      :shorterlink => Service.new("shorterlink.com") { |s|
-        s.action = "/add_url.html"
-        s.block = lambda { |body| URI.extract(body).grep(/shorterlink/)[0] }
-      },
-
-      :minilink => Service.new("minilink.org") { |s|
-        s.block = lambda { |body| URI.extract(body)[-1] }
-      },
-
-      :lns => Service.new("ln-s.net") { |s|
-        s.action = "/home/api.jsp"
-        s.block = lambda { |body| URI.extract(body)[0] }
-      },
-
-      :fyad => Service.new("fyad.org") { |s|
-        s.block = lambda { |body| URI.extract(body).grep(/fyad.org/)[2] }
-      },
-
-      :d62 => Service.new("d62.net") { |s|
-        s.block = lambda { |body| URI.extract(body)[0] }
-      },
-
-      :shiturl => Service.new("shiturl.com") { |s|
-        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] }
-      },
-
-      :shortify => Service.new("shortify.com") { |s|
-        s.action = "/shorten.php"
-        s.block = lambda { |body| URI.extract(body).grep(/shortify/)[0] }
-      },
-
-      :shurl => Service.new("shurl.org") { |s|
-        s.method = :post
-        s.block = lambda { |body| URI.extract(body).grep(/shurl/)[0] }
+class ShortURL
+  # Hash table of all the supported services.  The key is a symbol
+  # representing the service (usually the hostname minus the .com,
+  # .net, etc.)  The value is an instance of Service with all the
+  # parameters set so that when +instance+.call is invoked, the
+  # shortened URL is returned.
+  @@services = {
+    :rubyurl => Service.new("rubyurl.com") { |s|
+      s.action = "/rubyurl/remote"
+      s.field = "website_url"
+      s.block = lambda { |body| URI.extract(body).grep(/rubyurl/)[0] }      
+    },
+    
+    :tinyurl => Service.new("tinyurl.com") { |s|
+      s.action = "/create.php"
+      s.block = lambda { |body| URI.extract(body).grep(/tinyurl/)[-1] }
+    },
+    
+    :shorl => Service.new("shorl.com") { |s|
+      s.action = "/create.php"
+      s.block = lambda { |body| URI.extract(body)[2] }
+    },
+
+    :snipurl => Service.new("snipurl.com") { |s|
+      s.action = "/index.php"
+      s.field = "link"
+      s.block = lambda { |body|
+        line = body.split("\n").grep(/txt/)[0]
+        short_url = URI.extract(line)[1][0..-2] # Remove trailing '
       }
+    },
+
+    :metamark => Service.new("metamark.net") { |s|
+      s.action = "/add"
+      s.field = "long_url"
+      s.block = lambda { |body| URI.extract(body).grep(/xrl.us/)[0] }
+    },
+
+    :makeashorterlink => Service.new("makeashorterlink.com") { |s|
+      s.action = "/index.php"
+      s.block = lambda { |body| URI.extract(body).grep(/makeashorterlink/)[0] }
+    },
+
+    :skinnylink => Service.new("skinnylink.com") { |s|
+      s.block = lambda { |body| URI.extract(body).grep(/skinnylink/)[0] }
+    },
+
+    :linktrim => Service.new("linktrim.com") { |s|
+      s.method = :get
+      s.action = "/lt/generate"
+      s.block = lambda { |body| URI.extract(body).grep(/\/linktrim/)[1] }
+    },
+
+    :shorterlink => Service.new("shorterlink.com") { |s|
+      s.method = :get
+      s.action = "/add_url.html"
+      s.block = lambda { |body| URI.extract(body).grep(/shorterlink/)[0] }
+    },
+
+    :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] }
+    },
+
+    :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] }
+    },
+
+    :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] }
+    },
+    
+    :moourl => Service.new("moourl.com") { |s|      
+      s.code = 302
+      s.action = "/create/"
+      s.method = :get      
+      s.field = "source"
+      s.block = lambda { |body| body.gsub('Location/woot/?moo=','http://moourl.com/') } 
+    },
+    
+    :urltea => Service.new("urltea.com") { |s| 
+      s.method = :get
+      s.action = "/create/"
+      s.block = lambda { |body| URI.extract(body).grep(/urltea/)[6] }       
     }
+  }
 
-    # Array containing symbols representing all the implemented URL
-    # shortening services
-    @@valid_services = @@services.keys
+  # Array containing symbols representing all the implemented URL
+  # shortening services
+  @@valid_services = @@services.keys
 
-    # Returns @@valid_services
-    def self.valid_services
-      @@valid_services
-    end
+  # Returns @@valid_services
+  def self.valid_services
+    @@valid_services
+  end
 
-    # Main method of ShortURL, its usage is quite simple, just give an
-    # url to shorten and an optional service.  If no service is
-    # selected, RubyURL.com will be used.  An invalid service symbol
-    # will raise an ArgumentError exception
-    #
-    # Valid +service+ values:
-    #
-    # * <tt>:d62</tt>
-    # * <tt>:fyad</tt>
-    # * <tt>:linktrim</tt>
-    # * <tt>:littlink</tt>
-    # * <tt>:lns</tt>
-    # * <tt>:metamark</tt>
-    # * <tt>:minilink</tt>
-    # * <tt>:orz</tt>
-    # * <tt>:rubyurl</tt>
-    # * <tt>:shiturl</tt>
-    # * <tt>:shorterlink</tt>
-    # * <tt>:shortify</tt>
-    # * <tt>:shurl</tt>
-    # * <tt>:tinyurl</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
-        @@services[service].call(url)
-      else
-        raise InvalidService
-      end
+  # Main method of ShortURL, its usage is quite simple, just give an
+  # url to shorten and an optional service.  If no service is
+  # selected, RubyURL.com will be used.  An invalid service symbol
+  # will raise an ArgumentError exception
+  #
+  # Valid +service+ values:
+  #
+  # * <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>
+  # * <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
+      @@services[service].call(url)
+    else
+      raise InvalidService
     end
   end
 end

data/test/CVS/Entries

@@ -0,0 +1,4 @@
+/tc_service.rb/1.1.1.1/Mon Sep 26 23:19:07 2005//
+/ts_all.rb/1.1.1.1/Mon Sep 26 23:19:07 2005//
+/tc_shorturl.rb/1.1.1.1/Sun Jan  6 22:26:06 2008//
+D

data/test/CVS/Repository

@@ -0,0 +1 @@
+support/test

data/test/CVS/Root

@@ -0,0 +1 @@
+:pserver:anonymous@rubyforge.org:/var/cvs/shorturl

data/test/tc_service.rb

@@ -11,8 +11,6 @@ require "shorturl"
 
 class TestService < Test::Unit::TestCase
 
-  include WWW
-
   def test_call
     service = Service.new("oasdasobf")
     assert_raise(SocketError) { service.call(nil) }
@@ -31,7 +29,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, :get)
+    assert_equal(service.method, :post)
     assert_equal(service.action, "/")
     assert_equal(service.field, "url")
 

data/test/tc_shorturl.rb

@@ -15,7 +15,6 @@ class String
 end
 
 class TestShortURL < Test::Unit::TestCase
-  include WWW
   def setup
     @url = "http://groups.google.com/group/comp.lang.ruby/"
   end

metadata

@@ -1,64 +1,82 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.11
-specification_version: 1
 name: shorturl
 version: !ruby/object:Gem::Version 
-  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
-email: vfoleybourgon@yahoo.ca
-homepage: http://shorturl.rubyforge.org
-rubyforge_project: 
-description: 
-autorequire: shorturl
-default_executable: shorturl
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 0.8.4
 platform: ruby
-signing_key: 
-cert_chain: 
 authors: 
 - Vincent Foley
+autorequire: shorturl
+bindir: bin
+cert_chain: []
+
+date: 2008-01-06 00:00:00 -08:00
+default_executable: shorturl
+dependencies: []
+
+description: 
+email: vfoleybourgon@yahoo.ca
+executables: 
+- shorturl
+extensions: []
+
+extra_rdoc_files: 
+- README
+- TODO
+- MIT-LICENSE
+- ChangeLog
 files: 
+- bin/CVS
+- bin/CVS/Entries
+- bin/CVS/Repository
+- bin/CVS/Root
 - bin/shorturl
+- lib/CVS
+- lib/CVS/Entries
+- lib/CVS/Repository
+- lib/CVS/Root
 - lib/shorturl.rb
+- doc/classes
+- doc/classes/InvalidService.html
+- doc/classes/Service.html
+- doc/classes/Service.src
+- doc/classes/Service.src/M000003.html
+- doc/classes/Service.src/M000004.html
+- doc/classes/ShortURL.html
+- doc/classes/ShortURL.src
+- doc/classes/ShortURL.src/M000001.html
+- doc/classes/ShortURL.src/M000002.html
 - 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
+- doc/files/MIT-LICENSE.html
+- doc/files/README.html
+- doc/files/TODO.html
+- doc/fr_class_index.html
+- doc/fr_file_index.html
+- doc/fr_method_index.html
+- doc/index.html
+- doc/rdoc-style.css
+- test/CVS
+- test/CVS/Entries
+- test/CVS/Repository
+- test/CVS/Root
 - test/tc_service.rb
 - test/tc_shorturl.rb
 - test/ts_all.rb
+- examples/CVS
+- examples/CVS/Entries
+- examples/CVS/Repository
+- examples/CVS/Root
 - examples/shorten.rb
 - README
 - TODO
 - MIT-LICENSE
 - ChangeLog
-test_files: 
-- test/ts_all.rb
+has_rdoc: true
+homepage: http://shorturl.rubyforge.org
+post_install_message: 
 rdoc_options: 
 - --title
 - ShortURL Documentation
@@ -67,16 +85,26 @@ rdoc_options:
 - -S
 - -N
 - --all
-extra_rdoc_files: 
-- README
-- TODO
-- MIT-LICENSE
-- ChangeLog
-executables: 
-- shorturl
-extensions: []
-
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: []
-
+rubyforge_project: 
+rubygems_version: 1.0.1
+signing_key: 
+specification_version: 2
+summary: Shortens URLs using services such as RubyURL, urlTea, and TinyURL
+test_files: 
+- test/ts_all.rb

data/doc/classes/WWW.html

@@ -1,113 +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>Module: WWW</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>Module</strong></td>
-          <td class="class-name-in-header">WWW</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>
-
-        </table>
-    </div>
-  <!-- banner header -->
-
-  <div id="bodyContent">
-
-
-
-  <div id="contextContent">
-
-
-
-   </div>
-
-
-  </div>
-
-
-    <!-- if includes -->
-
-    <div id="section">
-
-    <div id="class-list">
-      <h3 class="section-bar">Classes and Modules</h3>
-
-      Class <a href="WWW/InvalidService.html" class="link">WWW::InvalidService</a><br />
-Class <a href="WWW/Service.html" class="link">WWW::Service</a><br />
-Class <a href="WWW/ShortURL.html" class="link">WWW::ShortURL</a><br />
-
-    </div>
-
-
-
-
-      
-
-
-    <!-- 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>