Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support JSONAPI standart #216

Closed
wants to merge 43 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
e037d5d
Add JSONAPI::Utils gem and integrate it
Oct 5, 2016
4e72702
Add JSONAPI custom extensions
Oct 5, 2016
8e32e17
Update RSpec api documentation config
Oct 5, 2016
f1e8c2e
Update RSpec API docs gem
Oct 5, 2016
39ffc33
Add JSONAPI acceptance test helpers
Oct 8, 2016
70f3a79
Install pry-rails
Oct 10, 2016
93fc1dc
Update session spec
Oct 10, 2016
b0b65a7
Add sessions delete endpoint
Oct 15, 2016
6ca87b6
Create users controller
Oct 15, 2016
16404c0
Add user policy
Oct 16, 2016
019f8d5
Add todo items model
Oct 21, 2016
184de9c
Update responders
Oct 22, 2016
25cd268
Add show/edit user specs
Oct 22, 2016
e06001c
Add users index spec
Oct 23, 2016
3f83d17
Install pry-byebug
Oct 23, 2016
65263d6
Fix edit user spec
Oct 23, 2016
900d9c3
Add destroy user spec
Oct 23, 2016
af7c4d8
Add users creation spec
Oct 23, 2016
3f6a0ee
Implement todo item resource
Oct 23, 2016
fa56dc6
Add todo items CRUD
Oct 23, 2016
0ed2328
Add todo items index spec
Oct 23, 2016
7011d2d
Add status to todo items
Oct 23, 2016
4a1a0e4
Simplify users controller
Oct 23, 2016
56de3de
Revert "Simplify users controller"
Oct 23, 2016
d48b1fe
Add todo show and destroy spec
Oct 23, 2016
e7cad8e
Add spec for creating todo items
Oct 29, 2016
8c37b5e
Create todo items update spec
Oct 29, 2016
284ac84
Generate documentation
Nov 6, 2016
ee86155
Merge branch 'master' into apply-json-api-208
Dec 15, 2016
0a30aa9
Fix code style issues
Dec 15, 2016
9791a2c
Merge branch 'apply-json-api-208' of github-fs:AlexeyKuznetzov/rails-…
Dec 15, 2016
91be845
Try to autload JSONAPI
ne1ro Mar 24, 2017
4a87da6
Use puma
ne1ro Mar 24, 2017
68983fe
Add puma to gemfile
ne1ro Mar 24, 2017
c9e00fe
Fix autoloading
ne1ro Mar 24, 2017
e8ab0f4
Update rails to 4.2.8
ne1ro Mar 24, 2017
45eaacf
Update ruby to 2.3.3
Mar 24, 2017
ad4875c
Downgrade rake to 11.3
Mar 24, 2017
17c66c5
Use updates jsonapi-utils version
ne1ro Mar 24, 2017
1b3ec9f
Update readme file with actual information
ne1ro Mar 24, 2017
adf8a2a
Use I18n for authentication error
Mar 24, 2017
5b85ebc
Use oneline validation
Mar 24, 2017
d209d42
Update puma config
Mar 24, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .env.example
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Add your API tokens here
RACK_ENV=development
ALLOW_REQUESTS_FROM=localhost:4000
ALLOW_REQUESTS_FROM=localhost:5000
HOST=localhost:5000
PORT=5000
SECRET_KEY_BASE=development
# ROLLBAR_ACCESS_TOKEN=

2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.3.1
2.3.3
14 changes: 9 additions & 5 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,27 +1,29 @@
source "https://rubygems.org"

ruby "2.3.1"
ruby "2.3.3"

# the most important stuff
gem "rails", "4.2.7.1"
gem "rails", "4.2.8"
gem "pg"
gem "rails-api"
gem "rails_api_format", git: "https://github.com/fs/rails-api-format.git"

# all other gems
gem "active_model_serializers", git: "https://github.com/rails-api/active_model_serializers.git"
gem "decent_exposure"
gem "devise"
gem "dotenv-rails"
gem "health_check"
gem "interactor"
gem "jsonapi-utils", git: "https://github.com/tiagopog/jsonapi-utils.git", branch: "master"
gem "kaminari"
gem "pundit"
gem "rack-cors", require: "rack/cors"
gem "responders"
gem "rollbar"
gem "seedbank"
gem "simple_token_authentication"
gem "thin"
gem "puma"
gem "nokogiri", "~> 1.7.1"
gem "rake", "~> 11.3"

group :development do
gem "letter_opener"
Expand All @@ -41,6 +43,8 @@ group :development, :test do
gem "brakeman"
gem "rubocop"
gem "bundler-audit"
gem "pry-rails"
gem "pry-byebug"
end

