Merge pull request #1593 from r00k/master

Simplify boolean logic into ternary
rails · Jun 9, 2011 · 9295053 · 9295053
2 parents 54b0aeb + f878880
commit 9295053
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/activesupport/lib/active_support/core_ext/module/delegation.rb b/activesupport/lib/active_support/core_ext/module/delegation.rb
@@ -113,7 +113,7 @@ def delegate(*methods)
       raise ArgumentError, "Can only automatically set the delegation prefix when delegating to a method."
     end
 
-    prefix = options[:prefix] && "#{options[:prefix] == true ? to : options[:prefix]}_" || ''
+    prefix = options[:prefix] ? "#{options[:prefix] == true ? to : options[:prefix]}_" : ''
 
     file, line = caller.first.split(':', 2)
     line = line.to_i