bitly 0.3.2 → 0.4.0

data/History.txt

@@ -1,3 +1,9 @@
+=== 0.4.0 / 2009-12-19
+
+* 1 major enhancement
+
+  * support for j.mp urls
+
 === 0.3.2 / 2009-11-15
 
 * 1 bug fix

data/README.txt

@@ -2,7 +2,7 @@
 
 == DESCRIPTION:
 
-A Ruby API for bit.ly
+A Ruby API for http://bit.ly (and now http://j.mp)
 
 http://code.google.com/p/bitly-api/wiki/ApiDocumentation
 
@@ -32,6 +32,8 @@ u = bitly.shorten('http://www.google.com') #=> Bitly::Url
 
 u.long_url #=> "http://www.google.com"
 u.short_url #=> "http://bit.ly/Ywd1"
+u.bitly_url #=> "http://bit.ly/Ywd1"
+u.jmp_url #=> "http://j.mp/Ywd1"
 u.user_hash #=> "Ywd1"
 u.hash #=> "2V6CFi"
 u.info #=> a ruby hash of the JSON returned from the API

data/Rakefile

@@ -1,12 +1,8 @@
-# -*- ruby -*-
-
 require 'rubygems'
 require 'rake'
 require 'echoe'
 require './lib/bitly.rb'
 
-# modified by coryosborn to remove native JSON dependency
-
 Echoe.new('bitly', Bitly::VERSION) do |p|
   p.description = "Use the bit.ly API to shorten or expand URLs"
   p.url = "http://github.com/philnash/bitly"
@@ -14,6 +10,4 @@ Echoe.new('bitly', Bitly::VERSION) do |p|
   p.email = "philnash@gmail.com"
   p.extra_deps      = [['crack', '>= 0.1.1']]
   p.development_dependencies = []
-end
-
-# vim: syntax=Ruby
+end

data/bitly.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bitly}
-  s.version = "0.3.2"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Phil Nash"]
-  s.date = %q{2009-11-15}
+  s.date = %q{2009-12-19}
   s.description = %q{Use the bit.ly API to shorten or expand URLs}
   s.email = %q{philnash@gmail.com}
   s.extra_rdoc_files = ["lib/bitly/client.rb", "lib/bitly/url.rb", "lib/bitly/utils.rb", "lib/bitly/version.rb", "lib/bitly.rb", "README.txt"]

data/lib/bitly/client.rb

@@ -40,7 +40,7 @@ module Bitly
     
     def expand(input)
       if input.is_a? String
-        if input.include? "bit.ly/"
+        if input.include?('bit.ly/') || input.include?('j.mp/')
           hash = create_hash_from_url(input)
           request = create_url "expand", :hash => hash
           result = get_result(request)
@@ -117,34 +117,4 @@ class BitlyError < StandardError
     @code = code
     super("#{msg} - '#{code}'")
   end
-end
-
-
-# How it should work
-# ==================
-# bitly = Bitly::Base.new('philnash','R_7776acc394294b2b0ad2c261a91c483d')
-# bitly.shorten("http://www.google.com")
-# #=> Bitly::Url
-# bitly.shorten(["http://www.google.com","http://cnn.com"])
-# #=> [Bitly::Url,Bitly::Url]
-# 
-# bitly.expand("http://bit.ly/wIRm")
-# #=> Bitly::Url
-# bitly.expand("wIRm")
-# #=> Bitly::Url
-# bitly.expand(["wIRm","sdfsd"])
-# #=> [Bitly::Url,Bitly::Url]
-#
-# bitly.info("http://bit.ly/wIRm") || bitly.info("wIRm")
-# #=> b = Bitly::Url
-# #=> b.info #=> hash of data back from info
-# bitly.info(['wIRm','qsads'])
-# #=> [Bitly::Url, Bitly::Url]
-# also, with any url = Bitly::Url
-# url.info #=> hash of info data
-
-# bitly.stats("http://bit.ly/wIRm") || bitly.stats("wIRm")
-# #=> b = Bitly::Url
-# #=> b.stats #=> hash of stats
-# also, any url = Bitly::Url
-# url.stats #=> hash of stats
+end

data/lib/bitly/url.rb

@@ -92,6 +92,13 @@ module Bitly
       end
     end
     
