caprese 0.3.19.1 → 0.3.19.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 229427ce58125e220fb6ce8864c87f78670808f3
-  data.tar.gz: ceb22983137388dcb76f9251d779f6c9e2ab1588
+  metadata.gz: 4f06336d5d4aafbe84693d22a9182e71e3caa923
+  data.tar.gz: 33975f9eae83da635079afe06a0aedfc2737ca15
 SHA512:
-  metadata.gz: 01d1694063ce113ce69fe8975203ead9d33099b6c4ce141962ab1acc1f2bdd9510883a66ca04586fb51876ac294868cd36c368886c1eb56d28e9d4fc7b0f8a12
-  data.tar.gz: bd81178f1ef091e1bcf24b57308cf7513ce412d118d16cb1d0769648ab0da1adbd27929031ae95966fef69324fc618c37dcbbf5fa9af92530b6d220fbb599331
+  metadata.gz: 762caaee5e60a49b56c87a3414614f4c7d313345df7b13504f671b305ac8ecc939734ef50203bbd242af921524455775c6fd63a9a496ba158665c5f4531d5c8f
+  data.tar.gz: 2862173fa24e4aa81173f7bc54a563000866abf3c53aafcccbcccc80cae04214c17e01829e4a13d17cb2525d8eee0b0359ae9b437c5db1c85e75d4d1572e424c

data/CHANGELOG.md

@@ -103,3 +103,7 @@
 ## 0.3.19.1
 
 * Rescue `Exception` temporarily, so we can always turn off `caprese_style_errors`
+
+## 0.3.19.2
+
+* Fix rendering of non-JSON actions

data/lib/caprese/controller/concerns/rendering.rb

@@ -9,20 +9,22 @@ module Caprese
     # Override render so we can automatically use our adapter and find the appropriate serializer
     # instead of requiring that they be explicity stated
     def render(options = {})
-      options[:adapter] = Caprese::Adapter::JsonApi
-      options[:meta] = meta unless meta.empty?
+      if options.is_a?(Hash) && options[:json]
+        options[:adapter] = Caprese::Adapter::JsonApi
+        options[:meta] = meta unless meta.empty?
 
-      if options[:json].respond_to?(:to_ary)
-        if options[:json].first.is_a?(Error)
-          options[:each_serializer] ||= Serializer::ErrorSerializer
-        elsif options[:json].any?
-          options[:each_serializer] ||= serializer_for(options[:json].first)
-        end
-      else
-        if options[:json].is_a?(Error)
-          options[:serializer] ||= Serializer::ErrorSerializer
-        elsif options[:json].present?
-          options[:serializer] ||= serializer_for(options[:json])
+        if options[:json].respond_to?(:to_ary)
+          if options[:json].first.is_a?(Error)
+            options[:each_serializer] ||= Serializer::ErrorSerializer
+          elsif options[:json].any?
+            options[:each_serializer] ||= serializer_for(options[:json].first)
+          end
+        else
+          if options[:json].is_a?(Error)
+            options[:serializer] ||= Serializer::ErrorSerializer
+          elsif options[:json].present?
+            options[:serializer] ||= serializer_for(options[:json])
+          end
         end
       end
 

data/lib/caprese/version.rb

@@ -1,3 +1,3 @@
 module Caprese
-  VERSION = '0.3.19.1'
+  VERSION = '0.3.19.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caprese
 version: !ruby/object:Gem::Version
-  version: 0.3.19.1
+  version: 0.3.19.2
 platform: ruby
 authors:
 - Nick Landgrebe
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-17 00:00:00.000000000 Z
+date: 2017-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers