doorkeeper 2.2.2 → 3.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d6335a06e80f4b3c0deaf0df17f7179c454024e
-  data.tar.gz: f0fcb5b41952e00cb778207346bbd3fa60ae837a
+  metadata.gz: 8450a1e6cc7b4a4b841532e3886687149b4d9200
+  data.tar.gz: 9d80327b747a96da75785cc32d208cbc829b6131
 SHA512:
-  metadata.gz: 10eb65f7b258c5408c176f5fc7c4f348ddb66a27f5254ab7aeab0f166766f4fcbf5a804b411093add7d62d38f7861493d205893937932a2beed4b573a8263922
-  data.tar.gz: 0e2a01becb02cee6f520e1c180d234e8bc1262d67330239cb5034ebe6ff89442daa44cc45201895eb4d92689f7e3e0823874d8723247593eca179d3c45b67131
+  metadata.gz: 9a23772dc01acb6827089ea7349c4492d08437d57dd5deb3318f1254505f97658a9b4db5276d5dbf033b8f8e99cc281b59c354e4166fffd85b52bbee9a7491c0
+  data.tar.gz: 749700263b4e424910c5713f923fd82b69737a87d69d472e852f1b6a1bacf330ecef4bd53f94cdae4a153aef371e6a04e2de02ee4a42e436eb61cd4052913365

data/.travis.yml

@@ -12,30 +12,7 @@ env:
   - rails=4.1.0
   - rails=4.2.0
 
-gemfile:
-  - Gemfile
-  - gemfiles/Gemfile.mongoid2.rb
-  - gemfiles/Gemfile.mongoid3.rb
-  - gemfiles/Gemfile.mongoid4.rb
-  - gemfiles/Gemfile.mongo_mapper.rb
-
-services:
-  - mongodb
-
 matrix:
   exclude:
     - env: rails=3.2.0
       rvm: 2.2
-
-    - gemfile: gemfiles/Gemfile.mongoid2.rb
-      env: rails=4.1.0
-    - gemfile: gemfiles/Gemfile.mongoid2.rb
-      env: rails=4.2.0
-
-    - gemfile: gemfiles/Gemfile.mongoid3.rb
-      env: rails=4.1.0
-    - gemfile: gemfiles/Gemfile.mongoid3.rb
-      env: rails=4.2.0
-
-    - gemfile: gemfiles/Gemfile.mongoid4.rb
-      env: rails=3.2.0

data/NEWS.md

@@ -4,17 +4,25 @@ User-visible changes worth mentioning.
 
 ---
 
-## 2.2.2
-
-- [#654] Fixed `check_requirements` not to abort when ActiveRecord
-    `oauth_applications` table does not have the `scopes` column.
-    (Issue #653)
-- [#599] Included MassAssignmentSecurity in mixins if
-    ::ProtectedAttributes is defined.
-- [#650] Only fallback i18n when it is not set.
+## 3.0.0 (rc1)
+
+### Backward incompatible changes
+
+- [#648] Extracts mongodb ORMs to
+  https://github.com/doorkeeper-gem/doorkeeper-mongodb. If you use ActiveRecord
+  you don’t need to do any change, otherwise you will need to install the new
+  plugin.
+
+### Removed deprecations
+
+- Removes `doorkeeper_for` deprecation notice.
+- Remove `applications.scopes` upgrade notice.
+
+
+## 2.2.2 (unreleased)
+
 - [#541] Fixed `undefined method attr_accessible` problem on Rails 4
     (happens only when ProtectedAttributes gem is used) in #599
-- [#689] Allow scopes to me resetted to empty in Mongoid
 
 ## 2.2.1
 

data/README.md

@@ -19,13 +19,10 @@ https://github.com/doorkeeper-gem/doorkeeper/releases.
 ## Table of Contents
 
 - [Useful links](#useful-links)
-- [Requirements](#requirements)
 - [Installation](#installation)
 - [Configuration](#configuration)
     - [Active Record](#active-record)
-    - [Mongoid / MongoMapper](#mongoid--mongomapper)
-        - [Mongoid indexes](#mongoid-indexes)
-        - [MongoMapper indexes](#mongomapper-indexes)
+    - [Other ORMs](#other-orms)
     - [Routes](#routes)
     - [Authenticating](#authenticating)
     - [Internationalization (I18n)](#internationalization-i18n)
@@ -55,12 +52,6 @@ https://github.com/doorkeeper-gem/doorkeeper/releases.
 - For documentation, please check out our [wiki](https://github.com/doorkeeper-gem/doorkeeper/wiki)
 - For general questions, please post it in [stack overflow](http://stackoverflow.com/questions/tagged/doorkeeper)
 
-## Requirements
-
-- Ruby >= 2.0.0
-- Rails >= 3.2
-- ORM ActiveRecord, Mongoid, MongoMapper
-
 ## Installation
 
 Put this in your Gemfile:
@@ -88,29 +79,12 @@ Don't forget to run the migration with:
 
     rake db:migrate
 
-### Mongoid / MongoMapper
-
-Doorkeeper currently supports MongoMapper, Mongoid 2 and 3. To start using it,
-you have to set the `orm` configuration:
-
-``` ruby
-Doorkeeper.configure do
-  orm :mongoid2 # or :mongoid3, :mongoid4, :mongo_mapper
-end
-```
-
-#### Mongoid indexes
-
-Make sure you create indexes for doorkeeper models. You can do this either by
-running `rake db:mongoid:create_indexes` or (if you're using Mongoid 2) by
-adding `autocreate_indexes: true` to your `config/mongoid.yml`
-
-#### MongoMapper indexes
+### Other ORMs
 
-Generate the `db/indexes.rb` file and create indexes for the doorkeeper models:
+See [doorkeeper-mongodb project] for mongoid and mongomapper support. Follow along
+the implementation in that repository to extend doorkeeper with other ORMs.
 
-    rails generate doorkeeper:mongo_mapper:indexes
-    rake db:index
+[doorkeeper-mongodb project]: https://github.com/doorkeeper-gem/doorkeeper-mongodb
 
 ### Routes
 

data/config/locales/en.yml

@@ -14,36 +14,6 @@ en:
               relative_uri: 'must be an absolute URI.'
               secured_uri: 'must be an HTTPS/SSL URI.'
 
-  mongoid:
-    attributes:
-      doorkeeper/application:
-        name: 'Name'
-        redirect_uri: 'Redirect URI'
-    errors:
-      models:
-        doorkeeper/application:
-          attributes:
-            redirect_uri:
-              fragment_present: 'cannot contain a fragment.'
-              invalid_uri: 'must be a valid URI.'
-              relative_uri: 'must be an absolute URI.'
-              secured_uri: 'must be an HTTPS/SSL URI.'
-
-  mongo_mapper:
-    attributes:
-      doorkeeper/application:
-        name: 'Name'
-        redirect_uri: 'Redirect URI'
-    errors:
-      models:
-        doorkeeper/application:
-          attributes:
-            redirect_uri:
-              fragment_present: 'cannot contain a fragment.'
-              invalid_uri: 'must be a valid URI.'
-              relative_uri: 'must be an absolute URI.'
-              secured_uri: 'must be an HTTPS/SSL URI.'
-
   doorkeeper:
     applications:
       confirmations:
@@ -148,4 +118,4 @@ en:
           oauth2_provider: 'OAuth2 Provider'
           applications: 'Applications'
       application:
-        title: 'OAuth authorize required'
+        title: 'OAuth authorize required'

data/doorkeeper.gemspec

@@ -25,7 +25,4 @@ Gem::Specification.new do |s|
   s.add_development_dependency "factory_girl", "~> 4.5.0"
   s.add_development_dependency "timecop", "~> 0.7.0"
   s.add_development_dependency "database_cleaner", "~> 1.3.0"
-  s.add_development_dependency "rspec-activemodel-mocks", "~> 1.0.0"
-  s.add_development_dependency "bcrypt-ruby", "~> 3.0.1"
-  s.add_development_dependency "pry", "~> 0.10.0"
 end

data/lib/doorkeeper.rb

@@ -47,10 +47,6 @@ require 'doorkeeper/rails/routes'
 require 'doorkeeper/rails/helpers'
 
 require 'doorkeeper/orm/active_record'
-require 'doorkeeper/orm/mongo_mapper'
-require 'doorkeeper/orm/mongoid2'
-require 'doorkeeper/orm/mongoid3'
-require 'doorkeeper/orm/mongoid4'
 
 module Doorkeeper
   def self.configured?

data/lib/doorkeeper/models/application_mixin.rb

@@ -31,18 +31,6 @@ module Doorkeeper
       end
     end
 
-    alias_method :original_scopes, :scopes
-    def scopes
-      if has_scopes?
-        original_scopes
-      else
-        fail NameError, "Missing column: `applications.scopes`.", <<-MSG.squish
-If you are using ActiveRecord run `rails generate doorkeeper:application_scopes
-&& rake db:migrate` to add it.
-        MSG
-      end
-    end
-
     private
 
     def has_scopes?

data/lib/doorkeeper/orm/active_record.rb

@@ -25,12 +25,11 @@ module Doorkeeper
              Doorkeeper::Application.table_name
            )
           unless Doorkeeper::Application.new.attributes.include?("scopes")
-            migration_path = '../../../generators/doorkeeper/templates/add_scopes_to_oauth_applications.rb'
-            puts <<-MSG.squish
+            fail <<-MSG.squish
 [doorkeeper] Missing column: `oauth_applications.scopes`.
-Create the following migration and run `rake db:migrate`.
+Run `rails generate doorkeeper:application_scopes
+&& rake db:migrate` to add it.
             MSG
-            puts File.read(File.expand_path(migration_path, __FILE__))
           end
         end
       end

data/lib/doorkeeper/rails/helpers.rb

@@ -68,24 +68,6 @@ module Doorkeeper
           *Doorkeeper.configuration.access_token_methods
         )
       end
-
-      module ClassMethods
-        def doorkeeper_for(*_args)
-          fail(
-            Errors::DoorkeeperError,
-            "`doorkeeper_for` no longer available",
-            <<-eos
-\nStarting in version 2.0.0 of doorkeeper gem, `doorkeeper_for` is no longer
-available. Please change `doorkeeper_for` calls in your application with:
-
-  before_action :doorkeeper_authorize!
-
-For more information check the README:
-https://github.com/doorkeeper-gem/doorkeeper#protecting-resources-with-oauth-aka-your-api-endpoint\n
-eos
-          )
-        end
-      end
     end
   end
 end

data/lib/doorkeeper/version.rb

@@ -1,3 +1,3 @@
 module Doorkeeper
-  VERSION = '2.2.2'
+  VERSION = '3.0.0.rc1'
 end

data/lib/generators/doorkeeper/templates/README

@@ -17,26 +17,6 @@ And run
 
   rake db:migrate
 
-If you want to use Mongoid, configure the orm in initializers/doorkeeper.rb:
-
-# Mongoid
-Doorkeeper.configure do
-  orm :mongoid
-end
-
-If you want to use MongoMapper, configure the orm in
-initializers/doorkeeper.rb:
-
-# MongoMapper
-Doorkeeper.configure do
-  orm :mongo_mapper
-end
-
-And run
-
-  rails generate doorkeeper:mongo_mapper:indexes
-  rake db:index
-
 Step 3.
 That's it, that's all. Enjoy!
 

data/lib/generators/doorkeeper/templates/initializer.rb

@@ -1,7 +1,5 @@
 Doorkeeper.configure do
-  # Change the ORM that doorkeeper will use.
-  # Currently supported options are :active_record, :mongoid2, :mongoid3,
-  # :mongoid4, :mongo_mapper
+  # Change the ORM that doorkeeper will use (needs plugins)
   orm :active_record
 
   # This block will be called to check whether the resource owner is authenticated or not.

data/spec/controllers/protected_resources_controller_spec.rb

@@ -154,17 +154,4 @@ describe 'doorkeeper authorize filter' do
       end
     end
   end
-
-  context 'defined for all actions' do
-    controller {}
-
-    it 'it renders a custom JSON response' do
-      expect do
-        controller.class.doorkeeper_for
-      end.to raise_error(
-        Doorkeeper::Errors::DoorkeeperError,
-        /`doorkeeper_for` no longer available/
-      )
-    end
-  end
 end

data/spec/dummy/app/models/user.rb

@@ -1,28 +1,4 @@
-case DOORKEEPER_ORM.to_s
-when "active_record"
-  class User < ActiveRecord::Base
-  end
-when /mongoid/
-  class User
-    include Mongoid::Document
-    include Mongoid::Timestamps
-
-    field :name, type: String
-    field :password, type: String
-  end
-when "mongo_mapper"
-  class User
-    include MongoMapper::Document
-    timestamps!
-
-    key :name,     String
-    key :password, String
-  end
-end
-
-class User
-  include ActiveModel::MassAssignmentSecurity if defined?(::ProtectedAttributes)
-
+class User < ActiveRecord::Base
   if respond_to?(:attr_accessible)
     attr_accessible :name, :password
   end

data/spec/dummy/config/application.rb

@@ -13,7 +13,6 @@ orm = if DOORKEEPER_ORM =~ /mongoid/
       else
         DOORKEEPER_ORM
       end
-
 require "#{orm}/railtie"
 
 module Dummy

data/spec/dummy/config/initializers/doorkeeper.rb

@@ -1,7 +1,5 @@
 Doorkeeper.configure do
   # Change the ORM that doorkeeper will use.
-  # Currently supported options are :active_record, :mongoid2, :mongoid3,
-  # :mongoid4, :mongo_mapper
   orm DOORKEEPER_ORM
 
   # This block will be called to check whether the resource owner is authenticated or not.

data/spec/models/doorkeeper/application_spec.rb

@@ -171,20 +171,5 @@ module Doorkeeper
         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/spec_helper_integration.rb

@@ -8,13 +8,11 @@ DOORKEEPER_ORM = (orm && orm[1] || :active_record).to_sym
 $LOAD_PATH.unshift File.dirname(__FILE__)
 
 require 'capybara/rspec'
-require 'rspec/active_model/mocks'
 require 'dummy/config/environment'
 require 'rspec/rails'
 require 'generator_spec/test_case'
 require 'timecop'
 require 'database_cleaner'
-require 'pry'
 
 Rails.logger.info "====> Doorkeeper.orm = #{Doorkeeper.configuration.orm.inspect}"
 if Doorkeeper.configuration.orm == :active_record
@@ -24,11 +22,7 @@ end
 Rails.logger.info "====> Rails version: #{Rails.version}"
 Rails.logger.info "====> Ruby version: #{RUBY_VERSION}"
 
-if [:mongoid2, :mongoid3, :mongoid4].include?(DOORKEEPER_ORM)
-  require "support/orm/mongoid"
-else
-  require "support/orm/#{DOORKEEPER_ORM}"
-end
+require "support/orm/#{DOORKEEPER_ORM}"
 
 ENGINE_RAILS_ROOT = File.join(File.dirname(__FILE__), '../')
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: doorkeeper
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 3.0.0.rc1
 platform: ruby
 authors:
 - Felipe Elias Philipp
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-30 00:00:00.000000000 Z
+date: 2015-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -123,48 +123,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.0
-- !ruby/object:Gem::Dependency
-  name: rspec-activemodel-mocks
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-- !ruby/object:Gem::Dependency
-  name: bcrypt-ruby
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.0.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.0.1
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.10.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.10.0
 description: Doorkeeper is an OAuth 2 provider for Rails and Grape.
 email:
 - tutecosta@gmail.com
@@ -210,17 +168,10 @@ 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/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/grape/authorization_decorator.rb
 - lib/doorkeeper/grape/helpers.rb
 - lib/doorkeeper/helpers/controller.rb
@@ -264,25 +215,6 @@ files:
 - 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
@@ -337,10 +269,6 @@ 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/mongo.yml
-- spec/dummy/config/mongoid2.yml
-- spec/dummy/config/mongoid3.yml
-- spec/dummy/config/mongoid4.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/db/migrate/20111122132257_create_users.rb
 - spec/dummy/db/migrate/20120312140401_add_password_to_users.rb
@@ -421,8 +349,6 @@ files:
 - spec/support/helpers/request_spec_helper.rb
 - spec/support/helpers/url_helper.rb
 - spec/support/orm/active_record.rb
-- spec/support/orm/mongo_mapper.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
@@ -442,9 +368,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5
@@ -482,10 +408,6 @@ test_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/mongo.yml
-- spec/dummy/config/mongoid2.yml
-- spec/dummy/config/mongoid3.yml
-- spec/dummy/config/mongoid4.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/db/migrate/20111122132257_create_users.rb
 - spec/dummy/db/migrate/20120312140401_add_password_to_users.rb
@@ -566,8 +488,6 @@ test_files:
 - spec/support/helpers/request_spec_helper.rb
 - spec/support/helpers/url_helper.rb
 - spec/support/orm/active_record.rb
-- spec/support/orm/mongo_mapper.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