masterview 0.2.0 → 0.2.1

data/CHANGELOG

@@ -1,3 +1,10 @@
+0.2.1 - June 28th, 2006
+Added Mongrel support
+Added image_tag directive
+Update javascript_include directive to infer path from src if attr_value is empty
+Update stylesheet_link directive to infer path from src if attr_value is empty
+New illustration
+
 0.2.0 - June 20th, 2006 - Big release. Added capability for eliminating rhtml generation, extends rails so that rhtml can be pulled directly from MasterView. 
 Support template compilation directly into Rails view cache for templates in app/views (rhtml generation now optional)
 New mechanism for configuring MasterView from settings files; internal initialization rework. Configuration can now be driven by editing config/masterview/settings.rb and/or config/masterview/environments/*.rb.

data/TODO

@@ -1,7 +1,7 @@
+- put image, stylesheets, javascript relative path regex in initializer
 - create install.rb for rails 1.1 plugin installs, it will create config/masterview and some sample configs
 - create namespace for mv and publish, update generated files
 - more videos
-- image_tag (improve support for referencing image assets in MasterView directives markup)
 - allow multiple namespace prefixes for directives (allow custom directives to declare their own namespace)
 - wiki for site
 - render from db
@@ -9,10 +9,26 @@
 - include additional stylesheets
 - ajax examples
 - ajax table component
+- fix admin controller config page so it fits into admin layout
 - documentation
+    - update the plugin generator descr in installation.html: also installs config file templates in config
+    - add tips in installation.doc about running gems rdoc server to view installed gems' rdoc
+    - update admin controller description to point out that it installs public/stylesheets/masterview
+    - run spelling checker on our html and release docs; retrofit to rdoc comments
 - directive developer documentation and examples
 - more tests
+- build improvements
+    - add release tasks to automate archiving trunk to tags/masterview-N.N.N, resetting tags/masterview
+- investigate mirror sites for obtaining gems (supplement primary rubyforge host)
+- improve RubyForge project site: include online docs; post release msgs in news
 - internal code cleanup 
     - DirectiveHelpers ERB_xx constants to differentiate ' %>' and ' -%>'
     - replace MasterView::NamespacePrefix+'<gen/import directivename>' concats in parser/analyzer with directive attr name constants
     - run spell checker on doc/*.html, ripple typo fixes back in rdoc comment
+- reverse engineer legacy rhtml into masterview templates
+
+--####################
+??? can we tweak the admin controller for gem plugin so it puts its empty.rhtml in, say, config/masterview/admin??
+=> better loc than vendor/plugins/masterview/........ if users are going to customize that guy
+
+--####################

data/doc/configuration.html

@@ -467,6 +467,8 @@ with the pathname of the source template file.
 <a href="./guide.html">Usage</a>
 &nbsp;|&nbsp;
 <a href="./directives.html">Directives</a>
+&nbsp;&nbsp;
+<a href="./media_list.html">Media (Videos/Illustrations)</a>
 &nbsp;&middot;
 </div>
 <table summary="layout area">

data/doc/directives.html

@@ -145,6 +145,14 @@ directive markup in the template.
 <td colspan="2"><a href="#asset_link_directives">Rails Asset and Link Helper Directives</a></td>
 </tr>
 <tr>
+<td class="directive"><a href="#mv_image_tag">mv:image_tag</a></td>
+<td>Replaces this element using the Rails <code>image_tag</code> helper.
+<span class="explanation">(
+Used on <code>&lt;img&gt;</code> elements
+)</span>
+</td>
+</tr>
+<tr>
 <td class="directive"><a href="#mv_javascript_include">mv:javascript_include</a></td>
 <td>Replaces this element using the Rails <code>javascript_include_tag</code> helper.
 <span class="explanation">(
@@ -639,6 +647,41 @@ Inline substitutions
 <a name="asset_link_directives"></a>
 <h3>Rails Asset and Link Helper Directives</h3>
 
+<a name="mv_image_tag"></a>
+<h4>mv:image_tag</h4>
+<p>
+mv:image_tag=&quot;cat.jpg&quot;
+</p>
+<pre>
+        Replaces the tag with a image_tag helper, size is determined by width and height, other html attributes
+	are passed through. for example...
+
+        &lt;img src=&quot;../../../public/images/cat.jpg&quot; mv:image_tag=&quot;cat.jpg&quot;/>
+
+          becomes
+
+        &lt;%= image_tag 'cat.jpg' %&gt;
+
+
+        &lt;img src=&quot;../../../public/images/cat.jpg&quot; alt=&quot;my cat&quot; width=&quot;20&quot; height=&quot;10&quot; mv:image_tag=&quot;cat.jpg&quot;/>
+
+          becomes
+
+        &lt;%= image_tag 'cat.jpg', :alt =&gt; 'my cat', :size =&gt; '20x10' %&gt;
+
+	Also if path isn't specified in the mv:image_tag attribute value then it will infer the path looking
+	for what follows the public/images/ in the src atttribute, like so
+
+        &lt;img src=&quot;../../../public/images/cat.jpg&quot; mv:image_tag=&quot;&quot;/>
+
+          becomes
+
+        &lt;%= image_tag 'cat.jpg' %&gt;
+
+        This is useful to allow images to be used for demos/prototypes and then at runtime
+        use the appropriate asset using the rails helper.
+</pre>
+
 <a name="mv_javascript_include"></a>
 <h4>mv:javascript_include</h4>
 <p>
@@ -654,6 +697,24 @@ mv:javascript_include=&quot;prototype.js&quot;
 
         &lt;%= javascript_include_tag 'prototype.js' %&gt;
 
+	You can also use a symbol
+
+        &lt;script type=&quot;text/javascript&quot; src=&quot;../../../public/javascripts/prototype.js&quot;
+           mv:javascript_include=&quot;:defaults&quot;&gt;&lt;/script&gt;
+
+          becomes
+
+        &lt;%= javascript_include_tag :defaults %&gt;
+
+	And you can have the path inferred from the src path (uses the relative path to public/javascripts)
+
+        &lt;script type=&quot;text/javascript&quot; src=&quot;../../../public/javascripts/prototype.js&quot;
+           mv:javascript_include=&quot;&quot;&gt;&lt;/script&gt;
+
+          becomes
+
+        &lt;%= javascript_include_tag 'prototype.js' %&gt;
+
         This is useful to allow scripts to be used for demos/prototypes and then at runtime
         use the appropriate asset using the rails helper.
 </pre>
@@ -723,6 +784,14 @@ mv:stylesheet_link=&quot;style&quot;
 
       &lt;%= stylesheet_link_tag &quot;scaffold&quot; %&gt;
 
+      You may also leave attribute empty and it will infer the path from src (uses relative path from public/stylesheets)
+
+      &lt;link rel=&quot;stylesheet&quot; type=&quot;text/css&quot; href=&quot;../../../public/stylesheets/scaffold.css&quot; mv:stylesheet_link=&quot;&quot;/&gt;
+
+        becomes
+
+      &lt;%= stylesheet_link_tag &quot;scaffold.css&quot; %&gt;
+
       This is useful to allow style to be used for demos/prototypes and then at runtime
       use the appropriate asset using the rails helper.
 </pre>
@@ -1068,6 +1137,8 @@ Used on <code>&lt;input&gt;</code> form elements
 <a href="./guide.html">Usage</a>
 &nbsp;|&nbsp;
 <a href="./directives.html">Directives</a>
+&nbsp;&nbsp;
+<a href="./media_list.html">Media (Videos/Illustrations)</a>
 &nbsp;&middot;
 </div>
 <table summary="layout area">

data/doc/guide.html

@@ -225,6 +225,8 @@ rake -T
 <a href="./guide.html">Usage</a>
 &nbsp;|&nbsp;
 <a href="./directives.html">Directives</a>
+&nbsp;&nbsp;
+<a href="./media_list.html">Media (Videos/Illustrations)</a>
 &nbsp;&middot;
 </div>
 <table summary="layout area">

data/doc/index.html

@@ -45,6 +45,7 @@ If you are interested in the background story behind all this, it is at the
 end of this page.
 </p>
 
+<p>
 <table summary="project location and author information">
 <tr>
   <td>Author:</td>
@@ -77,8 +78,21 @@ end of this page.
 <td>&nbsp;</td>
 <td>masterview-devel - MasterView project developer list</td>
 </tr>
-<tr><td>Videos:</td><td><a href="http://masterview.org/videos/masterview_quick_start.html">MasterView Quick Start Video</a> - demonstrating basic usage of MasterView (no audio)</td></tr>
 </table>
+</p>
+
+<h2>Illustrations/Diagrams</h2>
+<ul>
+<li><a href="simple_diagram.html" alt="MasterView rhtml Rendering Illustration">MasterView rendering illustration</a> - showing how MasterView renders rhtml internally</li>
+</ul>
+
+<h2>Videos</h2>
+<ul>
+<li><a href="http://masterview.org/videos/demo_short.html">MasterView Short Video</a> - demonstrating basic usage of MasterView (no audio, ~5 minutes, uses flash)</li>
+<li><a href="http://masterview.org/videos/masterview_quick_start.html">MasterView Quick Start Video</a> - longer video detailing basic configuration and operation of MasterView (no audio, ~25 minutes, uses flash)</li>
+</ul>
+
+
 
 <h2>Goals</h2>
 <ul>
@@ -136,7 +150,9 @@ application.
 
 <h2>Usage</h2>
 
-<p>See the <a href="guide.html">MasterView User's Guide</a> for information on using MasterView templates and supporting services.</p>
+<p>See the <a href="guide.html">MasterView User's Guide</a> for information on using MasterView templates and supporting services.
+View the <a href="simple_diagram.html" alt="MasterView rhtml rendering illustration">MasterView rendering illustration</a> to understand how a MasterView template renders rhtml 
+</p>
 
 
 <h2>MasterView attribute directive syntax</h2>
@@ -269,6 +285,8 @@ gmail.com)
 <a href="./guide.html">Usage</a>
 &nbsp;|&nbsp;
 <a href="./directives.html">Directives</a>
+&nbsp;&nbsp;
+<a href="./media_list.html">Media (Videos/Illustrations)</a>
 &nbsp;&middot;
 </div>
 <table summary="layout area">

data/doc/installation.html

@@ -358,6 +358,8 @@ releases.  They are obsolete and should be ignored.
 <a href="./guide.html">Usage</a>
 &nbsp;|&nbsp;
 <a href="./directives.html">Directives</a>
+&nbsp;&nbsp;
+<a href="./media_list.html">Media (Videos/Illustrations)</a>
 &nbsp;&middot;
 </div>
 <table summary="layout area">

data/doc/media_list.html

@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html 
+     PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+
+  <title>MasterView - Media list</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+  <meta http-equiv="Content-Script-Type" content="text/javascript" />
+
+  <link href="./stylesheets/masterview.css" rel="stylesheet" type="text/css" />
+</head>
+
+<body>
+
+<div id="pageHeader">
+<div>MasterView Template Engine</div>
+<div class="description">Rails-optimized (x)html friendly template engine</div>
+</div>
+
+<div id="pageBody">
+<div id="bodyContent" mv:generate="{template_path}" mv:omit_tag="">
+
+<h1>MasterView - Media list</h1>
+
+<h2>Illustrations/Diagrams</h2>
+<ul>
+<li><a href="simple_diagram.html" alt="MasterView rhtml Rendering Illustration">MasterView rendering illustration</a> - showing how MasterView renders rhtml internally</li>
+</ul>
+
+<h2>Videos</h2>
+<ul>
+<li><a href="http://masterview.org/videos/demo_short.html">MasterView Short Video</a> - demonstrating basic usage of MasterView (no audio, ~5 minutes, uses flash)</li>
+<li><a href="http://masterview.org/videos/masterview_quick_start.html">MasterView Quick Start Video</a> - longer video detailing basic configuration and operation of MasterView (no audio, ~25 minutes, uses flash)</li>
+</ul>
+
+</div>  <!-- bodyContent -->
+</div>
+
+<div id="pageFooter">
+<div>
+&middot;&nbsp;
+<a href="./index.html">Doc Home</a>
+&nbsp;|&nbsp;
+<a href="./installation.html">Installation</a>
+&nbsp;|&nbsp;
+<a href="./configuration.html">Configuration</a>
+&nbsp;|&nbsp;
+<a href="./guide.html">Usage</a>
+&nbsp;|&nbsp;
+<a href="./directives.html">Directives</a>
+&nbsp;&nbsp;
+<a href="./media_list.html">Media (Videos/Illustrations)</a>
+&nbsp;&middot;
+</div>
+<table summary="layout area">
+<tbody>
+<tr>
+<td class="copyright">&copy;&nbsp;Copyright MasterView 2006</td>
+<td class="validators">
+  <a href="http://validator.w3.org/check/referer">[Valid XHTML]</a>
+</td>
+</tr>
+</tbody>
+</table>
+</div>
+
+</body>
+</html>

data/doc/simple_diagram.html

@@ -0,0 +1,138 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html><head>
+<style type="text/css">
+  body { font-size: small;
+    }
+
+  div#template { border-style: solid;
+    border-width: 1px;
+    padding: 10px;
+    position: absolute;
+    left: 30px;
+    top: 105px;
+    }
+
+  div#new { padding: 10px;
+    position: absolute;
+    background-color: rgb(188, 255, 153);
+    left: 530px;
+    top: 270px;
+    }
+
+  div#form { padding: 10px;
+    position: absolute;
+    background-color: rgb(204, 204, 255);
+    left: 600px;
+    top: 440px;
+    }
+
+  div#layout { padding: 10px;
+    position: absolute;
+    left: 460px;
+    background-color: rgb(204, 255, 255);
+    top: 103px;
+    }
+
+  div#arrows { position: absolute;
+    color: rgb(153, 0, 0);
+    font-size: x-large;
+    left: 420px;
+    top: 180px;
+    }
+
+
+</style></head>
+<body> <h1>MasterView Rendering</h1>
+<p>A diagram representing how MasterView transforms a template into the equivalent rhtml
+</p><div id="template"><span style="font-weight: bold;">MasterView&nbsp;template -
+store/new.html</span><br><div style="text-align: left;"><span style="color: rgb(0, 0, 153);">&lt;html
+<span style="color: rgb(204, 0, 0);">mv:generate</span>="<span style="color: rgb(204, 153, 51);">layouts/store.rhtml</span>"&gt;</span><br style="color: rgb(0, 0, 153);"><br style="color: rgb(0, 0, 153);"><span style="color: rgb(0, 0, 153);">&nbsp;
+&lt;body&gt;</span><br style="color: rgb(0, 0, 153);"><br style="color: rgb(0, 0, 153);"><span style="color: rgb(0, 0, 153);">&nbsp;&nbsp;&nbsp;
+&lt;h1&gt;My
+Store&lt;/h1&gt;</span><br><br>&nbsp;
+&nbsp;&nbsp;&nbsp; <span style="color: rgb(0, 153, 0);">&lt;div</span>
+<span style="color: rgb(204, 0, 0);">mv:generate</span>="<span style="color: rgb(204, 153, 51);">store/new.rhtml</span>"
+<br>&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;
+&nbsp;&nbsp;&nbsp;
+<span style="color: rgb(204, 0, 0);">mv:gen_replace</span>="<span style="color: rgb(204, 153, 51);">@content_for_layout</span>"&gt;<br><br><br>&nbsp;&nbsp;&nbsp;
+&nbsp;&nbsp;&nbsp;
+<span style="color: rgb(0, 153, 0);">&lt;h2&gt;New&lt;/h2&gt;</span><br style="color: rgb(0, 153, 0);"><br style="color: rgb(0, 153, 0);"><span style="color: rgb(0, 153, 0);">&nbsp;
+&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;
+&lt;form <span style="color: rgb(204, 0, 0);">mv:form</span>="<span style="color: rgb(204, 153, 51);">:action =&gt; 'new'</span>"&gt;</span><br><br>&nbsp;
+&nbsp; &nbsp;&nbsp;&nbsp;
+&nbsp;&nbsp;&nbsp; <span style="color: rgb(102, 0, 204);">&lt;div</span> <span style="color: rgb(204, 0, 0);">mv:gen_partial</span>="<span style="color: rgb(204, 153, 51);">:partial
+=&gt; 'store/form'</span>"&gt;<br><br><br><br style="color: rgb(102, 0, 204);"><span style="color: rgb(102, 0, 204);">&nbsp;
+&nbsp; &nbsp;
+&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp; Name:
+</span><br style="color: rgb(102, 0, 204);"><span style="color: rgb(102, 0, 204);">&nbsp;&nbsp;&nbsp;
+&nbsp;&nbsp;&nbsp;
+&nbsp;&nbsp;&nbsp; &nbsp; &lt;input type="text"
+size="<span style="color: rgb(204, 153, 51);">20</span>"
+</span><br style="color: rgb(102, 0, 204);"><span style="color: rgb(102, 0, 204);">&nbsp;&nbsp;&nbsp;
+&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;
+&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;
+<span style="color: rgb(204, 0, 0);">mv:text_field</span>="<span style="color: rgb(204, 153, 51);">product,
+name</span>"/&gt;</span><br style="color: rgb(102, 0, 204);"><span style="color: rgb(102, 0, 204);">&nbsp;
+&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;
+&nbsp;&nbsp;&nbsp; </span><br style="color: rgb(102, 0, 204);"><span style="color: rgb(102, 0, 204);">&nbsp;&nbsp;&nbsp;
+&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;
+&nbsp;&nbsp;&nbsp;Description: </span><br style="color: rgb(102, 0, 204);"><span style="color: rgb(102, 0, 204);">&nbsp;&nbsp;&nbsp;
+&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;
+&nbsp; &lt;text_area rows="<span style="color: rgb(204, 153, 51);">5</span>" cols="<span style="color: rgb(204, 153, 51);">40</span>"
+</span><br style="color: rgb(102, 0, 204);"><span style="color: rgb(102, 0, 204);">&nbsp;&nbsp;&nbsp;
+&nbsp;&nbsp;&nbsp;
+&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;
+&nbsp;&nbsp;&nbsp; <span style="color: rgb(204, 0, 0);">mv:text_area</span>="<span style="color: rgb(204, 153, 51);">product, desc</span>"/&gt;</span><br style="color: rgb(102, 0, 204);"><br style="color: rgb(102, 0, 204);"><br style="color: rgb(102, 0, 204);"><br style="color: rgb(102, 0, 204);"><span style="color: rgb(102, 0, 204);">&nbsp;&nbsp;&nbsp;
+&nbsp;&nbsp;&nbsp;
+&nbsp;&nbsp;&nbsp; &lt;/div&gt;</span><br><br>&nbsp;&nbsp;&nbsp;
+&nbsp;&nbsp;&nbsp;
+&nbsp;&nbsp;&nbsp; <span style="color: rgb(0, 153, 0);">&lt;input
+type="submit"
+value="<span style="color: rgb(204, 153, 51);">save</span>" </span><br style="color: rgb(0, 153, 0);"><span style="color: rgb(0, 153, 0);">&nbsp;&nbsp;&nbsp;
+&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;
+&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;
+<span style="color: rgb(204, 0, 0);">mv:submit</span>=""/&gt;</span><br style="color: rgb(0, 153, 0);"><br style="color: rgb(0, 153, 0);"><span style="color: rgb(0, 153, 0);">&nbsp;
+&nbsp;&nbsp;&nbsp;
+&lt;/form&gt;</span><br style="color: rgb(0, 153, 0);"><br style="color: rgb(0, 153, 0);"><span style="color: rgb(0, 153, 0);">&nbsp;&nbsp;&nbsp;
+&lt;/div&gt;</span><br><br><br>&nbsp;
+<span style="color: rgb(0, 0, 153);">&lt;/body&gt;</span><br style="color: rgb(0, 0, 153);"><br style="color: rgb(0, 0, 153);"><span style="color: rgb(0, 0, 153);">&lt;/html&gt;</span><br></div>&nbsp;&nbsp;&nbsp;
+&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;
+</div> <div id="layout"><span style="font-weight: bold;">layouts/store.rhtml</span><br><span style="color: rgb(0, 0, 153);">&lt;html&gt;</span><br style="color: rgb(0, 0, 153);"><br style="color: rgb(0, 0, 153);"><span style="color: rgb(0, 0, 153);">&nbsp;
+&lt;body&gt;</span><br style="color: rgb(0, 0, 153);"><br style="color: rgb(0, 0, 153);"><span style="color: rgb(0, 0, 153);">&nbsp;&nbsp;&nbsp;
+&lt;h1&gt;My
+Store&lt;/h1&gt;</span><br style="color: rgb(0, 0, 153);"><br style="color: rgb(0, 0, 153);"><span style="color: rgb(0, 0, 153);">&nbsp;&nbsp;&nbsp;
+&lt;%= <span style="color: rgb(204, 153, 51);">@content_for_layout</span>
+%&gt;</span><br><br>&nbsp;
+<br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><span style="color: rgb(0, 0, 153);">&lt;/body&gt;</span><br style="color: rgb(0, 0, 153);"><br style="color: rgb(0, 0, 153);"><span style="color: rgb(0, 0, 153);">&lt;/html&gt;</span>
+</div> <div id="new"><span style="font-weight: bold;">store/new.rhtml</span><br><span style="color: rgb(0, 153, 0);">&lt;div&gt;</span><br style="color: rgb(0, 153, 0);"><br style="color: rgb(0, 153, 0);"><span style="color: rgb(0, 153, 0);">&nbsp;
+&lt;h2&gt;New&lt;/h2&gt;</span><br style="color: rgb(0, 153, 0);"><br style="color: rgb(0, 153, 0);"><span style="color: rgb(0, 153, 0);">&nbsp;
+&lt;%= form_tag <span style="color: rgb(204, 153, 51);">:action =&gt;
+'new'</span> %&gt;</span><br style="color: rgb(0, 153, 0);"><br style="color: rgb(0, 153, 0);"><span style="color: rgb(0, 153, 0);">&nbsp;&nbsp;&lt;%=
+render <span style="color: rgb(204, 153, 51);">:partial
+=&gt; 'store/form'</span> %&gt;</span><br style="color: rgb(0, 153, 0);"><br style="color: rgb(0, 153, 0);"><span style="color: rgb(0, 153, 0);">&nbsp;
+</span><br style="color: rgb(0, 153, 0);"><br style="color: rgb(0, 153, 0);"><br style="color: rgb(0, 153, 0);"><br style="color: rgb(0, 153, 0);"><br style="color: rgb(0, 153, 0);"><br style="color: rgb(0, 153, 0);"><br style="color: rgb(0, 153, 0);"><br style="color: rgb(0, 153, 0);"><br style="color: rgb(0, 153, 0);"><br style="color: rgb(0, 153, 0);"><br style="color: rgb(0, 153, 0);"><br style="color: rgb(0, 153, 0);"><br style="color: rgb(0, 153, 0);"><br style="color: rgb(0, 153, 0);"><span style="color: rgb(0, 153, 0);">&lt;%=
+submit_tag
+'<span style="color: rgb(204, 153, 51);">save</span>' %&gt;</span><br style="color: rgb(0, 153, 0);"><br style="color: rgb(0, 153, 0);"><span style="color: rgb(0, 153, 0);">&nbsp; &lt;%=
+end_form_tag
+%&gt; </span><br style="color: rgb(0, 153, 0);"><br style="color: rgb(0, 153, 0);"><span style="color: rgb(0, 153, 0);">&lt;/div&gt;</span>
+</div> <div id="form"><span style="font-weight: bold;">store/_form.rhtml</span><br><span style="color: rgb(102, 0, 204);">&lt;div&gt;</span><br style="color: rgb(102, 0, 204);"><br style="color: rgb(102, 0, 204);"><span style="color: rgb(102, 0, 204);">&nbsp;
+Name: </span><br style="color: rgb(102, 0, 204);"><span style="color: rgb(102, 0, 204);">&nbsp; &lt;%=
+text_field '<span style="color: rgb(204, 153, 51);">product</span>',
+'<span style="color: rgb(204, 153, 51);">name</span>',
+:size =&gt; <span style="color: rgb(204, 153, 51);">20</span>
+%&gt;</span><br style="color: rgb(102, 0, 204);"><br style="color: rgb(102, 0, 204);"><span style="color: rgb(102, 0, 204);">&nbsp;
+Description: </span><br style="color: rgb(102, 0, 204);"><span style="color: rgb(102, 0, 204);">&nbsp; &lt;%=
+text_area
+'<span style="color: rgb(204, 153, 51);">product</span>',
+'<span style="color: rgb(204, 153, 51);">desc</span>',
+</span><br style="color: rgb(102, 0, 204);"><span style="color: rgb(102, 0, 204);">&nbsp;&nbsp;&nbsp;
+&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;
+&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;
+&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp; :cols
+=&gt; <span style="color: rgb(204, 153, 51);">20</span>,
+:rows =&gt; <span style="color: rgb(204, 153, 51);">5</span>
+%&gt;</span><br style="color: rgb(102, 0, 204);"><br style="color: rgb(102, 0, 204);"><span style="color: rgb(102, 0, 204);">&lt;/div&gt;</span>
+</div> <div id="arrows">=&gt;<br><br><br><br><br>=&gt;<br><br><br><br><br><br>=&gt;<br><br><br><br><br><br>=&gt;<br><br><br><br>=&gt;</div>
+
+
+ </body></html>

data/examples/rails_app_config/masterview/environment/development.rb

@@ -8,15 +8,17 @@
 # Set development-mode config settings here
 
 # General options
-#config.log_level = 'DEBUG'
+#config.log_level = 'INFO'
 
-# Rails application options
-#config.reparse_changed_masterview_templates = true  # enable in development env
+# Rails application options - normally enabled (only) in development env
+#config.reparse_changed_masterview_templates = true
 
+# Rails application options that you might want to enable for development
+#config.enable_admin_pages = false
+#config.enable_view_rhtml = false
+
+# Sample of how you might want to modify logging config for development
 #config.log_level = 'WARN'
 #config.after_initialize {
 #   MasterView.log_level = 'DEBUG'
 #}
-
-# Only use the MasterView admin pages for development
-# config.enable_admin_pages = true

data/examples/rails_app_config/masterview/environment/production.rb

@@ -1,4 +1,4 @@
-# Development environment config settings for the MasterView template engine.
+# Production environment config settings for the MasterView template engine.
 #
 # The MasterView configuration specification is referenced through +config+.
 # 
@@ -6,4 +6,5 @@
 # general MasterView config in +config/masterview/settings.rb+.
 #
 # Set production-mode config settings here
+#
 

data/examples/rails_app_config/masterview/settings.rb

@@ -20,7 +20,7 @@
 #config.directive_paths << '/path/to/custom/directives'
 #config.logger = 'log4r'
 #config.log_level = 'WARN'
-#config.after_initialize { MasterView::Log.level = DEBUG }
+#config.after_initialize { MasterView::Log.level = 'DEBUG' }
 
 # Template Source Options
 #config.template_src_dir_path = 'app/views'  # relative path from config.root_path
@@ -52,8 +52,8 @@
 
 # Rails application options
 #config.parse_masterview_templates_at_startup = true
-#config.reparse_changed_masterview_templates = false  # enable in development env
+#config.reparse_changed_masterview_templates = false  # enabled in development env
 #config.enable_admin_pages = false
 #config.enable_view_rhtml = false
-#config.generate_rhtml_files = false
+#config.generate_rhtml_files = false  # compile directly to Rails view cache
 

data/lib/masterview/directive_helpers.rb

@@ -185,6 +185,16 @@ module MasterView
       attributes.each { |k,v| lcattrs[k.downcase] = v.downcase }
       lcattrs
     end
+
+    # using hash, symbolize keys, sort keys, serialize to string
+    def symbolize_sort_and_serialize_hash_to_str(hash)
+      symbolized = {}
+      hash.each{ |k,v| symbolized[k.to_sym] = v } #symbolize
+      sorted = symbolized.sort{ |a,b| a[0].to_s <=> b[0].to_s } # sort the keys
+      sorted_strings = sorted.collect{ |k,v| "#{k.inspect} => '#{v}'"} # create strings
+      sorted_strings.join(', ') # finally combine them
+    end
+
   end
 
 end

data/lib/masterview/directives/image_tag.rb

@@ -0,0 +1,43 @@
+module MasterView
+  module Directives
+
+    # creates a image_tag.
+    # if path is specified in attr_value then it will be used exactly as listed, otherwise if attr_value is empty
+    # then masterview will attempt to find the public/images in the string and infer the path from what follows.
+    # otherwise it will simply use the src path. 
+    # If both width and height attr values are specified then it will build the :size option from them.
+    # Other html attributes will be passed into image_tag options.
+    class Image_tag < MasterView::DirectiveBase
+      IMAGE_SRC_EXTRACT_REGEX = /public\/images\/(.*)/
+
+      def stag(dcs)
+      end
+
+      def etag(dcs)
+        src = attrs_lck['src']
+        if attr_value.empty? && src
+          match = IMAGE_SRC_EXTRACT_REGEX.match(src)
+          image_loc = (match) ? match[1] : src
+        else
+          image_loc = attr_value
+        end
+
+        image_tag_params = quote(image_loc)
+        attrs.delete('src') # delete this if exists, path has already been specified
+
+        width = attrs_lck['width']
+        height = attrs_lck['height']
+        if width && height
+          attrs.delete('width') #delete these since being used in size
+          attrs.delete('height')
+          attrs[:size] = "#{width}x#{height}"
+        end
+
+        options = symbolize_sort_and_serialize_hash_to_str(attrs)
+        image_tag_params += (', '+options) unless options.empty?
+        
+        erb_content('image_tag ' + image_tag_params)
+      end
+    end
+  end
+end

data/lib/masterview/directives/javascript_include.rb

@@ -3,12 +3,20 @@ module MasterView
 
     #creates a link_to
     class Javascript_include < MasterView::DirectiveBase
+      JAVASCRIPT_SRC_EXTRACT_REGEX = /public\/javascripts\/(.*)/
+
       def stag(dcs)
       end
 
       def etag(dcs)
-        val = attr_value.starts_with?(':') ? attr_value : quote(attr_value) 
-        erb_content('javascript_include_tag ' + val)
+        src = attrs_lck['src']
+        if attr_value.empty? && src
+          match = JAVASCRIPT_SRC_EXTRACT_REGEX.match(src)
+          js_loc = quote( (match) ? match[1] : src )
+        else
+          js_loc = attr_value.starts_with?(':') ? attr_value : quote(attr_value) 
+        end
+        erb_content('javascript_include_tag ' + js_loc)
       end
     end
   end

data/lib/masterview/directives/stylesheet_link.rb

@@ -3,11 +3,20 @@ module MasterView
 
     #creates a link_to
     class Stylesheet_link < MasterView::DirectiveBase
+      STYLESHEET_SRC_EXTRACT_REGEX = /public\/stylesheets\/(.*)/
+
       def stag(dcs)
       end
 
       def etag(dcs)
-        erb_content('stylesheet_link_tag ' + quote(attr_value))
+        src = attrs_lck['src']
+        if attr_value.empty? && src
+          match = STYLESHEET_SRC_EXTRACT_REGEX.match(src)
+          ss_loc = (match) ? match[1] : src
+        else
+          ss_loc = attr_value
+        end
+        erb_content('stylesheet_link_tag ' + quote(ss_loc))
       end
     end
   end

data/lib/masterview/extras/app/controllers/masterview_controller.rb

@@ -68,6 +68,10 @@ class MasterviewController < ApplicationController
     smart_render 'masterview/admin/list'
   end
 
+  def features
+    smart_render 'masterview/admin/features'
+  end
+
   # Rebuild all templates in the application.
   # Invoked from the main masterview admin page.
   def rebuild_all

data/lib/masterview/extras/app/views/masterview/admin/features.rhtml

@@ -0,0 +1,79 @@
+<html>
+  <head>
+      <title>Masterview Admin</title>
+
+      <%= stylesheet_link_tag 'masterview/style' %>
+      <%= stylesheet_link_tag 'masterview/sidebox' %>
+      <%= stylesheet_link_tag 'masterview/color-scheme' %>
+      <%= javascript_include_tag :defaults %>
+      
+  </head>
+  <body>
+
+    <!--  ###### Header ######  -->    
+
+    <div id="header"> 
+      <span class="headerTitle">Admin</span> 
+      <div class="menuBar">
+        <%= link_to 'Home', :action => :index %>
+	<!--  | <a href="">Another link</a>  -->
+      </div>
+    </div>
+
+
+    <div class="main">
+
+<div class="create_div" id="mv_admin_features"><!--  ###### features ######  -->
+	  <div class="mv_admin_features sidebar LHS">
+	    <h2>Tasks:</h2>
+	    <ul>
+	      <li><%= link_to 'Back to overview', :action => 'list' %></li>
+	    </ul>
+	  </div>
+
+	  <div class="mv_admin_features content">
+	    <h1>Loaded Features</h1>
+	    <b>MasterView Version:</b> <%= MasterView::VERSION::STRING %><br/><br/>
+
+	    <% if @flash[:notice] %>
+	      <div class="messages" id="admin_messages">
+	        <%= h @flash[:notice] %>
+	      </div>
+	    <% end %>
+
+	    <table>
+	      <thead>
+	        <tr><th>Feature</th><th>Loaded</th></tr>
+	      </thead>
+	      <tbody>
+	        <tr><td>Filter templates through tidy on read</td><td><%= (MasterView::LoadedFeatures[:tidy_template_read]) ? 'true' : 'false'  %></td></tr>
+	        <tr><td>Parse templates at startup</td><td><%= (MasterView::LoadedFeatures[:rails_parse_at_startup]) ? 'true' : 'false'  %></td></tr>
+	        <tr><td>Reparse modified templates</td><td><%= (MasterView::LoadedFeatures[:rails_reparse_checking]) ? 'true' : 'false'  %></td></tr>
+	        <tr><td>Read ERB directly from MasterView</td><td><%= (MasterView::LoadedFeatures[:rails_erb_mv_direct]) ? 'true' : 'false'  %></td></tr>
+	      </tbody>
+	    </table>
+
+	  </div>
+	</div>
+
+    </div>
+
+    <!--  ###### Footer ######  -->
+
+    <div id="footer">
+      <div class="footerLHS">
+        <a href="http://validator.w3.org/check/referer">Valid XHTML 1.0 Strict</a>
+      </div>
+      
+      <div class="footerLHS">
+        <a href="http://jigsaw.w3.org/css-validator/check/referer">Valid CSS 2</a>
+      </div>
+      
+      <div>
+        Powered by MasterView
+      </div>
+    </div>
+
+
+    </body>
+</html>

data/lib/masterview/extras/app/views/masterview/admin/list.rhtml

@@ -27,6 +27,7 @@
 	    <h2>Tasks:</h2>
 	    <ul>
         <li><%= link_to 'View Configuration', :action => 'configuration' %></li>
+        <li><%= link_to 'View Loaded Features', :action => 'features' %></li>
 	      <li><%= link_to 'Rebuild all outdated templates', :action => 'rebuild_all' %></li>
 	    </ul>
 	  </div>

data/lib/masterview/extras/init_rails_erb_mv_direct.rb

@@ -115,3 +115,4 @@ module ActionController #:nodoc:
   end
 end
 
+MasterView::LoadedFeatures[:rails_erb_mv_direct] = true

data/lib/masterview/extras/init_rails_reparse_checking.rb

@@ -42,6 +42,7 @@
 #++
 #
 
+
 MasterView::Log.info { 'Adding hook to allow MasterView to check for templates that have changed when processing a request' }
 
 module ActionController #:nodoc:
@@ -57,3 +58,5 @@ module ActionController #:nodoc:
     end
   end
 end
+
+MasterView::LoadedFeatures[:rails_reparse_checking] = true

data/lib/masterview/initializer.rb

@@ -425,7 +425,7 @@ module MasterView
       @mv_installation_dir = File.expand_path( "#{File.dirname(__FILE__)}/../.." )
 
       #ISSUE: should probably also detect std console or breakpointer launch scripts [DJL 10-Jun-2006]
-      @rails_runner_scripts_pattern = /server|dispatch/
+      @rails_runner_scripts_pattern = /server|dispatch|mongrel_rails/
 
       @has_rails_context = (defined?(::RAILS_ROOT) != nil)
       decide_if_running_rails
@@ -751,6 +751,10 @@ module MasterView
 
       config = configuration
 
+      # create loaded feature map - this map will track exactly what was loaded taking into account failures, so it can differ
+      # from what is configured. key = feature symbol, value = true if enabled and loaded
+      MasterView.const_set('LoadedFeatures', {} )
+
       # we don't record root_path or config_dir_path - their purpose is satisfied
       # by the time we're done processing this installation configuration
 
@@ -823,6 +827,7 @@ module MasterView
       end
       io_mgr.backup = FileMIOTree.new( config.rebuild_backups_tmp_dir_path ) if config.rebuild_backups_tmp_dir_path
       MasterView.const_set('IOMgr', io_mgr)
+      MasterView::LoadedFeatures[:tidy_template_read] = config.default_parser_options[:tidy]
     end
 
     # Initialize MasterView::Log with a logger which emits to std output, default DEBUG level
@@ -837,6 +842,7 @@ module MasterView
       parse_templates_at_startup
       enable_reparse_changed_templates
       enable_rails_erb_direct
+      MasterView::Log.info{  'MasterView plugin initialized - Version '+MasterView::VERSION::STRING }
     end
 
     # install the MasterviewController to support masterview admin pages in the site
@@ -883,6 +889,7 @@ module MasterView
         MasterView::IOMgr.template.find(:pattern => MasterView::TemplateFilenamePattern) do |mio|
           MasterView::Parser.parse_mio(mio, MasterView::IOMgr.erb)
         end
+        MasterView::LoadedFeatures[:rails_parse_at_startup] = true
       end
     end
 

data/lib/masterview/masterview_version.rb

@@ -2,7 +2,7 @@ module MasterView
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 2
-    TINY  = 0
+    TINY  = 1
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/test/unit/directive_image_tag_test.rb

@@ -0,0 +1,89 @@
+#!/usr/bin/env ruby
+
+require 'test/unit'
+currentPath = File.dirname(__FILE__)
+require File.join( currentPath, '../../lib/masterview' )
+require File.join( currentPath, '../../lib/masterview/directives/image_tag' )
+
+class ImageTagTest < Test::Unit::TestCase
+  include MasterView::Directives
+
+  def setup
+    @directives = MasterView::DirectiveSet.new
+  end
+
+  def test_default
+    tag = MasterView::Tag.new(@directives, 'foo', {}, :normal, nil)
+    @directives.directives = []
+    attr_value = "hello world"
+    @directives << Image_tag.new(attr_value)
+    assert_equal nil, @directives.determine_dcs(:stag).render
+    dcs = @directives.determine_dcs(:etag)
+    dcs.context = tag.create_context
+    assert_equal "<%= image_tag 'hello world' %>", dcs.render
+  end
+
+  def test_default_size
+    tag = MasterView::Tag.new(@directives, 'foo', {}, :normal, nil)
+    @directives.directives = []
+    attr_value = "hello world"
+    @directives << Image_tag.new(attr_value)
+    assert_equal nil, @directives.determine_dcs(:stag).render
+    dcs = @directives.determine_dcs(:etag)
+    dcs.context = tag.create_context
+    dcs.context[:tag].attributes['width'] = '20'
+    dcs.context[:tag].attributes['height'] = '10'
+    assert_equal "<%= image_tag 'hello world', :size => '20x10' %>", dcs.render
+  end
+
+  def test_default_size_alt
+    tag = MasterView::Tag.new(@directives, 'foo', {}, :normal, nil)
+    @directives.directives = []
+    attr_value = "hello world"
+    @directives << Image_tag.new(attr_value)
+    assert_equal nil, @directives.determine_dcs(:stag).render
+    dcs = @directives.determine_dcs(:etag)
+    dcs.context = tag.create_context
+    dcs.context[:tag].attributes['width'] = '20'
+    dcs.context[:tag].attributes['height'] = '10'
+    dcs.context[:tag].attributes['alt'] = 'foo'
+    assert_equal "<%= image_tag 'hello world', :alt => 'foo', :size => '20x10' %>", dcs.render
+  end
+
+  def test_empty_infer_path
+    tag = MasterView::Tag.new(@directives, 'foo', {}, :normal, nil)
+    @directives.directives = []
+    attr_value = ""
+    @directives << Image_tag.new(attr_value)
+    assert_equal nil, @directives.determine_dcs(:stag).render
+    dcs = @directives.determine_dcs(:etag)
+    dcs.context = tag.create_context
+    dcs.context[:tag].attributes['src'] = '../../public/images/foo.js'
+    assert_equal "<%= image_tag 'foo.js' %>", dcs.render
+  end
+
+  def test_empty_infer_path_sub
+    tag = MasterView::Tag.new(@directives, 'foo', {}, :normal, nil)
+    @directives.directives = []
+    attr_value = ""
+    @directives << Image_tag.new(attr_value)
+    assert_equal nil, @directives.determine_dcs(:stag).render
+    dcs = @directives.determine_dcs(:etag)
+    dcs.context = tag.create_context
+    dcs.context[:tag].attributes['src'] = '../../public/images/bar/foo.js'
+    assert_equal "<%= image_tag 'bar/foo.js' %>", dcs.render
+  end
+
+  def test_empty_use_src
+    tag = MasterView::Tag.new(@directives, 'foo', {}, :normal, nil)
+    @directives.directives = []
+    attr_value = ""
+    @directives << Image_tag.new(attr_value)
+    assert_equal nil, @directives.determine_dcs(:stag).render
+    dcs = @directives.determine_dcs(:etag)
+    dcs.context = tag.create_context
+    dcs.context[:tag].attributes['src'] = '/myimages/foo.js'
+    assert_equal "<%= image_tag '/myimages/foo.js' %>", dcs.render
+  end
+
+end

data/test/unit/directive_javascript_include_test.rb

@@ -23,4 +23,51 @@ class JavascriptIncludeTest < Test::Unit::TestCase
     assert_equal "<%= javascript_include_tag 'hello world' %>", dcs.render
   end
 
+  def test_symbol
+    tag = MasterView::Tag.new(@directives, 'foo', {}, :normal, nil)
+    @directives.directives = []
+    attr_value = ":defaults"
+    @directives << Javascript_include.new(attr_value)
+    assert_equal nil, @directives.determine_dcs(:stag).render
+    dcs = @directives.determine_dcs(:etag)
+    dcs.context = tag.create_context
+    assert_equal "<%= javascript_include_tag :defaults %>", dcs.render
+  end
+
+  def test_empty_infer_path
+    tag = MasterView::Tag.new(@directives, 'foo', {}, :normal, nil)
+    @directives.directives = []
+    attr_value = ""
+    @directives << Javascript_include.new(attr_value)
+    assert_equal nil, @directives.determine_dcs(:stag).render
+    dcs = @directives.determine_dcs(:etag)
+    dcs.context = tag.create_context
+    dcs.context[:tag].attributes['src'] = '../../public/javascripts/foo.js'
+    assert_equal "<%= javascript_include_tag 'foo.js' %>", dcs.render
+  end
+
+  def test_empty_infer_path_sub
+    tag = MasterView::Tag.new(@directives, 'foo', {}, :normal, nil)
+    @directives.directives = []
+    attr_value = ""
+    @directives << Javascript_include.new(attr_value)
+    assert_equal nil, @directives.determine_dcs(:stag).render
+    dcs = @directives.determine_dcs(:etag)
+    dcs.context = tag.create_context
+    dcs.context[:tag].attributes['src'] = '../../public/javascripts/bar/foo.js'
+    assert_equal "<%= javascript_include_tag 'bar/foo.js' %>", dcs.render
+  end
+
+  def test_empty_use_src
+    tag = MasterView::Tag.new(@directives, 'foo', {}, :normal, nil)
+    @directives.directives = []
+    attr_value = ""
+    @directives << Javascript_include.new(attr_value)
+    assert_equal nil, @directives.determine_dcs(:stag).render
+    dcs = @directives.determine_dcs(:etag)
+    dcs.context = tag.create_context
+    dcs.context[:tag].attributes['src'] = '/myjavascripts/foo.js'
+    assert_equal "<%= javascript_include_tag '/myjavascripts/foo.js' %>", dcs.render
+  end
+
 end

data/test/unit/directive_stylesheet_link_test.rb

@@ -23,4 +23,41 @@ class StylesheetLinkTest < Test::Unit::TestCase
     assert_equal "<%= stylesheet_link_tag 'hello world' %>", dcs.render
   end
 
+  def test_empty_infer_path
+    tag = MasterView::Tag.new(@directives, 'foo', {}, :normal, nil)
+    @directives.directives = []
+    attr_value = ""
+    @directives << Stylesheet_link.new(attr_value)
+    assert_equal nil, @directives.determine_dcs(:stag).render
+    dcs = @directives.determine_dcs(:etag)
+    dcs.context = tag.create_context
+    dcs.context[:tag].attributes['src'] = '../../public/stylesheets/foo.css'
+    assert_equal "<%= stylesheet_link_tag 'foo.css' %>", dcs.render
+  end
+
+  def test_empty_infer_path_sub
+    tag = MasterView::Tag.new(@directives, 'foo', {}, :normal, nil)
+    @directives.directives = []
+    attr_value = ""
+    @directives << Stylesheet_link.new(attr_value)
+    assert_equal nil, @directives.determine_dcs(:stag).render
+    dcs = @directives.determine_dcs(:etag)
+    dcs.context = tag.create_context
+    dcs.context[:tag].attributes['src'] = '../../public/stylesheets/bar/foo.css'
+    assert_equal "<%= stylesheet_link_tag 'bar/foo.css' %>", dcs.render
+  end
+
+  def test_empty_use_src
+    tag = MasterView::Tag.new(@directives, 'foo', {}, :normal, nil)
+    @directives.directives = []
+    attr_value = ""
+    @directives << Stylesheet_link.new(attr_value)
+    assert_equal nil, @directives.determine_dcs(:stag).render
+    dcs = @directives.determine_dcs(:etag)
+    dcs.context = tag.create_context
+    dcs.context[:tag].attributes['src'] = '/mystylesheets/foo.css'
+    assert_equal "<%= stylesheet_link_tag '/mystylesheets/foo.css' %>", dcs.render
+  end
+
+
 end

data/test/unit/template_test.rb

@@ -468,7 +468,161 @@ class TestTemplate < Test::Unit::TestCase
     assert_template_result expected, template, :template_pathname => 'one/two_three.four'
   end
 
+  def test_image_tag
+    template = <<-END
+      <div mv:generate='foo/bar'>
+        <img src="../../../public/images/cat.jpg" mv:image_tag="cat.jpg"/>
+      </div>
+    END
+    expected = {
+      'foo/bar' => "<div><%= image_tag 'cat.jpg' %></div>"
+    }
+    assert_template_result expected, template, :template_pathname => 'one/two_three.four'
+  end
+
+  def test_image_tag_infer_path
+    template = <<-END
+      <div mv:generate='foo/bar'>
+        <img src="../../../public/images/cat.jpg" mv:image_tag=""/>
+      </div>
+    END
+    expected = {
+      'foo/bar' => "<div><%= image_tag 'cat.jpg' %></div>"
+    }
+    assert_template_result expected, template, :template_pathname => 'one/two_three.four'
+  end
+
+  def test_image_tag_infer_path_use_src
+    template = <<-END
+      <div mv:generate='foo/bar'>
+        <img src="/myimages/cat.jpg" mv:image_tag=""/>
+      </div>
+    END
+    expected = {
+      'foo/bar' => "<div><%= image_tag '/myimages/cat.jpg' %></div>"
+    }
+    assert_template_result expected, template, :template_pathname => 'one/two_three.four'
+  end
+
+  def test_image_tag_infer_path_size
+    template = <<-END
+      <div mv:generate='foo/bar'>
+        <img src="../../../public/images/cat.jpg" mv:image_tag="" width="20" height="10"/>
+      </div>
+    END
+    expected = {
+      'foo/bar' => "<div><%= image_tag 'cat.jpg', :size => '20x10' %></div>"
+    }
+    assert_template_result expected, template, :template_pathname => 'one/two_three.four'
+  end
+
+  def test_image_tag_infer_missing_width
+    template = <<-END
+      <div mv:generate='foo/bar'>
+        <img src="../../../public/images/cat.jpg" mv:image_tag="" height="10"/>
+      </div>
+    END
+    expected = {
+      'foo/bar' => "<div><%= image_tag 'cat.jpg', :height => '10' %></div>"
+    }
+    assert_template_result expected, template, :template_pathname => 'one/two_three.four'
+  end
 
+  def test_image_tag_infer_missing_height
+    template = <<-END
+      <div mv:generate='foo/bar'>
+        <img src="../../../public/images/cat.jpg" mv:image_tag="" width="20"/>
+      </div>
+    END
+    expected = {
+      'foo/bar' => "<div><%= image_tag 'cat.jpg', :width => '20' %></div>"
+    }
+    assert_template_result expected, template, :template_pathname => 'one/two_three.four'
+  end
+
+  def test_image_tag_infer_path_size_alt
+    template = <<-END
+      <div mv:generate='foo/bar'>
+        <img src="../../../public/images/cat.jpg" mv:image_tag="" width="20" height="10" alt="my cat"/>
+      </div>
+    END
+    expected = {
+      'foo/bar' => "<div><%= image_tag 'cat.jpg', :alt => 'my cat', :size => '20x10' %></div>"
+    }
+    assert_template_result expected, template, :template_pathname => 'one/two_three.four'
+  end
+
+  def test_image_tag_infer_path_alt
+    template = <<-END
+      <div mv:generate='foo/bar'>
+        <img src="../../../public/images/cat.jpg" mv:image_tag="" alt="my cat"/>
+      </div>
+    END
+    expected = {
+      'foo/bar' => "<div><%= image_tag 'cat.jpg', :alt => 'my cat' %></div>"
+    }
+    assert_template_result expected, template, :template_pathname => 'one/two_three.four'
+  end
+
+  def test_image_tag_infer_path_class
+    template = <<-END
+      <div mv:generate='foo/bar'>
+        <img src="../../../public/images/cat.jpg" mv:image_tag="" alt="my cat" class="blue"/>
+      </div>
+    END
+    expected = {
+      'foo/bar' => "<div><%= image_tag 'cat.jpg', :alt => 'my cat', :class => 'blue' %></div>"
+    }
+    assert_template_result expected, template, :template_pathname => 'one/two_three.four'
+  end
+
+  def test_javascript_include
+    template = <<-END
+      <div mv:generate='foo/bar'>
+        <img src="../../../public/javascripts/cat.js" mv:javascript_include="cat.js"/>
+      </div>
+    END
+    expected = {
+      'foo/bar' => "<div><%= javascript_include_tag 'cat.js' %></div>"
+    }
+    assert_template_result expected, template, :template_pathname => 'one/two_three.four'
+  end
+
+  def test_javascript_include_symbols
+    template = <<-END
+      <div mv:generate='foo/bar'>
+        <img src="../../../public/javascripts/cat.js" mv:javascript_include=":defaults"/>
+      </div>
+    END
+    expected = {
+      'foo/bar' => "<div><%= javascript_include_tag :defaults %></div>"
+    }
+    assert_template_result expected, template, :template_pathname => 'one/two_three.four'
+  end
+
+  def test_javascript_include_infer_path
+    template = <<-END
+      <div mv:generate='foo/bar'>
+        <img src="../../../public/javascripts/cat.js" mv:javascript_include=""/>
+      </div>
+    END
+    expected = {
+      'foo/bar' => "<div><%= javascript_include_tag 'cat.js' %></div>"
+    }
+    assert_template_result expected, template, :template_pathname => 'one/two_three.four'
+  end
+
+  def test_javascript_include_infer_path_use_src
+    template = <<-END
+      <div mv:generate='foo/bar'>
+        <img src="/myjavascripts/cat.js" mv:javascript_include=""/>
+      </div>
+    END
+    expected = {
+      'foo/bar' => "<div><%= javascript_include_tag '/myjavascripts/cat.js' %></div>"
+    }
+    assert_template_result expected, template, :template_pathname => 'one/two_three.four'
+  end
 
 
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: masterview
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
-date: 2006-06-21 00:00:00 -05:00
+  version: 0.2.1
+date: 2006-06-28 00:00:00 -05:00
 summary: A (x)html friendly template engine for rails with the power of layouts, and partials.
 require_paths: 
 - lib
@@ -82,6 +82,7 @@ files:
 - lib/masterview/directives/import.rb
 - lib/masterview/directives/content.rb
 - lib/masterview/directives/text_area.rb
+- lib/masterview/directives/image_tag.rb
 - lib/masterview/extras/app
 - lib/masterview/extras/init_logger.rb
 - lib/masterview/extras/watcher.rb
@@ -96,6 +97,7 @@ files:
 - lib/masterview/extras/app/views/masterview/admin/list.rhtml
 - lib/masterview/extras/app/views/masterview/admin/empty.rhtml
 - lib/masterview/extras/app/views/masterview/admin/create.rhtml
+- lib/masterview/extras/app/views/masterview/admin/features.rhtml
 - Rakefile
 - init.rb
 - doc/stylesheets
@@ -106,6 +108,8 @@ files:
 - doc/configuration.html
 - doc/index.html
 - doc/troubleshooting.html
+- doc/media_list.html
+- doc/simple_diagram.html
 - doc/stylesheets/mv-directives.css
 - doc/stylesheets/mv-installation.css
 - doc/stylesheets/mv-config.css
@@ -160,6 +164,7 @@ files:
 - test/unit/directive_text_area_test.rb
 - test/unit/pathname_extensions_test.rb
 - test/unit/string_hash_mio_test.rb
+- test/unit/directive_image_tag_test.rb
 - test/xtras/config_initialize_standalone.rb
 - test/xtras/config-mv-logger_config.rb
 - test/fixtures/configs