RubyGems - shorturl - Versions diffs - 0.8.0 → 0.8.1 - Mend

shorturl 0.8.0 → 0.8.1

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 (7) hide show

data/ChangeLog CHANGED Viewed

@@ -1,3 +1,6 @@
+0.8.1:
+    - Wrapped the library in a WWW namespace
 0.8.0:
     - Made some improvements to bin/shorturl

data/README CHANGED Viewed

@@ -1,4 +1,4 @@
-= ShortURL 0.8.0
+= ShortURL 0.8.1
 == Summary
 ShortURL is a very simple library to use URL shortening services such as
@@ -31,13 +31,14 @@ Here is the list of the services supported by ShortURL:
 * http://clipurl.com
 * http://shortify.com
 * http://0rz.net
+* http://skinnylink.com
 == Usage:
 call-seq:
   require "shorturl"
-  puts ShortURL.shorten("http://mypage.com")
-  puts ShortURL.shorten("http://mypage.com", :tinyurl)
+  puts WWW::ShortURL.shorten("http://mypage.com")
+  puts WWW::ShortURL.shorten("http://mypage.com", :tinyurl)
 The second parameter represents the service you want to use.  These are:
 * <tt>:rubyurl</tt>
@@ -58,6 +59,7 @@ The second parameter represents the service you want to use.  These are:
 * <tt>:clipurl</tt>
 * <tt>:shortify</tt>
 * <tt>:orz</tt>
+* <tt>:skinnylink</tt>
 You can use <tt>ShortURL.valid_services</tt> to obtain a

data/bin/shorturl CHANGED Viewed

@@ -4,6 +4,8 @@ require "rubygems"
 require "shorturl"
 require "optparse"
+include WWW
 def service_list
   ShortURL.valid_services.map { |s| s.to_s }.sort.join("\n\t")
 end

data/lib/shorturl.rb CHANGED Viewed

@@ -7,202 +7,204 @@ require "net/http"
 require "cgi"
 require "uri"
-class InvalidService < Exception
-end
+module WWW
+  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 = :post
-    @action = "/"
-    @field = "url"
-    @block = lambda { |body| }
-    if block_given?
-      yield self
+  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
-  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
+    # 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
-    }
+      }
+    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.method = :get
-      s.action = "/rubyurl/create"
-      s.field = "rubyurl[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] }
-    },
-    :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 '
+  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.method = :get
+        s.action = "/rubyurl/create"
+        s.field = "rubyurl[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] }
+      },
+      :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] }
       }
-    },
-    :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] }
     }
-  }
-  # 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>: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
+    # 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
 end

data/test/tc_service.rb CHANGED Viewed

@@ -9,7 +9,7 @@ require "test/unit"
 require "shorturl"
-class TestService < Test::Unit::TestCase
+class WWW::TestService < Test::Unit::TestCase
   def test_call
     service = Service.new("oasdasobf")

data/test/tc_shorturl.rb CHANGED Viewed

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

metadata CHANGED Viewed

@@ -3,7 +3,7 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: shorturl
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 date: 2005-10-02 00:00:00 -04:00
 summary: Shortens URLs using services such as TinyURL and RubyURL
 require_paths: