swivel 0.0.20 → 0.0.21

data/lib/swivel.rb

@@ -459,10 +459,6 @@ module Swivel
       end
       @headers = options[:headers] || Hash.new
       @headers.merge! 'Accept' => 'application/xml'
-      if @config.has_key?(:api_key) && !@config[:api_key].blank?
-        encoded = Base64.encode64(':' + @config[:api_key])
-        @headers.merge! 'Authorization' => "Basic #{encoded}"
-      end
     end
 
     # Call Swivel's REST endpoint.  This method actually performs the HTTP stuff
@@ -501,7 +497,8 @@ module Swivel
     def call path, params = Hash.new, method = :get
       response =
         Net::HTTP.start @config[:host], @config[:port] do |http|
-          request = "Net::HTTP::#{method.to_s.camelize}".constantize.new path, @headers
+          request_class = "Net::HTTP::#{method.to_s.camelize}".constantize
+          request = request_class.new path, headers
           if [:delete, :post, :put].include? method
             http.read_timeout = @config[:timeout_up]
             http.request request, params.to_query_string
@@ -515,8 +512,9 @@ module Swivel
       doc = REXML::Document.new xml
       Response.class_for(doc.root.elements[1].name).new xml, self
     rescue Exception => e
-      raise e
       #xml.blank? ? nil : xml
+      warn "Failure while communicating with swivel: #{xml}\n"
+      raise e
     end
 
     %w/ data_columns data_sets graphs users /.each do |obj|
@@ -702,5 +700,15 @@ module Swivel
       end
       call '/rest/graphs', options, :post
     end
+
+    protected
+      def headers
+        if @config.has_key?(:api_key) && !@config[:api_key].blank?
+          encoded = Base64.encode64(':' + @config[:api_key])
+          @headers.merge 'Authorization' => "Basic #{encoded}"
+        else
+          @headers
+        end
+      end
   end
 end

metadata

@@ -1,9 +1,9 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.2
+rubygems_version: 0.9.4
 specification_version: 1
 name: swivel
 version: !ruby/object:Gem::Version 
-  version: 0.0.20
+  version: 0.0.21
 date: 2007-08-08 00:00:00 -07:00
 summary: Ruby interface to the Swivel API.
 require_paths: 
@@ -33,6 +33,7 @@ files:
 - README
 - Rakefile
 - lib/swivel.rb
+- lib/test
 - bin/swivel
 - CHANGELOG
 test_files: []