garage-doorkeeper 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e86f10c7895c4ede58f8145ca968a8be565410c
-  data.tar.gz: b097ce253e5ef97b5f514cd279254ac451bffacf
+  metadata.gz: 19f54ae10f7f220604e51d3e228a995b7b4ac265
+  data.tar.gz: ed25e285cde80c307d61edf2a9d6e559adfeb6a3
 SHA512:
-  metadata.gz: 786be0ce8b40cd602239f949c55627d43ddb2db4ee13fefe257508f32f625d2ccbffa54150c7fb7e68619f2d50dce3d173ee4b673c2a3186f409d1d6371421ab
-  data.tar.gz: 54f298f72f4d05b7b38774813cdacffd923c04a46c63c2efbeebd34d8eb426195940351b52b3ced03fac7ceb330dc64d58931492086136fdcc83d5652c110f6a
+  metadata.gz: 851ee4aca564017d463d5f28c5e3798e18ef17862bd12cb5798565292f056db877b0aa11877291202621350d5606b36ffc26fd82902c698017e15e8e1088fba0
+  data.tar.gz: 35406645e5c791fd9a506c2c1322e04283211affe430140107a9a0012a7b3e85191b094b5b7fc299a4f291e680a4424c1c2d590334902d6f7b3e4108e4ee273f

data/.travis.yml

@@ -0,0 +1,8 @@
+language: ruby
+sudo: false
+rvm:
+  - 2.0.0
+  - 2.1
+  - 2.2
+before_script:
+  - RAILS_ENV=test bundle exec rake db:create db:migrate

data/CHANGELOG.md

@@ -1,2 +1,5 @@
+## 2.0.0
+- Doorkeeper v2 compatible release.
+
 ## 1.0.0
 - Doorkeeper v1 compatible release.

data/Rakefile

@@ -1,2 +1,33 @@
-require "bundler/gem_tasks"
+#!/usr/bin/env rake
+begin
+  require 'bundler/setup'
+rescue LoadError
+  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
+end
+begin
+  require 'rdoc/task'
+rescue LoadError
+  require 'rdoc/rdoc'
+  require 'rake/rdoctask'
+  RDoc::Task = Rake::RDocTask
+end
 
+RDoc::Task.new(:rdoc) do |rdoc|
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title    = 'Garage'
+  rdoc.options << '--line-numbers'
+  rdoc.rdoc_files.include('README.rdoc')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end
+
+APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
+load 'rails/tasks/engine.rake'
+
+Bundler::GemHelper.install_tasks
+
+begin
+  require 'rspec/core/rake_task'
+  RSpec::Core::RakeTask.new(:spec)
+  task :default => :spec
+rescue LoadError
+end

data/garage-doorkeeper.gemspec

@@ -18,5 +18,5 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "doorkeeper", ">= 0.6.7", "< 1.5.0"
+  spec.add_dependency "doorkeeper", ">= 2.0.0"
 end

data/lib/garage/doorkeeper/version.rb

@@ -1,5 +1,5 @@
 module Garage
   module Doorkeeper
-    VERSION = "1.0.0"
+    VERSION = "2.0.0"
   end
 end

data/lib/garage/strategy/doorkeeper.rb

@@ -6,14 +6,13 @@ module Garage
 
       # Garage::ControllerHelper already implements `doorkeeper_token`,
       # so monkey patch here.
-      ::Doorkeeper::Helpers::Filter.class_eval do
+      ::Doorkeeper::Rails::Helpers.class_eval do
         alias_method :original_doorkeeper_token, :doorkeeper_token
       end
 
       included do
-        include ::Doorkeeper::Helpers::Filter
+        before_action :doorkeeper_authorize!
         alias_method :doorkeeper_unauthorized_render_options, :unauthorized_render_options
-        doorkeeper_for :all
       end
 
       def verify_permission?

data/spec/dummy/config/database.yml

@@ -11,7 +11,7 @@
 development:
   adapter: mysql2
   encoding: utf8
-  database: garage_dummy_development
+  database: garage_doorkeeper_dummy_development
   pool: 5
   username: root
   password:
@@ -23,7 +23,7 @@ development:
 test:
   adapter: mysql2
   encoding: utf8
-  database: garage_dummy_test
+  database: garage_doorkeeper_dummy_test
   pool: 5
   username: root
   password:
@@ -32,7 +32,7 @@ test:
 production:
   adapter: mysql2
   encoding: utf8
-  database: garage_dummy_production
+  database: garage_doorkeeper_dummy_production
   pool: 5
   username: root
   password:

data/spec/dummy/db/migrate/20150520073214_add_scopes_to_oauth_applications.rb

@@ -0,0 +1,5 @@
+class AddScopesToOauthApplications < ActiveRecord::Migration
+  def change
+    add_column :oauth_applications, :scopes, :string, null: false, default: ''
+  end
+end

data/spec/dummy/db/schema.rb

@@ -9,70 +9,71 @@
 # from scratch. The latter is a flawed and unsustainable approach (the more migrations
 # you'll amass, the slower it'll run and the greater likelihood for issues).
 #
-# It's strongly recommended to check this file into your version control system.
+# It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20130508032709) do
+ActiveRecord::Schema.define(version: 20141209001746) do
 
-  create_table "comments", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "post_id"
-    t.string   "body"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
+  create_table "comments", force: :cascade do |t|
+    t.integer  "user_id",    limit: 4
+    t.integer  "post_id",    limit: 4
+    t.string   "body",       limit: 255
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
-  create_table "oauth_access_grants", :force => true do |t|
-    t.integer  "resource_owner_id", :null => false
-    t.integer  "application_id",    :null => false
-    t.string   "token",             :null => false
-    t.integer  "expires_in",        :null => false
-    t.string   "redirect_uri",      :null => false
-    t.datetime "created_at",        :null => false
+  create_table "oauth_access_grants", force: :cascade do |t|
+    t.integer  "resource_owner_id", limit: 4,   null: false
+    t.integer  "application_id",    limit: 4,   null: false
+    t.string   "token",             limit: 255, null: false
+    t.integer  "expires_in",        limit: 4,   null: false
+    t.string   "redirect_uri",      limit: 255, null: false
+    t.datetime "created_at",                    null: false
     t.datetime "revoked_at"
-    t.string   "scopes"
+    t.string   "scopes",            limit: 255
   end
 
-  add_index "oauth_access_grants", ["token"], :name => "index_oauth_access_grants_on_token", :unique => true
+  add_index "oauth_access_grants", ["token"], name: "index_oauth_access_grants_on_token", unique: true, using: :btree
 
-  create_table "oauth_access_tokens", :force => true do |t|
-    t.integer  "resource_owner_id"
-    t.integer  "application_id",    :null => false
-    t.string   "token",             :null => false
-    t.string   "refresh_token"
-    t.integer  "expires_in"
+  create_table "oauth_access_tokens", force: :cascade do |t|
+    t.integer  "resource_owner_id", limit: 4
+    t.integer  "application_id",    limit: 4,   null: false
+    t.string   "token",             limit: 255, null: false
+    t.string   "refresh_token",     limit: 255
+    t.integer  "expires_in",        limit: 4
     t.datetime "revoked_at"
-    t.datetime "created_at",        :null => false
-    t.string   "scopes"
+    t.datetime "created_at",                    null: false
+    t.string   "scopes",            limit: 255
   end
 
-  add_index "oauth_access_tokens", ["refresh_token"], :name => "index_oauth_access_tokens_on_refresh_token", :unique => true
-  add_index "oauth_access_tokens", ["resource_owner_id"], :name => "index_oauth_access_tokens_on_resource_owner_id"
-  add_index "oauth_access_tokens", ["token"], :name => "index_oauth_access_tokens_on_token", :unique => true
+  add_index "oauth_access_tokens", ["refresh_token"], name: "index_oauth_access_tokens_on_refresh_token", unique: true, using: :btree
+  add_index "oauth_access_tokens", ["resource_owner_id"], name: "index_oauth_access_tokens_on_resource_owner_id", using: :btree
+  add_index "oauth_access_tokens", ["token"], name: "index_oauth_access_tokens_on_token", unique: true, using: :btree
 
-  create_table "oauth_applications", :force => true do |t|
-    t.string   "name",         :null => false
-    t.string   "uid",          :null => false
-    t.string   "secret",       :null => false
-    t.string   "redirect_uri", :null => false
-    t.datetime "created_at",   :null => false
-    t.datetime "updated_at",   :null => false
+  create_table "oauth_applications", force: :cascade do |t|
+    t.string   "name",         limit: 255,              null: false
+    t.string   "uid",          limit: 255,              null: false
+    t.string   "secret",       limit: 255,              null: false
+    t.string   "redirect_uri", limit: 255,              null: false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.string   "scopes",       limit: 255, default: "", null: false
   end
 
-  add_index "oauth_applications", ["uid"], :name => "index_oauth_applications_on_uid", :unique => true
+  add_index "oauth_applications", ["uid"], name: "index_oauth_applications_on_uid", unique: true, using: :btree
 
-  create_table "posts", :force => true do |t|
-    t.integer  "user_id"
-    t.string   "title"
-    t.string   "body"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
+  create_table "posts", force: :cascade do |t|
+    t.integer  "user_id",    limit: 4
+    t.string   "title",      limit: 255
+    t.string   "body",       limit: 255
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
-  create_table "users", :force => true do |t|
-    t.string   "name"
-    t.string   "email"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
+  create_table "users", force: :cascade do |t|
+    t.string   "name",       limit: 255
+    t.string   "email",      limit: 255
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
 end

data/spec/requests/authorization_spec.rb

@@ -57,7 +57,7 @@ describe "Authorization" do
 
     context "with another valid scope" do
       let(:scopes) do
-        "sudo"
+        "public sudo"
       end
       it { should == 200 }
     end
@@ -146,7 +146,7 @@ describe "Authorization" do
 
   describe "GET /posts/namespaced" do
     let(:scopes) do
-      "foobar.read_post"
+      "public foobar.read_post"
     end
 
     context "with valid condition" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: garage-doorkeeper
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Taiki Ono
@@ -16,20 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.7
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.7
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 2.0.0
 description: Garage extension to integrate doorkeeper gem.
 email:
 - taiks.4559@gmail.com
@@ -38,6 +32,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -96,6 +91,7 @@ files:
 - spec/dummy/db/migrate/20130501215033_create_users.rb
 - spec/dummy/db/migrate/20130501215056_create_posts.rb
 - spec/dummy/db/migrate/20130508032709_create_comments.rb
+- spec/dummy/db/migrate/20150520073214_add_scopes_to_oauth_applications.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/doc/garage/overview.ja.md
 - spec/dummy/doc/garage/overview.md
@@ -192,6 +188,7 @@ test_files:
 - spec/dummy/db/migrate/20130501215033_create_users.rb
 - spec/dummy/db/migrate/20130501215056_create_posts.rb
 - spec/dummy/db/migrate/20130508032709_create_comments.rb
+- spec/dummy/db/migrate/20150520073214_add_scopes_to_oauth_applications.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/doc/garage/overview.ja.md
 - spec/dummy/doc/garage/overview.md
@@ -214,4 +211,3 @@ test_files:
 - spec/support/authenticated_context.rb
 - spec/support/database_cleaner.rb
 - spec/support/rest_api_spec_helper.rb
-has_rdoc: