doorkeeper 1.4.1 → 2.0.0

data/spec/lib/config_spec.rb

@@ -14,6 +14,22 @@ describe Doorkeeper, 'configuration' do
     end
   end
 
+  describe 'enable_orm' do
+    it 'adds specific error message to NameError exception' do
+      expect do
+        Doorkeeper.configure { orm 'hibernate' }
+      end.to raise_error(NameError, /ORM adapter not found \(hibernate\)/)
+    end
+
+    it 'does not change other exceptions' do
+      String.any_instance.stub(:classify) { raise NoMethodError }
+
+      expect do
+        Doorkeeper.configure { orm 'hibernate' }
+      end.to raise_error(NoMethodError, 'NoMethodError')
+    end
+  end
+
   describe 'admin_authenticator' do
     it 'sets the block that is accessible via authenticate_admin' do
       block = proc {}
@@ -119,6 +135,20 @@ describe Doorkeeper, 'configuration' do
     end
   end
 
+  describe 'force_ssl_in_redirect_uri' do
+    it 'is true by default in non-development environments' do
+      expect(subject.force_ssl_in_redirect_uri).to be_truthy
+    end
+
+    it 'can change the value' do
+      Doorkeeper.configure do
+        orm DOORKEEPER_ORM
+        force_ssl_in_redirect_uri(false)
+      end
+      expect(subject.force_ssl_in_redirect_uri).to be_falsey
+    end
+  end
+
   describe 'access_token_credentials' do
     it 'has defaults order' do
       expect(subject.access_token_methods).to eq([:from_bearer_authorization, :from_access_token_param, :from_bearer_param])
@@ -264,16 +294,6 @@ describe Doorkeeper, 'configuration' do
     end
   end
 
-  describe 'test_redirect_uri' do
-    it 'can change the native_redirect_uri value' do
-      Doorkeeper.configure do
-        orm DOORKEEPER_ORM
-        test_redirect_uri 'foo'
-      end
-      expect(subject.native_redirect_uri).to eq('foo')
-    end
-  end
-
   it 'raises an exception when configuration is not set' do
     old_config = Doorkeeper.configuration
     Doorkeeper.module_eval do

data/spec/lib/models/expirable_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'timecop'
 require 'active_support/time'
-require 'doorkeeper/models/expirable'
+require 'doorkeeper/models/concerns/expirable'
 
 describe 'Expirable' do
   subject do

data/spec/lib/models/revocable_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 require 'active_support/core_ext/object/blank'
-require 'doorkeeper/models/revocable'
+require 'doorkeeper/models/concerns/revocable'
 
 describe 'Revocable' do
   subject do
@@ -18,11 +18,16 @@ describe 'Revocable' do
   end
 
   describe :revoked? do
-    it 'is revoked if :revoked_at is set' do
-      allow(subject).to receive(:revoked_at).and_return(double)
+    it 'is revoked if :revoked_at has passed' do
+      allow(subject).to receive(:revoked_at).and_return(DateTime.now - 1000)
       expect(subject).to be_revoked
     end
 
+    it 'is not revoked if :revoked_at has not passed' do
+      allow(subject).to receive(:revoked_at).and_return(DateTime.now + 1000)
+      expect(subject).not_to be_revoked
+    end
+
     it 'is not revoked if :revoked_at is not set' do
       allow(subject).to receive(:revoked_at).and_return(nil)
       expect(subject).not_to be_revoked

data/spec/lib/models/scopes_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 require 'active_support/core_ext/module/delegation'
 require 'active_support/core_ext/object/blank'
 require 'doorkeeper/oauth/scopes'
-require 'doorkeeper/models/scopes'
+require 'doorkeeper/models/concerns/scopes'
 
 describe 'Doorkeeper::Models::Scopes' do
   subject do
@@ -33,11 +33,11 @@ describe 'Doorkeeper::Models::Scopes' do
 
   describe :includes_scope? do
     it 'should return true if at least one scope is included' do
-      expect(subject.includes_scope?(['public', 'private'])).to be true
+      expect(subject.includes_scope?('public', 'private')).to be true
     end
 
     it 'should return false if no scopes are included' do
-      expect(subject.includes_scope?(['teacher', 'student'])).to be false
+      expect(subject.includes_scope?('teacher', 'student')).to be false
     end
   end
 end

data/spec/lib/oauth/client_spec.rb

@@ -28,7 +28,7 @@ module Doorkeeper::OAuth
         expect(Client.authenticate(credentials, authenticator)).to be_a(Client)
       end
 
-      it 'retunrs nil if client was not authenticated' do
+      it 'returns nil if client was not authenticated' do
         credentials = Client::Credentials.new('some-uid', 'some-secret')
         authenticator = double
         expect(authenticator).to receive(:call).with('some-uid', 'some-secret').and_return(nil)

data/spec/lib/oauth/password_access_token_request_spec.rb

@@ -36,7 +36,7 @@ module Doorkeeper::OAuth
     it 'requires the owner' do
       subject.resource_owner = nil
       subject.validate
-      expect(subject.error).to eq(:invalid_resource_owner)
+      expect(subject.error).to eq(:invalid_grant)
     end
 
     it 'optionally accepts the client' do

data/spec/lib/oauth/pre_authorization_spec.rb

@@ -5,11 +5,19 @@ module Doorkeeper::OAuth
     let(:server) {
       server = Doorkeeper.configuration
       server.stub(:default_scopes) { Scopes.new }
-      server.stub(:scopes) { Scopes.from_string('public') }
+      server.stub(:scopes) { Scopes.from_string('public profile') }
       server
     }
 
-    let(:client) { double :client, redirect_uri: 'http://tst.com/auth' }
+    let(:application) do
+      application = double :application
+      application.stub(:scopes) { Scopes.from_string('') }
+      application
+    end
+
+    let(:client) do
+      double :client, redirect_uri: 'http://tst.com/auth', application: application
+    end
 
     let :attributes do
       {
@@ -71,9 +79,39 @@ module Doorkeeper::OAuth
       end
     end
 
-    it 'accepts valid scopes' do
-      subject.scope = 'public'
-      expect(subject).to be_authorizable
+    context 'client application does not restrict valid scopes' do
+      it 'accepts valid scopes' do
+        subject.scope = 'public'
+        expect(subject).to be_authorizable
+      end
+
+      it 'rejects (globally) non-valid scopes' do
+        subject.scope = 'invalid'
+        expect(subject).not_to be_authorizable
+      end
+    end
+
+    context 'client application restricts valid scopes' do
+      let(:application) do
+        application = double :application
+        application.stub(:scopes) { Scopes.from_string('public nonsense') }
+        application
+      end
+
+      it 'accepts valid scopes' do
+        subject.scope = 'public'
+        expect(subject).to be_authorizable
+      end
+
+      it 'rejects (globally) non-valid scopes' do
+        subject.scope = 'invalid'
+        expect(subject).not_to be_authorizable
+      end
+
+      it 'rejects (application level) non-valid scopes' do
+        subject.scope = 'profile'
+        expect(subject).to_not be_authorizable
+      end
     end
 
     it 'uses default scopes when none is required' do
@@ -112,9 +150,5 @@ module Doorkeeper::OAuth
       expect(subject).not_to be_authorizable
     end
 
-    it 'rejects non-valid scopes' do
-      subject.scope = 'invalid'
-      expect(subject).not_to be_authorizable
-    end
   end
 end

data/spec/lib/oauth/token_request_spec.rb

@@ -8,7 +8,7 @@ module Doorkeeper::OAuth
         client: double(:application, id: 9990),
         redirect_uri: 'http://tst.com/cb',
         state: nil,
-        scopes: nil,
+        scopes: Scopes.from_string('public'),
         error: nil,
         authorizable?: true
       )
@@ -43,5 +43,32 @@ module Doorkeeper::OAuth
       allow(pre_auth).to receive(:authorizable?).and_return(false)
       expect(subject.authorize).to be_a(ErrorResponse)
     end
+
+    context 'token reuse' do
+      it 'creates a new token if there are no matching tokens' do
+        Doorkeeper.configuration.stub(:reuse_access_token).and_return(true)
+        expect do
+          subject.authorize
+        end.to change { Doorkeeper::AccessToken.count }.by(1)
+      end
+
+      it 'creates a new token if scopes do not match' do
+        Doorkeeper.configuration.stub(:reuse_access_token).and_return(true)
+        FactoryGirl.create(:access_token, application_id: pre_auth.client.id,
+                           resource_owner_id: owner.id, scopes: '')
+        expect do
+          subject.authorize
+        end.to change { Doorkeeper::AccessToken.count }.by(1)
+      end
+
+      it 'skips token creation if there is a matching one' do
+        Doorkeeper.configuration.stub(:reuse_access_token).and_return(true)
+        FactoryGirl.create(:access_token, application_id: pre_auth.client.id,
+                           resource_owner_id: owner.id, scopes: 'public')
+        expect do
+          subject.authorize
+        end.to_not change { Doorkeeper::AccessToken.count }
+      end
+    end
   end
 end

data/spec/lib/oauth/token_spec.rb

@@ -88,7 +88,7 @@ module Doorkeeper
 
         it 'calls the finder if token was found' do
           token = ->(r) { 'token' }
-          expect(AccessToken).to receive(:authenticate).with('token')
+          expect(AccessToken).to receive(:by_token).with('token')
           Token.authenticate double, token
         end
       end

data/spec/models/doorkeeper/application_spec.rb

@@ -169,9 +169,24 @@ module Doorkeeper
     describe :authenticate do
       it 'finds the application via uid/secret' do
         app = FactoryGirl.create :application
-        authenticated = Application.authenticate(app.uid, app.secret)
+        authenticated = Application.by_uid_and_secret(app.uid, app.secret)
         expect(authenticated).to eq(app)
       end
     end
+
+    if Doorkeeper.configuration.orm == :active_record
+      describe :scopes do
+        it 'fails on missing column with an upgrade notice' do
+          app = FactoryGirl.build :application
+          no_scopes_app = double(attributes: [])
+          allow(Application).to receive(:new).and_return(no_scopes_app)
+
+          expect { app.scopes }.to raise_error(
+            NameError,
+            /Missing column: `applications.scopes`/
+          )
+        end
+      end
+    end
   end
 end

data/spec/requests/applications/applications_request_spec.rb

@@ -7,8 +7,10 @@ feature 'Adding applications' do
     end
 
     scenario 'adding a valid app' do
-      fill_in 'application_name', with: 'My Application'
-      fill_in 'application_redirect_uri', with: 'http://example.com'
+      fill_in 'doorkeeper_application[name]', with: 'My Application'
+      fill_in 'doorkeeper_application[redirect_uri]',
+              with: 'https://example.com'
+
       click_button 'Submit'
       i_should_see 'Application created'
       i_should_see 'My Application'
@@ -55,7 +57,7 @@ feature 'Edit application' do
   end
 
   scenario 'updating a valid app' do
-    fill_in 'application[name]', with: 'Serious app'
+    fill_in 'doorkeeper_application[name]', with: 'Serious app'
     click_button 'Submit'
     i_should_see 'Application updated'
     i_should_see 'Serious app'
@@ -63,7 +65,7 @@ feature 'Edit application' do
   end
 
   scenario 'updating an invalid app' do
-    fill_in 'application[name]', with: ''
+    fill_in 'doorkeeper_application[name]', with: ''
     click_button 'Submit'
     i_should_see 'Whoops! Check your form for possible errors'
   end

data/spec/requests/flows/implicit_grant_spec.rb

@@ -16,4 +16,36 @@ feature 'Implicit Grant Flow' do
 
     i_should_be_on_client_callback @client
   end
+
+  context 'token reuse' do
+    scenario 'should return a new token each request' do
+      Doorkeeper.configuration.stub(:reuse_access_token).and_return(false)
+
+      token = client_is_authorized(@client, @resource_owner)
+
+      post "/oauth/authorize",
+           client_id: @client.uid,
+           state: '',
+           redirect_uri: @client.redirect_uri,
+           response_type: 'token',
+           commit: 'Authorize'
+
+      expect(response.location).not_to include(token.token)
+    end
+
+    scenario 'should return the same token if it is still accessible' do
+      Doorkeeper.configuration.stub(:reuse_access_token).and_return(true)
+
+      token = client_is_authorized(@client, @resource_owner)
+
+      post "/oauth/authorize",
+           client_id: @client.uid,
+           state: '',
+           redirect_uri: @client.redirect_uri,
+           response_type: 'token',
+           commit: 'Authorize'
+
+      expect(response.location).to include(token.token)
+    end
+  end
 end

data/spec/requests/flows/refresh_token_spec.rb

@@ -74,15 +74,24 @@ feature 'Refresh Token Flow' do
       # enable password auth to simulate other devices
       config_is_set(:resource_owner_from_credentials) { User.authenticate! params[:username], params[:password] }
       create_resource_owner
+      _another_token = post password_token_endpoint_url(client: @client, resource_owner: @resource_owner)
+      last_token.update_attribute :created_at, 5.seconds.ago
+
       @token = FactoryGirl.create(:access_token, application: @client, resource_owner_id: @resource_owner.id, use_refresh_token: true)
+      @token.update_attribute :expires_in, -100
     end
 
     scenario 'client request a token after creating another token with the same user' do
-      @token.update_attribute :expires_in, -100
-      post password_token_endpoint_url(client: @client, resource_owner: @resource_owner)
       post refresh_token_endpoint_url(client: @client, refresh_token: @token.refresh_token)
-      should_have_json 'refresh_token', Doorkeeper::AccessToken.last.refresh_token
+
+      should_have_json 'refresh_token', last_token.refresh_token
       expect(@token.reload).to be_revoked
     end
+
+    def last_token
+      Doorkeeper::AccessToken.last_authorized_token_for(
+        @client.id, @resource_owner.id
+      )
+    end
   end
 end

data/spec/spec_helper_integration.rb

@@ -1,8 +1,10 @@
 ENV['RAILS_ENV'] ||= 'test'
-DOORKEEPER_ORM = (ENV['orm'] || :active_record).to_sym
 TABLE_NAME_PREFIX = ENV['table_name_prefix'] || nil
 TABLE_NAME_SUFFIX = ENV['table_name_suffix'] || nil
 
+orm = ENV['BUNDLE_GEMFILE'].match(/Gemfile\.(.+)\.rb/)
+DOORKEEPER_ORM = (orm && orm[1] || :active_record).to_sym
+
 $LOAD_PATH.unshift File.dirname(__FILE__)
 
 require 'capybara/rspec'
@@ -22,7 +24,11 @@ end
 Rails.logger.info "====> Rails version: #{Rails.version}"
 Rails.logger.info "====> Ruby version: #{RUBY_VERSION}"
 
-require "support/orm/#{Doorkeeper.configuration.orm_name}"
+if [:mongoid2, :mongoid3, :mongoid4].include?(DOORKEEPER_ORM)
+  require "support/orm/mongoid"
+else
+  require "support/orm/#{DOORKEEPER_ORM}"
+end
 
 ENGINE_RAILS_ROOT = File.join(File.dirname(__FILE__), '../')
 

data/spec/support/shared/controllers_shared_context.rb

@@ -8,7 +8,7 @@ shared_context 'valid token', token: :valid do
   end
 
   before :each do
-    allow(Doorkeeper::AccessToken).to receive(:authenticate).with(token_string).and_return(token)
+    allow(Doorkeeper::AccessToken).to receive(:by_token).with(token_string).and_return(token)
   end
 end
 
@@ -22,7 +22,7 @@ shared_context 'invalid token', token: :invalid do
   end
 
   before :each do
-    allow(Doorkeeper::AccessToken).to receive(:authenticate).with(token_string).and_return(token)
+    allow(Doorkeeper::AccessToken).to receive(:by_token).with(token_string).and_return(token)
   end
 end
 

data/spec/validators/redirect_uri_validator_spec.rb

@@ -6,7 +6,7 @@ describe RedirectUriValidator do
   end
 
   it 'is valid when the uri is a uri' do
-    subject.redirect_uri = 'http://example.com/callback'
+    subject.redirect_uri = 'https://example.com/callback'
     expect(subject).to be_valid
   end
 
@@ -34,13 +34,40 @@ describe RedirectUriValidator do
   end
 
   it 'is invalid when the uri has a fragment' do
-    subject.redirect_uri = 'http://example.com/abcd#xyz'
+    subject.redirect_uri = 'https://example.com/abcd#xyz'
     expect(subject).not_to be_valid
     expect(subject.errors[:redirect_uri].first).to eq('cannot contain a fragment.')
   end
 
   it 'is invalid when the uri has a query parameter' do
-    subject.redirect_uri = 'http://example.com/abcd?xyz=123'
+    subject.redirect_uri = 'https://example.com/abcd?xyz=123'
     expect(subject).to be_valid
   end
+
+  context 'force secured uri' do
+    it 'accepts an valid uri' do
+      subject.redirect_uri = 'https://example.com/callback'
+      expect(subject).to be_valid
+    end
+
+    it 'accepts native redirect uri' do
+      subject.redirect_uri = 'urn:ietf:wg:oauth:2.0:oob'
+      expect(subject).to be_valid
+    end
+
+    it 'accepts a non secured protocol when disabled' do
+      subject.redirect_uri = 'http://example.com/callback'
+      allow(Doorkeeper.configuration).to receive(
+                                             :force_ssl_in_redirect_uri
+                                         ).and_return(false)
+      expect(subject).to be_valid
+    end
+
+    it 'invalidates the uri when the uri does not use a secure protocol' do
+      subject.redirect_uri = 'http://example.com/callback'
+      expect(subject).not_to be_valid
+      error = subject.errors[:redirect_uri].first
+      expect(error).to eq('must be an HTTPS/SSL URI.')
+    end
+  end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: doorkeeper
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Felipe Elias Philipp
-- Piotr Jakubowski
+- Tute Costa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-17 00:00:00.000000000 Z
+date: 2014-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -87,14 +87,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.4.0
+        version: 4.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.4.0
+        version: 4.5.0
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -167,8 +167,7 @@ dependencies:
         version: 0.10.0
 description: Doorkeeper is an OAuth 2 provider for Rails.
 email:
-- felipe@applicake.com
-- piotr.jakubowski@applicake.com
+- tutecosta@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -178,6 +177,7 @@ files:
 - ".rspec"
 - ".travis.yml"
 - CHANGELOG.md
+- CONTRIBUTING.md
 - Gemfile
 - MIT-LICENSE
 - README.md
@@ -191,7 +191,7 @@ files:
 - app/controllers/doorkeeper/authorized_applications_controller.rb
 - app/controllers/doorkeeper/token_info_controller.rb
 - app/controllers/doorkeeper/tokens_controller.rb
-- app/helpers/doorkeeper/form_errors_helper.rb
+- app/helpers/doorkeeper/dashboard_helper.rb
 - app/validators/redirect_uri_validator.rb
 - app/views/doorkeeper/applications/_delete_form.html.erb
 - app/views/doorkeeper/applications/_form.html.erb
@@ -208,35 +208,26 @@ files:
 - app/views/layouts/doorkeeper/application.html.erb
 - config/locales/en.yml
 - doorkeeper.gemspec
+- gemfiles/Gemfile.common.rb
+- gemfiles/Gemfile.mongo_mapper.rb
+- gemfiles/Gemfile.mongoid2.rb
+- gemfiles/Gemfile.mongoid3.rb
+- gemfiles/Gemfile.mongoid4.rb
 - lib/doorkeeper.rb
 - lib/doorkeeper/config.rb
-- lib/doorkeeper/doorkeeper_for.rb
 - lib/doorkeeper/engine.rb
 - lib/doorkeeper/errors.rb
+- lib/doorkeeper/generators/doorkeeper/mongo_mapper/indexes_generator.rb
+- lib/doorkeeper/generators/doorkeeper/mongo_mapper/templates/indexes.rb
 - lib/doorkeeper/helpers/controller.rb
-- lib/doorkeeper/helpers/filter.rb
-- lib/doorkeeper/models/access_grant.rb
-- lib/doorkeeper/models/access_token.rb
-- lib/doorkeeper/models/accessible.rb
-- lib/doorkeeper/models/active_record/access_grant.rb
-- lib/doorkeeper/models/active_record/access_token.rb
-- lib/doorkeeper/models/active_record/application.rb
-- lib/doorkeeper/models/application.rb
-- lib/doorkeeper/models/expirable.rb
-- lib/doorkeeper/models/mongo_mapper/access_grant.rb
-- lib/doorkeeper/models/mongo_mapper/access_token.rb
-- lib/doorkeeper/models/mongo_mapper/application.rb
-- lib/doorkeeper/models/mongoid/scopes.rb
-- lib/doorkeeper/models/mongoid/version.rb
-- lib/doorkeeper/models/mongoid2/access_grant.rb
-- lib/doorkeeper/models/mongoid2/access_token.rb
-- lib/doorkeeper/models/mongoid2/application.rb
-- lib/doorkeeper/models/mongoid3_4/access_grant.rb
-- lib/doorkeeper/models/mongoid3_4/access_token.rb
-- lib/doorkeeper/models/mongoid3_4/application.rb
-- lib/doorkeeper/models/ownership.rb
-- lib/doorkeeper/models/revocable.rb
-- lib/doorkeeper/models/scopes.rb
+- lib/doorkeeper/models/access_grant_mixin.rb
+- lib/doorkeeper/models/access_token_mixin.rb
+- lib/doorkeeper/models/application_mixin.rb
+- lib/doorkeeper/models/concerns/accessible.rb
+- lib/doorkeeper/models/concerns/expirable.rb
+- lib/doorkeeper/models/concerns/ownership.rb
+- lib/doorkeeper/models/concerns/revocable.rb
+- lib/doorkeeper/models/concerns/scopes.rb
 - lib/doorkeeper/oauth/authorization/code.rb
 - lib/doorkeeper/oauth/authorization/token.rb
 - lib/doorkeeper/oauth/authorization/uri_builder.rb
