Refactor header util methods

Author: samwgoldman

lib/rspec_api_documentation.rb

@@ -17,6 +17,7 @@ module RspecApiDocumentation
     autoload :ExampleGroup
     autoload :Index
     autoload :TestClient
+    autoload :Headers
   end
 
   autoload :DSL

lib/rspec_api_documentation/headers.rb

@@ -0,0 +1,21 @@
+module RspecApiDocumentation
+  module Headers
+    def env_to_headers(env)
+      headers = {}
+      env.each do |key, value|
+        # HTTP_ACCEPT_CHARSET => Accept-Charset
+        if key =~ /^(HTTP_|CONTENT_TYPE)/
+          header = key.gsub(/^HTTP_/, '').titleize.split.join("-")
+          headers[header] = value
+        end
+      end
+      headers
+    end
+
+    def format_headers(headers)
+      headers.map do |key, value|
+        "#{key}: #{value}"
+      end.join("\n")
+    end
+  end
+end

lib/rspec_api_documentation/test_client.rb

@@ -2,6 +2,8 @@
 
 module RspecApiDocumentation
   class TestClient < Struct.new(:context, :options)
+    include Headers
+
     delegate :example, :app, :to => :context
     delegate :metadata, :to => :example
     delegate :last_request, :last_response, :to => :rack_test_session
@@ -100,24 +102,6 @@ def document_example(method, action, params)
       metadata[:requests] << request_metadata
     end
 
-    def env_to_headers(env)
-      headers = {}
-      env.each do |key, value|
-        # HTTP_ACCEPT_CHARSET => Accept-Charset
-        if key =~ /^(HTTP_|CONTENT_TYPE)/
-          header = key.gsub(/^HTTP_/, '').titleize.split.join("-")
-          headers[header] = value
-        end
-      end
-      headers
-    end
-
-    def format_headers(headers)
-      headers.map do |key, value|
-        "#{key}: #{value}"
-      end.join("\n")
-    end
-
     def format_query_hash(query_hash)
       return if query_hash.blank?
       query_hash.map do |key, value|

lib/rspec_api_documentation/test_server.rb

@@ -1,5 +1,7 @@
 module RspecApiDocumentation
   class TestServer < Struct.new(:context)
+    include Headers
+
     delegate :example, :last_request, :last_response, :to => :context
     delegate :metadata, :to => :example
 
@@ -11,7 +13,7 @@ def call(env)
       request_metadata[:request_method] = env["REQUEST_METHOD"]
       request_metadata[:request_path] = env["PATH_INFO"]
       request_metadata[:request_body] = prettify_json(env["rack.input"].read)
-      request_metadata[:request_headers] = headers(env)
+      request_metadata[:request_headers] = format_headers(env_to_headers(env))
 
       metadata[:requests] ||= []
       metadata[:requests] << request_metadata
@@ -21,18 +23,6 @@ def call(env)
 
     private
 
-    def headers(env)
-      env.
-        select do |k, v|
-          k =~ /^(HTTP_|CONTENT_TYPE)/
-        end.
-        map do |key, value|
-          # HTTP_ACCEPT_CHARSET => Accept-Charset
-          formatted_key = key.gsub(/^HTTP_/, '').titleize.split.join("-")
-          "#{formatted_key}: #{value}"
-        end.join("\n")
-    end
-
     def prettify_json(json)
       begin
         JSON.pretty_generate(JSON.parse(json))