Added ActiveResource.format= which defaults to :xml but can also be set to :json [DHH]. Added one-off declarations of mock behavior [DHH]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7518 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

1 files changed, 9 insertions, 21 deletions

diff --git a/activeresource/lib/active_resource/connection.rb b/activeresource/lib/active_resource/connection.rb
index 07f3c98eda..5f86d77a26 100644
--- a/activeresource/lib/active_resource/connection.rb
+++ b/activeresource/lib/active_resource/connection.rb
@@ -47,23 +47,20 @@ module ActiveResource
   # services.
   class Connection
     attr_reader :site
+    attr_accessor :format
 
     class << self
       def requests
         @@requests ||= []
       end
-      
-      def default_header
-        class << self ; attr_reader :default_header end
-        @default_header = { 'Content-Type' => 'application/xml' }
-      end
     end
 
     # The +site+ parameter is required and will set the +site+
     # attribute to the URI for the remote resource service.
-    def initialize(site)
+    def initialize(site, format = ActiveResource::Formats[:xml])
       raise ArgumentError, 'Missing site URI' unless site
       self.site = site
+      self.format = format
     end
 
     # Set URI for remote service.
@@ -74,7 +71,7 @@ module ActiveResource
     # Execute a GET request.
     # Used to get (find) resources.
     def get(path, headers = {})
-      xml_from_response(request(:get, path, build_request_headers(headers)))
+      format.decode(request(:get, path, build_request_headers(headers)).body)
     end
 
     # Execute a DELETE request (see HTTP protocol documentation if unfamiliar).
@@ -95,9 +92,6 @@ module ActiveResource
       request(:post, path, body.to_s, build_request_headers(headers))
     end
 
-    def xml_from_response(response)
-      from_xml_data(Hash.from_xml(response.body))
-    end
 
     private
       # Makes request to remote service.
@@ -144,10 +138,14 @@ module ActiveResource
 
         @http
       end
+
+      def default_header
+        @default_header ||= { 'Content-Type' => format.mime_type }
+      end
       
       # Builds headers for request to remote service.
       def build_request_headers(headers)
-        authorization_header.update(self.class.default_header).update(headers)
+        authorization_header.update(default_header).update(headers)
       end
       
       # Sets authorization header; authentication information is pulled from credentials provided with site URI.
@@ -158,15 +156,5 @@ module ActiveResource
       def logger #:nodoc:
         ActiveResource::Base.logger
       end
-
-      # Manipulate from_xml Hash, because xml_simple is not exactly what we
-      # want for ActiveResource.
-      def from_xml_data(data)
-        if data.is_a?(Hash) && data.keys.size == 1
-          data.values.first
-        else
-          data
-        end
-      end
   end
 end
\ No newline at end of file