From adcea6aaf0c8dac2c7e3b3c9f19a111b1c82895d Mon Sep 17 00:00:00 2001 From: Vladimir Lyzo Date: Wed, 13 Aug 2014 11:26:16 +0400 Subject: [PATCH] Fix failing test: option format_key with root option --- lib/active_model/array_serializer.rb | 3 ++- lib/active_model/serializer.rb | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/active_model/array_serializer.rb b/lib/active_model/array_serializer.rb index 8a42e18a..b314dbfc 100644 --- a/lib/active_model/array_serializer.rb +++ b/lib/active_model/array_serializer.rb @@ -25,7 +25,8 @@ module ActiveModel def json_key key = root.nil? ? @resource_name : root - key_format == :lower_camel ? key.camelize(:lower) : key + + key_format == :lower_camel && key.present? ? key.camelize(:lower) : key end def serializer_for(item) diff --git a/lib/active_model/serializer.rb b/lib/active_model/serializer.rb index bd1a3ac5..8a0e856e 100644 --- a/lib/active_model/serializer.rb +++ b/lib/active_model/serializer.rb @@ -126,7 +126,7 @@ end root end - key_format == :lower_camel ? key.camelize(:lower) : key + key_format == :lower_camel && key.present? ? key.camelize(:lower) : key end def attributes