Skip to content

Associations2 #7

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.

Sign up for GitHub

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

Merged
merged 9 commits into from
Feb 8, 2017
Merged

Associations2 #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ee5c56a
Refactor scope logic
Jan 31, 2017
d4ca615
Move to subclassable resources
Jan 31, 2017
26ceae8
Move to new adapters/sideloading pattern
Feb 1, 2017
88f7a1b
Add polymorphic associations
Feb 2, 2017
88425bb
Improve AR adapters
Feb 2, 2017
a7872b9
Ensure nested sideloads work, add multisort
Feb 3, 2017
417cf73
Add swagger compatibility
Feb 7, 2017
88989d7
Remove Rails (!)
Feb 8, 2017
4440ded
bump version
Feb 8, 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
4 changes: 4 additions & 0 deletions Appraisals
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
appraise "rails-4" do
gem "rails", "~> 4.1"
gem 'jsonapi-rails', '~> 0.1', require: 'jsonapi/rails'
gem 'rspec-rails'
end

appraise "rails-5" do
gem "rails", "~> 5.0"
gem 'jsonapi-rails', '~> 0.1', require: 'jsonapi/rails'
gem 'rspec-rails'
end
4 changes: 2 additions & 2 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ source "https://rubygems.org"
gemspec

group :test do
gem 'pry'
gem 'pry-byebug', platform: [:mri]
gem 'appraisal'
gem 'guard'
gem 'guard-rspec'
gem 'pry'
gem 'pry-byebug'
end
9 changes: 0 additions & 9 deletions gemfiles/rails_3.gemfile
View file
Open in desktop

This file was deleted.

7 changes: 4 additions & 3 deletions gemfiles/rails_4.gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,16 @@

source "https://rubygems.org"

gem "active_model_serializers", :git => "https://github.com/richmolj/active_model_serializers.git"
gem "rails", "~> 4.1"
gem "jsonapi-rails", "~> 0.1", :require => "jsonapi/rails"
gem "rspec-rails"

group :test do
gem "pry"
gem "pry-byebug", :platform => [:mri]
gem "appraisal"
gem "guard"
gem "guard-rspec"
gem "pry"
gem "pry-byebug"
end

gemspec :path => "../"
63 changes: 27 additions & 36 deletions gemfiles/rails_4.gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,8 @@
GIT
remote: https://github.com/richmolj/active_model_serializers.git
revision: 1dc2b74059731339f4df3e7882fd949e20433013
specs:
active_model_serializers (0.10.2)
actionpack (>= 4.1, < 6)
activemodel (>= 4.1, < 6)
jsonapi (~> 0.1.1.beta2)
railties (>= 4.1, < 6)

PATH
remote: ../
specs:
jsonapi_compliable (0.3.4)
active_model_serializers (~> 0.10)
jsonapi (~> 0.1.1.beta2)
jsonapi_ams_extensions (~> 0.1)
rails (>= 4.1, < 6)
jsonapi_compliable (0.4.0)
jsonapi-serializable (~> 0.1)

GEM
remote: https://rubygems.org/
Expand Down Expand Up @@ -61,9 +48,9 @@ GEM
thor (>= 0.14.0)
arel (6.0.3)
builder (3.2.2)
byebug (9.0.5)
byebug (9.0.6)
coderay (1.1.1)
concurrent-ruby (1.0.2)
concurrent-ruby (1.0.4)
database_cleaner (1.5.3)
diff-lcs (1.2.5)
erubis (2.7.0)
Expand All @@ -87,11 +74,17 @@ GEM
rspec (>= 2.99.0, < 4.0)
i18n (0.7.0)
json (1.8.3)
jsonapi (0.1.1.beta2)
json (~> 1.8)
jsonapi_ams_extensions (0.1.1)
active_model_serializers (~> 0.10.x)
jsonapi_spec_helpers (0.2.0)
jsonapi-deserializable (0.1.1)
jsonapi-parser (= 0.1.1)
jsonapi-parser (0.1.1)
jsonapi-rails (0.1.1)
jsonapi-rb (= 0.1.1)
jsonapi-rb (0.1.1)
jsonapi-deserializable (= 0.1.1)
jsonapi-serializable (= 0.1.1)
jsonapi-renderer (0.1.1)
jsonapi-serializable (0.1.1)
jsonapi-renderer (= 0.1.1)
kaminari (0.17.0)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
Expand All @@ -109,23 +102,21 @@ GEM
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
mini_portile2 (2.1.0)
minitest (5.9.0)
minitest (5.10.1)
nenv (0.3.0)
nokogiri (1.6.8)
nokogiri (1.6.8.1)
mini_portile2 (~> 2.1.0)
pkg-config (~> 1.1.7)
notiffany (0.1.1)
nenv (~> 0.1)
shellany (~> 0.0)
pkg-config (1.1.7)
pry (0.10.4)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
pry-byebug (3.4.0)
pry-byebug (3.4.2)
byebug (~> 9.0)
pry (~> 0.10)
rack (1.6.4)
rack (1.6.5)
rack-test (0.6.3)
rack (>= 1.0)
rails (4.2.7.1)
Expand Down Expand Up @@ -153,14 +144,14 @@ GEM
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (10.5.0)
rb-fsevent (0.9.7)
rb-fsevent (0.9.8)
rb-inotify (0.9.7)
ffi (>= 0.5.0)
rspec (3.5.0)
rspec-core (~> 3.5.0)
rspec-expectations (~> 3.5.0)
rspec-mocks (~> 3.5.0)
rspec-core (3.5.3)
rspec-core (3.5.4)
rspec-support (~> 3.5.0)
rspec-expectations (3.5.0)
diff-lcs (>= 1.2.0, < 2.0)
Expand All @@ -177,7 +168,7 @@ GEM
rspec-mocks (~> 3.5.0)
rspec-support (~> 3.5.0)
rspec-support (3.5.0)
ruby_dep (1.4.0)
ruby_dep (1.5.0)
shellany (0.0.1)
slop (3.6.0)
sprockets (3.7.0)
Expand All @@ -187,8 +178,8 @@ GEM
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
sqlite3 (1.3.11)
thor (0.19.1)
sqlite3 (1.3.12)
thor (0.19.4)
thread_safe (0.3.5)
tzinfo (1.2.2)
thread_safe (~> 0.1)
Expand All @@ -197,14 +188,14 @@ PLATFORMS
ruby

DEPENDENCIES
active_model_serializers!
activerecord (>= 4.1, < 6)
appraisal
bundler (~> 1.12)
database_cleaner
guard
guard-rspec
jsonapi-rails (~> 0.1)
jsonapi_compliable!
jsonapi_spec_helpers
kaminari
pry
pry-byebug
Expand All @@ -214,4 +205,4 @@ DEPENDENCIES
sqlite3

BUNDLED WITH
1.12.5
1.13.6
7 changes: 4 additions & 3 deletions gemfiles/rails_5.gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,16 @@

source "https://rubygems.org"

gem "active_model_serializers", :git => "https://github.com/richmolj/active_model_serializers.git"
gem "rails", "~> 5.0"
gem "jsonapi-rails", "~> 0.1", :require => "jsonapi/rails"
gem "rspec-rails"

group :test do
gem "pry"
gem "pry-byebug", :platform => [:mri]
gem "appraisal"
gem "guard"
gem "guard-rspec"
gem "pry"
gem "pry-byebug"
end

gemspec :path => "../"
64 changes: 27 additions & 37 deletions gemfiles/rails_5.gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,8 @@
GIT
remote: https://github.com/richmolj/active_model_serializers.git
revision: 1dc2b74059731339f4df3e7882fd949e20433013
specs:
active_model_serializers (0.10.2)
actionpack (>= 4.1, < 6)
activemodel (>= 4.1, < 6)
jsonapi (~> 0.1.1.beta2)
railties (>= 4.1, < 6)

PATH
remote: ../
specs:
jsonapi_compliable (0.3.4)
active_model_serializers (~> 0.10)
jsonapi (~> 0.1.1.beta2)
jsonapi_ams_extensions (~> 0.1)
rails (>= 4.1, < 6)
jsonapi_compliable (0.4.0)
jsonapi-serializable (~> 0.1)

GEM
remote: https://rubygems.org/
Expand Down Expand Up @@ -61,11 +48,11 @@ GEM
bundler
rake
thor (>= 0.14.0)
arel (7.1.1)
arel (7.1.4)
builder (3.2.2)
byebug (9.0.5)
byebug (9.0.6)
coderay (1.1.1)
concurrent-ruby (1.0.2)
concurrent-ruby (1.0.4)
database_cleaner (1.5.3)
diff-lcs (1.2.5)
erubis (2.7.0)
Expand All @@ -88,12 +75,17 @@ GEM
guard-compat (~> 1.1)
rspec (>= 2.99.0, < 4.0)
i18n (0.7.0)
json (1.8.3)
jsonapi (0.1.1.beta2)
json (~> 1.8)
jsonapi_ams_extensions (0.1.1)
active_model_serializers (~> 0.10.x)
jsonapi_spec_helpers (0.2.0)
jsonapi-deserializable (0.1.1)
jsonapi-parser (= 0.1.1)
jsonapi-parser (0.1.1)
jsonapi-rails (0.1.1)
jsonapi-rb (= 0.1.1)
jsonapi-rb (0.1.1)
jsonapi-deserializable (= 0.1.1)
jsonapi-serializable (= 0.1.1)
jsonapi-renderer (0.1.1)
jsonapi-serializable (0.1.1)
jsonapi-renderer (= 0.1.1)
kaminari (0.17.0)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
Expand All @@ -111,21 +103,19 @@ GEM
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
mini_portile2 (2.1.0)
minitest (5.9.0)
minitest (5.10.1)
nenv (0.3.0)
nio4r (1.2.1)
nokogiri (1.6.8)
nokogiri (1.6.8.1)
mini_portile2 (~> 2.1.0)
pkg-config (~> 1.1.7)
notiffany (0.1.1)
nenv (~> 0.1)
shellany (~> 0.0)
pkg-config (1.1.7)
pry (0.10.4)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
pry-byebug (3.4.0)
pry-byebug (3.4.2)
byebug (~> 9.0)
pry (~> 0.10)
rack (2.0.1)
Expand Down Expand Up @@ -155,14 +145,14 @@ GEM
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (10.5.0)
rb-fsevent (0.9.7)
rb-fsevent (0.9.8)
rb-inotify (0.9.7)
ffi (>= 0.5.0)
rspec (3.5.0)
rspec-core (~> 3.5.0)
rspec-expectations (~> 3.5.0)
rspec-mocks (~> 3.5.0)
rspec-core (3.5.3)
rspec-core (3.5.4)
rspec-support (~> 3.5.0)
rspec-expectations (3.5.0)
diff-lcs (>= 1.2.0, < 2.0)
Expand All @@ -179,7 +169,7 @@ GEM
rspec-mocks (~> 3.5.0)
rspec-support (~> 3.5.0)
rspec-support (3.5.0)
ruby_dep (1.4.0)
ruby_dep (1.5.0)
shellany (0.0.1)
slop (3.6.0)
sprockets (3.7.0)
Expand All @@ -189,8 +179,8 @@ GEM
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
sqlite3 (1.3.11)
thor (0.19.1)
sqlite3 (1.3.12)
thor (0.19.4)
thread_safe (0.3.5)
tzinfo (1.2.2)
thread_safe (~> 0.1)
Expand All @@ -202,14 +192,14 @@ PLATFORMS
ruby

DEPENDENCIES
active_model_serializers!
activerecord (>= 4.1, < 6)
appraisal
bundler (~> 1.12)
database_cleaner
guard
guard-rspec
jsonapi-rails (~> 0.1)
jsonapi_compliable!
jsonapi_spec_helpers
kaminari
pry
pry-byebug
Expand All @@ -219,4 +209,4 @@ DEPENDENCIES
sqlite3

BUNDLED WITH
1.12.5
1.13.6
10 changes: 3 additions & 7 deletions jsonapi_compliable.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,12 @@ Gem::Specification.new do |spec|
spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
spec.require_paths = ["lib"]

spec.add_dependency "rails", ['>= 4.1', '< 6']
spec.add_dependency 'jsonapi-serializable', '~> 0.1'

spec.add_dependency 'jsonapi-rails', '~> 0.1'

spec.add_development_dependency "kaminari"
spec.add_development_dependency "active_model_serializers"
spec.add_development_dependency "jsonapi_spec_helpers"
spec.add_development_dependency "activerecord", ['>= 4.1', '< 6']
spec.add_development_dependency "kaminari", '~> 0.17'
spec.add_development_dependency "bundler", "~> 1.12"
spec.add_development_dependency "rake", "~> 10.0"
spec.add_development_dependency "rspec-rails"
spec.add_development_dependency "sqlite3"
spec.add_development_dependency "database_cleaner"
end
Loading