Skip to content

Commit 4ae310f

Browse files
richmoljrichmolj
authored
Merge pull request #7 from jsonapi-suite/associations2
Associations2
2 parents a4bd278 + 4440ded commit 4ae310f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+2859
-1252
lines changed

‎Appraisals‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
appraise "rails-4" do
22
gem "rails", "~> 4.1"
3+
gem 'jsonapi-rails', '~> 0.1', require: 'jsonapi/rails'
4+
gem 'rspec-rails'
35
end
46

57
appraise "rails-5" do
68
gem "rails", "~> 5.0"
9+
gem 'jsonapi-rails', '~> 0.1', require: 'jsonapi/rails'
10+
gem 'rspec-rails'
711
end

‎Gemfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ source "https://rubygems.org"
44
gemspec
55

66
group :test do
7+
gem 'pry'
8+
gem 'pry-byebug', platform: [:mri]
79
gem 'appraisal'
810
gem 'guard'
911
gem 'guard-rspec'
10-
gem 'pry'
11-
gem 'pry-byebug'
1212
end

‎gemfiles/rails_3.gemfile‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎gemfiles/rails_4.gemfile‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,16 @@
22

33
source "https://rubygems.org"
44

5-
gem "active_model_serializers", :git => "https://github.com/richmolj/active_model_serializers.git"
65
gem "rails", "~> 4.1"
6+
gem "jsonapi-rails", "~> 0.1", :require => "jsonapi/rails"
7+
gem "rspec-rails"
78

89
group :test do
10+
gem "pry"
11+
gem "pry-byebug", :platform => [:mri]
912
gem "appraisal"
1013
gem "guard"
1114
gem "guard-rspec"
12-
gem "pry"
13-
gem "pry-byebug"
1415
end
1516

1617
gemspec :path => "../"

‎gemfiles/rails_4.gemfile.lock‎

Lines changed: 27 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,8 @@
1-
GIT
2-
remote: https://github.com/richmolj/active_model_serializers.git
3-
revision: 1dc2b74059731339f4df3e7882fd949e20433013
4-
specs:
5-
active_model_serializers (0.10.2)
6-
actionpack (>= 4.1, < 6)
7-
activemodel (>= 4.1, < 6)
8-
jsonapi (~> 0.1.1.beta2)
9-
railties (>= 4.1, < 6)
10-
111
PATH
122
remote: ../
133
specs:
14-
jsonapi_compliable (0.3.4)
15-
active_model_serializers (~> 0.10)
16-
jsonapi (~> 0.1.1.beta2)
17-
jsonapi_ams_extensions (~> 0.1)
18-
rails (>= 4.1, < 6)
4+
jsonapi_compliable (0.4.0)
5+
jsonapi-serializable (~> 0.1)
196

