doorkeeper 0.4.0 → 0.5.0

data/spec/spec_helper_integration.rb

@@ -1,21 +1,24 @@
 ENV["RAILS_ENV"] ||= 'test'
-require File.expand_path("../dummy/config/environment", __FILE__)
+DOORKEEPER_ORM = (ENV["DOORKEEPER_ORM"] || :active_record).to_sym
 
+$:.unshift File.dirname(__FILE__)
+
+require 'dummy/config/environment'
 require 'rspec/rails'
 require 'rspec/autorun'
 require 'generator_spec/test_case'
 require 'timecop'
+require 'database_cleaner'
 
-ENGINE_RAILS_ROOT = File.join(File.dirname(__FILE__), '../')
-
+puts "====> Doorkeeper.orm = #{Doorkeeper.configuration.orm.inspect}"
 puts "====> Rails version: #{Rails.version}"
 puts "====> Ruby version: #{RUBY_VERSION}"
 
-# load schema to in memory sqlite
-ActiveRecord::Migration.verbose = false
-load Rails.root + "db/schema.rb"
+require "support/orm/#{Doorkeeper.configuration.orm}"
 
-Dir[File.join(ENGINE_RAILS_ROOT, "spec/support/**/*.rb")].each { |f| require f }
+ENGINE_RAILS_ROOT = File.join(File.dirname(__FILE__), '../')
+
+Dir["#{File.dirname(__FILE__)}/support/{dependencies,helpers,shared}/*.rb"].each { |f| require f }
 
 RSpec.configure do |config|
   config.mock_with :rspec
@@ -23,6 +26,13 @@ RSpec.configure do |config|
   config.infer_base_class_for_anonymous_controllers = false
 
   config.before do
-    Doorkeeper.configure {}
+    DatabaseCleaner.start
+    Doorkeeper.configure {
+      orm DOORKEEPER_ORM
+    }
+  end
+
+  config.after do
+    DatabaseCleaner.clean
   end
 end

data/spec/support/dependencies/factory_girl.rb

@@ -1,5 +1,2 @@
 require 'factory_girl'
-
-FactoryGirl.definition_file_paths << File.join(ENGINE_RAILS_ROOT, 'spec/factories')
-
 FactoryGirl.find_definitions

data/spec/support/orm/active_record.rb

@@ -0,0 +1,11 @@
+# load schema to in memory sqlite
+ActiveRecord::Migration.verbose = false
+load Rails.root + "db/schema.rb"
+
+module Doorkeeper
+  module OrmHelper
+  	def mock_application_owner
+      mock_model 'User', :id => 1234
+  	end
+  end
+end

data/spec/support/orm/mongoid.rb

@@ -0,0 +1,26 @@
+DatabaseCleaner[:mongoid].strategy = :truncation
+DatabaseCleaner[:mongoid].clean_with :truncation
+
+RSpec.configure do |config|
+  config.before :suite do
+    Doorkeeper::Application.create_indexes
+    Doorkeeper::AccessGrant.create_indexes
+    Doorkeeper::AccessToken.create_indexes
+  end
+end
+
+module Doorkeeper
+  class PlaceholderApplicationOwner
+    include Mongoid::Document
+
+    self.store_in :placeholder_application_owners
+    has_many :applications
+
+  end
+
+  module OrmHelper
+  	def mock_application_owner
+  		PlaceholderApplicationOwner.new
+  	end
+  end
+end

data/spec/support/shared/controllers_shared_context.rb

@@ -8,7 +8,7 @@ shared_context "valid token", :token => :valid do
   end
 
   before :each do
-    Doorkeeper::AccessToken.stub(:find_by_token).with(token_string).and_return(token)
+    Doorkeeper::AccessToken.stub(:authenticate).with(token_string).and_return(token)
   end
 end
 
@@ -22,7 +22,7 @@ shared_context "invalid token", :token => :invalid do
   end
 
   before :each do
-    Doorkeeper::AccessToken.stub(:find_by_token).with(token_string).and_return(token)
+    Doorkeeper::AccessToken.stub(:authenticate).with(token_string).and_return(token)
   end
 end
 

data/spec/support/shared/models_shared_examples.rb

@@ -40,5 +40,21 @@ shared_examples "an unique token" do
     it "is generated before validation" do
       expect { subject.valid? }.to change { subject.token }.from(nil)
     end
+
+    it "is not valid if token exists" do
+      token1 = FactoryGirl.create factory_name
+      token2 = FactoryGirl.create factory_name
+      token2.token = token1.token
+      token2.should_not be_valid
+    end
+
+    it 'expects database to throw an error when tokens are the same' do
+      token1 = FactoryGirl.create factory_name
+      token2 = FactoryGirl.create factory_name
+      token2.token = token1.token
+      expect {
+        token2.save!(:validate => false)
+      }.to raise_error
+    end
   end
 end

data/spec/validators/redirect_uri_validator_spec.rb

@@ -0,0 +1,40 @@
+require 'spec_helper'
+require 'active_model'
+require 'validators/redirect_uri_validator'
+
+require 'spec_helper_integration'
+
+describe RedirectUriValidator do
+  subject do
+    FactoryGirl.create(:application)
+  end
+
+  it 'is valid when the uri is a uri' do
+    subject.redirect_uri = "http://example.com/callback"
+    subject.should be_valid
+  end
+
+  it 'is invalid when the uri is not a uri' do
+    subject.redirect_uri = ']'
+    subject.should_not be_valid
+    subject.errors[:redirect_uri].first.should == "must be a valid URI."
+  end
+
+  it 'is invalid when the uri is relative' do
+    subject.redirect_uri = "/abcd"
+    subject.should_not be_valid
+    subject.errors[:redirect_uri].first.should == "must be an absolute URI."
+  end
+
+  it 'is invalid when the uri has a fragment' do
+    subject.redirect_uri = "http://example.com/abcd#xyz"
+    subject.should_not be_valid
+    subject.errors[:redirect_uri].first.should == "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.should_not be_valid
+    subject.errors[:redirect_uri].first.should == "cannot contain a query parameter."
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: doorkeeper
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-26 00:00:00.000000000 Z
+date: 2012-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &70213938588360 !ruby/object:Gem::Requirement
+  requirement: &70141743363880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70213938588360
+  version_requirements: *70141743363880
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70213938586440 !ruby/object:Gem::Requirement
+  requirement: &70141743362900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,21 +33,21 @@ dependencies:
         version: 1.3.5
   type: :development
   prerelease: false
-  version_requirements: *70213938586440
+  version_requirements: *70141743362900
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70213938584520 !ruby/object:Gem::Requirement
+  requirement: &70141743361840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: 2.11.0
   type: :development
   prerelease: false
-  version_requirements: *70213938584520
+  version_requirements: *70141743361840
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70213938582960 !ruby/object:Gem::Requirement
+  requirement: &70141743395920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 1.1.2
   type: :development
   prerelease: false
-  version_requirements: *70213938582960
+  version_requirements: *70141743395920
 - !ruby/object:Gem::Dependency
   name: generator_spec
-  requirement: &70213938582320 !ruby/object:Gem::Requirement
+  requirement: &70141743395180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 0.8.5
   type: :development
   prerelease: false
-  version_requirements: *70213938582320
+  version_requirements: *70141743395180
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &70213938597380 !ruby/object:Gem::Requirement
+  requirement: &70141743394460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,32 +77,32 @@ dependencies:
         version: 2.6.4
   type: :development
   prerelease: false
-  version_requirements: *70213938597380
+  version_requirements: *70141743394460
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &70213938595120 !ruby/object:Gem::Requirement
+  requirement: &70141743393440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: 0.4.3
   type: :development
   prerelease: false
-  version_requirements: *70213938595120
+  version_requirements: *70141743393440
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &70213938592720 !ruby/object:Gem::Requirement
+  requirement: &70141743392060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: '0.8'
   type: :development
   prerelease: false
-  version_requirements: *70213938592720
+  version_requirements: *70141743392060
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
-  requirement: &70213938591020 !ruby/object:Gem::Requirement
+  requirement: &70141743390940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,7 +110,7 @@ dependencies:
         version: 3.0.1
   type: :development
   prerelease: false
-  version_requirements: *70213938591020
+  version_requirements: *70141743390940
 description: Doorkeeper is an OAuth 2 provider for Rails.
 email:
 - felipe@applicake.com
@@ -134,11 +134,9 @@ files:
 - app/controllers/doorkeeper/applications_controller.rb
 - app/controllers/doorkeeper/authorizations_controller.rb
 - app/controllers/doorkeeper/authorized_applications_controller.rb
+- app/controllers/doorkeeper/token_info_controller.rb
 - app/controllers/doorkeeper/tokens_controller.rb
-- app/helpers/doorkeeper/application_helper.rb
-- app/models/doorkeeper/access_grant.rb
-- app/models/doorkeeper/access_token.rb
-- app/models/doorkeeper/application.rb
+- app/validators/redirect_uri_validator.rb
 - app/views/doorkeeper/applications/_form.html.erb
 - app/views/doorkeeper/applications/edit.html.erb
 - app/views/doorkeeper/applications/index.html.erb
@@ -150,7 +148,6 @@ files:
 - app/views/layouts/doorkeeper/application.html.erb
 - config/initializers/form_errors.rb
 - config/locales/en.yml
-- config/routes.rb
 - doorkeeper.gemspec
 - gemfiles/gemfile.rails-3.1.x
 - gemfiles/gemfile.rails-3.2.x
@@ -158,7 +155,22 @@ files:
 - lib/doorkeeper/config.rb
 - lib/doorkeeper/doorkeeper_for.rb
 - lib/doorkeeper/engine.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/mongoid/access_grant.rb
+- lib/doorkeeper/models/mongoid/access_token.rb
+- lib/doorkeeper/models/mongoid/application.rb
+- lib/doorkeeper/models/mongoid/revocable.rb
+- lib/doorkeeper/models/mongoid/scopes.rb
+- lib/doorkeeper/models/ownership.rb
 - lib/doorkeeper/models/revocable.rb
 - lib/doorkeeper/models/scopes.rb
 - lib/doorkeeper/oauth/access_token_request.rb
@@ -182,26 +194,35 @@ files:
 - lib/doorkeeper/oauth/helpers/uri_checker.rb
 - lib/doorkeeper/oauth/password_access_token_request.rb
 - lib/doorkeeper/oauth/scopes.rb
+- lib/doorkeeper/oauth/token.rb
+- lib/doorkeeper/rails/routes.rb
+- lib/doorkeeper/rails/routes/mapper.rb
+- lib/doorkeeper/rails/routes/mapping.rb
 - lib/doorkeeper/validations.rb
 - lib/doorkeeper/version.rb
+- lib/generators/doorkeeper/application_owner_generator.rb
 - lib/generators/doorkeeper/install_generator.rb
+- lib/generators/doorkeeper/migration_generator.rb
 - lib/generators/doorkeeper/templates/README
+- lib/generators/doorkeeper/templates/add_owner_to_application_migration.rb
 - lib/generators/doorkeeper/templates/initializer.rb
 - lib/generators/doorkeeper/templates/migration.rb
 - lib/generators/doorkeeper/views_generator.rb
-- lib/tasks/doorkeeper_tasks.rake
 - script/rails
 - script/run_all
 - spec/controllers/applications_controller_spec.rb
 - spec/controllers/authorizations_controller_spec.rb
 - spec/controllers/protected_resources_controller_spec.rb
+- spec/controllers/token_info_controller_spec.rb
 - spec/controllers/tokens_controller_spec.rb
 - spec/dummy/Rakefile
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/application_controller.rb
+- spec/dummy/app/controllers/custom_authorizations_controller.rb
 - spec/dummy/app/controllers/full_protected_resources_controller.rb
 - spec/dummy/app/controllers/home_controller.rb
+- spec/dummy/app/controllers/metal_controller.rb
 - spec/dummy/app/controllers/semi_protected_resources_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/models/user.rb
@@ -221,6 +242,7 @@ files:
 - spec/dummy/config/initializers/session_store.rb
 - spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/locales/doorkeeper.en.yml
+- spec/dummy/config/mongoid.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/db/migrate/20111122132257_create_users.rb
 - spec/dummy/db/migrate/20120312140401_add_password_to_users.rb
@@ -234,7 +256,9 @@ files:
 - spec/factories/access_grant.rb
 - spec/factories/access_token.rb
 - spec/factories/application.rb
+- spec/generators/application_owner_generator_spec.rb
 - spec/generators/install_generator_spec.rb
+- spec/generators/migration_generator_spec.rb
 - spec/generators/templates/routes.rb
 - spec/generators/views_generator_spec.rb
 - spec/lib/config_spec.rb
@@ -260,6 +284,7 @@ files:
 - spec/lib/oauth/helpers/uri_checker_spec.rb
 - spec/lib/oauth/password_access_token_request_spec.rb
 - spec/lib/oauth/scopes_spec.rb
+- spec/lib/oauth/token_spec.rb
 - spec/models/doorkeeper/access_grant_spec.rb
 - spec/models/doorkeeper/access_token_spec.rb
 - spec/models/doorkeeper/application_spec.rb
@@ -275,10 +300,12 @@ files:
 - spec/requests/flows/password_spec.rb
 - spec/requests/flows/refresh_token_spec.rb
 - spec/requests/flows/skip_authorization_spec.rb
+- spec/requests/protected_resources/metal_spec.rb
 - spec/requests/protected_resources/private_api_spec.rb
