Skip to content

Commit 8766126

Browse files
committed
Update Grape::OAuth2 to new version
1 parent 3362fa6 commit 8766126

File tree

9 files changed

+15
-14
lines changed

9 files changed

+15
-14
lines changed

Gemfile.lock

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
GIT
22
remote: https://github.com/nbulaj/grape_oauth2.git
3-
revision: 76f0fd234a8775c6d8e441a59357087d070f4dc7
3+
revision: 0f98c1c1bafc30520de0ff154c6e2bdaff78f509
44
specs:
55
grape_oauth2 (0.1.1)
66
grape (>= 0.16)
@@ -40,6 +40,7 @@ GEM
4040
ice_nine (~> 0.11.0)
4141
thread_safe (~> 0.3, >= 0.3.1)
4242
bcrypt (3.1.11)
43+
bcrypt (3.1.11-x86-mingw32)
4344
builder (3.2.2)
4445
coercible (1.0.0)
4546
descendants_tracker (~> 0.0.1)
@@ -69,7 +70,7 @@ GEM
6970
rack (>= 1.3.0)
7071
rack-accept
7172
virtus (>= 1.0.0)
72-
grape-entity (0.5.1)
73+
grape-entity (0.6.0)
7374
activesupport
7475
multi_json (>= 1.3.2)
7576
hashie (3.4.6)
@@ -97,7 +98,7 @@ GEM
9798
hashie-forbidden_attributes (~> 0.1)
9899
pg (0.19.0)
99100
pg (0.19.0-x86-mingw32)
100-
puma (3.6.0)
101+
puma (3.6.2)
101102
rack (2.0.1)
102103
rack-accept (0.4.5)
103104
rack (>= 0.4)
@@ -148,10 +149,10 @@ GEM
148149
tins (~> 1.0)
149150
thor (0.19.1)
150151
thread_safe (0.3.5)
151-
tins (1.12.0)
152+
tins (1.13.0)
152153
tzinfo (1.2.2)
153154
thread_safe (~> 0.1)
154-
tzinfo-data (1.2016.9)
155+
tzinfo-data (1.2016.10)
155156
tzinfo (>= 1.0.0)
156157
virtus (1.0.5)
157158
axiom-types (~> 0.1)

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2016 Grape-OAuth2 maintainers.
3+
Copyright (c) 2016 Grape::OAuth2 maintainers.
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
[![Code Climate](https://codeclimate.com/github/grape-oauth2/grape-oauth2-sample/badges/gpa.svg)](https://codeclimate.com/github/grape-oauth2/grape-oauth2-sample)
44
[![License](http://img.shields.io/badge/license-MIT-brightgreen.svg)](#license)
55

6-
This is an example of using GrapeOAuth2 gem with the Grape API project.
6+
This is an example of using [Grape::OAuth2 gem](https://github.com/nbulaj/grape_oauth2) with the [Grape API](https://github.com/ruby-grape/grape) project.
77

88
This app is ready to deploy to Heroku [![Deploy](https://www.herokucdn.com/deploy/button.png)](https://heroku.com/deploy?template=https://github.com/grape-oauth2/grape-oauth2-sample).
99

10-
Project stack includes: **Grape, Grape::Entity, GrapeOAuth2, ActiveRecord 5, Puma, PostgreSQL, Dotenv, Rack::Cors, Rubocop, RSpec**.
10+
Project stack includes: **Grape, Grape::OAuth2, Grape::Entity, ActiveRecord 5, Puma, PostgreSQL, Dotenv, Rack::Cors, Rubocop, RSpec**.
1111

1212
## Implemented features
1313

app.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "GrapeOAuth2Sample",
3-
"description": "GrapeOAuth2 Sample application",
3+
"description": "Grape::OAuth2 Sample application",
44
"repository": "https://github.com/grape-oauth2/grape-oauth2-sample",
55
"keywords": ["grape_oauth2", "grape", "rest", "api", "OAuth"],
66
"scripts": {

app/api.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ class API < ::Grape::API
33
format :json
44
prefix :api
55

6-
include GrapeOAuth2.api
6+
include Grape::OAuth2.api
77

88
desc 'Root action'
99

app/models/access_code.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
class AccessCode < ApplicationRecord
2-
include GrapeOAuth2::ActiveRecord::AccessGrant
2+
include Grape::OAuth2::ActiveRecord::AccessGrant
33
end

app/models/access_token.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
class AccessToken < ApplicationRecord
2-
include GrapeOAuth2::ActiveRecord::AccessToken
2+
include Grape::OAuth2::ActiveRecord::AccessToken
33
end

app/models/application.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
class Application < ApplicationRecord
2-
include GrapeOAuth2::ActiveRecord::Client
2+
include Grape::OAuth2::ActiveRecord::Client
33
end

config/initializers/grape_oauth2.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
GrapeOAuth2.configure do |config|
1+
Grape::OAuth2.configure do |config|
22
config.client_class_name = 'Application'
33
config.access_token_class_name = 'AccessToken'
44
config.access_grant_class_name = 'AccessCode'

0 commit comments

Comments
 (0)