Simplify if statements

rails · Aug 25, 2013 · f6039df · f6039df
1 parent e10a253
commit f6039df
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/actionpack/lib/action_controller/metal/rendering.rb b/actionpack/lib/action_controller/metal/rendering.rb
@@ -11,12 +11,10 @@ module BasicRendering
     def render(*args, &block)
       super(*args, &block)
       opts = args.first
-      if (opts.keys & [:text, :nothing]).present?
+      if opts.has_key?(:text) && opts[:text].present?
-        self.response_body = if opts.has_key?(:text) && opts[:text].present?
+        self.response_body = opts[:text]
-          opts[:text]
+      elsif opts.has_key?(:nothing) && opts[:nothing]
-        elsif opts.has_key?(:nothing) && opts[:nothing]
+        self.response_body = " "
-          " "
-        end
       else
         raise UnsupportedOperationError
       end