api-versions 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8adc4de1dfbb8f6e52a6a5615970e1acf1717efa
-  data.tar.gz: 602c0862e6e96c18143d27180252f89cbec959a6
+  metadata.gz: daa8e2061260c0cf2b7f4d58d95d9f321ba5796b
+  data.tar.gz: 1de22bfc799fb807ee1e8af14d47ef8707c59a4a
 SHA512:
-  metadata.gz: 7d9533e0ebd026c70ede3fd641d61dfc72cd620442e7d88c655170c7d62bb3dd248510d719827349c3098a78fab32b778b9c03dd2af77d83bada672a00538635
-  data.tar.gz: ee6171b5a7115e1c9ae195b6947fe2bb9886a397ec4fbf58b0beff888af9f74ce40d3f3bdc9377f240c52f5a7fef137828d24b1a40773985bc1fdfb32b26c104
+  metadata.gz: 3e5a9e281b081b71b0caad6c1b71acac5a00ca01040337182e00a3ee68eedf39de6ccb1caecc3b69632772e69f916116c53894995270769de2471f1c5aacf817
+  data.tar.gz: 562696e06899eadf515615ae257357cd3610125559236f9876c1de48824bb85ce026560f5565b4b5492e67c2d1e7ff0f54596197b7ffaa3daf1cd25e957194f5

data/.travis.yml

@@ -12,3 +12,9 @@ env:
   - RAILS_VERSION=3-0-stable
   - RAILS_VERSION=3-1-stable
   - RAILS_VERSION=3-2-stable
+  - RAILS_VERSION=4-0-stable
+  - RAILS_VERSION=master
+
+matrix:
+  allow_failures:
+    - env: RAILS_VERSION=master

data/Changes.md

@@ -0,0 +1,3 @@
+## 1.1
+
+* Use middleware to simplify the MIME type instead of doing it at the controller.

data/Gemfile

@@ -4,6 +4,10 @@ source "http://rubygems.org"
 gemspec
 
 case ENV['RAILS_VERSION']
+when /master/
+  gem "rails", github: "rails/rails"
+when /4-0-stable/
+  gem "rails", github: "rails/rails", branch: "4-0-stable"
 when /3-2-stable/
   gem "rails", github: "rails/rails", branch: "3-2-stable"
 when /3-1-stable/

data/README.md

@@ -26,7 +26,7 @@ api-versions is very lightweight. It adds a generator and only one method to the
 ## Installation
 In your Gemfile:
 
-    gem "api-versions", "~> 0.2.0"
+    gem "api-versions", "~> 1.0"
 
 ## Versions are specified by header, not by URL
 A lot of APIs are versioned by changing the URL. `http://test.host/api/v1/some_resource/new` for example.
@@ -178,17 +178,3 @@ end
 
 So instead of copying your prior version controllers over to the new ones and duplicating all the code in them, you can redefine specific methods,
 or start from scratch by removing the inheritance.
-
-## A word on Rails responders
-If you use `responds_to` and `responds_with` you'll run into a bit of a problem. Rails doesn't understand the Accept header so you'll get a 406 Unacceptable when you use `respond_to`.
-To get around this I suggest creating a base API controller and including ApiVersions::SimplifyFormat, which will set the format to the one specified with the + symbol in the Accept header.
-
-``` ruby
-class Api::V1::BaseController < ActionController::Base
-  include ApiVersions::SimplifyFormat
-
-  respond_to :json
-end
-```
-
-This will set `request.format` accordingly.

data/api-versions.gemspec

@@ -20,8 +20,8 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 1.9'
 
-  s.add_dependency 'actionpack', '~> 3'
-  s.add_dependency 'activesupport', '~> 3'
+  s.add_dependency('actionpack', '>= 3.0')
+  s.add_dependency('activesupport', '>= 3.0')
 
   s.add_development_dependency "rspec-rails", "~> 2.0"
   s.add_development_dependency 'ammeter',  '0.2.5'

data/lib/api-versions.rb

@@ -1,8 +1,8 @@
 require "api-versions/version"
 require "api-versions/version_check"
 require "api-versions/dsl"
-require "api-versions/simplify_format"
-
+require 'api-versions/middleware'
+require 'api-versions/railtie'
 
 module ApiVersions
   def api(options = {}, &block)

data/lib/api-versions/dsl.rb

@@ -1,3 +1,5 @@
+require 'forwardable'
+
 module ApiVersions
   class DSL
     extend Forwardable

data/lib/api-versions/middleware.rb

@@ -0,0 +1,23 @@
+module ApiVersions
+  class Middleware
+    def initialize(app)
+      @app = app
+    end
+
+    def call(env)
+      accepts = env['HTTP_ACCEPT'].split(',')
+      offset = 0
+      accepts.dup.each_with_index do |accept, i|
+        accept.strip!
+        match = /\Aapplication\/vnd\.#{ApiVersions::VersionCheck.vendor_string}\s*\+\s*(?<format>\w+)\s*/.match(accept)
+        if match
+          accepts.insert i + offset, "application/#{match[:format]}"
+          offset += 1
+        end
+      end
+
+      env['HTTP_ACCEPT'] = accepts.join(',')
+      @app.call(env)
+    end
+  end
+end

data/lib/api-versions/railtie.rb

@@ -0,0 +1,7 @@
+require 'rails/railtie'
+
+module ApiVersions
+  class Railtie < Rails::Railtie
+    config.app_middleware.use ApiVersions::Middleware
+  end
+end

data/lib/api-versions/version.rb

@@ -1,3 +1,3 @@
 module ApiVersions
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/lib/api-versions/version_check.rb

@@ -9,21 +9,25 @@ module ApiVersions
     end
 
     def matches?(request)
-      accepts_proper_format?(request) && (matches_version?(request) || unversioned?(request))
+      accepts = request.headers['Accept'].split(',')
+      accepts.any? do |accept|
+        accept.strip!
+        accepts_proper_format?(accept) && (matches_version?(accept) || unversioned?(accept))
+      end
     end
 
     private
 
-    def accepts_proper_format?(request)
-      request.headers['Accept'] =~ /\Aapplication\/vnd\.#{self.class.vendor_string}\s*\+\s*.+/
+    def accepts_proper_format?(accept_string)
+      accept_string =~ /\Aapplication\/vnd\.#{self.class.vendor_string}\s*\+\s*.+/
     end
 
-    def matches_version?(request)
-      request.headers['Accept'] =~ /version\s*?=\s*?#{@process_version}\b/
+    def matches_version?(accept_string)
+      accept_string =~ /version\s*?=\s*?#{@process_version}\b/
     end
 
-    def unversioned?(request)
-      @process_version == self.class.default_version && !(request.headers['Accept'] =~ /version\s*?=\s*?\d*\b/i)
+    def unversioned?(accept_string)
+      @process_version == self.class.default_version && !(accept_string =~ /version\s*?=\s*?\d*\b/i)
     end
   end
 end

data/spec/dummy/app/controllers/api/v1/bar_controller.rb

@@ -1,2 +1,5 @@
 class Api::V1::BarController < ActionController::Base
+  def new
+    render nothing: true
+  end
 end

data/spec/dummy/app/controllers/api/v2/bar_controller.rb

@@ -1,5 +1,3 @@
-class Api::V2::BarController < ActionController::Base
-  def new
+class Api::V2::BarController < Api::V1::BarController
 
-  end
 end

data/spec/dummy/app/controllers/api/v2/foo_controller.rb

@@ -1,2 +1,5 @@
 class Api::V2::FooController < ActionController::Base
+  def new
+    render nothing: true
+  end
 end

data/spec/dummy/app/controllers/api/v3/foo_controller.rb

@@ -1,2 +1,2 @@
-class Api::V3::FooController < ActionController::Base
+class Api::V3::FooController < Api::V2::FooController
 end

data/spec/dummy/app/controllers/errors_controller.rb

@@ -0,0 +1,5 @@
+class ErrorsController < ActionController::Base
+  def not_found
+    render nothing: true, status: 404
+  end
+end

data/spec/dummy/config/environments/test.rb

