lib/rack/stripper.rb in rack-stripper-1.0.1 vs lib/rack/stripper.rb in rack-stripper-1.1.0

@@ -1,44 +1,50 @@
 require 'rack'
 
 module Rack
   class Stripper
-    VERSION = '1.0.1'
+    VERSION = '1.1.0'
 
     attr_accessor :add_xml_instruction
     attr_accessor :is_xml_response
 
     def initialize(app, options={})
       @app = app
-      self.add_xml_instruction = options[:add_xml_instruction] || false
+      @add_xml_instruction = options[:add_xml_instruction] || false
     end
 
     def call(env)
       dup._call(env)
     end
 
     def _call(env)
       status, headers, response = @app.call(env)
 
+      if status != 200
+        return [status, headers, response]
+      end
+
       if headers.has_key?('Content-Type')
         self.is_xml_response = !headers['Content-Type'].match(/xml/).nil?
       end
 
       if response.respond_to?(:body)
-        stripped_body = process_body(response.body)
-        headers['Content-Length'] = stripped_body.bytesize if headers.has_key?('Content-Length')
-        response = Rack::Response.new(stripped_body, status, headers)
-        response.to_a
+        response.body = process_body(response.body)
+        if headers.has_key?('Content-Length')
+          headers['Content-Length'] = response.body.bytesize
+        end
       end
+
+      [status, headers, response]
     end
 
     protected
 
     def process_body(body)
       body = body[0] if body.is_a?(Array)
       body.strip!
-      if self.add_xml_instruction && doesnt_have_xml_instruction_already?(body) && self.is_xml_response
+      if @add_xml_instruction && @is_xml_response && lacks_instruction?(body)
         body = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n#{body}"
       end
       body
     end
 
@@ -46,10 +52,10 @@
     # put doubles in, because that'd be worse than not having one at all.
     #
     # @param [String] body The body of the text.
     #
     # @return [Boolean] true if the content doesn't have an XML instruction, false if it does.
-    def doesnt_have_xml_instruction_already?(body)
+    def lacks_instruction?(body)
       body.index('<?xml ').nil? rescue false
     end
   end
-end
\ No newline at end of file
+end