207
GEM
218
remote: https://rubygems.org/
@@ -61,9 +48,9 @@ GEM
6148
thor (>= 0.14.0)
6249
arel (6.0.3)
6350
builder (3.2.2)
64-
byebug (9.0.5)
51+
byebug (9.0.6)
6552
coderay (1.1.1)
66-
concurrent-ruby (1.0.2)
53+
concurrent-ruby (1.0.4)
6754
database_cleaner (1.5.3)
6855
diff-lcs (1.2.5)
6956
erubis (2.7.0)
@@ -87,11 +74,17 @@ GEM
8774
rspec (>= 2.99.0, < 4.0)
8875
i18n (0.7.0)
8976
json (1.8.3)
90-
jsonapi (0.1.1.beta2)
91-
json (~> 1.8)
92-
jsonapi_ams_extensions (0.1.1)
93-
active_model_serializers (~> 0.10.x)
94-
jsonapi_spec_helpers (0.2.0)
77+
jsonapi-deserializable (0.1.1)
78+
jsonapi-parser (= 0.1.1)
79+
jsonapi-parser (0.1.1)
80+
jsonapi-rails (0.1.1)
81+
jsonapi-rb (= 0.1.1)
82+
jsonapi-rb (0.1.1)
83+
jsonapi-deserializable (= 0.1.1)
84+
jsonapi-serializable (= 0.1.1)
85+
jsonapi-renderer (0.1.1)
86+
jsonapi-serializable (0.1.1)
87+
jsonapi-renderer (= 0.1.1)
9588
kaminari (0.17.0)
9689
actionpack (>= 3.0.0)
9790
activesupport (>= 3.0.0)
@@ -109,23 +102,21 @@ GEM
109102
mime-types-data (~> 3.2015)
110103
mime-types-data (3.2016.0521)
111104
mini_portile2 (2.1.0)
112-
minitest (5.9.0)
105+
minitest (5.10.1)
113106
nenv (0.3.0)
114-
nokogiri (1.6.8)
107+
nokogiri (1.6.8.1)
115108
mini_portile2 (~> 2.1.0)
116-
pkg-config (~> 1.1.7)
117109
notiffany (0.1.1)
118110
nenv (~> 0.1)
119111
shellany (~> 0.0)
120-
pkg-config (1.1.7)
121112
pry (0.10.4)
122113
coderay (~> 1.1.0)
123114
method_source (~> 0.8.1)
124115
slop (~> 3.4)
125-
pry-byebug (3.4.0)
116+
pry-byebug (3.4.2)
126117
byebug (~> 9.0)
127118
pry (~> 0.10)
128-
rack (1.6.4)
119+
rack (1.6.5)
129120
rack-test (0.6.3)
130121
rack (>= 1.0)
131122
rails (4.2.7.1)
@@ -153,14 +144,14 @@ GEM
153144
rake (>= 0.8.7)
154145
thor (>= 0.18.1, < 2.0)
155146
rake (10.5.0)
156-
rb-fsevent (0.9.7)
147+
rb-fsevent (0.9.8)
157148
rb-inotify (0.9.7)
158149
ffi (>= 0.5.0)
159150
rspec (3.5.0)
160151
rspec-core (~> 3.5.0)
161152
rspec-expectations (~> 3.5.0)
162153
rspec-mocks (~> 3.5.0)
163-
rspec-core (3.5.3)
154+
rspec-core (3.5.4)
164155
rspec-support (~> 3.5.0)
165156
rspec-expectations (3.5.0)
166157
diff-lcs (>= 1.2.0, < 2.0)
@@ -177,7 +168,7 @@ GEM
177168
rspec-mocks (~> 3.5.0)
178169
rspec-support (~> 3.5.0)
179170
rspec-support (3.5.0)
180-
ruby_dep (1.4.0)
171+
ruby_dep (1.5.0)
181172
shellany (0.0.1)
182173
slop (3.6.0)
183174
sprockets (3.7.0)
@@ -187,8 +178,8 @@ GEM
187178
actionpack (>= 4.0)
188179
activesupport (>= 4.0)
189180
sprockets (>= 3.0.0)
190-
sqlite3 (1.3.11)
191-
thor (0.19.1)
181+
sqlite3 (1.3.12)
182+
thor (0.19.4)
192183
thread_safe (0.3.5)
193184
tzinfo (1.2.2)
194185
thread_safe (~> 0.1)
@@ -197,14 +188,14 @@ PLATFORMS
197188
ruby
198189

199190
DEPENDENCIES
200-
active_model_serializers!
191+
activerecord (>= 4.1, < 6)
201192
appraisal
202193
bundler (~> 1.12)
203194
database_cleaner
204195
guard
205196
guard-rspec
197+
jsonapi-rails (~> 0.1)
206198
jsonapi_compliable!
207-
jsonapi_spec_helpers
208199
kaminari
209200
pry
210201
pry-byebug
@@ -214,4 +205,4 @@ DEPENDENCIES
214205
sqlite3
215206

216207
BUNDLED WITH
217-
1.12.5
208+
1.13.6

‎gemfiles/rails_5.gemfile‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,16 @@
22

33
source "https://rubygems.org"
44

5-
gem "active_model_serializers", :git => "https://github.com/richmolj/active_model_serializers.git"
65
gem "rails", "~> 5.0"
6+
gem "jsonapi-rails", "~> 0.1", :require => "jsonapi/rails"
7+
gem "rspec-rails"
78

89
group :test do
10+
gem "pry"
11+
gem "pry-byebug", :platform => [:mri]
912
gem "appraisal"
1013
gem "guard"
1114
gem "guard-rspec"
12-
gem "pry"
13-
gem "pry-byebug"
1415
end
1516

1617
gemspec :path => "../"

‎gemfiles/rails_5.gemfile.lock‎

Lines changed: 27 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,8 @@
1-
GIT
2-
remote: https://github.com/richmolj/active_model_serializers.git
3-
revision: 1dc2b74059731339f4df3e7882fd949e20433013
4-
specs:
5-
active_model_serializers (0.10.2)
6-
actionpack (>= 4.1, < 6)
7-
activemodel (>= 4.1, < 6)
8-
jsonapi (~> 0.1.1.beta2)
9-
railties (>= 4.1, < 6)
10-
111
PATH
122
remote: ../
133
specs:
14-
jsonapi_compliable (0.3.4)
15-
active_model_serializers (~> 0.10)
16-
jsonapi (~> 0.1.1.beta2)
17-
jsonapi_ams_extensions (~> 0.1)
18-
rails (>= 4.1, < 6)
4+
jsonapi_compliable (0.4.0)
5+
jsonapi-serializable (~> 0.1)
196

