From 918dc27345319fbabf25a43bd65b613878b3a66e Mon Sep 17 00:00:00 2001
From: thedarkone <thedarkone2@gmail.com>
Date: Mon, 27 Sep 2010 14:50:39 +0200
Subject: Compile ActionController::Base.config's methods to avoid
 method_missing overhead.

---
 actionpack/lib/action_controller/railtie.rb | 10 ++++++++++
 actionpack/lib/action_view/base.rb          |  3 +--
 2 files changed, 11 insertions(+), 2 deletions(-)

(limited to 'actionpack/lib')

diff --git a/actionpack/lib/action_controller/railtie.rb b/actionpack/lib/action_controller/railtie.rb
index aea28d9265..4c57d82f1c 100644
--- a/actionpack/lib/action_controller/railtie.rb
+++ b/actionpack/lib/action_controller/railtie.rb
@@ -26,6 +26,10 @@ module ActionController
       options.stylesheets_dir      ||= paths.public.stylesheets.to_a.first
       options.page_cache_directory ||= paths.public.to_a.first
 
+      # make sure readers methods get compiled
+      options.asset_path           ||= nil
+      options.asset_host           ||= nil
+
       ActiveSupport.on_load(:action_controller) do
         include app.routes.mounted_helpers
         extend ::AbstractController::Railties::RoutesHelpers.with(app.routes)
@@ -33,5 +37,11 @@ module ActionController
         options.each { |k,v| send("#{k}=", v) }
       end
     end
+
+    config.after_initialize do
+      ActiveSupport.on_load(:action_controller) do
+        config.crystalize! if config.respond_to?(:crystalize!)
+      end
+    end
   end
 end
diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb
index 3fa46d0f43..0bef3e3a08 100644
--- a/actionpack/lib/action_view/base.rb
+++ b/actionpack/lib/action_view/base.rb
@@ -209,8 +209,7 @@ module ActionView #:nodoc:
         @_request = controller.request if controller.respond_to?(:request)
       end
 
-      config = controller && controller.respond_to?(:config) ? controller.config : {}
-      @_config = ActiveSupport::InheritableOptions.new(config)
+      @_config = controller && controller.respond_to?(:config) ? controller.config.inheritable_copy : {}
 
       @_content_for  = Hash.new { |h,k| h[k] = ActiveSupport::SafeBuffer.new }
       @_virtual_path = nil
-- 
cgit v1.2.3


From 05e53b4c1a3422131f73598848b0332cdc793f69 Mon Sep 17 00:00:00 2001
From: thedarkone <thedarkone2@gmail.com>
Date: Wed, 22 Sep 2010 20:18:05 +0200
Subject: Optimize relative_url_root rewriting code.

---
 actionpack/lib/action_view/helpers/asset_tag_helper.rb | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'actionpack/lib')

diff --git a/actionpack/lib/action_view/helpers/asset_tag_helper.rb b/actionpack/lib/action_view/helpers/asset_tag_helper.rb
index 687cb83d75..bf57321e86 100644
--- a/actionpack/lib/action_view/helpers/asset_tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/asset_tag_helper.rb
@@ -718,6 +718,10 @@ module ActionView
           "#{host}#{source}"
         end
 
+        def rewrite_relative_url_root(source, relative_url_root)
+          relative_url_root && !source.starts_with?("#{relative_url_root}/") ? "#{relative_url_root}#{source}" : source
+        end
+
         # Add the the extension +ext+ if not present. Return full URLs otherwise untouched.
         # Prefix with <tt>/dir/</tt> if lacking a leading +/+. Account for relative URL
         # roots. Rewrite the asset path for cache-busting asset ids. Include
@@ -733,9 +737,7 @@ module ActionView
           source = rewrite_asset_path(source, config.asset_path)
 
           has_request = controller.respond_to?(:request)
-          if has_request && include_host && source !~ %r{^#{controller.config.relative_url_root}/}
-            source = "#{controller.config.relative_url_root}#{source}"
-          end
+          source = rewrite_relative_url_root(source, controller.config.relative_url_root) if has_request && include_host
           source = rewrite_host_and_protocol(source, has_request) if include_host
 
           source
-- 
cgit v1.2.3


From 7b2d51817d58336324bce5de422ff82fcab8e18a Mon Sep 17 00:00:00 2001
From: thedarkone <thedarkone2@gmail.com>
Date: Wed, 22 Sep 2010 22:38:13 +0200
Subject: Make asset extension rewriting faster.

---
 actionpack/lib/action_view/helpers/asset_tag_helper.rb | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

(limited to 'actionpack/lib')

diff --git a/actionpack/lib/action_view/helpers/asset_tag_helper.rb b/actionpack/lib/action_view/helpers/asset_tag_helper.rb
index bf57321e86..7576177392 100644
--- a/actionpack/lib/action_view/helpers/asset_tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/asset_tag_helper.rb
@@ -705,9 +705,15 @@ module ActionView
 
       private
 
-        def rewrite_extension?(source, dir, ext)
-          source_ext = File.extname(source)[1..-1]
-          ext && (source_ext.blank? || (ext != source_ext && File.exist?(File.join(config.assets_dir, dir, "#{source}.#{ext}"))))
+        def rewrite_extension(source, dir, ext)
+          source_ext = File.extname(source)
+
+          if source_ext.empty?
+            "#{source}.#{ext}"
+          elsif ext != source_ext[1..-1]
+            with_ext = "#{source}.#{ext}"
+            with_ext if File.exist?(File.join(config.assets_dir, dir, with_ext))
+          end || source
         end
 
         def rewrite_host_and_protocol(source, has_request)
@@ -729,8 +735,8 @@ module ActionView
         def compute_public_path(source, dir, ext = nil, include_host = true)
           return source if is_uri?(source)
 
-          source += ".#{ext}" if rewrite_extension?(source, dir, ext)
-          source  = "/#{dir}/#{source}" unless source[0] == ?/
+          source = rewrite_extension(source, dir, ext) if ext
+          source = "/#{dir}/#{source}" unless source[0] == ?/
           if controller.respond_to?(:env) && controller.env["action_dispatch.asset_path"]
             source = rewrite_asset_path(source, controller.env["action_dispatch.asset_path"])
           end
-- 
cgit v1.2.3


From 86bcccf8dfced5e9428407a71f02c1dcc186f2ba Mon Sep 17 00:00:00 2001
From: thedarkone <thedarkone2@gmail.com>
Date: Thu, 23 Sep 2010 18:08:43 +0200
Subject: No need to create a separate lambda for each call.

---
 .../lib/action_dispatch/routing/route_set.rb       | 29 +++++++++++-----------
 1 file changed, 14 insertions(+), 15 deletions(-)

(limited to 'actionpack/lib')

diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb
index 1a5f21bd09..60b1342d55 100644
--- a/actionpack/lib/action_dispatch/routing/route_set.rb
+++ b/actionpack/lib/action_dispatch/routing/route_set.rb
@@ -334,6 +334,19 @@ module ActionDispatch
       end
 
       class Generator #:nodoc:
+        PARAMETERIZE = {
+          :parameterize => lambda do |name, value|
+            if name == :controller
+              value
+            elsif value.is_a?(Array)
+              value.map { |v| Rack::Mount::Utils.escape_uri(v.to_param) }.join('/')
+            else
+              return nil unless param = value.to_param
+              param.split('/').map { |v| Rack::Mount::Utils.escape_uri(v) }.join("/")
+            end
+          end
+        }
+
         attr_reader :options, :recall, :set, :named_route
 
         def initialize(options, recall, set, extras = false)
@@ -422,7 +435,7 @@ module ActionDispatch
         end
 
         def generate
-          path, params = @set.set.generate(:path_info, named_route, options, recall, opts)
+          path, params = @set.set.generate(:path_info, named_route, options, recall, PARAMETERIZE)
 
           raise_routing_error unless path
 
@@ -436,20 +449,6 @@ module ActionDispatch
           raise_routing_error
         end
 
-        def opts
-          parameterize = lambda do |name, value|
-            if name == :controller
-              value
-            elsif value.is_a?(Array)
-              value.map { |v| Rack::Mount::Utils.escape_uri(v.to_param) }.join('/')
-            else
-              return nil unless param = value.to_param
-              param.split('/').map { |v| Rack::Mount::Utils.escape_uri(v) }.join("/")
-            end
-          end
-          {:parameterize => parameterize}
-        end
-
         def raise_routing_error
           raise ActionController::RoutingError.new("No route matches #{options.inspect}")
         end
-- 
cgit v1.2.3


From 8fdb34b2373b13eee24a403a3af398cddb2a5ad0 Mon Sep 17 00:00:00 2001
From: thedarkone <thedarkone2@gmail.com>
Date: Mon, 27 Sep 2010 15:11:19 +0200
Subject: Cache url_options on a per-request basis.

---
 actionpack/lib/action_controller/metal/url_for.rb | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

(limited to 'actionpack/lib')

diff --git a/actionpack/lib/action_controller/metal/url_for.rb b/actionpack/lib/action_controller/metal/url_for.rb
index 85c6b0a9b5..ef1071bb3d 100644
--- a/actionpack/lib/action_controller/metal/url_for.rb
+++ b/actionpack/lib/action_controller/metal/url_for.rb
@@ -5,16 +5,18 @@ module ActionController
     include AbstractController::UrlFor
 
     def url_options
-      options = {}
-      if _routes.equal?(env["action_dispatch.routes"])
-        options[:script_name] = request.script_name.dup
-      end
+      @_url_options ||= begin
+        options = {}
+        if _routes.equal?(env["action_dispatch.routes"])
+          options[:script_name] = request.script_name.dup
+        end
 
-      super.merge(options).reverse_merge(
-        :host => request.host_with_port,
-        :protocol => request.protocol,
-        :_path_segments => request.symbolized_path_parameters
-      )
+        super.merge(options).reverse_merge(
+          :host => request.host_with_port,
+          :protocol => request.protocol,
+          :_path_segments => request.symbolized_path_parameters
+        ).freeze
+      end
     end
   end
 end
-- 
cgit v1.2.3


From e12e2fb4f660da479110b35b375694bf267aedfb Mon Sep 17 00:00:00 2001
From: thedarkone <thedarkone2@gmail.com>
Date: Mon, 27 Sep 2010 17:37:40 +0200
Subject: Cache 2 of Request's commonly called methods.

---
 actionpack/lib/action_dispatch/http/url.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'actionpack/lib')

diff --git a/actionpack/lib/action_dispatch/http/url.rb b/actionpack/lib/action_dispatch/http/url.rb
index 2e39d0dbc2..3e5cd6a2f9 100644
--- a/actionpack/lib/action_dispatch/http/url.rb
+++ b/actionpack/lib/action_dispatch/http/url.rb
@@ -15,12 +15,12 @@ module ActionDispatch
 
       # Returns 'https://' if this is an SSL request and 'http://' otherwise.
       def protocol
-        ssl? ? 'https://' : 'http://'
+        @protocol ||= ssl? ? 'https://' : 'http://'
       end
 
       # Is this an SSL request?
       def ssl?
-        @env['HTTPS'] == 'on' || @env['HTTP_X_FORWARDED_PROTO'] == 'https'
+        @ssl ||= @env['HTTPS'] == 'on' || @env['HTTP_X_FORWARDED_PROTO'] == 'https'
       end
 
       # Returns the \host for this request, such as "example.com".
-- 
cgit v1.2.3


From 7cee1587f14638e61a33d12114a0d5ae2620d62b Mon Sep 17 00:00:00 2001
From: thedarkone <thedarkone2@gmail.com>
Date: Sat, 25 Sep 2010 16:15:21 +0200
Subject: options[:action] is very likely to be nil.

---
 actionpack/lib/action_dispatch/routing/polymorphic_routes.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack/lib')

diff --git a/actionpack/lib/action_dispatch/routing/polymorphic_routes.rb b/actionpack/lib/action_dispatch/routing/polymorphic_routes.rb
index 02ba5236ee..eaef09d445 100644
--- a/actionpack/lib/action_dispatch/routing/polymorphic_routes.rb
+++ b/actionpack/lib/action_dispatch/routing/polymorphic_routes.rb
@@ -105,7 +105,7 @@ module ActionDispatch
           else        [ record_or_hash_or_array ]
         end
 
-        inflection = if options[:action].to_s == "new"
+        inflection = if options[:action] && options[:action].to_s == "new"
           args.pop
           :singular
         elsif (record.respond_to?(:persisted?) && !record.persisted?)
-- 
cgit v1.2.3


From e1bccc5169ba18238aa0bde720384efc74c533b0 Mon Sep 17 00:00:00 2001
From: thedarkone <thedarkone2@gmail.com>
Date: Sat, 25 Sep 2010 16:40:53 +0200
Subject: Simple .empty? test will do fine here (rails_asset_id returns nice
 strings).

---
 actionpack/lib/action_view/helpers/asset_tag_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack/lib')

diff --git a/actionpack/lib/action_view/helpers/asset_tag_helper.rb b/actionpack/lib/action_view/helpers/asset_tag_helper.rb
index 7576177392..59d1c8b7eb 100644
--- a/actionpack/lib/action_view/helpers/asset_tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/asset_tag_helper.rb
@@ -810,7 +810,7 @@ module ActionView
           end
 
           asset_id = rails_asset_id(source)
-          if asset_id.blank?
+          if asset_id.empty?
             source
           else
             source + "?#{asset_id}"
-- 
cgit v1.2.3


From 70357666bc86629c8d10501209105b144855ddbc Mon Sep 17 00:00:00 2001
From: thedarkone <thedarkone2@gmail.com>
Date: Sat, 25 Sep 2010 16:42:35 +0200
Subject: Do a single string interpolation.

---
 actionpack/lib/action_view/helpers/asset_tag_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack/lib')

diff --git a/actionpack/lib/action_view/helpers/asset_tag_helper.rb b/actionpack/lib/action_view/helpers/asset_tag_helper.rb
index 59d1c8b7eb..efd238c692 100644
--- a/actionpack/lib/action_view/helpers/asset_tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/asset_tag_helper.rb
@@ -813,7 +813,7 @@ module ActionView
           if asset_id.empty?
             source
           else
-            source + "?#{asset_id}"
+            "#{source}?#{asset_id}"
           end
         end
 
-- 
cgit v1.2.3


From 5b81d1f3ef1f1b06495eadcc1c2d110d76ac1de3 Mon Sep 17 00:00:00 2001
From: thedarkone <thedarkone2@gmail.com>
Date: Mon, 27 Sep 2010 17:42:32 +0200
Subject: Hash#empty? is faster than Enumerable#any? when used on a Hash.

---
 actionpack/lib/action_dispatch/routing/route_set.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack/lib')

diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb
index 60b1342d55..eeec10a403 100644
--- a/actionpack/lib/action_dispatch/routing/route_set.rb
+++ b/actionpack/lib/action_dispatch/routing/route_set.rb
@@ -443,7 +443,7 @@ module ActionDispatch
 
           return [path, params.keys] if @extras
 
-          path << "?#{params.to_query}" if params.any?
+          path << "?#{params.to_query}" unless params.empty?
           path
         rescue Rack::Mount::RoutingError
           raise_routing_error
-- 
cgit v1.2.3


From 7d9f605f8072ef473e2c30800b91493b56af5b2b Mon Sep 17 00:00:00 2001
From: thedarkone <thedarkone2@gmail.com>
Date: Sun, 26 Sep 2010 14:04:51 +0200
Subject: Clean up url_for.

---
 actionpack/lib/action_view/helpers/url_helper.rb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'actionpack/lib')

diff --git a/actionpack/lib/action_view/helpers/url_helper.rb b/actionpack/lib/action_view/helpers/url_helper.rb
index f8147840ed..8d1def05de 100644
--- a/actionpack/lib/action_view/helpers/url_helper.rb
+++ b/actionpack/lib/action_view/helpers/url_helper.rb
@@ -95,7 +95,7 @@ module ActionView
       #   # => javascript:history.back()
       def url_for(options = {})
         options ||= {}
-        url = case options
+        case options
         when String
           options
         when Hash
@@ -106,8 +106,6 @@ module ActionView
         else
           polymorphic_path(options)
         end
-
-        url
       end
 
       # Creates a link tag of the given +name+ using a URL created by the set
-- 
cgit v1.2.3


From dcabc6c04301a44d875447e4f88534ca04a538d6 Mon Sep 17 00:00:00 2001
From: thedarkone <thedarkone2@gmail.com>
Date: Sun, 26 Sep 2010 14:24:48 +0200
Subject: Remove dead code.

---
 actionpack/lib/action_view/helpers/url_helper.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'actionpack/lib')

diff --git a/actionpack/lib/action_view/helpers/url_helper.rb b/actionpack/lib/action_view/helpers/url_helper.rb
index 8d1def05de..98ea75502f 100644
--- a/actionpack/lib/action_view/helpers/url_helper.rb
+++ b/actionpack/lib/action_view/helpers/url_helper.rb
@@ -591,9 +591,9 @@ module ActionView
             html_options['data-remote'] = 'true'
           end
 
-          confirm = html_options.delete("confirm")
-          method, href = html_options.delete("method"), html_options['href']
 
+          confirm = html_options.delete('confirm')
+          method  = html_options.delete('method')
           add_confirm_to_attributes!(html_options, confirm) if confirm
           add_method_to_attributes!(html_options, method)   if method
 
-- 
cgit v1.2.3


From b127e0cac97886d9fcaaea7b91f88becd2fcff2c Mon Sep 17 00:00:00 2001
From: thedarkone <thedarkone2@gmail.com>
Date: Mon, 27 Sep 2010 17:43:27 +0200
Subject: Performance: refactor convert_options_to_data_attributes.

---
 actionpack/lib/action_view/helpers/url_helper.rb | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

(limited to 'actionpack/lib')

diff --git a/actionpack/lib/action_view/helpers/url_helper.rb b/actionpack/lib/action_view/helpers/url_helper.rb
index 98ea75502f..1c3ca78d28 100644
--- a/actionpack/lib/action_view/helpers/url_helper.rb
+++ b/actionpack/lib/action_view/helpers/url_helper.rb
@@ -584,20 +584,24 @@ module ActionView
 
       private
         def convert_options_to_data_attributes(options, html_options)
-          html_options = {} if html_options.nil?
-          html_options = html_options.stringify_keys
+          if html_options.nil?
+            link_to_remote_options?(options) ? {'data-remote' => 'true'} : {}
+          else
+            html_options = html_options.stringify_keys
+            html_options['data-remote'] = 'true' if link_to_remote_options?(options) || link_to_remote_options?(html_options)
 
-          if (options.is_a?(Hash) && options.key?('remote') && options.delete('remote')) || (html_options.is_a?(Hash) && html_options.key?('remote') && html_options.delete('remote'))
-            html_options['data-remote'] = 'true'
-          end
+            confirm = html_options.delete('confirm')
+            method  = html_options.delete('method')
 
+            add_confirm_to_attributes!(html_options, confirm) if confirm
+            add_method_to_attributes!(html_options, method)   if method
 
-          confirm = html_options.delete('confirm')
-          method  = html_options.delete('method')
-          add_confirm_to_attributes!(html_options, confirm) if confirm
-          add_method_to_attributes!(html_options, method)   if method
+            html_options
+          end
+        end
 
-          html_options
+        def link_to_remote_options?(options)
+          options.is_a?(Hash) && options.key?('remote') && options.delete('remote')
         end
 
         def add_confirm_to_attributes!(html_options, confirm)
-- 
cgit v1.2.3


From bb47927d914480218b003d322c8e8ebcd388093e Mon Sep 17 00:00:00 2001
From: thedarkone <thedarkone2@gmail.com>
Date: Mon, 27 Sep 2010 17:44:11 +0200
Subject: Convert unless/else into if/else.

---
 actionpack/lib/action_dispatch/routing/polymorphic_routes.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'actionpack/lib')

diff --git a/actionpack/lib/action_dispatch/routing/polymorphic_routes.rb b/actionpack/lib/action_dispatch/routing/polymorphic_routes.rb
index eaef09d445..49e237f8db 100644
--- a/actionpack/lib/action_dispatch/routing/polymorphic_routes.rb
+++ b/actionpack/lib/action_dispatch/routing/polymorphic_routes.rb
@@ -168,10 +168,7 @@ module ActionDispatch
         end
 
         def build_named_route_call(records, inflection, options = {})
-          unless records.is_a?(Array)
-            record = extract_record(records)
-            route  = []
-          else
+          if records.is_a?(Array)
             record = records.pop
             route = records.map do |parent|
               if parent.is_a?(Symbol) || parent.is_a?(String)
@@ -180,6 +177,9 @@ module ActionDispatch
                 ActiveModel::Naming.route_key(parent).singularize
               end
             end
+          else
+            record = extract_record(records)
+            route  = []
           end
 
           if record.is_a?(Symbol) || record.is_a?(String)
-- 
cgit v1.2.3


From dc09cc055ab79ec8181ec4089449c94759700e51 Mon Sep 17 00:00:00 2001
From: thedarkone <thedarkone2@gmail.com>
Date: Sun, 26 Sep 2010 14:45:27 +0200
Subject: Assume compute_asset_host returns reasonable values.

---
 actionpack/lib/action_view/helpers/asset_tag_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack/lib')

diff --git a/actionpack/lib/action_view/helpers/asset_tag_helper.rb b/actionpack/lib/action_view/helpers/asset_tag_helper.rb
index efd238c692..c1dfbe5dc3 100644
--- a/actionpack/lib/action_view/helpers/asset_tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/asset_tag_helper.rb
@@ -718,7 +718,7 @@ module ActionView
 
         def rewrite_host_and_protocol(source, has_request)
           host = compute_asset_host(source)
-          if has_request && host.present? && !is_uri?(host)
+          if has_request && host && !is_uri?(host)
             host = "#{controller.request.protocol}#{host}"
           end
           "#{host}#{source}"
-- 
cgit v1.2.3