Api fixes

app/models/api_user.rb

@@ -75,4 +75,4 @@ def can_sort?(resource)
     can_do?(:sort, resource)
   end
 
-end
+end

config/routes.rb

@@ -33,7 +33,9 @@
   end
 
   namespace :api, defaults: {format: 'json'} do
-    scope module: :v1, constraints: ApiConstraints.new(version: 1) do
+    # ApiConstraints.default should be set to true for the latest version,
+    # all other versions should not have default set to true
+    scope module: :v1, constraints: ApiConstraints.new(version: 1, default: true) do
       get '/me' => 'credentials#me'
 
       resources :users, only: [:show, :update] do

lib/api_constraints.rb

@@ -5,6 +5,6 @@ def initialize(options)
   end
 
   def matches?(req)
-    @default || req.headers['Accept'].include?("application/vnd.exercises.openstax.v#{@version}")
+    @default || req.headers['Accept'].try(:include?, "application/vnd.exercises.openstax.v#{@version}")
   end
-end
+end

spec/features/add_application_spec.rb

@@ -12,7 +12,7 @@
     login_as 'admin'
     expect(page).to have_content('Welcome, admin')
     visit '/oauth/applications'
-    expect(page).to have_content('OAuth2 Provider')
+    expect(page).to have_content('OAuth Applications')
     create_new_application
     expect(page).to have_content('Application created.')
     expect(page).to have_content('Application: example')

spec/lib/api_constraints_spec.rb

@@ -0,0 +1,69 @@
+require 'spec_helper'
+
+describe ApiConstraints do
+  context 'default is not defined' do
+    let!(:constraints) { ApiConstraints.new(version: 1) }
+    let(:req) { double('Request') }
+    it 'matches if version is correct in the accept headers' do
+      req.stub(:headers).and_return({
+        'Accept' => 'application/vnd.exercises.openstax.v1'
+      })
+      expect(constraints.matches? req).to be_true
+    end
+
+    it 'does not match if version is incorrect in the accept headers' do
+      req.stub(:headers).and_return({
+        'Accept' => 'application/vnd.exercises.openstax.v2'
+      })
+      expect(constraints.matches? req).to be_false
+    end
+
+    it 'does not match if version is not defined in the accept headers' do
+      req.stub(:headers).and_return({
+        'Accept' => '*/*',
+      })
+      expect(constraints.matches? req).to be_false
+    end
+
+    it 'does not match if accept is not in headers' do
+      req.stub(:headers).and_return({
+        'Host' => 'localhost'
+      })
+      expect(constraints.matches? req).to be_nil
+    end
+  end
+
+  context 'default is defined' do
+    let!(:default) { double('default') }
+    let!(:constraints) { ApiConstraints.new(version: 1, default: default) }
+    let(:req) { double('Request') }
+
+    it 'matches if version is correct in the accept headers' do
+      req.stub(:headers).and_return({
+        'Accept' => 'application/vnd.exercises.openstax.v1'
+      })
+      expect(constraints.matches? req).to be_true
+    end
+
+    it 'returns default if version is incorrect in the accept headers' do
+      req.stub(:headers).and_return({
+        'Accept' => 'application/vnd.exercises.openstax.v2'
+      })
+      expect(constraints.matches? req).to eq(default)
+    end
+
+    it 'returns default if version is not defined in the accept headers' do
+      req.stub(:headers).and_return({
+        'Accept' => '*/*',
+      })
+      expect(constraints.matches? req).to eq(default)
+    end
+
+    it 'returns default if accept is not in headers' do
+      req.stub(:headers).and_return({
+        'Host' => 'localhost'
+      })
+      expect(constraints.matches? req).to eq(default)
+    end
+  end
+end