service.rb in open311-0.1.1

- old
+ new

@@ -11,11 +11,13 @@
       # @example Provide a list of acceptable 311 service request types and their associated service codes
       #   Open311.service_list
       def service_list(options={})
         options.merge!(:jurisdiction_id => jurisdiction)
         response = get('services', options)
-        format.to_s.downcase == 'xml' ? response['services']['service'] : response
+        unpack_if_xml(response) do
+          response['services']['service']
+        end
       end
 
       # @format :xml
       # @key false
       # @param id String the service code
@@ -25,11 +27,13 @@
       # @example define attributes associated with a service code, i.e. 033
       #   Open311.service_definition
       def service_definition(id, options={})
         options.merge!(:jurisdiction_id => jurisdiction)
         response = get("services/#{id}", options)
-        format.to_s.downcase == 'xml' ? response['service_definition'] : response
+        unpack_if_xml(response) do
+          response['service_definition']
+        end
       end
 
       # @format :xml
       # @key false
       # @param options [Hash] A customizable set of options.
@@ -37,16 +41,14 @@
       # @see http://wiki.open311.org/GeoReport_v2#GET_Service_Requests
       #   Open311.service_requests
       def service_requests(options={})
         options.merge!(:jurisdiction_id => jurisdiction)
         response = get("requests", options)
-        if format.to_s.downcase == 'xml'
+        unpack_if_xml(response) do
           response.service_requests.request.map do |request|
-            ServiceRequest.new(request)
+            response['service_requests']['request']
           end
-        else
-          response
         end
       end
 
       # @format :xml
       # @key true
@@ -55,11 +57,13 @@
       # @see http://wiki.open311.org/GeoReport_v2#POST_Service_Request
       #   Open311.post_service_request
       def post_service_request(options={})
         options.merge!(:jurisdiction_id => jurisdiction, :api_key => api_key)
         response = post("requests", options)
-        format.to_s.downcase == 'xml' ? response['service_requests']['request'] : response
+        unpack_if_xml(response) do
+          response['service_requests']['request']
+        end
       end
 
       # @format :xml
       # @key false
       # @param id String of the service request id
@@ -68,23 +72,37 @@
       # @see http://wiki.open311.org/GeoReport_v2#GET_Service_Requests
       #   Open311.get_service_request
       def get_service_request(id, options={})
         options.merge!(:jurisdiction_id => jurisdiction)
         response = get("requests/#{id}", options)
-        format.to_s.downcase == 'xml' ? ServiceRequest.new(response.service_requests.request.first) : response
+        unpack_if_xml(response) do
+          response['service_requests']['request']
+        end
       end
 
       # @format :xml
       # @key false
       # @param token_id A token included in the response to .service_response request
       # @param options [Hash] A customizable set of options.
       # @return Array
       # @see http://wiki.open311.org/GeoReport_v2#GET_request_id_from_a_token
       #   Open311.request_id
-      def request_id(token_id, options = {})
+      def request_id_from_token(token_id, options = {})
         options.merge!(:jurisdiction_id => jurisdiction)
         response = get("tokens/#{token_id}", options)
-        format.to_s.downcase == 'xml' ? ServiceRequest.new(response.service_requests.request) : response
+        unpack_if_xml(response) do
+          response['service_requests']['request']
+        end
+      end
+
+      private 
+
+      def unpack_if_xml(response)
+        if format.to_s.downcase == 'xml'
+          yield
+        else
+          response
+        end
       end
     end
   end
 end