philnash-bitly 0.1.1 → 0.1.2

data/History.txt

@@ -1,3 +1,10 @@
+=== 0.1.2 / 2009-04-12
+
+* 1 minor enhancement
+
+	* Allows to add a keyword for shortening urls
+
+
 === 0.1.1 / 2009-01-26
 
 * 1 bug fix

data/README.txt

@@ -15,6 +15,7 @@ bitly = Bitly.new(username, api_key)
 You can then use that client to shorten or expand urls or return more information or statistics as so:
 
 bitly.shorten('http://www.google.com')
+bitly.shorten('http://www.google.com', 'keyword') # returns a shortened url using the given keyword
 bitly.expand('wQaT')
 bitly.info('http://bit.ly/wQaT')
 bitly.stats('http://bit.ly/wQaT')

data/bitly.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bitly}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Phil Nash"]
-  s.date = %q{2009-01-26}
+  s.date = %q{2009-03-13}
   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

@@ -22,9 +22,9 @@ module Bitly
       @api_key = api_key
     end
     
-    def shorten(input)
+    def shorten(input, keyword=nil)
       if input.is_a? String
-        request = create_url "shorten", :longUrl => input
+        request = create_url "shorten", :longUrl => input, :keyword => keyword
         result = get_result(request)
         result = {:long_url => input}.merge result[input]
         Bitly::Url.new(@login,@api_key,result)

data/lib/bitly/url.rb

@@ -7,6 +7,9 @@ module Bitly
     
     def initialize(login,api_key,obj=nil)
       unless obj.nil?
+        
+        raise BitlyError.new(obj['errorMessage'],obj['errorCode'],'expand') if obj['statusCode'] == "ERROR"
+        
         instance_variablise(obj, VARIABLES)
         @info = obj[:info] if obj[:info]
         @stats = obj[:stats] if obj[:stats]

data/lib/bitly/version.rb

@@ -1,3 +1,3 @@
 module Bitly
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/test/test_bitly.rb

@@ -38,4 +38,23 @@ class TestBitly < Test::Unit::TestCase
     assert_equal url2.short_url, "http://bit.ly/wQaT"
     assert_equal url2.long_url, "http://google.com/"
   end
-end
+  
+  def test_returns_keyword_url
+    #kind of ghetto test but we need it to be different every time
+    require 'digest/sha1'
+    keyword = Digest::SHA1.hexdigest(DateTime.now.to_s)
+
+    url = @bitly.shorten("http://google.com", keyword)
+    assert_equal url.short_keyword_url, "http://bit.ly/#{keyword}"
+  end
+
+  def test_returns_error_on_existing_keyword
+    keyword = 'apple'
+    assert_raise BitlyError do
+      @bitly.shorten("http://apple.com/itunes", keyword)
+    end
+  end
+
+  
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: philnash-bitly
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Phil Nash
@@ -9,11 +9,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-26 00:00:00 -08:00
+date: 2009-03-13 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: