api-versions 0.2.0 → 0.2.1

data/.rspec

@@ -0,0 +1 @@
+--color

data/.travis.yml

@@ -1,4 +1,5 @@
 language: ruby
+before_install: gem install bundler
 
 rvm:
   - 1.9.3
@@ -12,3 +13,19 @@ notifications:
   email:
     recipients:
       - api-versions@erichmenge.com
+env:
+  - RAILS_VERSION=3.0.20
+  - RAILS_VERSION=3.1.11
+  - RAILS_VERSION=3.2.12
+  - RAILS_VERSION=3-2-stable
+  - RAILS_VERSION=3-1-stable
+  - RAILS_VERSION=3-0-stable
+  - RAILS_VERSION=master
+
+matrix:
+  allow_failures:
+    - rvm: 2.0.0
+    - env: RAILS_VERSION=3-2-stable
+    - env: RAILS_VERSION=3-1-stable
+    - env: RAILS_VERSION=3-0-stable
+    - env: RAILS_VERSION=master

data/Gemfile

@@ -2,4 +2,20 @@ source "http://rubygems.org"
 
 # Specify your gem's dependencies in api-versions.gemspec
 gemspec
-gem 'rails'
+
+case ENV['RAILS_VERSION']
+when /master/
+  gem "rails", github: "rails/rails"
+  gem "journey", github: "rails/journey"
+  gem "activerecord-deprecated_finders", github: "rails/activerecord-deprecated_finders"
+when /3-2-stable/
+  gem "rails", github: "rails/rails", branch: "3-2-stable"
+when /3-1-stable/
+  gem "rails", github: "rails/rails", branch: "3-1-stable"
+when /3-0-stable/
+  gem "rails", github: "rails/rails", branch: "3-0-stable"
+else
+  gem "rails", ENV['RAILS_VERSION']
+end
+
+gem 'tzinfo'

data/README.md

@@ -1,4 +1,4 @@
-# api-versions [![Build Status](https://secure.travis-ci.org/erichmenge/api-versions.png)](http://travis-ci.org/erichmenge/api-versions) #
+# api-versions [![Build Status](https://travis-ci.org/erichmenge/api-versions.png?branch=master)](https://travis-ci.org/erichmenge/api-versions) #
 
 
 #### api-versions is a Gem to help you manage your Rails API endpoints.
@@ -71,7 +71,7 @@ In your routes.rb file:
 
 
 Then the client simply sets the Accept header `application/vnd.myvendor+json;version=1`. If no version is specified, the default version you set will be assumed.
-You'll of course still need to copy all of your controllers over, even if they haven't changed from version to version.  At least you'll remove a bit of the mess in your routes file.
+You'll of course still need to copy all of your controllers over (or bump them automatically, see below), even if they haven't changed from version to version.  At least you'll remove a bit of the mess in your routes file.
 
 A more complicated example:
 
@@ -181,6 +181,8 @@ To get around this I suggest creating a base API controller and including ApiVer
 ``` ruby
 class Api::V1::BaseController < ActionController::Base
   include ApiVersions::SimplifyFormat
+
+  respond_to :json
 end
 ```
 

data/api-versions.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |s|
   s.authors     = ["Erich Menge"]
   s.email       = ["erich.menge@me.com"]
   s.homepage    = "https://github.com/erichmenge/api-versions"
-  s.summary     = "An API versioning gem for Rails."
-  s.description = "api-versions helps manage your app's API endpoints."
+  s.summary     = "api-versions helps manage your Rails app API endpoints."
+  s.description = "api-versions helps manage your Rails app API endpoints."
 
   s.rubyforge_project = "api-versions"
 
@@ -18,6 +18,11 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
+  s.required_ruby_version = '>= 1.9'
+
+  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'
 end

data/lib/api-versions.rb

@@ -6,11 +6,11 @@ require "api-versions/simplify_format"
 
 module ApiVersions
   def api(options = {}, &block)
+    raise "Please set a vendor_string for the api method" if options[:vendor_string].nil?
+
     VersionCheck.default_version = options[:default_version]
     VersionCheck.vendor_string   = options[:vendor_string]
 
-    raise "Please set a vendor_string for the api method" if options[:vendor_string].nil?
-
     namespace(:api) { DSL.new(self, &block) }
   end
 end

data/lib/api-versions/dsl.rb

@@ -4,8 +4,8 @@ module ApiVersions
 
     def initialize(context, &block)
       @context = context
-      self.class.def_delegators :@context, *(@context.public_methods - public_methods)
-      instance_eval &block
+      singleton_class.def_delegators :@context, *(@context.public_methods - public_methods)
+      instance_eval(&block)
     end
 
     def version(version_number, &block)
@@ -16,16 +16,16 @@ module ApiVersions
       end
     end
 
-    def inherit(args)
-      Array.wrap(args[:from]).each do |block|
+    def inherit(options)
+      Array.wrap(options[:from]).each do |block|
          @resource_cache[block].call
       end
     end
 
-    def cache(args, &block)
+    def cache(options, &block)
       @resource_cache ||= {}
-      @resource_cache[args[:as]] = block
-      block.call
+      @resource_cache[options[:as]] = block
+      yield
     end
   end
 end

data/lib/api-versions/simplify_format.rb

@@ -9,7 +9,7 @@ module ApiVersions
     private
 
     def simplify_format
-      request.headers['Accept'] && request.headers['Accept'].match(/\+\s*(.+?)[;\s\z]/) { |m| request.format = m[1] }
+      request.headers['Accept'] && request.headers['Accept'].match(/\+\s*(\w+)/) { |m| request.format = m[1] }
     end
   end
 end

data/lib/api-versions/version.rb

@@ -1,3 +1,3 @@
 module ApiVersions
-    VERSION = "0.2.0"
+    VERSION = "0.2.1"
 end

data/lib/api-versions/version_check.rb

@@ -1,6 +1,8 @@
 module ApiVersions
   class VersionCheck
-    cattr_accessor :default_version, :vendor_string
+    class << self
+      attr_accessor :default_version, :vendor_string
+    end
 
     def initialize(args = {})
       @process_version = args[:version]
@@ -13,7 +15,7 @@ module ApiVersions
     private
 
     def accepts_proper_format?(request)
-      request.headers['Accept'] =~ /\Aapplication\/vnd\.#{self.class.vendor_string}\+.+/
+      request.headers['Accept'] =~ /\Aapplication\/vnd\.#{self.class.vendor_string}\s*\+\s*.+/
     end
 
     def matches_version?(request)

data/lib/generators/api_versions/bump_generator.rb

@@ -18,7 +18,7 @@ module ApiVersions
 
       def generate_new_controllers
         @controllers.each do |controller|
-          new_controller = controller.gsub /api\/v#{@highest_version}\//, "api/v#{@highest_version.to_i + 1}/"
+          new_controller = controller.gsub(/api\/v#{@highest_version}\//, "api/v#{@highest_version.to_i + 1}/")
           @current_new_controller = new_controller.chomp(File.extname(controller)).camelize
           @current_old_controller = controller.chomp(File.extname(controller)).camelize
           template 'controller.rb', File.join('app', 'controllers', new_controller)

data/spec/controllers/simplified_format_spec.rb

@@ -0,0 +1,47 @@
+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/dummy/app/controllers/api/v1/bar_controller.rb

@@ -1,2 +1,2 @@
-class Api::V1::BarController < ApplicationController
+class Api::V1::BarController < ActionController::Base
 end

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

@@ -1,4 +1,4 @@
-class Api::V2::BarController < ApplicationController
+class Api::V2::BarController < ActionController::Base
   def new
 
   end

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

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

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

@@ -1,2 +1,2 @@
-class Api::V2::UsersController < ApplicationController
+class Api::V2::UsersController < ActionController::Base
 end

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

@@ -1,2 +1,2 @@
-class Api::V3::BarController < ApplicationController
+class Api::V3::BarController < ActionController::Base
 end

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

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

data/spec/dummy/config/application.rb

@@ -1,54 +1,12 @@
 require File.expand_path('../boot', __FILE__)
-
-# Pick the frameworks you want:
 require "action_controller/railtie"
-# require "rails/test_unit/railtie"
 
 Bundler.require
 require "api-versions"
 
 module Dummy
   class Application < Rails::Application
-    # Settings in config/environments/* take precedence over those specified here.
-    # Application configuration should go into files in config/initializers
-    # -- all .rb files in that directory are automatically loaded.
-
-    # Custom directories with classes and modules you want to be autoloadable.
-    # config.autoload_paths += %W(#{config.root}/extras)
-
-    # Only load the plugins named here, in the order given (default is alphabetical).
-    # :all can be used as a placeholder for all plugins not explicitly named.
-    # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
-
-    # Activate observers that should always be running.
-    # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
-
-    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
-    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
-    # config.time_zone = 'Central Time (US & Canada)'
-
-    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
-    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
-    # config.i18n.default_locale = :de
-
-    # Configure the default encoding used in templates for Ruby 1.9.
     config.encoding = "utf-8"
-
-    # Configure sensitive parameters which will be filtered from the log file.
-    config.filter_parameters += [:password]
-
-    # Enable escaping HTML in JSON.
-    config.active_support.escape_html_entities_in_json = true
-
-    # Use SQL instead of Active Record's schema dumper when creating the database.
-    # This is necessary if your schema can't be completely dumped by the schema dumper,
-    # like if you have constraints or database-specific column types
-    # config.active_record.schema_format = :sql
-
-    # Enforce whitelist mode for mass assignment.
-    # This will create an empty whitelist of attributes available for mass-assignment for all models
-    # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
-    # parameters by using an attr_accessible or attr_protected declaration.
   end
 end
 

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

@@ -1,29 +1,8 @@
 Dummy::Application.configure do
-  # Settings specified here will take precedence over those in config/application.rb
-
-  # The test environment is used exclusively to run your application's
-  # test suite. You never need to work with it otherwise. Remember that
-  # your test database is "scratch space" for the test suite and is wiped
-  # and recreated between test runs. Don't rely on the data there!
   config.cache_classes = true
-
-  # Configure static asset server for tests with Cache-Control for performance
-  config.serve_static_assets = true
-  config.static_cache_control = "public, max-age=3600"
-
-  # Log error messages when you accidentally call methods on nil
   config.whiny_nils = true
-
-  # Show full error reports and disable caching
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
-
-  # Raise exceptions instead of rendering exception templates
   config.action_dispatch.show_exceptions = false
-
-  # Disable request forgery protection in test environment
-  config.action_controller.allow_forgery_protection    = false
-
-  # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr
 end

data/spec/dummy/config/routes.rb

@@ -18,5 +18,5 @@ Dummy::Application.routes.draw do
     end
   end
 
-  match '/app/index' => 'application#index'
+  get 'index' => 'simplified_format#index'
 end

data/spec/lib/api_versions_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe ApiVersions do
+  let(:testclass) { Class.new.extend ApiVersions }
+
+  it "should raise if no vendor string is provided" do
+    expect { testclass.api }.to raise_exception(RuntimeError, 'Please set a vendor_string for the api method')
+  end
+end

data/spec/routing/routing_spec.rb

@@ -7,39 +7,24 @@ describe 'API Routing' do
   end
 
   describe "V1" do
-    context "when no header is set" do
-      it "doesn't route" do
-        expect(get: new_api_bar_path).to_not be_routable
-      end
+    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
 
-    context "when the header is set incorrectly" do
-      it "doesn't route" do
-        merge_and_stub new_api_bar_path, 'get', 'Accept' => 'application/vnd.mybadvendor+json;version=1'
-        expect(get: '/api/bar/new').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
 
-    context "when it is set correctly" 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" 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
+    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
 
@@ -76,24 +61,61 @@ describe 'API Routing' do
   end
 
   describe "Header syntax" do
-    after(:each) do
-      expect(get: new_api_bar_path).to route_to(controller: 'api/v1/bar', action: 'new')
-    end
+    context "when valid" do
+      after(:each) do
+        expect(get: new_api_bar_path).to route_to(controller: 'api/v1/bar', action: 'new')
+      end
 
-    it "should allow spaces after the semi-colon" do
-      merge_and_stub new_api_bar_path, 'get', 'Accept' => 'application/vnd.myvendor+json;   version=1'
-    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 other formats besides json" do
-      merge_and_stub new_api_bar_path, 'get', 'Accept' => 'application/vnd.myvendor+xml; version=1'
+        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 allow spacing around the equal sign" do
-      merge_and_stub new_api_bar_path, 'get', 'Accept' => 'application/vnd.myvendor+json; version = 1'
+    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 allow spacing around the plus" do
-      merge_and_stub new_api_bar_path, 'get', 'Accept' => 'application/vnd.myvendor+xml; version=1'
+    it "should not route when no header is specified" do
+      expect(get: new_api_bar_path).to_not be_routable
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,24 +1,12 @@
-# This file is copied to spec/ when you run 'rails generate rspec:install'
 ENV["RAILS_ENV"] ||= 'test'
 require File.expand_path("../dummy/config/environment", __FILE__)
 require 'rspec/rails'
 require 'rspec/autorun'
 require 'ammeter/init'
 
-# Requires supporting ruby files with custom matchers and macros, etc,
-# in spec/support/ and its subdirectories.
 Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
 
 RSpec.configure do |config|
-
-  # If true, the base class of anonymous controllers will be inferred
-  # automatically. This will be the default behavior in future versions of
-  # rspec-rails.
   config.infer_base_class_for_anonymous_controllers = true
-
-  # Run specs in random order to surface order dependencies. If you find an
-  # order dependency and want to debug it, you can fix the order by providing
-  # the seed, which is printed after each run.
-  #     --seed 1234
   config.order = "random"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: api-versions
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,40 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-02 00:00:00.000000000 Z
+date: 2013-02-12 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: actionpack
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -43,7 +75,7 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.2.5
-description: api-versions helps manage your app's API endpoints.
+description: api-versions helps manage your Rails app API endpoints.
 email:
 - erich.menge@me.com
 executables: []
@@ -51,6 +83,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
 - .travis.yml
 - Gemfile
 - License.txt
@@ -64,7 +97,7 @@ files:
 - lib/api-versions/version_check.rb
 - lib/generators/api_versions/bump_generator.rb
 - lib/generators/api_versions/templates/controller.rb
-- spec/controllers/application_controller_spec.rb
+- spec/controllers/simplified_format_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
@@ -72,7 +105,6 @@ 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/application_controller.rb
 - spec/dummy/config.ru
 - spec/dummy/config/application.rb
 - spec/dummy/config/boot.rb
@@ -81,6 +113,7 @@ 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/spec_helper.rb
 homepage: https://github.com/erichmenge/api-versions
@@ -94,7 +127,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -106,9 +139,9 @@ rubyforge_project: api-versions
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: An API versioning gem for Rails.
+summary: api-versions helps manage your Rails app API endpoints.
 test_files:
-- spec/controllers/application_controller_spec.rb
+- spec/controllers/simplified_format_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
@@ -116,7 +149,6 @@ 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/application_controller.rb
 - spec/dummy/config.ru
 - spec/dummy/config/application.rb
 - spec/dummy/config/boot.rb
@@ -125,5 +157,6 @@ 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/spec_helper.rb

data/spec/controllers/application_controller_spec.rb

@@ -1,31 +0,0 @@
-require 'spec_helper'
-
-class ApplicationController < ActionController::Base
-  include ApiVersions::SimplifyFormat
-
-  def index
-    render nothing: true, status: 200
-  end
-end
-
-describe ApplicationController do
-  describe "simplify format" do
-    it "should set the format" do
-      request.env['Accept'] = 'application/vnd.myvendor+json;version=1'
-      get :index
-      request.format.should == 'application/json'
-    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/dummy/app/controllers/application_controller.rb

@@ -1,3 +0,0 @@
-class ApplicationController < ActionController::Base
-  protect_from_forgery
-end