@@ -7,4 +7,5 @@ Dummy::Application.configure do
   config.action_controller.allow_forgery_protection = false
   config.active_support.deprecation = :stderr
   config.secret_key_base = "eb6e66d4263b36e93912a0e0c367059d38c3417058890737c1bed0e52961429817430c38be6acab423cf023fe51c05123727f4dd4782cb2a46966d496d8e951c"
+  config.secret_token = "35c2d7361ce46603d587097392f7397748e94216a275d34f0449fe3db03c36e19e998950317bd2bfc28f1cfa4d106792ff346949ecb8209911995480d4668530"
 end

data/spec/dummy/config/routes.rb

@@ -18,5 +18,7 @@ Dummy::Application.routes.draw do
     end
   end
 
+  get '*a' => 'errors#not_found'
+
   get 'index' => 'simplified_format#index'
 end

data/spec/middleware_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+require 'rack/test'
+
+describe ApiVersions::Middleware do
+  let(:app) { ->(env) { [200, { "Content-Type" => "text/plain"}, [env["HTTP_ACCEPT"]]] } }
+
+  before do
+    ApiVersions::VersionCheck.vendor_string = "myvendor"
+  end
+
+  describe "the accept header" do
+    it "should not adjust the header" do
+      request = Rack::MockRequest.env_for("/", "HTTP_ACCEPT" => "application/vnd.foobar+json;version=1", lint: true, fatal: true)
+      _, _, response = described_class.new(app).call(request)
+      response.first.should == "application/vnd.foobar+json;version=1"
+    end
+
+    it "should adjust the header" do
+      request = Rack::MockRequest.env_for("/", "HTTP_ACCEPT" => "text/plain,application/vnd.myvendor+json;version=1,text/html,application/vnd.myvendor+xml", lint: true, fatal: true)
+      _, _, response = described_class.new(app).call(request)
+      response.last.should == "text/plain,application/json,application/vnd.myvendor+json;version=1,text/html,application/xml,application/vnd.myvendor+xml"
+    end
+  end
+end

data/spec/routing_spec.rb

@@ -0,0 +1,122 @@
+require 'spec_helper'
+
+describe 'API Routing' do
+  include RSpec::Rails::RequestExampleGroup
+
+  describe "V1" do
+    it "should not route something from V2" do
+      get new_api_foo_path, nil, 'HTTP_ACCEPT' => 'application/vnd.myvendor+json;version=1'
+      response.status.should == 404
+    end
+
+    it "should route" do
+      get new_api_bar_path, nil, 'HTTP_ACCEPT' => 'application/vnd.myvendor+json;version=1'
+      @controller.class.should == Api::V1::BarController
+    end
+
+    it "should default" do
+      get new_api_bar_path, nil, 'HTTP_ACCEPT' => 'application/vnd.myvendor+json'
+      @controller.class.should == Api::V1::BarController
+    end
+
+    it "should default with nothing after the semi-colon" do
+      get new_api_bar_path, nil, 'HTTP_ACCEPT' => 'application/vnd.myvendor+json; '
+      @controller.class.should == Api::V1::BarController
+    end
+  end
+
+  describe "V2" do
+    it "should copy bar" do
+      get new_api_bar_path, nil, 'HTTP_ACCEPT' => 'application/vnd.myvendor+json;version=2'
+      @controller.class.should == Api::V2::BarController
+    end
+
+    it "should add foo" do
+      get new_api_foo_path, nil, 'HTTP_ACCEPT' => 'application/vnd.myvendor+json;version=2'
+      @controller.class.should == Api::V2::FooController
+    end
+
+    it "should not default" do
+      get new_api_foo_path, nil, 'HTTP_ACCEPT' => 'application/vnd.myvendor+json'
+      response.status.should == 404
+    end
+
+    it "should default" do
+      original_version = ApiVersions::VersionCheck.default_version
+      ApiVersions::VersionCheck.default_version = 2
+      get new_api_foo_path, nil, 'HTTP_ACCEPT' => 'application/vnd.myvendor+json'
+      ApiVersions::VersionCheck.default_version = original_version
+      @controller.class.should == Api::V2::FooController
+    end
+  end
+
+  describe "V3" do
+    it "should copy foo" do
+      get new_api_foo_path, nil, 'HTTP_ACCEPT' => 'application/vnd.myvendor+json;version=3'
+      @controller.class.should == Api::V3::FooController
+    end
+  end
+
+  describe "Header syntax" do
+    context "when valid" do
+      after(:each) do
+        get new_api_bar_path, nil, 'HTTP_ACCEPT' => @accept_string
+        desired_format = /application\/.*\+\W*(?<format>\w+)\W*/.match(@accept_string)[:format]
+        response.content_type.should == "application/#{desired_format}"
+        response.should be_success
+      end
+
+      context "the semi-colon" do
+        it "should allow spaces after" do
+          @accept_string = 'application/vnd.myvendor+json;   version=1'
+        end
+
+        it "should allow spaces before" do
+          @accept_string = 'application/vnd.myvendor + xml ;version=1'
+        end
+
+        it "should allow spaces around" do
+          @accept_string = 'application/vnd.myvendor + xml ; version=1'
+        end
+      end
+
+      context "the equal sign" do
+        it "should allow spacing before" do
+          @accept_string = 'application/vnd.myvendor+json; version =1'
+        end
+
+        it "should allow spacing after" do
+          @accept_string = 'application/vnd.myvendor+json; version= 1'
+        end
+
+        it "should allow spacing around" do
+          @accept_string = 'application/vnd.myvendor+json; version = 1'
+        end
+      end
+
+      context "the plus sign" do
+        it "should allow spacing before" do
+          @accept_string = 'application/vnd.myvendor +xml; version=1'
+        end
+
+        it "should allow spacing after" do
+          @accept_string = 'application/vnd.myvendor+ xml; version=1'
+        end
+
+        it "should allow spacing around" do
+          @accept_string = 'application/vnd.myvendor +xml; version=1'
+        end
+      end
+    end
+
+    it "should not route when invalid" do
+      get new_api_bar_path, nil, 'HTTP_ACCEPT' => 'application/vnd.garbage+xml;version=1'
+      response.status.should == 404
+    end
+
+    it "should not route when no header is specified" do
+      get new_api_bar_path, nil
+      response.status.should == 404
+    end
+  end
+end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: api-versions
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Erich Menge
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-09 00:00:00.000000000 Z
+date: 2013-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -76,6 +76,7 @@ files:
 - .gitignore
 - .rspec
 - .travis.yml
+- Changes.md
 - Gemfile
 - License.txt
 - README.md
@@ -83,12 +84,13 @@ files:
 - api-versions.gemspec
 - lib/api-versions.rb
 - lib/api-versions/dsl.rb
-- lib/api-versions/simplify_format.rb
+- lib/api-versions/middleware.rb
+- lib/api-versions/railtie.rb
 - lib/api-versions/version.rb
 - lib/api-versions/version_check.rb
 - lib/generators/api_versions/bump_generator.rb
 - lib/generators/api_versions/templates/controller.rb
-- spec/controllers/simplified_format_spec.rb
+- spec/api_versions_spec.rb
 - spec/dummy/app/controllers/api/v1/bar_controller.rb
 - spec/dummy/app/controllers/api/v2/bar_controller.rb
 - spec/dummy/app/controllers/api/v2/foo_controller.rb
@@ -96,6 +98,7 @@ files:
 - spec/dummy/app/controllers/api/v3/bar_controller.rb
 - spec/dummy/app/controllers/api/v3/foo_controller.rb
 - spec/dummy/app/controllers/api/v3/nests/nested_controller.rb
+- spec/dummy/app/controllers/errors_controller.rb
 - spec/dummy/config.ru
 - spec/dummy/config/application.rb
 - spec/dummy/config/boot.rb
@@ -104,8 +107,8 @@ files:
 - spec/dummy/config/routes.rb
 - spec/dummy/log/.gitkeep
 - spec/generators/bump_generator_spec.rb
-- spec/lib/api_versions_spec.rb
-- spec/routing/routing_spec.rb
+- spec/middleware_spec.rb
+- spec/routing_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/erichmenge/api-versions
 licenses: []
@@ -131,7 +134,7 @@ signing_key:
 specification_version: 4
 summary: api-versions helps manage your Rails app API endpoints.
 test_files:
-- spec/controllers/simplified_format_spec.rb
+- spec/api_versions_spec.rb
 - spec/dummy/app/controllers/api/v1/bar_controller.rb
 - spec/dummy/app/controllers/api/v2/bar_controller.rb
 - spec/dummy/app/controllers/api/v2/foo_controller.rb
@@ -139,6 +142,7 @@ test_files:
 - spec/dummy/app/controllers/api/v3/bar_controller.rb
 - spec/dummy/app/controllers/api/v3/foo_controller.rb
 - spec/dummy/app/controllers/api/v3/nests/nested_controller.rb
+- spec/dummy/app/controllers/errors_controller.rb
 - spec/dummy/config.ru
 - spec/dummy/config/application.rb
 - spec/dummy/config/boot.rb
@@ -147,7 +151,7 @@ test_files:
 - spec/dummy/config/routes.rb
 - spec/dummy/log/.gitkeep
 - spec/generators/bump_generator_spec.rb
-- spec/lib/api_versions_spec.rb
-- spec/routing/routing_spec.rb
+- spec/middleware_spec.rb
+- spec/routing_spec.rb
 - spec/spec_helper.rb
 has_rdoc: 

data/lib/api-versions/simplify_format.rb

@@ -1,15 +0,0 @@
-module ApiVersions
-  module SimplifyFormat
-    extend ActiveSupport::Concern
-
-    included do
-      prepend_before_filter :simplify_format
-    end
-
-    private
-
-    def simplify_format
-      request.headers['Accept'] && request.headers['Accept'].match(/\+\s*(\w+)/) { |m| request.format = m[1] }
-    end
-  end
-end

data/spec/controllers/simplified_format_spec.rb

@@ -1,47 +0,0 @@
-require 'spec_helper'
-
-class SimplifiedFormat < ActionController::Base
-  include ApiVersions::SimplifyFormat
-
-  def index
-    render nothing: true, status: 200
-  end
-end
-
-describe SimplifiedFormat do
-  describe "simplify format" do
-    after { request.format.should == 'application/json' }
-
-    it "should set the format" do
-      request.env['Accept'] = 'application/vnd.myvendor+json;version=1'
-      get :index
-    end
-
-    it "should set the format when there is no version specified" do
-      request.env['Accept'] = 'application/vnd.myvendor+json'
-      get :index
-    end
-
-    it "should set the format with spaces" do
-      request.env['Accept'] = 'application/vnd.myvendor + json ; version = 1'
-      get :index
-    end
-
-    it "should set the format with spaces and no version" do
-      request.env['Accept'] = 'application/vnd.myvendor + json'
-      get :index
-    end
-  end
-
-  context "when the header is not set" do
-    it "should be successful" do
-      get :index
-      response.should be_success
-    end
-
-    it "should not change the format" do
-      get :index
-      request.format.should == "text/html"
-    end
-  end
-end

data/spec/routing/routing_spec.rb

@@ -1,121 +0,0 @@
-require 'spec_helper'
-
-describe 'API Routing' do
-  def merge_and_stub(path, method, hash)
-    env_hash = Rack::MockRequest.env_for(path, method: method).merge(hash)
-    Rack::MockRequest.stub(:env_for).and_return env_hash
-  end
-
-  describe "V1" do
-    it "should not route something from V2" do
-      merge_and_stub new_api_foo_path, 'get', 'Accept' => 'application/vnd.myvendor+json;version=1'
-      expect(get: new_api_foo_path).to_not be_routable
-    end
-
-    it "should route" do
-      merge_and_stub new_api_bar_path, 'get', 'Accept' => 'application/vnd.myvendor+json;version=1'
-      expect(get: new_api_bar_path).to route_to(controller: 'api/v1/bar', action: 'new')
-    end
-
-    it "should default" do
-      merge_and_stub new_api_bar_path, 'get', 'Accept' => 'application/vnd.myvendor+json'
-      expect(get: new_api_bar_path).to route_to(controller: 'api/v1/bar', action: 'new')
-    end
-
-    it "should default with nothing after the semi-colon" do
-      merge_and_stub new_api_bar_path, 'get', 'Accept' => 'application/vnd.myvendor+json; '
-      expect(get: new_api_bar_path).to route_to(controller: 'api/v1/bar', action: 'new')
-    end
-  end
-
-  describe "V2" do
-    it "should copy bar" do
-      merge_and_stub new_api_bar_path, 'get', 'Accept' => 'application/vnd.myvendor+json;version=2'
-      expect(get: new_api_bar_path).to route_to(controller: 'api/v2/bar', action: 'new')
-    end
-
-    it "should add foo" do
-      merge_and_stub new_api_foo_path, 'get', 'Accept' => 'application/vnd.myvendor+json;version=2'
-      expect(get: new_api_foo_path).to route_to(controller: 'api/v2/foo', action: 'new')
-    end
-
-    it "should not default" do
-      merge_and_stub new_api_foo_path, 'get', 'Accept' => 'application/vnd.myvendor+json'
-      expect(get: new_api_foo_path).to_not be_routable
-    end
-
-    it "should default" do
-      original_version = ApiVersions::VersionCheck.default_version
-      ApiVersions::VersionCheck.default_version = 2
-      merge_and_stub new_api_foo_path, 'get', 'Accept' => 'application/vnd.myvendor+json'
-      expect(get: new_api_foo_path).to route_to(controller: 'api/v2/foo', action: 'new')
-      ApiVersions::VersionCheck.default_version = original_version
-    end
-  end
-
-  describe "V3" do
-    it "should copy foo" do
-      merge_and_stub new_api_bar_path, 'get', 'Accept' => 'application/vnd.myvendor+json;version=3'
-      expect(get: new_api_bar_path).to route_to(controller: 'api/v3/bar', action: 'new')
-    end
-  end
-
-  describe "Header syntax" do
-    context "when valid" do
-      after(:each) do
-        expect(get: new_api_bar_path).to route_to(controller: 'api/v1/bar', action: 'new')
-      end
-
-      context "the semi-colon" do
-        it "should allow spaces after" do
-          merge_and_stub new_api_bar_path, 'get', 'Accept' => 'application/vnd.myvendor+json;   version=1'
-        end
-
-        it "should allow spaces before" do
-          merge_and_stub new_api_bar_path, 'get', 'Accept' => 'application/vnd.myvendor + xml ;version=1'
-        end
-
-        it "should allow spaces around" do
-          merge_and_stub new_api_bar_path, 'get', 'Accept' => 'application/vnd.myvendor + xml ; version=1'
-        end
-      end
-
-      context "the equal sign" do
-        it "should allow spacing before" do
-          merge_and_stub new_api_bar_path, 'get', 'Accept' => 'application/vnd.myvendor+json; version =1'
-        end
-
-        it "should allow spacing after" do
-          merge_and_stub new_api_bar_path, 'get', 'Accept' => 'application/vnd.myvendor+json; version= 1'
-        end
-
-        it "should allow spacing around" do
-          merge_and_stub new_api_bar_path, 'get', 'Accept' => 'application/vnd.myvendor+json; version = 1'
-        end
-      end
-
-      context "the plus sign" do
-        it "should allow spacing before" do
-          merge_and_stub new_api_bar_path, 'get', 'Accept' => 'application/vnd.myvendor +xml; version=1'
-        end
-
-        it "should allow spacing after" do
-          merge_and_stub new_api_bar_path, 'get', 'Accept' => 'application/vnd.myvendor+ xml; version=1'
-        end
-
-        it "should allow spacing around" do
-          merge_and_stub new_api_bar_path, 'get', 'Accept' => 'application/vnd.myvendor +xml; version=1'
-        end
-      end
-    end
-
-    it "should not route when invalid" do
-      merge_and_stub new_api_bar_path, 'get', 'Accept' => 'application/vnd.garbage+xml;version=1'
-      expect(get: new_api_bar_path).to_not route_to(controller: 'api/v1/bar', action: 'new')
-    end
-
-    it "should not route when no header is specified" do
-      expect(get: new_api_bar_path).to_not be_routable
-    end
-  end
-end