Changeset 1090

Timestamp:

12/13/07 16:00:24 (1 year ago)

Author:

dudl..@misnomer.us

Message:

Fixed image_tag, css_include_tag, and js_include_tag to work with path_prefix

Files:

• trunk/CHANGELOG (modified) (1 diff)
• trunk/lib/merb/mixins/general_controller.rb (modified) (1 diff)
• trunk/lib/merb/mixins/view_context.rb (modified) (3 diffs)
• trunk/spec/merb/view_context_spec.rb (modified) (3 diffs)

trunk/CHANGELOG

@@ -5 +5 @@
-* merb_helpers: form field labels are now explicit, huge documentation update, added select, fieldset, more helpers
-* Fixed merb.show_routes within merb -i
+* Fixed image_tag, css_include_tag, and js_include_tag to work with path_prefix
-
-== 0.4.1 "Faster Partials or Partially Faster?" 2007-11-12

trunk/lib/merb/mixins/general_controller.rb

@@ -86 +86 @@
-          raise "URL not generated: #{route_name.inspect}, #{new_params.inspect}"
-        end
-Handler.path_prefix + url if MerbHandler.path_prefix
+::Server.config[:path_prefix] + url if Merb::Server.config[:path_prefix]
-      url
-    end

trunk/lib/merb/mixins/view_context.rb

@@ -49 +49 @@
-    #   # => <img src="http://test.com/foo.gif">
-    def image_tag(img, opts={})
-
+
+
+
+
+
+
+
+
+
+
-      opts[:src] ||= opts.delete(:path) + img
-      %{<img #{ opts.to_xml_attributes } />}    
@@ -259 +268 @@
-      scripts.each do |script|
-        script = script.to_s
-
+
+
+
-      end
-      include_tag
@@ -288 +299 @@
-      scripts.each do |script|
-        script = script.to_s
-
+
+
+
-      end
-      include_tag

trunk/spec/merb/view_context_spec.rb

@@ -14 +14 @@
-  it "should render local image" do
-    image_tag('foo.gif').clean.should == %[<img src="/images/foo.gif"/>].clean
+  end
+
+  it "should render a local image with a path_prefix" do
+    Merb::Server.config[:path_prefix] = '/inky'
+    image_tag('foo.gif').clean.should == %[<img src="/inky/images/foo.gif"/>].clean
+    Merb::Server.config.delete(:path_prefix)
-  end
-  
@@ -48 +54 @@
-    css_include_tag('bar')
-  end
+  
+  it "should render a link tag with a path_prefix" do
+    Merb::Server.config[:path_prefix] = '/inky'
+    css_include_tag('foo.css').clean.should ==
+      %[<link href="/inky/stylesheets/foo.css" media="all" rel="Stylesheet" type="text/css"/>].clean
+    Merb::Server.config.delete(:path_prefix)
+  end
+  
-  it "should not generate a script tag with the include_required_css" do
-    include_required_css.clean.should == ''
-
+
+
-  it "should generate script tags with the include_required_css" do
-    require_css('foo')
@@ -72 +87 @@
-    js_include_tag('bar')
-  end
+  
+  it "should render a script tag with a path_prefix" do
+    Merb::Server.config[:path_prefix] = '/inky'
+    js_include_tag('foo.js').clean.should ==
+      %[<script src="/inky/javascripts/foo.js" type="text/javascript">//</script>].clean
+    Merb::Server.config.delete(:path_prefix)
+  end
+  
-  it "should not generate a script tag with the include_required_js" do
-    include_required_js.clean.should == ''
-
+
+
-  it "should generate script tags with the include_required_js" do
-    require_js('foo')