group :test do
Expand Down
166 changes: 84 additions & 82 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,55 +1,45 @@
GIT
remote: https://github.com/fs/rails-api-format.git
revision: c3acffa0fb559c9bb9fa1f615ab60acc256f3c0b
remote: https://github.com/tiagopog/jsonapi-utils.git
revision: 838b05c6924637264d475899ea3d45675980c8b9
branch: master
specs:
rails_api_format (0.0.2)
active_model_serializers (~> 0.10.0.rc2)
devise (~> 3.5.1)
rails (~> 4.2.3)
responders (~> 2.1.0)

GIT
remote: https://github.com/rails-api/active_model_serializers.git
revision: 6aba26049154712d65176708ffad55fcfe512ca0
specs:
active_model_serializers (0.10.0.rc2)
activemodel (>= 4.0)
jsonapi-utils (0.5.2)
jsonapi-resources (= 0.8.3)

GEM
remote: https://rubygems.org/
specs:
actionmailer (4.2.7.1)
actionpack (= 4.2.7.1)
actionview (= 4.2.7.1)
activejob (= 4.2.7.1)
actionmailer (4.2.8)
actionpack (= 4.2.8)
actionview (= 4.2.8)
activejob (= 4.2.8)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.5)
actionpack (4.2.7.1)
actionview (= 4.2.7.1)
activesupport (= 4.2.7.1)
actionpack (4.2.8)
actionview (= 4.2.8)
activesupport (= 4.2.8)
rack (~> 1.6)
rack-test (~> 0.6.2)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (4.2.7.1)
activesupport (= 4.2.7.1)
actionview (4.2.8)
activesupport (= 4.2.8)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
activejob (4.2.7.1)
activesupport (= 4.2.7.1)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (4.2.8)
activesupport (= 4.2.8)
globalid (>= 0.3.0)
activemodel (4.2.7.1)
activesupport (= 4.2.7.1)
activemodel (4.2.8)
activesupport (= 4.2.8)
builder (~> 3.1)
activerecord (4.2.7.1)
activemodel (= 4.2.7.1)
activesupport (= 4.2.7.1)
activerecord (4.2.8)
activemodel (= 4.2.8)
activesupport (= 4.2.8)
arel (~> 6.0)
activesupport (4.2.7.1)
activesupport (4.2.8)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
Expand All @@ -58,7 +48,7 @@ GEM
github-markdown
railties (>= 3.2.5, < 5)
rspec_api_documentation
arel (6.0.3)
arel (6.0.4)
ast (2.1.0)
astrolabe (1.3.1)
parser (~> 2.2)
Expand All @@ -75,21 +65,21 @@ GEM
sass (~> 3.0)
slim (>= 1.3.6, < 3.0)
terminal-table (~> 1.4)
builder (3.2.2)
builder (3.2.3)
bullet (4.14.7)
activesupport (>= 3.0.0)
uniform_notifier (~> 1.9.0)
bundler-audit (0.3.1)
bundler (~> 1.2)
thor (~> 0.18)
byebug (6.0.2)
byebug (9.0.6)
code_analyzer (0.4.4)
sexp_processor
coderay (1.1.1)
colored (1.2)
concurrent-ruby (1.0.2)
concurrent-ruby (1.0.5)
crack (0.4.2)
safe_yaml (~> 1.0.0)
daemons (1.1.9)
database_cleaner (1.2.0)
decent_exposure (3.0.0)
activesupport (>= 4.0)
Expand All @@ -109,7 +99,6 @@ GEM
launchy (~> 2.1)
mail (~> 2.2)
erubis (2.7.0)
eventmachine (1.0.7)
factory_girl (4.4.0)
activesupport (>= 3.0.0)
factory_girl_rails (4.4.1)
Expand All @@ -129,12 +118,14 @@ GEM
health_check (2.2.1)
rails (>= 4.0)
highline (1.6.21)
i18n (0.7.0)
i18n (0.8.1)
interactor (3.1.0)
json (1.8.3)
json_spec (1.1.4)
multi_json (~> 1.0)
rspec (>= 2.0, < 4.0)
jsonapi-resources (0.8.3)
concurrent-ruby
rails (>= 4.0)
kaminari (0.16.1)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
Expand All @@ -148,45 +139,56 @@ GEM
mime-types (>= 1.16, < 4)
mail_safe (0.3.1)
actionmailer (>= 1.3.6)
method_source (0.8.2)
mime-types (3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
mini_portile2 (2.1.0)
minitest (5.9.0)
minitest (5.10.1)
multi_json (1.12.1)
mustache (0.99.8)
nokogiri (1.6.8)
mustache (1.0.3)
nokogiri (1.7.1)
mini_portile2 (~> 2.1.0)
pkg-config (~> 1.1.7)
orm_adapter (0.5.0)
parser (2.2.2.6)
ast (>= 1.1, < 3.0)
pg (0.17.1)
pkg-config (1.1.7)
powerpack (0.1.1)
rack (1.6.4)
pry (0.10.4)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
pry-byebug (3.4.0)
byebug (~> 9.0)
pry (~> 0.10)
pry-rails (0.3.4)
pry (>= 0.9.10)
puma (3.8.2)
pundit (1.1.0)
activesupport (>= 3.0.0)
rack (1.6.5)
rack-cors (0.2.9)
rack-test (0.6.3)
rack (>= 1.0)
rails (4.2.7.1)
actionmailer (= 4.2.7.1)
actionpack (= 4.2.7.1)
actionview (= 4.2.7.1)
activejob (= 4.2.7.1)
activemodel (= 4.2.7.1)
activerecord (= 4.2.7.1)
activesupport (= 4.2.7.1)
rails (4.2.8)
actionmailer (= 4.2.8)
actionpack (= 4.2.8)
actionview (= 4.2.8)
activejob (= 4.2.8)
activemodel (= 4.2.8)
activerecord (= 4.2.8)
activesupport (= 4.2.8)
bundler (>= 1.3.0, < 2.0)
railties (= 4.2.7.1)
railties (= 4.2.8)
sprockets-rails
rails-api (0.4.0)
rails-api (0.4.1)
actionpack (>= 3.2.11)
railties (>= 3.2.11)
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
rails-dom-testing (1.0.7)
rails-dom-testing (1.0.8)
activesupport (>= 4.2.0.beta, < 5.0)
nokogiri (~> 1.6.0)
nokogiri (~> 1.6)
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
Expand All @@ -204,15 +206,15 @@ GEM
ruby-progressbar
rails_serve_static_assets (0.0.1)
rails_stdout_logging (0.0.3)
railties (4.2.7.1)
actionpack (= 4.2.7.1)
activesupport (= 4.2.7.1)
railties (4.2.8)
actionpack (= 4.2.8)
activesupport (= 4.2.8)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rainbow (2.0.0)
rake (11.2.2)
rake (11.3.0)
require_all (1.3.2)
responders (2.1.1)
responders (2.3.0)
railties (>= 4.2.0, < 5.1)
rollbar (2.12.0)
multi_json
Expand All @@ -237,11 +239,10 @@ GEM
rspec-mocks (~> 3.3.0)
rspec-support (~> 3.3.0)
rspec-support (3.3.0)
rspec_api_documentation (4.4.0)
rspec_api_documentation (4.8.0)
activesupport (>= 3.0.0)
json (~> 1.4, >= 1.4.6)
mustache (~> 0.99, >= 0.99.4)
rspec (>= 3.0.0)
mustache (~> 1.0, >= 0.99.4)
rspec (~> 3.0, >= 3.0.0)
rubocop (0.33.0)
astrolabe (~> 1.3)
parser (>= 2.2.2.5, < 3.0)
Expand Down Expand Up @@ -272,24 +273,21 @@ GEM
slim (2.0.2)
temple (~> 0.6.6)
tilt (>= 1.3.3, < 2.1)
slop (3.6.0)
spring (1.3.6)
spring-commands-rspec (1.0.4)
spring (>= 0.9.1)
sprockets (3.7.0)
sprockets (3.7.1)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.1.1)
sprockets-rails (3.2.0)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
temple (0.6.7)
terminal-table (1.4.5)
thin (1.6.2)
daemons (>= 1.0.9)
eventmachine (>= 1.0.0)
rack (>= 1.0.0)
thor (0.19.1)
thread_safe (0.3.5)
thor (0.19.4)
thread_safe (0.3.6)
tilt (2.0.1)
tzinfo (1.2.2)
thread_safe (~> 0.1)
Expand All @@ -304,7 +302,6 @@ PLATFORMS
ruby

DEPENDENCIES
active_model_serializers!
apitome
brakeman
bullet
Expand All @@ -321,16 +318,22 @@ DEPENDENCIES
health_check
interactor
json_spec
jsonapi-utils!
kaminari
letter_opener
mail_safe
nokogiri (~> 1.7.1)
pg
pry-byebug
pry-rails
puma
pundit
rack-cors
rails (= 4.2.7.1)
rails (= 4.2.8)
rails-api
rails_12factor
rails_api_format!
rails_best_practices
rake (~> 11.3)
responders
rollbar
rspec-rails
Expand All @@ -342,11 +345,10 @@ DEPENDENCIES
simplecov
spring
spring-commands-rspec
thin
webmock

RUBY VERSION
ruby 2.3.1p112
ruby 2.3.3p222

BUNDLED WITH
1.12.5
1.14.6
2 changes: 1 addition & 1 deletion Procfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
web: bundle exec rails server thin -p $PORT -e $RACK_ENV
web: bundle exec puma -C config/puma.rb
Loading