@@ -265,6 +256,30 @@ files:
 - lib/doorkeeper/oauth/token.rb
 - lib/doorkeeper/oauth/token_request.rb
 - lib/doorkeeper/oauth/token_response.rb
+- lib/doorkeeper/orm/active_record.rb
+- lib/doorkeeper/orm/active_record/access_grant.rb
+- lib/doorkeeper/orm/active_record/access_token.rb
+- lib/doorkeeper/orm/active_record/application.rb
+- lib/doorkeeper/orm/mongo_mapper.rb
+- lib/doorkeeper/orm/mongo_mapper/access_grant.rb
+- lib/doorkeeper/orm/mongo_mapper/access_token.rb
+- lib/doorkeeper/orm/mongo_mapper/application.rb
+- lib/doorkeeper/orm/mongoid2.rb
+- lib/doorkeeper/orm/mongoid2/access_grant.rb
+- lib/doorkeeper/orm/mongoid2/access_token.rb
+- lib/doorkeeper/orm/mongoid2/application.rb
+- lib/doorkeeper/orm/mongoid2/concerns/scopes.rb
+- lib/doorkeeper/orm/mongoid3.rb
+- lib/doorkeeper/orm/mongoid3/access_grant.rb
+- lib/doorkeeper/orm/mongoid3/access_token.rb
+- lib/doorkeeper/orm/mongoid3/application.rb
+- lib/doorkeeper/orm/mongoid3/concerns/scopes.rb
+- lib/doorkeeper/orm/mongoid4.rb
+- lib/doorkeeper/orm/mongoid4/access_grant.rb
+- lib/doorkeeper/orm/mongoid4/access_token.rb
+- lib/doorkeeper/orm/mongoid4/application.rb
+- lib/doorkeeper/orm/mongoid4/concerns/scopes.rb
+- lib/doorkeeper/rails/helpers.rb
 - lib/doorkeeper/rails/routes.rb
 - lib/doorkeeper/rails/routes/mapper.rb
 - lib/doorkeeper/rails/routes/mapping.rb
@@ -279,17 +294,15 @@ files:
 - lib/doorkeeper/validations.rb
 - lib/doorkeeper/version.rb
 - lib/generators/doorkeeper/application_owner_generator.rb
+- lib/generators/doorkeeper/application_scopes_generator.rb
 - lib/generators/doorkeeper/install_generator.rb
 - lib/generators/doorkeeper/migration_generator.rb
-- lib/generators/doorkeeper/mongo_mapper/indexes_generator.rb
 - lib/generators/doorkeeper/templates/README
 - lib/generators/doorkeeper/templates/add_owner_to_application_migration.rb
-- lib/generators/doorkeeper/templates/indexes.rb
+- lib/generators/doorkeeper/templates/add_scopes_to_oauth_applications.rb
 - lib/generators/doorkeeper/templates/initializer.rb
 - lib/generators/doorkeeper/templates/migration.rb
 - lib/generators/doorkeeper/views_generator.rb
-- script/rails
-- script/run_all
 - spec/controllers/applications_controller_spec.rb
 - spec/controllers/authorizations_controller_spec.rb
 - spec/controllers/protected_resources_controller_spec.rb
@@ -325,19 +338,19 @@ files:
 - spec/dummy/config/mongoid3.yml
 - spec/dummy/config/mongoid4.yml
 - spec/dummy/config/routes.rb
+- spec/dummy/db/development.sqlite3
 - spec/dummy/db/migrate/20111122132257_create_users.rb
 - spec/dummy/db/migrate/20120312140401_add_password_to_users.rb
 - spec/dummy/db/migrate/20130902165751_create_doorkeeper_tables.rb
 - spec/dummy/db/migrate/20130902175349_add_owner_to_application.rb
+- spec/dummy/db/migrate/20141209001746_add_scopes_to_oauth_applications.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
 - spec/dummy/script/rails
-- spec/factories/access_grant.rb
-- spec/factories/access_token.rb
-- spec/factories/application.rb
+- spec/factories.rb
 - spec/generators/application_owner_generator_spec.rb
 - spec/generators/install_generator_spec.rb
 - spec/generators/migration_generator_spec.rb