+    def bitly_url
+      @short_url.nil? ? nil : @short_url.gsub(/j\.mp/,'bit.ly')
+    end
+    
+    def jmp_url
+      @short_url.nil? ? nil : @short_url.gsub(/bit\.ly/,'j.mp')
+    end
   end
 
 end

data/lib/bitly/utils.rb

@@ -11,7 +11,7 @@ module Bitly
     end
     
     def create_hash_from_url(url)
-      url.gsub(/^.*bit.ly\//,'')
+      url.gsub(/^.*(bit\.ly|j\.mp)\//,'')
     end
     
     def attr_define(k,v)

data/lib/bitly/version.rb

@@ -1,3 +1,3 @@
 module Bitly
-  VERSION = '0.3.2'
+  VERSION = '0.4.0'
 end

data/test/bitly/test_client.rb

@@ -23,6 +23,10 @@ class TestClient < Test::Unit::TestCase
         end
         should "return a short bitly url" do
           assert_equal "http://bit.ly/15DlK", @url.short_url
+          assert_equal "http://bit.ly/15DlK", @url.bitly_url
+        end
+        should "return a short jmp url" do
+          assert_equal "http://j.mp/15DlK", @url.jmp_url
         end
         should "save the long url" do
           assert_equal "http://cnn.com", @url.long_url
@@ -73,7 +77,7 @@ class TestClient < Test::Unit::TestCase
           assert_equal "http://bit.ly/31IqMl", @url.short_url
         end
       end
-      context "a short url" do
+      context "a short bitly url" do
         setup do
           stub_get(/^http:\/\/api.bit.ly\/expand\?.*hash=31IqMl.*$/,"expand_cnn.json")
           @url = @bitly.expand("http://bit.ly/31IqMl")
@@ -87,8 +91,32 @@ class TestClient < Test::Unit::TestCase
         should "save the hash" do
           assert_equal "31IqMl", @url.hash
         end
-        should "save the short url" do
-          assert_equal "http://bit.ly/31IqMl", @url.short_url
+        should "save the bitly url" do
+          assert_equal "http://bit.ly/31IqMl", @url.bitly_url
+        end
+        should "save a jmp url" do
+          assert_equal "http://j.mp/31IqMl", @url.jmp_url
+        end
+      end
+      context "a short jmp url" do
+        setup do
+          stub_get(/^http:\/\/api.bit.ly\/expand\?.*hash=31IqMl.*$/,"expand_cnn.json")
+          @url = @bitly.expand("http://j.mp/31IqMl")
+        end
+        should "return a Bitly::Url" do
+          assert_kind_of Bitly::Url, @url
+        end
+        should "return the expanded url" do
+          assert_equal "http://cnn.com/", @url.long_url
+        end
+        should "save the hash" do
+          assert_equal "31IqMl", @url.hash
+        end
+        should "save the bitly url" do
+          assert_equal "http://bit.ly/31IqMl", @url.bitly_url
+        end
+        should "save a jmp url" do
+          assert_equal "http://j.mp/31IqMl", @url.jmp_url
         end
       end
       context "multiple hashes" do

data/test/bitly/test_url.rb

@@ -22,6 +22,11 @@ class TestUrl < Test::Unit::TestCase
         should "return a short url" do
           assert_equal "http://bit.ly/15DlK", @url.shorten
         end
+        should "create bitly and jmp urls" do
+          @url.shorten
+          assert_equal "http://bit.ly/15DlK", @url.bitly_url
+          assert_equal "http://j.mp/15DlK", @url.jmp_url
+        end
       end
       context "with no long url" do
         setup do

data/test/bitly/test_utils.rb

@@ -8,9 +8,12 @@ class TestUtils < Test::Unit::TestCase
     should "underscore a word" do
       assert_equal "hello_world", underscore("HelloWorld")
     end
-    should "create a hash from a short url" do
+    should "create a hash from a bitly url" do
       assert_equal "hello", create_hash_from_url("http://bit.ly/hello")
     end
+    should "create a hash from a jmp url" do
+      assert_equal "hello", create_hash_from_url("http://j.mp/hello")
+    end
   end
   
   context "class utils" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bitly
 version: !ruby/object:Gem::Version 
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors: 
 - Phil Nash
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-15 00:00:00 +00:00
+date: 2009-12-19 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency