Optimize construction of headers.

Author: marshall-lee

lib/grape.rb

@@ -38,7 +38,7 @@ module Grape
 
     autoload :Cookies
     autoload :Validations
-    autoload :Request, 'grape/http/request'
+    autoload :Request
     autoload :Env, 'grape/util/env'
   end
 

lib/grape/http/request.rb renamed to lib/grape/request.rb

@@ -1,8 +1,6 @@
 module Grape
   class Request < Rack::Request
-    HTTP_PREFIX  = 'HTTP_'.freeze
-    UNDERSCORE   = '_'.freeze
-    MINUS        = '-'.freeze
+    HTTP_PREFIX = 'HTTP_'.freeze
 
     def params
       @params ||= begin
@@ -22,10 +20,7 @@ def headers
       @headers ||= env.each_with_object({}) do |(k, v), h|
         next unless k.to_s.start_with? HTTP_PREFIX
 
-        k = k[5..-1]
-        k.tr!(UNDERSCORE, MINUS)
-        k.downcase!
-        k.gsub!(/^.|[-\s]./, &:upcase!)
+        k = k[5..-1].split('_').each(&:capitalize!).join('-')
         h[k] = v
       end
     end

lib/grape/util/env.rb

@@ -7,7 +7,6 @@ module Env
     API_TYPE = 'api.type'.freeze
     API_SUBTYPE = 'api.subtype'.freeze
     API_VENDOR = 'api.vendor'.freeze
-    API_VERSION = 'api.version'.freeze
     API_FORMAT = 'api.format'.freeze
 
     RACK_INPUT = 'rack.input'.freeze

spec/grape/request_spec.rb

@@ -0,0 +1,100 @@
+require 'spec_helper'
+
+module Grape
+  describe Request do
+    let(:default_method) { 'GET' }
+    let(:default_params) { {} }
+    let(:default_options) {
+      {
+        method: method,
+        params: params
+      }
+    }
+    let(:default_env) {
+      Rack::MockRequest.env_for('/', options)
+    }
+    let(:method) { default_method }
+    let(:params) { default_params }
+    let(:options) { default_options }
+    let(:env) { default_env }
+
+    let(:request) {
+      Grape::Request.new(env)
+    }
+
+    describe '#params' do
+      let(:params) {
+        {
+          a: '123',
+          b: 'xyz'
+        }
+      }
+
+      it 'returns params' do
+        expect(request.params).to eq('a' => '123', 'b' => 'xyz')
+      end
+
+      describe 'with rack.routing_args' do
+        let(:options) {
+          default_options.merge('rack.routing_args' => routing_args)
+        }
+        let(:routing_args) {
+          {
+            version: '123',
+            route_info: '456',
+            c: 'ccc'
+          }
+        }
+
+        it 'cuts version and route_info' do
+          expect(request.params).to eq('a' => '123', 'b' => 'xyz', 'c' => 'ccc')
+        end
+      end
+    end
+
+    describe '#headers' do
+      let(:options) {
+        default_options.merge(request_headers)
+      }
+
+      describe 'with http headers in env' do
+        let(:request_headers) {
+          {
+            'HTTP_X_GRAPE_IS_COOL' => 'yeah'
+          }
+        }
+
+        it 'cuts HTTP_ prefix and capitalizes header name words' do
+          expect(request.headers).to eq('X-Grape-Is-Cool' => 'yeah')
+        end
+      end
+
+      describe 'with non-HTTP_* stuff in env' do
+        let(:request_headers) {
+          {
+            'HTP_X_GRAPE_ENTITY_TOO' => 'but now we are testing Grape'
+          }
+        }
+
+        it 'does not include them' do
+          expect(request.headers).to eq({})
+        end
+      end
+
+      describe 'with symbolic header names' do
+        let(:request_headers) {
+          {
+            HTTP_GRAPE_LIKES_SYMBOLIC: 'it is true'
+          }
+        }
+        let(:env) {
+          default_env.merge(request_headers)
+        }
+
+        it 'converts them to string' do
+          expect(request.headers).to eq('Grape-Likes-Symbolic' => 'it is true')
+        end
+      end
+    end
+  end
+end