standardapi 1.0.19 → 1.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e568bcafb624da9ac84b8f85b975bba6ac051e7
-  data.tar.gz: 33d3ba09653ace45e6cc31f5551d330517e85ba8
+  metadata.gz: 8efee4c4e9e7dc0b224b60a46f793a7484534b03
+  data.tar.gz: bfbe121a41e3e3bc7b26674012c2f79e07955ad0
 SHA512:
-  metadata.gz: 589496fddcc6ffe77ab69c8104f6c8a73a472ceceb283767a70a6d07d1eab9aadef191f5a1e6f087360f9bf9b1adbdd8e8e99d904ccd2ff04c6b19aeeaad2d95
-  data.tar.gz: 77d5e322883ed99681ddc466f898ed67f71254f888ce81357a96d1540d61aa4f7ad4418965dc8db63ed82dc26183a154f3dd92d9491e18f213cf5faeffbc5fba
+  metadata.gz: fc900a2e9e417ae3a5c3d3067c5fb833e83ff647f9f7433a2b443c1c458c12ebf5e653e4414155bdb798e7df397bcd43c59e9935fde5afcc38eff12e50e1282c
+  data.tar.gz: ea1883e5531ebb73ee3973002165dc714e0a19c89a4d984a2c26d88695d0f6299f893554256a74a578c7a5c621f09e02ab1648ddeb8d19ee0b4a4d9fa95d6df0

data/lib/standard_api/views/application/_record.json.jbuilder

@@ -5,32 +5,49 @@ record.attributes.each do |name, value|
 end
 
 includes.each do |inc, subinc|
+
+  
   association = record.class.reflect_on_association(inc)
   if association
-    json.set! inc do
-      collection = [:has_many, :has_and_belongs_to_many].include?(association.macro)
+    collection = [:has_many, :has_and_belongs_to_many].include?(association.macro)
 
-      if collection
-        partial = model_partial(association.klass)
+    if collection
+      partial = model_partial(association.klass)
+      json.set! inc do
         json.array! record.send(inc), partial: partial, as: partial.split('/').last, locals: { includes: subinc }
-      else
-        if record.send(inc).nil?
+      end
+    else
+
+      if record.send(inc).nil?
+        json.set! inc do
           json.null!
-        else
-          partial = model_partial(record.send(inc))
+        end
+      else
+        partial = model_partial(record.send(inc))
+        json.set! inc do
           json.partial! partial, partial.split('/').last.to_sym => record.send(inc), includes: subinc
         end
       end
     end
+
   else
-    json.set! inc do
-      if record.send(inc).nil?
+
+    if record.send(inc).nil?
+      json.set! inc do
         json.null!
-      else
-        record.send(inc).as_json
       end
+    elsif record.send(inc).is_a?(ActiveModel::Model)
+      partial = model_partial(record.send(inc))
+      json.set! inc do
+        json.partial! partial, partial.split('/').last.to_sym => record.send(inc), includes: subinc
+      end
+    else
+      # TODO: Test
+      json.set! inc, record.send(inc).as_json
     end
+
   end
+  
 end
 
 if !record.errors.blank?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: standardapi
 version: !ruby/object:Gem::Version
-  version: 1.0.19
+  version: 1.0.20
 platform: ruby
 authors:
 - James Bracy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-18 00:00:00.000000000 Z
+date: 2015-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-sort