standardapi 1.0.18 → 1.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a335bf3f3a1df576a464d696cfb2c4e08db85ebd
-  data.tar.gz: b1c17381aa0c534ccaec58ffa3a9d86fe53d37f0
+  metadata.gz: 3e568bcafb624da9ac84b8f85b975bba6ac051e7
+  data.tar.gz: 33d3ba09653ace45e6cc31f5551d330517e85ba8
 SHA512:
-  metadata.gz: 6d08cab6b53e58fff34afd58d359c51bc4ae72f7d020d5ee35f649fc0f7f7589185225771b5dabd4a0a2250c5ec1f7d630c2b116368a7c62155b00bd2e0b9a0f
-  data.tar.gz: 5193ba62c57aa0aa3e997a73875ebf66434a06228897b5e13adb682a32cfefc802b5d562286a6815f30b190fa3c03b163ae373777df66bb54e76c9329deea489
+  metadata.gz: 589496fddcc6ffe77ab69c8104f6c8a73a472ceceb283767a70a6d07d1eab9aadef191f5a1e6f087360f9bf9b1adbdd8e8e99d904ccd2ff04c6b19aeeaad2d95
+  data.tar.gz: 77d5e322883ed99681ddc466f898ed67f71254f888ce81357a96d1540d61aa4f7ad4418965dc8db63ed82dc26183a154f3dd92d9491e18f213cf5faeffbc5fba

data/lib/standard_api/helpers.rb

@@ -2,7 +2,7 @@ module StandardAPI
   module Helpers
 
     def model_partial(record)
-      if lookup_context.exists?(record.model_name.element, controller_name, true)
+      if lookup_context.exists?(record.model_name.element, record.model_name.plural, true)
         [record.model_name.plural, record.model_name.element].join('/')
       else
         'application/record'

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

@@ -15,15 +15,21 @@ includes.each do |inc, subinc|
         json.array! record.send(inc), partial: partial, as: partial.split('/').last, locals: { includes: subinc }
       else
         if record.send(inc).nil?
-          json.set! association.klass.model_name.element, nil
+          json.null!
         else
           partial = model_partial(record.send(inc))
-          json.partial! partial, partial.split('/').last => record.send(inc), includes: subinc
+          json.partial! partial, partial.split('/').last.to_sym => record.send(inc), includes: subinc
         end
       end
     end
   else
-    json.set! inc, record.send(inc)
+    json.set! inc do
+      if record.send(inc).nil?
+        json.null!
+      else
+        record.send(inc).as_json
+      end
+    end
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: standardapi
 version: !ruby/object:Gem::Version
-  version: 1.0.18
+  version: 1.0.19
 platform: ruby
 authors:
 - James Bracy