ocean-rails 1.22.4 → 1.22.5
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 +4 -4
- data/lib/ocean/ocean_application_controller.rb +1 -1
- data/lib/ocean/ocean_resource_model.rb +2 -2
- data/lib/ocean/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 2457904b789004d0cac927136c86dcc984f615a9
|
|
4
|
+
data.tar.gz: 1a6dc9e959d0d11c2274ac79ac429e234585bb7d
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: b0e117ef9959e411995d4c2a13c51892fdb3046f9dc617029a9df47a9466859cb534b1b50adad33be176335d1d11d5c0c850a2a81f2c0fc5ed7f137b8ac3c012
|
|
7
|
+
data.tar.gz: eb1b5186dcb073420612f5622307da96371540a545f7f511844a35a721ee405fff530d73e1aab3874ff8f5bab1c1a672b7ed32de25cd2464140e2c7bf7eafd2c
|
|
@@ -165,7 +165,7 @@ module OceanApplicationController
|
|
|
165
165
|
# for resources creates a partial in the proper location.
|
|
166
166
|
#
|
|
167
167
|
def api_render(x, new: false)
|
|
168
|
-
if !x.is_a?(Array) && !x.is_a?(ActiveRecord::Relation)
|
|
168
|
+
if !x.is_a?(Array) && !(defined?(ActiveRecord) && x.is_a?(ActiveRecord::Relation))
|
|
169
169
|
partial = x.to_partial_path
|
|
170
170
|
if new
|
|
171
171
|
render partial: partial, object: x, status: 201, location: x
|
|
@@ -58,5 +58,5 @@ module Ocean
|
|
|
58
58
|
end
|
|
59
59
|
|
|
60
60
|
|
|
61
|
-
ActiveRecord::Base.send
|
|
62
|
-
OceanDynamo::Base.send
|
|
61
|
+
ActiveRecord::Base.send(:include, Ocean::OceanResourceModel) if defined? ActiveRecord
|
|
62
|
+
OceanDynamo::Base.send(:include, Ocean::OceanResourceModel) if defined? OceanDynamo
|
data/lib/ocean/version.rb
CHANGED