+- spec/routing/custom_controller_routes_spec.rb
+- spec/routing/default_routes_spec.rb
 - spec/spec_helper.rb
 - spec/spec_helper_integration.rb
-- spec/support/dependencies/database_cleaner.rb
 - spec/support/dependencies/factory_girl.rb
 - spec/support/helpers/access_token_request_helper.rb
 - spec/support/helpers/authorization_request_helper.rb
@@ -286,8 +313,11 @@ files:
 - spec/support/helpers/model_helper.rb
 - spec/support/helpers/request_spec_helper.rb
 - spec/support/helpers/url_helper.rb
+- spec/support/orm/active_record.rb
+- spec/support/orm/mongoid.rb
 - spec/support/shared/controllers_shared_context.rb
 - spec/support/shared/models_shared_examples.rb
+- spec/validators/redirect_uri_validator_spec.rb
 homepage: https://github.com/applicake/doorkeeper
 licenses: []
 post_install_message: 
@@ -302,7 +332,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -318783597431461187
+      hash: -1887190500184471372
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -311,7 +341,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -318783597431461187
+      hash: -1887190500184471372
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.12

data/app/helpers/doorkeeper/application_helper.rb

@@ -1,4 +0,0 @@
-module Doorkeeper
-  module ApplicationHelper
-  end
-end

data/app/models/doorkeeper/application.rb

@@ -1,54 +0,0 @@
-module Doorkeeper
-  class Application < ActiveRecord::Base
-    include Doorkeeper::OAuth::Helpers
-
-    self.table_name = :oauth_applications
-
-    has_many :access_grants, :dependent => :destroy
-    has_many :access_tokens, :dependent => :destroy
-    has_many :authorized_tokens, :class_name => "AccessToken", :conditions => { :revoked_at => nil }
-    has_many :authorized_applications, :through => :authorized_tokens, :source => :application
-
-    validates :name, :secret, :redirect_uri, :presence => true
-    validates :uid, :presence => true, :uniqueness => true
-    validate :validate_redirect_uri
-
-    before_validation :generate_uid, :generate_secret, :on => :create
-
-    attr_accessible :name, :redirect_uri
-
-    def self.authenticate(uid, secret)
-      find_by_uid_and_secret(uid, secret)
-    end
-
-    def self.column_names_with_table
-      self.column_names.map { |c| "oauth_applications.#{c}" }
-    end
-
-    def self.authorized_for(resource_owner)
-      joins(:authorized_applications).
-        where(:oauth_access_tokens => { :resource_owner_id => resource_owner.id }).
-        group(column_names_with_table.join(','))
-    end
-
-    def validate_redirect_uri
-      return unless redirect_uri
-      uri = URI.parse(redirect_uri)
-      errors.add(:redirect_uri, "cannot contain a fragment.") unless uri.fragment.nil?
-      errors.add(:redirect_uri, "must be an absolute URL.") if uri.scheme.nil? || uri.host.nil?
-      errors.add(:redirect_uri, "cannot contain a query parameter.") unless uri.query.nil?
-    rescue URI::InvalidURIError => e
-      errors.add(:redirect_uri, "must be a valid URI.")
-    end
-
-    private
-
-    def generate_uid
-      self.uid = UniqueToken.generate_for :uid, self.class
-    end
-
-    def generate_secret
-      self.secret = UniqueToken.generate_for :secret, self.class
-    end
-  end
-end

data/config/routes.rb

@@ -1,9 +0,0 @@
-Doorkeeper::Engine.routes.draw do
-  get    'authorize', :to => "authorizations#new",     :as => :authorization
-  post   'authorize', :to => "authorizations#create",  :as => :authorization
-  delete 'authorize', :to => "authorizations#destroy", :as => :authorization
-  post   'token',     :to => "tokens#create",          :as => :token
-
-  resources :applications
-  resources :authorized_applications, :only => [:index, :destroy]
-end

data/lib/tasks/doorkeeper_tasks.rake

@@ -1,4 +0,0 @@
-# desc "Explaining what the task does"
-# task :doorkeeper do
-#   # Task goes here
-# end

data/spec/support/dependencies/database_cleaner.rb

@@ -1,16 +0,0 @@
-require "database_cleaner"
-
-RSpec.configure do |config|
-  config.before(:suite) do
-    DatabaseCleaner.strategy = :transaction
-    DatabaseCleaner.clean_with(:truncation)
-  end
-
-  config.before(:each) do
-    DatabaseCleaner.start
-  end
-
-  config.after(:each) do
-    DatabaseCleaner.clean
-  end
-end