model-api 0.8.6 → 0.8.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 95ae1633c2baa4a79b179c84be9ddd6d7b88a90b
4
- data.tar.gz: d0c704c3b3da52e804d882b6f2f058990c52204a
3
+ metadata.gz: 87c1e48361794afbec466d37b263424debab8f5b
4
+ data.tar.gz: 53df6228739bf03d9047d22c8d76804193a541ab
5
5
  SHA512:
6
- metadata.gz: a15c1b6b310de1fe521ed6b5ed6de3d1f3ad978b64235ed558169b28ebd206e560f85dbdd4be445936c2d4a2e17820e983deb46d46617124888ab571411745ca
7
- data.tar.gz: 495bd7405fdcc08ebb437e25a19e086317744eede270a862523374add229269089a620839602bd46eec959141e58c21d17d9ec35ae9573df142f927c31571a5e
6
+ metadata.gz: af7384ecb85455e7514fc1ad27e2ea98037730bb6f2995fe0f72840231dc30cfe4056893d7d746a40df6c09ef8fe74d0036b8b6ebcbf3de0e9ad1a6b98ea3f5a
7
+ data.tar.gz: 3765d125af6fc44acf91f1ddeada3a937d19c738e35de003e659eeade086586de7204ec136a46d522c56e674feba687f863e195cb8f2739c2f88ce1e8ee95e27
@@ -52,8 +52,8 @@ module ModelApi
52
52
  status: { type: :string, required: true, description: 'HTTP status' },
53
53
  statusCode: { type: :integer, required: true,
54
54
  description: 'Numeric HTTP status code' },
55
- ModelApi::Utils.ext_attr(opts[:root] || ModelApi::Utils.model_name(model_class).singular) =>
56
- response_object_metadata)
55
+ ModelApi::Utils.ext_attr(opts[:root] ||
56
+ ModelApi::Utils.model_name(model_class).singular) => response_object_metadata)
57
57
  wrapper_object_name
58
58
  end
59
59
 
@@ -408,8 +408,9 @@ module ModelApi
408
408
  metadata = filtered_ext_attrs(klass, opts[:operation] || :index, opts)
409
409
  model_metadata = opts[:model_metadata] || model_metadata(klass)
410
410
  includes = []
411
- if (metadata_includes = model_metadata[:collection_includes]).is_a?(Array)
412
- includes += metadata_includes.map(&:to_sym)
411
+ if (metadata_includes = model_metadata[:collection_includes]).present?
412
+ meta_includes = [meta_includes] unless meta_includes.is_a?(Array)
413
+ includes += metadata_includes
413
414
  end
414
415
  metadata.each do |_attr, attr_metadata|
415
416
  includes << attr_metadata[:key] if attr_metadata[:type] == :association
@@ -3,7 +3,7 @@ $:.unshift lib unless $:.include?(lib)
3
3
 
4
4
  Gem::Specification.new do |s|
5
5
  s.name = 'model-api'
6
- s.version = '0.8.6'
6
+ s.version = '0.8.7'
7
7
  s.summary = 'Create easy REST API\'s using metadata inside your ActiveRecord models'
8
8
  s.description = 'Ruby gem allowing Ruby on Rails developers to create REST API’s using ' \
9
9
  'metadata defined inside their ActiveRecord models.'
@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
17
17
  s.require_path = "lib"
18
18
 
19
19
  s.add_dependency "rails", "~> 4.0"
20
- s.add_dependency "open-api", "~> 0.8.2"
20
+ s.add_dependency "open-api", "~> 0.8.4"
21
21
 
22
22
  s.add_development_dependency "rspec-rails", "~> 3.5", ">= 3.5.2"
23
23
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: model-api
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.8.6
4
+ version: 0.8.7
5
5
  platform: ruby
6
6
  authors:
7
7
  - Matthew Mead
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-10-14 00:00:00.000000000 Z
11
+ date: 2016-10-20 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -30,14 +30,14 @@ dependencies:
30
30
  requirements:
31
31
  - - ~>
32
32
  - !ruby/object:Gem::Version
33
- version: 0.8.2
33
+ version: 0.8.4
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - ~>
39
39
  - !ruby/object:Gem::Version
40
- version: 0.8.2
40
+ version: 0.8.4
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: rspec-rails
43
43
  requirement: !ruby/object:Gem::Requirement