masterview 0.2.5 → 0.3.0

data/CHANGELOG

@@ -1,3 +1,33 @@
+0.3.0 - November 8, 2006
+Fixed compatibility of AdminPages with edge rails using dependency mechanism
+Refactored directive api using DSL to simplify and solidify creation of directives
+Fix find_last_parent bug which failed to search nested arrays properly, found and patch submitted by Sergey Shalatskly
+Added form_remote, link_to_function, eval directives based on ideas from Sergey Shalatskly
+New method Configuration.add_directive_path to add directives directories to load path.
+Reworked directive framework to use DirectiveMetadata, support declarative metadata DSL
+Support multiple namespaces for directive attribute markup.
+Provide separate config defaults for builtin masterview directives (mv:) and addon directives (mvx:)
+Support installation-level config of directive dir metadata defaults using .metadata file in directives directory.
+Support app-level config of directive dir metadata defaults using path-entry options
+Internal rework of directive loading and management to handle namespaces, config options
+Internal cleanup in parser to remove old hooks for namespace and dir path options; supported by MV config.
+Internal restructuring to introduce MasterView::MIO namespace for i/o mechanisms.
+Add 'View Directives' page to MasterView Admin to display loaded directives info
+Fix missing context layout of View Configuration page in MasterView Admin
+Add Developer's Guide documentation (describe directive implementation framework)
+Change output of directives to use parens for methods
+Output xml declaration (version and encoding) and doctype if provided in template
+Added custom version of rexml sax2parser and baseparser which throws proper event for doctype
+Added directive API method find_parent_directive which allows for directives to find and communicate with their parents
+Changed form directive to output closing form tag rather than using end_form_tag helper which is deprecated in rails 1.2
+Changed form_remote directive to allow normal output of </form> and not output end_form_tag helper since end_form_tag helper has been deprecated in rails 1.2
+Updated sidebox.css to work better with small IE browser windows
+
+**UPGRADE CONSIDERATIONS:
+  default namespace of extensions directives changed from mv: to mvx:
+  upgrade any user created custom directives to use new directive API (see release notes)
+
+
 0.2.5 - August 19th, 2006
 Added default generate filter which will add in a default generate directive if none is found in template
 Changed default_parser_options to be merged in with original set rather than to be absolute replacement
@@ -34,7 +64,7 @@ Update javascript_include directive to infer path from src if attr_value is empt
 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. 
+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.
 Add support for configuring MasterView logger and log_level; default level INFO for dev, WARN otherwise

data/README

@@ -1,21 +1,21 @@
-= MasterView - Rails-optimized (x)html friendly template engine 
-
-MasterView is a ruby/rails optimized HTML/XHTML friendly template engine. 
-It is designed to use the full power and productivity of rails including 
-layouts, partials, and rails html helpers while still being editable/styleable 
-in a WYSIWYG HTML editor.  
-
-MasterView is distributed as a gem or a plugin. You may install it as a gem and 
-then generate a lightweight plugin which mainly refers to the gem *or* you can 
-simply install as a plugin which is self contained. I personally prefer installing 
-as a gem for ease of management, however if you are running at a shared hosting 
-environment you might not have authority to install this gem so you may install 
+= MasterView - Rails-optimized (x)html friendly template engine
+
+MasterView is a ruby/rails optimized HTML/XHTML friendly template engine.
+It is designed to use the full power and productivity of rails including
+layouts, partials, and rails html helpers while still being editable/styleable
+in a WYSIWYG HTML editor.
+
+MasterView is distributed as a gem or a plugin. You may install it as a gem and
+then generate a lightweight plugin which mainly refers to the gem *or* you can
+simply install as a plugin which is self contained. I personally prefer installing
+as a gem for ease of management, however if you are running at a shared hosting
+environment you might not have authority to install this gem so you may install
 as a self contained plugin.
 
 If you are interested in the background story behind all this, it is at the end of this page.
 
 Author:: Jeff Barczewski
-Email:: jeff.barczewski @ gmail.com
+Email:: jeff.barczewski (at) gmail (dot) com
 Primary developers:: Jeff Barczewski, Deb Lewis
 Website:: http://masterview.org
 Rubyforge project:: masterview
@@ -35,16 +35,16 @@ License:: MIT open source license like Rails
 == Prerequisites
 
 Requires::
-	No external dependencies
+        No external dependencies
 
 Optional::
-	tidy (gem) and tidy library - if these are installed you can use tidy to cleanup html into valid xhtml for use by MasterView
-	log4r (gem) - if this gem is installed then MasterView will use it for logging otherwise it defaults to using built in Logger.
+        tidy (gem) and tidy library - if these are installed you can use tidy to cleanup html into valid xhtml for use by MasterView
+        log4r (gem) - if this gem is installed then MasterView will use it for logging otherwise it defaults to using built in Logger.
 
 == User Documentation
 
 MasterView documentation is available online at the MasterView site:
-  http://www.masterview.org 
+  http://www.masterview.org
 and on the rubyforge project
   http://rubyforge.org/projects/masterview/
 
@@ -70,12 +70,12 @@ to assist you during development with creating and managing your templates.
 
 == Background story
 
-I came from a Java Struts environment when I was introduced to Ruby. I 
-was just in the process of evaluating Tapestry and JSF when I learned about Rails. 
-Ruby and Rails changed my world forever. I had to however drop many of my bad 
-habits aquired from years of Java and C++ work. I had to embrace the new ideas 
+I came from a Java Struts environment when I was introduced to Ruby. I
+was just in the process of evaluating Tapestry and JSF when I learned about Rails.
+Ruby and Rails changed my world forever. I had to however drop many of my bad
+habits aquired from years of Java and C++ work. I had to embrace the new ideas
 and approach things now with a different mindset. (If you ever have a chance to
-hear Dave Thomas speak, you will know what I mean. He has a wonderfully entertaining 
+hear Dave Thomas speak, you will know what I mean. He has a wonderfully entertaining
 yet enlightening way of illustrating this.)
 
 After learning the Ruby and Rails way, (Thank you Matz and DHH for such wonderful
@@ -84,74 +84,75 @@ fun once again, and everything you do in Ruby or Rails is easier than any other
 language or framework I have ever seen. Even taking into account having to learn
 something new, I was still far more productive than ever before. The only thing
 that I felt that could be done better, was to have a nice html friendly templating
-engine so that designers and developers could work collaboratively together on a project. 
-The designers could style and layout the pages with their WYSIWYG HTML editors and 
-developers would have the full power of Ruby and Rails without having to jump 
-through extra hoops to use them. I looked at the available html template engines 
-to see if anything fit with my style. I was disappointed with each of them, mainly because 
-they all made it harder than straigt ERb (rhtml) and were not able to use layouts 
+engine so that designers and developers could work collaboratively together on a project.
+The designers could style and layout the pages with their WYSIWYG HTML editors and
+developers would have the full power of Ruby and Rails without having to jump
+through extra hoops to use them. I looked at the available html template engines
+to see if anything fit with my style. I was disappointed with each of them, mainly because
+they all made it harder than straigt ERb (rhtml) and were not able to use layouts
 and partials easily.
 
-After all the hard work so many people have put into Ruby and Rails, I wanted to see 
-if there was anyway I could contribute as well, maybe extending one of the existing 
-template projects to have the ideal functionality I was striving for. I wanted 
-something to make my own web development even more productive. However after 
-reviewing each of them and even getting into the source code, the closest ones seemed 
-to be Amrita2, Liquid, and Kwartz. Unfortunately it was not going to be easy to add 
+After all the hard work so many people have put into Ruby and Rails, I wanted to see
+if there was anyway I could contribute as well, maybe extending one of the existing
+template projects to have the ideal functionality I was striving for. I wanted
+something to make my own web development even more productive. However after
+reviewing each of them and even getting into the source code, the closest ones seemed
+to be Amrita2, Liquid, and Kwartz. Unfortunately it was not going to be easy to add
 the functionality and usability I desired.
 
-During my research I learned that many of the rails gurus were putting down html 
-template engines because they felt that they handicapped the developer severely, 
-namely by not taking advantage of rails layouts, partials, and html helpers. 
-After doing some projects with ERb (rhtml) I realized that they were right. I too 
-did not want to give up any of that power either. I also didn't want to create a 
-bunch of extra code or config to use the templates (extra view code, or data 
+During my research I learned that many of the rails gurus were putting down html
+template engines because they felt that they handicapped the developer severely,
+namely by not taking advantage of rails layouts, partials, and html helpers.
+After doing some projects with ERb (rhtml) I realized that they were right. I too
+did not want to give up any of that power either. I also didn't want to create a
+bunch of extra code or config to use the templates (extra view code, or data
 structures to pass to the templates) as so many of the other engines relied on.
 
-I expanded my search outside of Ruby for the best html template technology I could find. 
-After reviewing all the front runners I still didn't find anything that quite met with my 
-goals for developing with ruby and rails. I also didn't find any technology that was 
-close enough that I could adapt it. However I did come across features in a variety of 
-systems that inspired me, and helped me shape the ideas that are presented here. 
-A few of those systems were Tapestry, Zope/PHP TAL, Kwartz, Amrita 2, Liquid, 
-and Web Objects. 
+I expanded my search outside of Ruby for the best html template technology I could find.
+After reviewing all the front runners I still didn't find anything that quite met with my
+goals for developing with ruby and rails. I also didn't find any technology that was
+close enough that I could adapt it. However I did come across features in a variety of
+systems that inspired me, and helped me shape the ideas that are presented here.
+A few of those systems were Tapestry, Zope/PHP TAL, Kwartz, Amrita 2, Liquid,
+and Web Objects.
 
-After putting much thought into all the possible options I could not see extending 
+After putting much thought into all the possible options I could not see extending
 an existing template engine to meet my needs. And since I wanted this engine to have
 all the power of ruby and rails, it seemed that I would be best served by developing
 a html template syntax that was a thin layer above ERb. That way it would be intuitive
-to use (not having to learn yet another syntax) yet very powerful. Once I was able to 
-come up with the desired syntax and approach it became apparent that this would also 
+to use (not having to learn yet another syntax) yet very powerful. Once I was able to
+come up with the desired syntax and approach it became apparent that this would also
 be fairly straightforward to build.
 
-I ran the concept by the guys at the St. Louis Ruby Group http://stlruby.org and 
-they were excited about the project. With their help I was able to simply some of 
-the confusing or complicated areas before beginning development. They also sparked 
-some ideas about how to make this infinitely extensible such that developers could 
-easily add their own attribute directives. This would give them the power to create 
-custom extensions that would encapsulate some of their development work. This would 
-serve a couple needs, it would not only make this engine extensible, it would also 
+I ran the concept by the guys at the St. Louis Ruby Group http://stlruby.org and
+they were excited about the project. With their help I was able to simply some of
+the confusing or complicated areas before beginning development. They also sparked
+some ideas about how to make this infinitely extensible such that developers could
+easily add their own attribute directives. This would give them the power to create
+custom extensions that would encapsulate some of their development work. This would
+serve a couple needs, it would not only make this engine extensible, it would also
 allow this engine to grow easily being composed of small pluggable attribute directives.
-Many thanks to the members of this group, I continue to enjoy discussing the power of 
+Many thanks to the members of this group, I continue to enjoy discussing the power of
 Ruby and learning from each of them on a monthly basis.
 
-While I am on the subject of thanks, I would like to thank my wife and daughter for 
-their support as I took time away from them to work on this project and I want to 
-thank God for bringing the right people into my life just when I needed them and for 
-bringing me on this wonderful journey, I am so very blessed. May I be able to give 
+While I am on the subject of thanks, I would like to thank my wife and daughter for
+their support as I took time away from them to work on this project and I want to
+thank God for bringing the right people into my life just when I needed them and for
+bringing me on this wonderful journey, I am so very blessed. May I be able to give
 back some of what has been given to me.
 
 And one more mention of tremendous thanks to Deb Lewis, the other core developer on the
-team, she has spent countless hours reviewing, revising, and improving the codebase, 
-configuration, and documentation. The project wouldn't be half of what it is today 
-without all her help, inspiration, and hard work. I thoroughly enjoy working and 
+team, she has spent countless hours reviewing, revising, and improving the codebase,
+configuration, and documentation. The project wouldn't be half of what it is today
+without all her help, inspiration, and hard work. I thoroughly enjoy working and
 debating the finer points of the project with her each step of the way.
 
 So that's the story, I hope that many of you will find MasterView to be a useful
 tool for your development. I am continuing to refine MasterView by using it daily for
-Genesis Ministry sites and all my web projects. I know that there is much more work needed 
-in documentation, examples, test cases, additional directives, etc., so I would 
-appreciate any feedback and ideas that you have. Thanks for taking the time to 
+Genesis Ministry sites and all my web projects. I know that there is much more work needed
+in documentation, examples, test cases, additional directives, etc., so I would
+appreciate any feedback and ideas that you have. Thanks for taking the time to
 review MasterView!
 
-Jeff Barczewski (jeff.barczewski  @   gmail.com)
+Jeff Barczewski
+jeff.barczewski (at) gmail (dot) com

data/RELEASE_NOTES

@@ -1,5 +1,11 @@
 = MasterView - Rails-optimized (x)html friendly template engine
 
+== Recent changes (Release 0.3.0 - Major update - refactoring of directive API (for developing directives)
+The directive API for creating directives has been refactored and simplified. This will enable directives to be developed more easily by both core developers and MasterView users. The end goal is to make it extremely simple for anyone to create their own custom directives and to share those with the community, and thus the project can live and grow into many specialty areas. The directive API refactoring is one more step towards those goals.
+
+The old directive_base.rb which provided the API for directives has been deprecated and moved to deprecated/directive_base.rb, MasterViewdevelopers which have developed custom directives should upgrade those directives to the new API as soon as possible. During the transition period one can use the original API by requiring the deprecated/directive_base.rb file and changing their directive to inherit from DirectiveBaseOld rather than DirectiveBase.
+
+
 == Recent changes (Release 0.2.5)
 Fix AdminPage compatibility with Rails 1.1.5+ which uses safe_load_paths to find controllers
 Fix rake mv:view_rhtml RHTML=foo/_bar.rhtml was not able to find partials
@@ -20,7 +26,7 @@ rhtml.
 Changed default development settings for enable_admin_pages and
 enable_view_rhtml = true (false in production) to make it easy
 for new users to get up and running. Added check_box, radio_button,
-select, collection_select directives. Refactor attr_value parsing 
+select, collection_select directives. Refactor attr_value parsing
 to be more robust taking into account nested objects. Internal rework
 of directive handling to support alternate namespaces for directives.
 Std app directives dir at rails app/masterview/directives will be
@@ -31,8 +37,8 @@ automatically added to MasterView load path if exists.
 
 Fixes problem when rails encounters exception in either compiling or
 involving RuntimeError in the generated rhtml. The rails TemplateError
-class looks at the file system for the template contents. So when 
-generate_rhtml is false (no file is generated) rails was not able to 
+class looks at the file system for the template contents. So when
+generate_rhtml is false (no file is generated) rails was not able to
 find source and was not outputting an error page. Rails TemplateError
 class was extended to look at MasterView store first and then fallback
 to file system.
@@ -40,11 +46,11 @@ to file system.
 == Recent changes (Release 0.2.1)
 
 Release 0.2.1 adds Mongrel support, a new image_tag directive
-and some additional illustrations and links to videos. Also 
+and some additional illustrations and links to videos. Also
 javascript_include and stylesheet_link directives can infer the
 path from the src attribute if the attr_value is empty.
 
-Also added additional logging around startup and the version of 
+Also added additional logging around startup and the version of
 MasterView that is running and a new admin page to visually
 see what MasterView features are currently loaded (tidy,
 auto parsing on change, parse on startup, reading rhtml direct
@@ -89,87 +95,87 @@ a new Configuration Guide describing how to customize the
 MasterView configuration.
 
 UPGRADE NOTES: If you have customized your MasterView configuration
-in the init.rb file of your existing plugin installation, you *MUST* 
+in the init.rb file of your existing plugin installation, you *MUST*
 migrate your configuration to the new settings file configuration mechanism
 (config/masterview/settings.rb and environment settings files).
 
-Also note that a directive was renamed from gen_render to gen_partial to 
+Also note that a directive was renamed from gen_render to gen_partial to
 more clearly represent the functionality and eliminate future confusion.
 Be sure to change any references to gen_render to gen_partial.
 
-The default location for MasterView templates is now the standard Rails 
-app/views directory.  Either move your existing templates into app/views 
+The default location for MasterView templates is now the standard Rails
+app/views directory.  Either move your existing templates into app/views
 or update the MasterView config.template_src_dir_path setting in your
-config/masterview/settings.rb to reference your existing templates source 
+config/masterview/settings.rb to reference your existing templates source
 directory.
 
 == Recent changes (Release 0.1.0)
 
-MasterView now by default generates five masterview template files instead 
-of one, though you can specify the --single-file option to only generate 
-one file. Using one masterview template file gives the most DRY implementation 
-but since all the views are in one file, it can become a point of contention 
-and is a little more difficult for designers to work with. 
-This Version 0.1.0 upgrade fixes that by generating one masterview template 
-for each action (list, new, edit, show, destroy). The layout and message 
-partials are defined in the list template and are imported into the other 
-files so that you can have a complete page rendering when working with style 
-and design of page. Similarly new defines the form partial which is imported 
+MasterView now by default generates five masterview template files instead
+of one, though you can specify the --single-file option to only generate
+one file. Using one masterview template file gives the most DRY implementation
+but since all the views are in one file, it can become a point of contention
+and is a little more difficult for designers to work with.
+This Version 0.1.0 upgrade fixes that by generating one masterview template
+for each action (list, new, edit, show, destroy). The layout and message
+partials are defined in the list template and are imported into the other
+files so that you can have a complete page rendering when working with style
+and design of page. Similarly new defines the form partial which is imported
 into edit, and show defines a _show partial which is imported into destroy.
 
-One can edit the layout or other partials in the file they are defined in, 
-so for instance to edit the layout, edit the list template and once finished, 
-you can trigger the other templates to be rebuilt with the current information. 
-MasterView now contains an MasterView admin controller/view to visually see 
-all the status and details about the templates. You can rebuild any out of sync 
-templates from this page. Alternatively you can view and rebuild templates from 
-the command line as well using the built in rake commands (mv:list, mv:list_all, 
+One can edit the layout or other partials in the file they are defined in,
+so for instance to edit the layout, edit the list template and once finished,
+you can trigger the other templates to be rebuilt with the current information.
+MasterView now contains an MasterView admin controller/view to visually see
+all the status and details about the templates. You can rebuild any out of sync
+templates from this page. Alternatively you can view and rebuild templates from
+the command line as well using the built in rake commands (mv:list, mv:list_all,
 mv:rebuild TEMPLATE=foo.html, mv:rebuild_all).
 
-To make it easy to add additional actions which also import the layout, 
-MasterView now has a way to generate a starter template file for your action 
-by simply choosing from which other template file you want to import the layout 
-from. For instance say you want to add an action called hello to your Product 
-controller. Find the masterview template you want to get the layout imported 
-from which could be (product_list.html, product_new.html, product_edit.html, ...), 
-you can choose any of the templates that have the layout you want (it doesn't 
-matter whether they defined the layout or simply imported it. To generate the 
-starter template go to the MasterView Admin page http://yourserver/masterview 
-and click copy link next to the appropriate template. On the next screen indicate 
-the name of the action you wish to add (in this case 'hello') and click the submit 
-button. MasterView generates a starter template file product_hello.html which 
-imports the layout from the template file you chose and it creates some 
-placeholder divs in the template that you can edit to add your hello view code. 
-Alternatively there is also a 
-    rake mv:copy_layout TEMPLATE=product_list.html ACTION=hello 
+To make it easy to add additional actions which also import the layout,
+MasterView now has a way to generate a starter template file for your action
+by simply choosing from which other template file you want to import the layout
+from. For instance say you want to add an action called hello to your Product
+controller. Find the masterview template you want to get the layout imported
+from which could be (product_list.html, product_new.html, product_edit.html, ...),
+you can choose any of the templates that have the layout you want (it doesn't
+matter whether they defined the layout or simply imported it. To generate the
+starter template go to the MasterView Admin page http://yourserver/masterview
+and click copy link next to the appropriate template. On the next screen indicate
+the name of the action you wish to add (in this case 'hello') and click the submit
+button. MasterView generates a starter template file product_hello.html which
+imports the layout from the template file you chose and it creates some
+placeholder divs in the template that you can edit to add your hello view code.
+Alternatively there is also a
+    rake mv:copy_layout TEMPLATE=product_list.html ACTION=hello
 command to allow you to do the same thing via command line.
 
-Note that you don't have to use the starter or generated files to use MasterView 
-(you can just add MasterView attribute directives manually), but I found that 
-once you had things started and wanted to reuse that same information, that 
-having an automated way to get the layout imported makes it much easier and 
-quicker to get things going. You can also change the default action div that is 
-generated by simply creating your own file in app/views/masterview/admin/empty.rhtml 
-which if found the copy_layout will use it, otherwise it uses the one from the gem/plugin. 
+Note that you don't have to use the starter or generated files to use MasterView
+(you can just add MasterView attribute directives manually), but I found that
+once you had things started and wanted to reuse that same information, that
+having an automated way to get the layout imported makes it much easier and
+quicker to get things going. You can also change the default action div that is
+generated by simply creating your own file in app/views/masterview/admin/empty.rhtml
+which if found the copy_layout will use it, otherwise it uses the one from the gem/plugin.
 
 == Description
 
-MasterView is a ruby/rails optimized HTML/XHTML friendly template engine. 
-It is designed to use the full power and productivity of rails including 
-layouts, partials, and rails html helpers while still being editable/styleable 
-in a WYSIWYG HTML editor.  
+MasterView is a ruby/rails optimized HTML/XHTML friendly template engine.
+It is designed to use the full power and productivity of rails including
+layouts, partials, and rails html helpers while still being editable/styleable
+in a WYSIWYG HTML editor.
 
-MasterView is distributed as a gem or a plugin. You may install it as a gem and 
-then generate a lightweight plugin which mainly refers to the gem *or* you can 
-simply install as a plugin which is self contained. I personally prefer installing 
-as a gem for ease of management, however if you are running at a shared hosting 
-environment you might not have authority to install this gem so you may install 
+MasterView is distributed as a gem or a plugin. You may install it as a gem and
+then generate a lightweight plugin which mainly refers to the gem *or* you can
+simply install as a plugin which is self contained. I personally prefer installing
+as a gem for ease of management, however if you are running at a shared hosting
+environment you might not have authority to install this gem so you may install
 as a self contained plugin.
 
 If you are interested in the background story behind all this, it is at the end of this page.
 
 Author:: Jeff Barczewski
-Email:: jeff.barczewski @ gmail.com
+Email:: jeff.barczewski (at) gmail (dot) com
 Primary developers:: Jeff Barczewski, Deb Lewis
 Website:: http://masterview.org
 Rubyforge project:: masterview
@@ -189,16 +195,16 @@ License:: MIT open source license like Rails
 == Prerequisites
 
 Requires::
-	No external dependencies
+        No external dependencies
 
 Optional::
-	tidy (gem) and tidy library - if these are installed you can use tidy to cleanup html into valid xhtml for use by MasterView
-	log4r (gem) - if this gem is installed then MasterView will use it for logging otherwise it defaults to using built in Logger.
+        tidy (gem) and tidy library - if these are installed you can use tidy to cleanup html into valid xhtml for use by MasterView
+        log4r (gem) - if this gem is installed then MasterView will use it for logging otherwise it defaults to using built in Logger.
 
 == User Documentation
 
 MasterView documentation is available online at the MasterView site:
-  http://www.masterview.org 
+  http://www.masterview.org
 and on the rubyforge project
   http://rubyforge.org/projects/masterview/
 

data/Rakefile

@@ -107,8 +107,8 @@ end
 desc 'Run parser on masterview html templates in examples'
 namespace 'dev' do
 task :mvparse_examples do
-  template_mio_tree = MasterView::FileMIOTree.new('examples', '.html', :logging => true )
-  output_mio_tree = MasterView::FileMIOTree.new('tmp/views', '.rhtml', :logging => true )
+  template_mio_tree = MasterView::MIO::FileMIOTree.new('examples', '.html', :logging => true )
+  output_mio_tree = MasterView::MIO::MFileMIOTree.new('tmp/views', '.rhtml', :logging => true )
   template_mio_tree.find(:pattern => '*.html') do |mio|
     MasterView::Parser.parse_mio( mio, output_mio_tree )
   end
@@ -118,7 +118,7 @@ end
 # Run syntax check on all ruby code files
 desc 'Run syntax check on all ruby code files'
 namespace 'dev' do
-task :check_syntax do 
+task :check_syntax do
   #WAS: filelist = Dir.glob('**/*.rb')
   #skip: generators - erb-ized code templates confuse the parser
   filelist = [ 'init.rb', 'lib/masterview.rb' ]
@@ -129,11 +129,11 @@ task :check_syntax do
     unless output =~ /Syntax OK/
       puts "#{file}:"
       puts "  #{output}"
-      return 
+      return
     end
   end
   puts "#{filelist.length} files checked"
-  puts 'Syntax OK'  
+  puts 'Syntax OK'
 end
 end
 
@@ -144,15 +144,15 @@ task :count_loc do
   files = 0
   lines = 0
   codelines = 0
-  
-  #VER1 WAS: Dir.foreach("lib") { |file_name| 
+
+  #VER1 WAS: Dir.foreach("lib") { |file_name|
   #VER1 WAS:   next unless file_name =~ /.*rb/
   #VER1 WAS:   f = File.open("lib/" + file_name)
   filelist = [ 'init.rb', 'lib/masterview.rb' ]
   filelist.concat Dir.glob('lib/**/*.rb')
   #filelist.concat Dir.glob('test**/*.rb')
   filelist.each { |file_name|
-    
+
     f = File.open(file_name)
     files += 1
 
@@ -179,7 +179,7 @@ end
 # Build/Release Tasks
 #==============================================================================
 
-# Publish beta gem  
+# Publish beta gem
 #desc "Publish the gem"
 #task :publish => [:rdoc, :package] do
 #  Rake::SshFilePublisher.new("foobar.com", "dist/pkg", "pkg", "#{PKG_FILE_NAME}.zip").upload
@@ -221,7 +221,7 @@ desc 'Build all packages'
 task :package => [
         :copy_duplicated_files,
         # gems (runtime, mv generator, mv plugin generator, 3-in-1 supersaver)
-        'masterview:package', 
+        'masterview:package',
         'masterview_generator:package',
         'masterview_plugin_generator:package',
         'masterview_gem_pack:package',
@@ -233,7 +233,7 @@ desc 'Re-build all packages'
 task :repackage => [
         :copy_duplicated_files,
         # gems (runtime, mv generator, mv plugin generator, 3-in-1 supersaver)
-        'masterview:repackage', 
+        'masterview:repackage',
         'masterview_generator:repackage',
         'masterview_plugin_generator:repackage',
         'masterview_gem_pack:repackage',
@@ -257,17 +257,16 @@ task :rm_packages do
   FileUtils.remove_dir('pkg', true)
 end
 
-####
-#ISSUE: jeff - we don't include that top-level index.html in any of the packages?!
-####
+
 PKG_FILES_RELEASE_DOCS = [
       "[A-Z]*"   # README, RELEASE_NOTES, CHANGELOG, MIT_LICENSE, TODO
       ]
 
 PKG_FILES_RUNTIME = [
       "lib/**/*",
+      "lib/**/.metadata",
       "directives/**/*",  #SHOULD THIS GO AWAY (??)
-      "Rakefile", 
+      "Rakefile",
       "init.rb"
     ]
 PKG_FILES_MV_GENERATOR = [
@@ -311,8 +310,8 @@ namespace 'masterview_plugin' do
       s.require_path = 'lib'
       s.autorequire  = 'masterview'
       s.author = "Jeff Barczewski"
-      s.email = "jeff.barczewski@gmail.com"
-      s.homepage = "http://masterview.org/"  
+      s.email = "jeff.barczewski (at) gmail (dot) com"
+      s.homepage = "http://masterview.org/"
     end
 
     # Create Rubygem package
@@ -323,7 +322,7 @@ namespace 'masterview_plugin' do
     end
 
     desc "Release files on RubyForge."
-    task :release_files => [ :verify_rubyforge ] do 
+    task :release_files => [ :verify_rubyforge ] do
       release_files = ["zip", "tgz"].map { |ext| "pkg/#{PKG_FILE_NAME}.#{ext}" }
 
       Rake::XForge::Release.new(MASTERVIEW) do |release|
@@ -383,8 +382,8 @@ namespace 'masterview_gem_pack' do
       s.add_dependency( 'masterview_generator', ">= #{PKG_VERSION}" )
       s.add_dependency( 'masterview_plugin_generator', ">= #{PKG_VERSION}" )
       s.author = "Jeff Barczewski"
-      s.email = "jeff.barczewski@gmail.com"
-      s.homepage = "http://masterview.org/"  
+      s.email = "jeff.barczewski (at) gmail (dot) com"
+      s.homepage = "http://masterview.org/"
     end
 
     # Create Rubygem package
@@ -395,7 +394,7 @@ namespace 'masterview_gem_pack' do
     end
 
     desc "Release files on RubyForge."
-    task :release_files => [ :verify_rubyforge ] do 
+    task :release_files => [ :verify_rubyforge ] do
       release_files = ["gem"].map { |ext| "pkg/#{PKG_FILE_NAME}.#{ext}" }
 
       Rake::XForge::Release.new(MASTERVIEW) do |release|
@@ -453,8 +452,8 @@ namespace 'masterview' do
       s.autorequire  = 'masterview'
       s.extra_rdoc_files = ['README']
       s.author = "Jeff Barczewski"
-      s.email = "jeff.barczewski@gmail.com"
-      s.homepage = "http://masterview.org/"  
+      s.email = "jeff.barczewski (at) gmail (dot) com"
+      s.homepage = "http://masterview.org/"
     end
 
     # Create Rubygem package
@@ -465,7 +464,7 @@ namespace 'masterview' do
     end
 
     desc "Release files on RubyForge."
-    task :release_files => [ :verify_rubyforge ] do 
+    task :release_files => [ :verify_rubyforge ] do
       release_files = ["gem"].map { |ext| "pkg/#{PKG_FILE_NAME}.#{ext}" }
 
       Rake::XForge::Release.new(MASTERVIEW) do |release|
@@ -514,7 +513,7 @@ namespace 'masterview_generator' do
     RELEASE_NAME  = "REL #{PKG_VERSION}"
     #PKG_INCLUDES = PKG_FILES_MV_GENERATOR
     #PKG_FILES = FileList.new( PKG_INCLUDES ).exclude( PKG_FILES_EXCLUDE_PATTERN )
-    
+
     desc "Package masterview_generator"
     task :package do
       work_dir = Dir.getwd
@@ -532,7 +531,7 @@ namespace 'masterview_generator' do
     end
 
     desc "Release files on RubyForge."
-    task :release_files => [ :verify_rubyforge ] do 
+    task :release_files => [ :verify_rubyforge ] do
       release_files = ["gem"].map { |ext| "pkg/#{PKG_FILE_NAME}.#{ext}" }
 
       Rake::XForge::Release.new(MASTERVIEW) do |release|
@@ -598,7 +597,7 @@ namespace 'masterview_plugin_generator' do
     end
 
     desc "Release files on RubyForge."
-    task :release_files => [ :verify_rubyforge ] do 
+    task :release_files => [ :verify_rubyforge ] do
       release_files = ["gem"].map { |ext| "pkg/#{PKG_FILE_NAME}.#{ext}" }
 
       Rake::XForge::Release.new(MASTERVIEW) do |release|