From 9b08afd2f4d501fb1710ba0ed4e19313093605c8 Mon Sep 17 00:00:00 2001
From: Milan Dobrota <mdobrota@tribune.com>
Date: Sun, 4 Sep 2011 10:44:08 -0500
Subject: if ... nil? is more expensive than unless

---
 actionpack/lib/action_controller/caching/sweeping.rb  | 2 +-
 actionpack/lib/action_controller/metal/redirecting.rb | 2 +-
 actionpack/lib/action_controller/test_case.rb         | 6 +++---
 actionpack/lib/action_dispatch/routing/mapper.rb      | 2 +-
 actionpack/lib/action_view/asset_paths.rb             | 2 +-
 actionpack/lib/action_view/helpers/form_tag_helper.rb | 2 +-
 actionpack/lib/action_view/helpers/url_helper.rb      | 6 +++---
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/actionpack/lib/action_controller/caching/sweeping.rb b/actionpack/lib/action_controller/caching/sweeping.rb
index 938a6ae81c..49cf70ec21 100644
--- a/actionpack/lib/action_controller/caching/sweeping.rb
+++ b/actionpack/lib/action_controller/caching/sweeping.rb
@@ -88,7 +88,7 @@ module ActionController #:nodoc:
           end
 
           def method_missing(method, *arguments, &block)
-            return if @controller.nil?
+            return unless @controller
             @controller.__send__(method, *arguments, &block)
           end
       end
diff --git a/actionpack/lib/action_controller/metal/redirecting.rb b/actionpack/lib/action_controller/metal/redirecting.rb
index 4f311a1cf5..f2dfb3833b 100644
--- a/actionpack/lib/action_controller/metal/redirecting.rb
+++ b/actionpack/lib/action_controller/metal/redirecting.rb
@@ -57,7 +57,7 @@ module ActionController
     # When using <tt>redirect_to :back</tt>, if there is no referrer, RedirectBackError will be raised. You may specify some fallback
     # behavior for this case by rescuing RedirectBackError.
     def redirect_to(options = {}, response_status = {}) #:doc:
-      raise ActionControllerError.new("Cannot redirect to nil!") if options.nil?
+      raise ActionControllerError.new("Cannot redirect to nil!") unless options
       raise AbstractController::DoubleRenderError if response_body
 
       self.status        = _extract_redirect_to_status(options, response_status)
diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb
index 40332da321..a83fa74795 100644
--- a/actionpack/lib/action_controller/test_case.rb
+++ b/actionpack/lib/action_controller/test_case.rb
@@ -79,10 +79,10 @@ module ActionController
                 "expecting <?> but rendering with <?>",
                 options, rendered.keys.join(', '))
         assert_block(msg) do
-          if options.nil?
-            @templates.blank?
-          else
+          if options
             rendered.any? { |t,num| t.match(options) }
+          else
+            @templates.blank?
           end
         end
       when Hash
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index 0c43954d81..21dc5af486 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -1436,7 +1436,7 @@ module ActionDispatch
             name_prefix = @scope[:as]
 
             if parent_resource
-              return nil if as.nil? && action.nil?
+              return nil unless as || action
 
               collection_name = parent_resource.collection_name
               member_name = parent_resource.member_name
diff --git a/actionpack/lib/action_view/asset_paths.rb b/actionpack/lib/action_view/asset_paths.rb
index aae8377f8a..73f4f8ee5f 100644
--- a/actionpack/lib/action_view/asset_paths.rb
+++ b/actionpack/lib/action_view/asset_paths.rb
@@ -69,7 +69,7 @@ module ActionView
           host = "#{compute_protocol(protocol)}#{host}"
         end
       end
-      host.nil? ? source : "#{host}#{source}"
+      host ? "#{host}#{source}" : source
     end
 
     def compute_protocol(protocol)
diff --git a/actionpack/lib/action_view/helpers/form_tag_helper.rb b/actionpack/lib/action_view/helpers/form_tag_helper.rb
index 1ceb53fe9c..13b9dc8553 100644
--- a/actionpack/lib/action_view/helpers/form_tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_tag_helper.rb
@@ -656,7 +656,7 @@ module ActionView
           if token == false || !protect_against_forgery?
             ''
           else
-            token = form_authenticity_token if token.nil?
+            token ||= form_authenticity_token
             tag(:input, :type => "hidden", :name => request_forgery_protection_token.to_s, :value => token)
           end
         end
diff --git a/actionpack/lib/action_view/helpers/url_helper.rb b/actionpack/lib/action_view/helpers/url_helper.rb
index 4dbb0135f6..0cdc103df3 100644
--- a/actionpack/lib/action_view/helpers/url_helper.rb
+++ b/actionpack/lib/action_view/helpers/url_helper.rb
@@ -596,9 +596,7 @@ module ActionView
 
       private
         def convert_options_to_data_attributes(options, html_options)
-          if html_options.nil?
-            link_to_remote_options?(options) ? {'data-remote' => 'true'} : {}
-          else
+          if html_options
             html_options = html_options.stringify_keys
             html_options['data-remote'] = 'true' if link_to_remote_options?(options) || link_to_remote_options?(html_options)
 
@@ -611,6 +609,8 @@ module ActionView
             add_method_to_attributes!(html_options, method)   if method
 
             html_options
+          else
+            link_to_remote_options?(options) ? {'data-remote' => 'true'} : {}
           end
         end
 
-- 
cgit v1.2.3