shorturl 0.7.0 → 0.8.0

data/ChangeLog

@@ -1,3 +1,6 @@
+0.8.0:
+    - Made some improvements to bin/shorturl
+	
 0.7.0:
     - Added shortify.com, 0rz.net
     - Modified unit tests

data/README

@@ -1,4 +1,4 @@
-= ShortURL 0.7.0
+= ShortURL 0.8.0
 
 == Summary 
 ShortURL is a very simple library to use URL shortening services such as
@@ -33,6 +33,7 @@ Here is the list of the services supported by ShortURL:
 * http://0rz.net
 
 == Usage: 
+
 call-seq:
   require "shorturl"
   puts ShortURL.shorten("http://mypage.com")
@@ -63,6 +64,15 @@ You can use <tt>ShortURL.valid_services</tt> to obtain a
 list of the valid services (in case I forget to update the
 documentation)
 
+You can also use the small script in bin/ which can be used from the
+command line:
+call-seq:
+  $ shorturl www.google.com
+  http://rubyurl.com/fuuUw
+  $ shorturl -s tinyurl www.google.com
+  http://tinyurl.com/1c2
+  $ 
+
 == Thanks
 - Marcel Molina Jr., Devin Mullins for some ideas
 - imperator from #ruby-lang (I don't know your real name, sorry) for

data/bin/shorturl

@@ -2,35 +2,37 @@
 
 require "rubygems"
 require "shorturl"
+require "optparse"
 
-def usage
-  puts "Usage: #$0 <url> [<service>]"
-  puts "Available services:"
-  ShortURL.valid_services.each { |s| puts "\t#{s}" }
-  exit(-1)
+def service_list
+  ShortURL.valid_services.map { |s| s.to_s }.sort.join("\n\t")
 end
 
 def main
-  if ARGV.size < 1
-    usage
+  service = :rubyurl
+  op = OptionParser.new do |opts|
+    opts.banner = "Usage: #{File.basename($0)} [<options>] <url>"
+    opts.on("-h", "--help", "Displays help") { puts opts; exit }
+    opts.on("-s", "--service <service>", String,
+            "Uses <service> instead of RubyURL
+Available services:\n\t" + service_list) { |s| service = s.to_sym }
+    opts.parse!
   end
 
-  url = ARGV[0]
-  service = ARGV[1]
-
-  shorturl = if service.nil?
-               ShortURL.shorten(url)
+  if ARGV.empty?
+    puts op
+    exit(-1)
+  end
+  
+  url = ARGV.shift
+  shorturl = if ShortURL.valid_services.include?(service)
+               ShortURL.shorten(url, service)
              else
-               if ShortURL.valid_services.include?(service.to_sym)
-                 ShortURL.shorten(url, service.to_sym)
-               else
-                 puts "Invalid service"
-                 exit(-1)
-               end
+               puts "Invalid service"
+               exit(-1)
              end
 
-  puts shorturl
-    
+  puts shorturl || "Unable to get shortened URL.  Maybe the URL is already too short?"
 end
 
 main

data/doc/classes/Service.html

@@ -214,10 +214,14 @@ Now that our service is set up, call it with all the parameters to
 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>)
-45:       <span class="ruby-keyword kw">end</span>
-46:     }
-47:   <span class="ruby-keyword kw">end</span>
+44:         <span class="ruby-keyword kw">begin</span>
+45:           <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>)
+46:         <span class="ruby-keyword kw">rescue</span> <span class="ruby-constant">NoMethodError</span>
+47:           <span class="ruby-keyword kw">nil</span>
+48:         <span class="ruby-keyword kw">end</span>
+49:       <span class="ruby-keyword kw">end</span>
+50:     }
+51:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
         </div>

data/doc/classes/ShortURL.html

@@ -195,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 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>
+     <span class="ruby-comment cmt"># File lib/shorturl.rb, line 201</span>
+201:   <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>)
+202:     <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>
+203:       <span class="ruby-ivar">@@services</span>[<span class="ruby-identifier">service</span>].<span class="ruby-identifier">call</span>(<span class="ruby-identifier">url</span>)
+204:     <span class="ruby-keyword kw">else</span>
+205:       <span class="ruby-identifier">raise</span> <span class="ruby-constant">InvalidService</span>
+206:     <span class="ruby-keyword kw">end</span>
+207:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
         </div>
@@ -225,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 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>
+     <span class="ruby-comment cmt"># File lib/shorturl.rb, line 168</span>
+168:   <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">valid_services</span>
+169:     <span class="ruby-ivar">@@valid_services</span>
+170:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
         </div>

data/doc/created.rid

@@ -1 +1 @@
-Mon Sep 26 19:17:22 EDT 2005
+Sun Oct 02 14:18:23 EDT 2005

data/doc/files/ChangeLog.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Mon Sep 26 18:49:23 EDT 2005</td>
+      <td>Sun Oct 02 14:08:57 EDT 2005</td>
     </tr>
     </table>
   </div>
@@ -70,11 +70,18 @@
 
     <div id="description">
       <p>
+0.8.0:
+</p>
+<pre>
+    - Made some improvements to bin/shorturl
+</pre>
+<p>
 0.7.0:
 </p>
 <pre>
     - Added shortify.com, 0rz.net
     - Modified unit tests
+    - Started using CVS on RubyForge
 </pre>
 <p>
 0.6.0:

data/doc/files/README.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Mon Sep 26 18:53:49 EDT 2005</td>
+      <td>Sun Oct 02 14:18:21 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.7.0</h1>
+      <h1><a href="../classes/ShortURL.html">ShortURL</a> 0.8.0</h1>
 <h2>Summary</h2>
 <p>
 <a href="../classes/ShortURL.html">ShortURL</a> is a very simple library to
@@ -220,6 +220,17 @@ href="../classes/ShortURL.html#M000001">ShortURL.valid_services</a></tt> to
 obtain a list of the valid services (in case I forget to update the
 documentation)
 </p>
+<p>
+You can also use the small script in bin/ which can be used from the
+command line: call-seq:
+</p>
+<pre>
+  $ shorturl www.google.com
+  http://rubyurl.com/fuuUw
+  $ shorturl -s tinyurl www.google.com
+  http://tinyurl.com/1c2
+  $
+</pre>
 <h2>Thanks</h2>
 <ul>
 <li>Marcel Molina Jr., Devin Mullins for some ideas

data/doc/files/lib/shorturl_rb.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Mon Sep 26 19:09:28 EDT 2005</td>
+      <td>Thu Sep 29 23:03:41 EDT 2005</td>
     </tr>
     </table>
   </div>

data/lib/shorturl.rb

@@ -41,7 +41,11 @@ class Service
                  when :get: http.get("#{@action}?#{@field}=#{CGI.escape(url)}")
                  end
       if response.code == @code.to_s
-        @block.call(response.read_body)
+        begin
+          @block.call(response.read_body)
+        rescue NoMethodError
+          nil
+        end
       end
     }
   end

metadata

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