Changeset 6162

Timestamp:

02/18/07 07:23:57 (3 years ago)

Author:

bitsweat

Message:

Add request protocol to asset host if not given. Prefer setting asset host as hostname only, no request protocol.

Files:

• trunk/actionpack/lib/action_view/helpers/asset_tag_helper.rb (modified) (3 diffs)
• trunk/actionpack/test/template/asset_tag_helper_test.rb (modified) (2 diffs)

trunk/actionpack/lib/action_view/helpers/asset_tag_helper.rb

@@ -11 +11 @@
-    # linking to them.
-    #
-http://
+
-    #   image_tag("rails.png")
-    #     => <img src="http://assets.example.com/images/rails.png" alt="Rails" />
@@ -213 +213 @@
-        # Prefix with /dir/ if lacking a leading /. Account for relative URL
-        # roots. Rewrite the asset path for cache-busting asset ids. Include
-
+
+
-        def compute_public_path(source, dir, ext)
-          source += ".#{ext}" if File.extname(source).blank?
@@ -222 +223 @@
-            source = "#{@controller.request.relative_url_root}#{source}"
-            rewrite_asset_path!(source)
-
+
+
+
+
+
+
+
-          end
-        end

trunk/actionpack/test/template/asset_tag_helper_test.rb

@@ -190 +190 @@
-        "/collaboration/hieraki"
-      end
+
+      def protocol
+        'gopher://'
+      end
-    end.new
-    
@@ -231 +235 @@
-    ActionController::Base.asset_host = nil
-  end
+
+  def test_asset_host_without_protocol_should_use_request_protocol
+    ActionController::Base.asset_host = 'a.example.com'
+    assert_equal 'gopher://a.example.com/collaboration/hieraki/images/xml.png', image_path('xml.png')
+  ensure
+    ActionController::Base.asset_host = nil
+  end
-end