Merge pull request #1518 from stanio/master

Use simpler less confusing form of expression
ruby-grape · Nov 7, 2016 · f50576a · f50576a
2 parents 40cc054 + 7a5d3dd
commit f50576a
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/grape/formatter/serializable_hash.rb b/lib/grape/formatter/serializable_hash.rb
@@ -12,13 +12,13 @@ def call(object, _env)
         private
 
         def serializable?(object)
-          object.respond_to?(:serializable_hash) || object.is_a?(Array) && !object.map { |o| o.respond_to? :serializable_hash }.include?(false) || object.is_a?(Hash)
+          object.respond_to?(:serializable_hash) || object.is_a?(Array) && object.all? { |o| o.respond_to? :serializable_hash } || object.is_a?(Hash)
         end
 
         def serialize(object)
           if object.respond_to? :serializable_hash
             object.serializable_hash
-          elsif object.is_a?(Array) && !object.map { |o| o.respond_to? :serializable_hash }.include?(false)
+          elsif object.is_a?(Array) && object.all? { |o| o.respond_to? :serializable_hash }
             object.map(&:serializable_hash)
           elsif object.is_a?(Hash)
             h = {}