bitly 0.5.1 → 0.5.2

data/History.txt

@@ -1,3 +1,15 @@
+=== 0.5.2 / 2010-07-18
+
+* 1 minor enhancement
+
+  * Added the lookup call to the version 3 API.
+
+=== 0.5.1 / 2010-05-26
+
+* 1 bug fix
+
+  * When expanding a short url with the v3 module, user hash and short url weren't being set properly
+  
 === 0.5.0 / 2010-05-12
 
 * Loads of major enhancements

data/bitly.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bitly}
-  s.version = "0.5.1"
+  s.version = "0.5.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Phil Nash"]
-  s.date = %q{2010-05-26}
+  s.date = %q{2010-07-18}
   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/v3/bitly.rb", "lib/bitly/v3/client.rb", "lib/bitly/v3/missing_url.rb", "lib/bitly/v3/url.rb", "lib/bitly/v3.rb", "lib/bitly/version.rb", "lib/bitly.rb", "README.txt"]

data/lib/bitly/v3/client.rb

@@ -53,6 +53,31 @@ module Bitly
       def clicks(input)
         get_method(:clicks, input)
       end
+      
+      # Looks up the short url and global hash of a url or array of urls
+      #
+      # Returns the results in the order they were entered
+      def lookup(input)
+        input = [input] if input.is_a?(String)
+        query = input.inject([]) { |query, i| query << "url=#{CGI.escape(i)}" }
+        query = "/lookup?" + query.join('&')
+        response = get(query)
+        results = response['data']['lookup'].inject([]) do |results, url|
+          url['long_url'] = url['url']
+          url['url'] = nil
+          if url['error'].nil?
+            # builds the results array in the same order as the input
+            results[input.index(url['long_url'])] = Bitly::V3::Url.new(self, url)
+            # remove the key from the original array, in case the same hash/url was entered twice
+            input[input.index(url['long_url'])] = nil
+          else
+            results[input.index(url['long_url'])] = Bitly::V3::MissingUrl.new(url)
+            input[input.index(url['long_url'])] = nil
+          end
+          results
+        end
+        return results.length > 1 ? results : results[0]
+      end
         
       private
     
@@ -73,8 +98,7 @@ module Bitly
     
       def get_method(method, input)
         input = [input] if input.is_a? String
-        query = []
-        input.each do |i|
+        query = input.inject([]) do |query,i|
           if is_a_short_url?(i)
             query << "shortUrl=#{CGI.escape(i)}"
           else
@@ -83,8 +107,7 @@ module Bitly
         end
         query = "/#{method}?" + query.join('&')
         response = get(query)
-        results = []
-        response['data'][method.to_s].each do |url|
+        results = response['data'][method.to_s].inject do |results, url|
           if url['error'].nil?
             # builds the results array in the same order as the input
             results[input.index(url['short_url'] || url['hash'])] = Bitly::V3::Url.new(self, url)
@@ -94,6 +117,7 @@ module Bitly
             results[input.index(url['short_url'] || url['hash'])] = Bitly::V3::MissingUrl.new(url)
             input[input.index(url['short_url'] || url['hash'])] = nil
           end
+          results
         end
         return results.length > 1 ? results : results[0]
       end

data/lib/bitly/v3/missing_url.rb

@@ -1,11 +1,12 @@
 module Bitly
   module V3
     class MissingUrl
-      attr_accessor :short_url, :user_hash, :error
+      attr_accessor :short_url, :user_hash, :long_url, :error
       def initialize(opts={})
         if opts
           @short_url = opts['short_url']
           @user_hash = opts['hash']
+          @long_url = opts['long_url']
           @error = opts['error']
         end
       end

data/lib/bitly/v3/url.rb

@@ -9,7 +9,7 @@ module Bitly
       def initialize(client, opts={})
         @client = client
         if opts
-          @short_url = opts['url']
+          @short_url = opts['url'] || opts['short_url']
           @long_url = opts['long_url']
           @user_hash = opts['hash'] || opts['user_hash']
           @global_hash = opts['global_hash']

data/lib/bitly/version.rb

@@ -1,3 +1,3 @@
 module Bitly
-  VERSION = '0.5.1'
+  VERSION = '0.5.2'
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 1
-  version: 0.5.1
+  - 2
+  version: 0.5.2
 platform: ruby
 authors: 
 - Phil Nash
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-26 00:00:00 +01:00
+date: 2010-07-18 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency