hugeurl 0.0.6 → 0.0.7

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.0.7 2012-09-13
+
+* expand nested short url
+
 === 0.0.6 2012-06-28
 
 * little fix

data/bin/hugeurl

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 require 'rubygems'
 require 'hugeurl'
-#require File.dirname(__FILE__)+'/../lib/hugeurl'
+#require File.expand_path '../lib/hugeurl', File.dirname(__FILE__)
 
 unless ARGV.empty?
   puts URI.parse(ARGV.shift).to_huge

data/examples/example.rb

@@ -1,5 +1,8 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__)+'/../lib/hugeurl'
+$:.unshift File.expand_path '../lib', File.dirname(__FILE__)
+
+require 'rubygems'
+require 'hugeurl'
 
 puts tinyurl = "http://tinyurl.com/242tthb"
 puts " => " + Hugeurl.get(tinyurl).to_s
@@ -13,3 +16,6 @@ puts " => #{tco.to_huge}"
 
 puts gyamp = URI.parse("http://gyamp.com/shokai/shokai")
 puts " => #{gyamp.to_huge}"
+
+puts bitly_tinyurl_nested = URI.parse("http://bit.ly/TSLl6M")
+puts " => #{bitly_tinyurl_nested.to_huge}"

data/lib/hugeurl.rb

@@ -4,9 +4,18 @@ require 'net/http'
 require 'net/https'
 
 module Hugeurl
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
   def self.get(uri)
     uri = URI.parse uri unless uri.class.to_s =~ /^URI::/
+    loop do
+      res = self.get_redirect_to uri
+      return res if res.to_s == uri.to_s
+      uri = res
+    end
+  end
+
+  private
+  def self.get_redirect_to(uri)
     if uri.class == URI::HTTPS
       http = Net::HTTP.new(uri.host, 443)
       http.use_ssl = true

data/test/test_helper.rb

@@ -1,3 +1,3 @@
 require 'stringio'
 require 'test/unit'
-require File.dirname(__FILE__) + '/../lib/hugeurl'
+require File.expand_path '../lib/hugeurl', File.dirname(__FILE__)

data/test/test_hugeurl.rb

@@ -6,6 +6,7 @@ class TestHugeurl < Test::Unit::TestCase
     @source = "http://shokai.org"
     @tinyurl = URI.parse("http://tinyurl.com/242tthb").to_huge
     @tco = URI.parse("http://t.co/sdMbEC7n").to_huge
+    @bitly_tinyurl_nested = URI.parse("http://bit.ly/TSLl6M").to_huge
   end
 
   def test_response
@@ -20,4 +21,7 @@ class TestHugeurl < Test::Unit::TestCase
     assert @tinyurl.to_s == @source
   end
 
+  def test_bitly_tinyurl_nested
+    assert @bitly_tinyurl_nested.to_s == @source
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hugeurl
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-27 00:00:00.000000000 Z
+date: 2012-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc