Skip to content

Commit

Permalink
Prepare 5.0.0 release
Browse files Browse the repository at this point in the history
  • Loading branch information
nbulaj committed Aug 24, 2018
1 parent bd631bc commit 4c94445
Show file tree
Hide file tree
Showing 7 changed files with 30 additions and 27 deletions.
4 changes: 4 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ User-visible changes worth mentioning.

## master

- [#PR ID] Add PR description.

## 5.0.0

- [#1127] Change the token_type initials of the Banner Token to uppercase to comply with the RFC6750 specification.

## 5.0.0.rc2
Expand Down
36 changes: 18 additions & 18 deletions doorkeeper.gemspec
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
$LOAD_PATH.push File.expand_path("../lib", __FILE__)
$LOAD_PATH.push File.expand_path('../lib', __FILE__)

require "doorkeeper/version"
require 'doorkeeper/version'

Gem::Specification.new do |s|
s.name = "doorkeeper"
s.name = 'doorkeeper'
s.version = Doorkeeper.gem_version
s.authors = ["Felipe Elias Philipp", "Tute Costa", "Jon Moss", "Nikita Bulai"]
s.authors = ['Felipe Elias Philipp', 'Tute Costa', 'Jon Moss', 'Nikita Bulai']
s.email = %w(bulaj.nikita@gmail.com)
s.homepage = "https://github.com/doorkeeper-gem/doorkeeper"
s.summary = "OAuth 2 provider for Rails and Grape"
s.description = "Doorkeeper is an OAuth 2 provider for Rails and Grape."
s.homepage = 'https://github.com/doorkeeper-gem/doorkeeper'
s.summary = 'OAuth 2 provider for Rails and Grape'
s.description = 'Doorkeeper is an OAuth 2 provider for Rails and Grape.'
s.license = 'MIT'

s.files = `git ls-files`.split("\n")
s.test_files = `git ls-files -- spec/*`.split("\n")
s.require_paths = ["lib"]
s.require_paths = ['lib']

s.add_dependency "railties", ">= 4.2"
s.required_ruby_version = ">= 2.1"
s.add_dependency 'railties', '>= 4.2'
s.required_ruby_version = '>= 2.1'

s.add_development_dependency "capybara", '~> 2.18'
s.add_development_dependency "coveralls"
s.add_development_dependency "grape"
s.add_development_dependency "database_cleaner", "~> 1.6"
s.add_development_dependency "factory_bot", "~> 4.8"
s.add_development_dependency "generator_spec", "~> 0.9.3"
s.add_development_dependency "rake", ">= 11.3.0"
s.add_development_dependency "rspec-rails"
s.add_development_dependency 'capybara', '~> 2.18'
s.add_development_dependency 'coveralls'
s.add_development_dependency 'grape'
s.add_development_dependency 'database_cleaner', '~> 1.6'
s.add_development_dependency 'factory_bot', '~> 4.8'
s.add_development_dependency 'generator_spec', '~> 0.9.3'
s.add_development_dependency 'rake', '>= 11.3.0'
s.add_development_dependency 'rspec-rails'
end
2 changes: 0 additions & 2 deletions lib/doorkeeper/oauth/authorization/token.rb
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@ def refresh_token_enabled?(server, context)
!!server.refresh_token_enabled?
end
end

private
end

def initialize(pre_auth, resource_owner)
Expand Down
3 changes: 2 additions & 1 deletion lib/doorkeeper/oauth/client_credentials/creator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ class Creator
def call(client, scopes, attributes = {})
AccessToken.find_or_create_for(
client, nil, scopes, attributes[:expires_in],
attributes[:use_refresh_token])
attributes[:use_refresh_token]
)
end
end
end
Expand Down
8 changes: 4 additions & 4 deletions lib/doorkeeper/rails/routes.rb
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@ def generate_routes!(options)
private

def map_route(name, method)
unless @mapping.skipped?(name)
send(method, @mapping[name])
return if @mapping.skipped?(name)

mapping[name] = @mapping[name]
end
send(method, @mapping[name])

mapping[name] = @mapping[name]
end

def authorization_routes(mapping)
Expand Down
2 changes: 1 addition & 1 deletion lib/doorkeeper/version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ module VERSION
MAJOR = 5
MINOR = 0
TINY = 0
PRE = 'rc2'
PRE = nil

# Full version number
STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
Expand Down
2 changes: 1 addition & 1 deletion spec/controllers/tokens_controller_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
allow(I18n).to receive(:translate).
with(
custom_message,
hash_including(scope: %i[doorkeeper errors messages]),
hash_including(scope: %i[doorkeeper errors messages])
).
and_return('Authorization custom message')

Expand Down

0 comments on commit 4c94445

Please sign in to comment.