carrot-top 0.0.6 → 0.0.7

data/carrot-top.gemspec

@@ -2,12 +2,12 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "carrot-top"
-  s.version     = "0.0.6"
+  s.version     = "0.0.7"
   s.authors     = ["Sean Porter"]
   s.email       = ["portertech@gmail.com"]
   s.homepage    = "https://github.com/portertech/carrot-top"
   s.summary     = "A Ruby library for querying the RabbitMQ Management API"
-  s.description = "A Ruby library for querying the RabbitMQ Management API"
+  s.description = "A Ruby library for querying the RabbitMQ Management API, `top` for RabbitMQ."
 
   s.rubyforge_project = "carrot-top"
 

data/lib/carrot-top.rb

@@ -9,7 +9,9 @@ class CarrotTop
 
   def initialize(options={})
     [:host, :port, :user, :password].each do |option|
-      raise "You must supply a RabbitMQ management API #{option}" if options[option].nil?
+      if options[option].nil?
+        raise ArgumentError, "You must supply a RabbitMQ management API #{option}"
+      end
     end
     protocol = options[:ssl] ? "https" : "http"
     credentials = "#{options[:user]}:#{options[:password]}"
@@ -18,17 +20,8 @@ class CarrotTop
   end
 
   def query_api(options={})
-    raise "You must supply an API path" if options[:path].nil?
-    uri = URI.parse(@rabbitmq_api + options[:path])
-    http = Net::HTTP.new(uri.host, uri.port)
-    if uri.scheme == "https"
-      http.use_ssl = true
-      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-    end
-    request = Net::HTTP::Get.new(uri.request_uri)
-    request.add_field("content-type", "application/json")
-    request.basic_auth(uri.user, uri.password)
-    http.request(request)
+    raise ArgumentError, "You must supply an API path" if options[:path].nil?
+    fetch_uri(@rabbitmq_api + options[:path])
   end
 
   def method_missing(method, *args, &block)
@@ -39,4 +32,32 @@ class CarrotTop
       Hash.new
     end
   end
+
+  private
+
+  def fetch_uri(uri, limit=5)
+    raise ArgumentError, "HTTP redirect too deep" if limit == 0
+    url = URI.parse(uri)
+    http = Net::HTTP.new(url.host, url.port)
+    if url.scheme == "https"
+      http.use_ssl = true
+      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+    end
+    request = Net::HTTP::Get.new(url.request_uri)
+    request.add_field("content-type", "application/json")
+    request.basic_auth(url.user, url.password)
+    response = http.request(request)
+    case response
+    when Net::HTTPSuccess
+      response
+    when Net::HTTPRedirection
+      redirect_url = URI.parse(response["location"])
+      redirect_url.user = url.user
+      redirect_url.password = url.password
+      fetch_uri(redirect_url.to_s, limit - 1)
+    else
+      response.error!
+    end
+  end
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: carrot-top
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Sean Porter
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-13 00:00:00 -07:00
+date: 2012-12-25 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -60,7 +60,7 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id003
-description: A Ruby library for querying the RabbitMQ Management API
+description: A Ruby library for querying the RabbitMQ Management API, `top` for RabbitMQ.
 email: 
 - portertech@gmail.com
 executables: []