doorkeeper 4.0.0.rc4 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8dc5d57a6b22f136349e84f529ef9a925553dd9f
-  data.tar.gz: a37456b60aa1dfa8f530fdb267d163838dcb9da5
+  metadata.gz: 68df4a2a59a456f294e58416fb229932a8ea08c3
+  data.tar.gz: 30ff755d1ec25a53119b419ad1d0be3a69bedd7d
 SHA512:
-  metadata.gz: d97281f371ce8772fbdd540066a19d0dcae962ae7cac57fd05d1b877c7cb5923e42d080f8def9da8ceed8348251f1eae7b2459abca0c7c0cef44be91ceacefa8
-  data.tar.gz: 6dde7539983303cbefd28391b9a8617ee24ed1e2234c1e7cd80dae1896d2c100617be9cfc1b84715c82502a841caf11a7ed849c728cb123177572449cc657ab9
+  metadata.gz: df0bc1f0075ede4a575d2c007806ae887ef11d746204df8bda6345b73abf504911fd8bde1c22e6cbf55066553a3c7f9f10653d127a79ead3c2b5fa204dc9b0d1
+  data.tar.gz: becadfd542de1ee8c6863f4dcb4a53db12ea737687942f0699519eb5299a7c22ecac9beb8026a9833dd3dd166810cf6bf0213602fa5696def66fefe6cc5dbb38

data/.travis.yml

@@ -12,9 +12,9 @@ before_install:
 
 env:
   - rails=4.2.0
-  - rails=5.0.0.rc1
+  - rails=5.0.0
 
 matrix:
   exclude:
-    - env: rails=5.0.0.rc1
+    - env: rails=5.0.0
       rvm: 2.1

data/NEWS.md

@@ -4,6 +4,12 @@ User-visible changes worth mentioning.
 
 ## master
 
+## 4.0.0
+
+- [#834] Fix AssetNotPrecompiled error with Sprockets 4
+- [#843] Revert "Fix validation error messages"
+- [#847] Specify Null option to timestamps
+
 ## 4.0.0.rc4
 
 - [#777] Add support for public client in password grant flow

data/app/views/layouts/doorkeeper/admin.html.erb

@@ -19,7 +19,7 @@
         <%= link_to t('doorkeeper.layouts.admin.nav.applications'), oauth_applications_path %>
       <% end %>
       <%= content_tag :li do %>
-        <%= link_to 'Home', root_path %>
+        <%= link_to t('doorkeeper.layouts.admin.nav.home'), root_path %>
       <% end %>
     </ul>
   </div>

data/config/locales/en.yml

@@ -119,5 +119,6 @@ en:
         nav:
           oauth2_provider: 'OAuth2 Provider'
           applications: 'Applications'
+          home: 'Home'
       application:
         title: 'OAuth authorization required'

data/lib/doorkeeper/engine.rb

@@ -14,5 +14,14 @@ module Doorkeeper
         include Doorkeeper::Rails::Helpers
       end
     end
+
+    if defined?(Sprockets) && Sprockets::VERSION.chr.to_i >= 4
+      initializer 'doorkeeper.assets.precompile' do |app|
+        app.config.assets.precompile += %w(
+          doorkeeper/application.css
+          doorkeeper/admin/application.css
+        )
+      end
+    end
   end
 end

data/lib/doorkeeper/oauth/authorization_code_request.rb

@@ -7,7 +7,7 @@ module Doorkeeper
       validate :attributes,   error: :invalid_request
       validate :client,       error: :invalid_client
       validate :grant,        error: :invalid_grant
-      validate :redirect_uri, error: :invalid_redirect_uri
+      validate :redirect_uri, error: :invalid_grant
 
       attr_accessor :server, :grant, :client, :redirect_uri, :access_token
 

data/lib/doorkeeper/oauth/password_access_token_request.rb

@@ -6,7 +6,7 @@ module Doorkeeper
       include OAuth::Helpers
 
       validate :client,         error: :invalid_client
-      validate :resource_owner, error: :invalid_resource_owner
+      validate :resource_owner, error: :invalid_grant
       validate :scopes,         error: :invalid_scope
 
       attr_accessor :server, :client, :resource_owner, :parameters,

data/lib/doorkeeper/version.rb

@@ -1,3 +1,3 @@
 module Doorkeeper
-  VERSION = "4.0.0.rc4".freeze
+  VERSION = "4.0.0".freeze
 end

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

@@ -6,7 +6,7 @@ class CreateDoorkeeperTables < ActiveRecord::Migration
       t.string  :secret,       null: false
       t.text    :redirect_uri, null: false
       t.string  :scopes,       null: false, default: ''
-      t.timestamps
+      t.timestamps             null: false
     end
 
     add_index :oauth_applications, :uid, unique: true
@@ -31,7 +31,7 @@ class CreateDoorkeeperTables < ActiveRecord::Migration
 
     create_table :oauth_access_tokens do |t|
       t.integer  :resource_owner_id
-      t.references :application,       null: false
+      t.references :application
 
       # If you use a custom token generator you may need to change this column
       # from string to text, so that it accepts tokens larger than 255

data/spec/dummy/db/migrate/20151223192035_create_doorkeeper_tables.rb

@@ -6,7 +6,7 @@ class CreateDoorkeeperTables < ActiveRecord::Migration
       t.string  :secret,       null: false
       t.text    :redirect_uri, null: false
       t.string  :scopes,       null: false, default: ''
-      t.timestamps
+      t.timestamps             null: false
     end
 
     add_index :oauth_applications, :uid, unique: true

data/spec/lib/oauth/authorization_code_request_spec.rb

@@ -59,7 +59,7 @@ module Doorkeeper::OAuth
     it "matches the redirect_uri with grant's one" do
       subject.redirect_uri = 'http://other.com'
       subject.validate
-      expect(subject.error).to eq(:invalid_redirect_uri)
+      expect(subject.error).to eq(:invalid_grant)
     end
 
     it "matches the client with grant's one" do

data/spec/lib/oauth/password_access_token_request_spec.rb

@@ -44,7 +44,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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: doorkeeper
 version: !ruby/object:Gem::Version
-  version: 4.0.0.rc4
+  version: 4.0.0
 platform: ruby
 authors:
 - Felipe Elias Philipp
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-17 00:00:00.000000000 Z
+date: 2016-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -373,9 +373,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.2