207
GEM
218
remote: https://rubygems.org/
@@ -61,11 +48,11 @@ GEM
6148
bundler
6249
rake
6350
thor (>= 0.14.0)
64-
arel (7.1.1)
51+
arel (7.1.4)
6552
builder (3.2.2)
66-
byebug (9.0.5)
53+
byebug (9.0.6)
6754
coderay (1.1.1)
68-
concurrent-ruby (1.0.2)
55+
concurrent-ruby (1.0.4)
6956
database_cleaner (1.5.3)
7057
diff-lcs (1.2.5)
7158
erubis (2.7.0)
@@ -88,12 +75,17 @@ GEM
8875
guard-compat (~> 1.1)
8976
rspec (>= 2.99.0, < 4.0)
9077
i18n (0.7.0)
91-
json (1.8.3)
92-
jsonapi (0.1.1.beta2)
93-
json (~> 1.8)
94-
jsonapi_ams_extensions (0.1.1)
95-
active_model_serializers (~> 0.10.x)
96-
jsonapi_spec_helpers (0.2.0)
78+
jsonapi-deserializable (0.1.1)
79+
jsonapi-parser (= 0.1.1)
80+
jsonapi-parser (0.1.1)
81+
jsonapi-rails (0.1.1)
82+
jsonapi-rb (= 0.1.1)
83+
jsonapi-rb (0.1.1)
84+
jsonapi-deserializable (= 0.1.1)
85+
jsonapi-serializable (= 0.1.1)
86+
jsonapi-renderer (0.1.1)
87+
jsonapi-serializable (0.1.1)
88+
jsonapi-renderer (= 0.1.1)
9789
kaminari (0.17.0)
9890
actionpack (>= 3.0.0)
9991
activesupport (>= 3.0.0)
@@ -111,21 +103,19 @@ GEM
111103
mime-types-data (~> 3.2015)
112104
mime-types-data (3.2016.0521)
113105
mini_portile2 (2.1.0)
114-
minitest (5.9.0)
106+
minitest (5.10.1)
115107
nenv (0.3.0)
116108
nio4r (1.2.1)
117-
nokogiri (1.6.8)
109+
nokogiri (1.6.8.1)
118110
mini_portile2 (~> 2.1.0)
119-
pkg-config (~> 1.1.7)
120111
notiffany (0.1.1)
121112
nenv (~> 0.1)
122113
shellany (~> 0.0)
123-
pkg-config (1.1.7)
124114
pry (0.10.4)
125115
coderay (~> 1.1.0)
126116
method_source (~> 0.8.1)
127117
slop (~> 3.4)
128-
pry-byebug (3.4.0)
118+
pry-byebug (3.4.2)
129119
byebug (~> 9.0)
130120
pry (~> 0.10)
131121
rack (2.0.1)
@@ -155,14 +145,14 @@ GEM
155145
rake (>= 0.8.7)
156146
thor (>= 0.18.1, < 2.0)
157147
rake (10.5.0)
158-
rb-fsevent (0.9.7)
148+
rb-fsevent (0.9.8)
159149
rb-inotify (0.9.7)
160150
ffi (>= 0.5.0)
161151
rspec (3.5.0)
162152
rspec-core (~> 3.5.0)
163153
rspec-expectations (~> 3.5.0)
164154
rspec-mocks (~> 3.5.0)
165-
rspec-core (3.5.3)
155+
rspec-core (3.5.4)
166156
rspec-support (~> 3.5.0)
167157
rspec-expectations (3.5.0)
168158
diff-lcs (>= 1.2.0, < 2.0)
@@ -179,7 +169,7 @@ GEM
179169
rspec-mocks (~> 3.5.0)
180170
rspec-support (~> 3.5.0)
181171
rspec-support (3.5.0)
182-
ruby_dep (1.4.0)
172+
ruby_dep (1.5.0)
183173
shellany (0.0.1)
184174
slop (3.6.0)
185175
sprockets (3.7.0)
@@ -189,8 +179,8 @@ GEM
189179
actionpack (>= 4.0)
190180
activesupport (>= 4.0)
191181
sprockets (>= 3.0.0)
192-
sqlite3 (1.3.11)
193-
thor (0.19.1)
182+
sqlite3 (1.3.12)
183+
thor (0.19.4)
194184
thread_safe (0.3.5)
195185
tzinfo (1.2.2)
196186
thread_safe (~> 0.1)
@@ -202,14 +192,14 @@ PLATFORMS
202192
ruby
203193

204194
DEPENDENCIES
205-
active_model_serializers!
195+
activerecord (>= 4.1, < 6)
206196
appraisal
207197
bundler (~> 1.12)
208198
database_cleaner
209199
guard
210200
guard-rspec
201+
jsonapi-rails (~> 0.1)
211202
jsonapi_compliable!
212-
jsonapi_spec_helpers
213203
kaminari
214204
pry
215205
pry-byebug
@@ -219,4 +209,4 @@ DEPENDENCIES
219209
sqlite3
220210

221211
BUNDLED WITH
222-
1.12.5
212+
1.13.6

‎jsonapi_compliable.gemspec‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,12 @@ Gem::Specification.new do |spec|
1717
spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
1818
spec.require_paths = ["lib"]
1919

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

22-
spec.add_dependency 'jsonapi-rails', '~> 0.1'
23-
24-
spec.add_development_dependency "kaminari"
25-
spec.add_development_dependency "active_model_serializers"
26-
spec.add_development_dependency "jsonapi_spec_helpers"
22+
spec.add_development_dependency "activerecord", ['>= 4.1', '< 6']
23+
spec.add_development_dependency "kaminari", '~> 0.17'
2724
spec.add_development_dependency "bundler", "~> 1.12"
2825
spec.add_development_dependency "rake", "~> 10.0"
29-
spec.add_development_dependency "rspec-rails"
3026
spec.add_development_dependency "sqlite3"
3127
spec.add_development_dependency "database_cleaner"
3228
end

0 commit comments

Comments
 (0)