masterview 0.3.3 → 0.3.4

data/CHANGELOG

@@ -1,4 +1,11 @@
-0.3.3
+0.3.4 - October 4th, 2007
+Added rake task mv:generate_all_rhtml which calls mv:parse to generate all the rhtml files. Added to make it clearer for those wanting to generate their rhtml manually.
+Make values in gen_partial and import_partial retain their page specific values, allowing you to specify different locals, collections, or objects for import_render than you do on gen_partial. Also allows you to reuse the partial multiple times on a page with different values. (thanks James Britt)
+Fix rebuild template so that it uses the same list of XHTML empty elements to determine whether to collapse empty elements (thanks Brian Jordan)
+Fixed problem with CruiseControl where ActionController was not defined (thanks James Britt)
+
+
+0.3.3 - July 1, 2007
 Added xml doctype to generated code
 Fixed bug in gen_replace where it was generating <% %> rather than <%= %> (Thanks to Jon Frisby for indentifying)
 Fix defect in form tag not setting :multipart => true when form enctype=multipart/form-data (Thanks to Rajavel Lenin for identifying)

data/RELEASE_NOTES

@@ -1,4 +1,18 @@
 = MasterView - Rails-optimized (x)html friendly template engine
+== Recent changes (Release 0.3.4)
+Added mv:generate_all_rhtml rake task which generates all rhtml files to make it
+more obvious for users who want to generate the rhtml files. Also changed the way
+gen_partial and import_render work with regards to collections, object, and locals,
+they now retain the values from the page even after rebuild. This allows you to have
+different values on each page and even different values on the same page if use partials
+multiple times on a page.
+
+Make values in gen_partial and import_partial retain their page specific values, allowing you to specify different locals, collections, or objects for import_render than you do on gen_partial. Also allows you to reuse the partial multiple times on a page with different values. (thanks James Britt)
+
+Fix rebuild template so that it uses the same list of XHTML empty elements to determine whether to collapse empty elements (thanks to Brian Jordan)
+
+Fixed a problem with CruiseControl where ActionController was not defined when masterview was initialized. (thanks James Britt)
+
 
 == Recent changes (Release 0.3.3) - Maintenance release plus auto_copy
 Added auto copy feature which can be configured to automatically copy static files

data/Rakefile

@@ -643,15 +643,17 @@ task :publish_news => [ :verify_rubyforge] do
     news.subject      = "MasterView #{MasterView::VERSION::STRING} Rails-optimized (x)html template engine"
     news.changes_file = nil
 
-    details = []
-    File.open("ReleaseAnnouncement") do |file|
-      file.each do |line|
-        line.chomp!
-        break if line =~ /^=/
-        details << line
-      end
-    end
-    news.details      = details.join("\n")
+#    details = []
+#    File.open("ReleaseAnnouncement") do |file|
+#      file.each do |line|
+#        line.chomp!
+#        break if line =~ /^=/
+#        details << line
+#      end
+#    end
+#    news.details      = details.join("\n")
+
+    news.details = File.read("ReleaseAnnouncement")
   end
 end
 

data/ReleaseAnnouncement

@@ -1,10 +1,10 @@
 = MasterView - Rails-optimized (x)html friendly template engine
 
-MasterView is a template engine plugin that provides another option to the existing rails view templates (rhtml and rxml). This template engine has all the power of layouts, partials, and rails helpers but is still editable/styleable in a WYSIWYG editor. 
+MasterView is a template engine plugin that provides another option to the existing rails view templates (rhtml and rxml). This template engine has all the power of layouts, partials, and rails helpers but is still editable/styleable in a WYSIWYG editor.
 
-Another major goal it to have the syntax of these attribute directives be very similar to rails helpers so that one could intuitively start using MasterView with little learning curve other than knowing rails. MasterView users can additionally create their own directives to encapsulate custom functionality so the system can be easily extended into specific uses. 
+Another major goal it to have the syntax of these attribute directives be very similar to rails helpers so that one could intuitively start using MasterView with little learning curve other than knowing rails. MasterView users can additionally create their own directives to encapsulate custom functionality so the system can be easily extended into specific uses.
 
-MasterView was inspired by Amrita, Kwartz, Tapestry, Zope/PHP TAL, Liquid, and Web Objects but designed with a fresh approach and specifically targetted for rails users. 
+MasterView was inspired by Amrita, Kwartz, Tapestry, Zope/PHP TAL, Liquid, and Web Objects but designed with a fresh approach and specifically targetted for rails users.
 
 There are several ways to use MasterView:
 
@@ -14,8 +14,21 @@ There are several ways to use MasterView:
 
 - If you already have an application but would like to use MasterView, you can start to use MasterView for new pages. MasterView will co-exist nicely with existing rhtml and you can slowly evolve the site over time.
 
+== Recent changes (Release 0.3.4)
+Make values in gen_partial and import_partial retain their page specific values, allowing you to specify different locals, collections, or objects for import_render than you do on gen_partial. Also allows you to reuse the partial multiple times on a page with different values. (thanks James Britt)
 
-== Recent changes (Release 0.3.3) - Maintenance release plus auto_copy 
+Fix rebuild template so that it uses the same list of XHTML empty elements to determine whether to collapse empty elements (thanks to Brian Jordan)
+
+Fixed a problem with CruiseControl where ActionController was not defined when masterview was initialized. (thanks James Britt)
+
+Added mv:generate_all_rhtml rake task which generates all rhtml files to make it
+more obvious for users who want to generate the rhtml files. Also changed the way
+gen_partial and import_render work with regards to collections, object, and locals,
+they now retain the values from the page even after rebuild. This allows you to have
+different values on each page and even different values on the same page if use partials
+multiple times on a page.
+
+== Recent changes (Release 0.3.3) - Maintenance release plus auto_copy
 Added auto copy feature which can be configured to automatically copy static files like stylesheets, images, and javascripts from a non-standard location to the proper location at runtime (under Rails public). This makes it easy to use HTML prototypes and associated files with MasterView eliminating any manual copying.
 
 This release fix adds doctype to generated code, and a bug in gen_replace which outputted <% %> rather than <%= %> (thanks Jon Frisby). Fixed defect in multipart form and stylesheet_link directives (thanks Rajavel Lenin).
@@ -24,9 +37,9 @@ Made REXML sax2parser configurable. Generator now creates example for custom adm
 
 Fix defect which prevented MasterView to be used with Goldberg or other plugins which alter the view base unless MasterView was configured to generate the rhtml files.
 
-Fix rails runtime detection when running in RadRails which launches using -e 
+Fix rails runtime detection when running in RadRails which launches using -e
 
-Added rake task mv:clean_mv_rhtml task which removes the MasterView generated rhtml if you have configured MasterView to generate to the file system. Only removes files that it generates leaving other rhtml untouched. This is useful when switching to not generating rhtml mode when it was previously enabled. 
+Added rake task mv:clean_mv_rhtml task which removes the MasterView generated rhtml if you have configured MasterView to generate to the file system. Only removes files that it generates leaving other rhtml untouched. This is useful when switching to not generating rhtml mode when it was previously enabled.
 
 == Release 0.3.2 - Maintenance release plus custom admin auth
 This release addresses a compatibility problem with Rails 1.2 where a view syntax error would not display the normal debug output but instead displayed only a blank screen. Also fixed a parsing problem with multiple parameters in some directives. Added the ability to use custom mixin for authorization to MasterView admin screens. Changed the MasterView generator to use request, flash, and params rather than deprecated @request, @flash, and @params. Tested with Rails 1.2.2
@@ -76,13 +89,13 @@ Requires::
         No external dependencies
 
 Optional::
-        tidy (gem) and tidy library 
-            if these are installed you can use tidy to cleanup 
+        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 
+            if this gem is installed then MasterView will use
+            it for logging otherwise it defaults to using built
             in Logger.
 
 
@@ -104,7 +117,7 @@ The Configuration Guide describes how to customize the configuration of the Mast
 
 == Usage
 
-The MasterView User's Guide and a complete Directives Reference are provided in the MasterView user documentation.  MasterView templates can be created by adding masterview directives markup to an (x)html ptototype, or can be generated for typical Rails controller/view scenarios using the supplied masterview generator developer tool. 
+The MasterView User's Guide and a complete Directives Reference are provided in the MasterView user documentation.  MasterView templates can be created by adding masterview directives markup to an (x)html ptototype, or can be generated for typical Rails controller/view scenarios using the supplied masterview generator developer tool.
 
 A MasterView Admin controller can optionally be activated in your application to assist you during development with creating and managing your templates.
 
@@ -112,7 +125,7 @@ A MasterView Admin controller can optionally be activated in your application to
 == Next Steps
 
 Visit the online documentation page at http://masterview.org/  for screenshots, illustrations, complete installation and usage information.
-       
+
 We would love to hear your feedback and ideas around this project! Visit the rubyforge project to join the users mailing list or to add yourself to the announce list to receive future announcements. Check out the video to see MasterView in action!
 
 Thanks for your time!!

data/doc/guide.html

@@ -264,14 +264,17 @@ when the MasterView plugin is installed.
 In a command shell, cd to your Rails application directory and use rake commands of the form:
 </p>
 
-<pre class="code">
-rake mv:list
-rake mv:list_all
-rake mv:rebuild
-rake mv:rebuild_all
-rake mv:copy_layout
-rake mv:clean_mv_rhtml
-</pre>
+<table>
+<tr><th>Rake command</th><th>Description</th></tr>
+<tr><td><pre class="code">rake mv:clean_mv_rhtml</pre></td><td>Cleanup/remove MasterView generated rhtml files - useful when generating erb to file system</td></tr>
+<tr><td><pre class="code">rake mv:copy_layout</pre></td><td>Create shell template using layout of existing masterview template, requires TEMPLATE=foo/bar.html ACTION=list</td></tr>
+<tr><td><pre class="code">rake mv:generate_all_rhtml</pre></td><td>Run parser manually on masterview html files to parse and generate the erb/rhtml files</td></tr>
+<tr><td><pre class="code">rake mv:list</pre></td><td>Display list and status about each MasterView template</td></tr>
+<tr><td><pre class="code">rake mv:list_all</pre></td><td>Display list, status, and full details about each MasterView template</td></tr>
+<tr><td><pre class="code">rake mv:rebuild</pre></td><td>Rebuild/update html template imports, specify TEMPLATE=foo/bar.html</td></tr>
+<tr><td><pre class="code">rake mv:rebuild_all</pre></td><td>Rebuild all outdated html template imports</td></tr>
+<tr><td><pre class="code">rake mv:view_rhtml</pre></td><td>View erb/rhtml that masterview generated - specify rhtml name like RHTML=product/_form.rhtml or RHTML=layouts/product.rhtml</td></tr>
+</table>
 
 <p>To obtain further information about the supported commands,
 run the standard rake tasks report using the <code>--tasks</code> (<code>-T</code>) option:</p>

data/doc/media_list.html

@@ -56,22 +56,38 @@ Click for larger view</a>
 
 <h2>Presentations</h2>
 <ul>
+
 <li>
-<a href="presentations/sdruby-Nov2006/MasterView_FlyBy.pdf">MasterView FlyBy</a> - SD Ruby - Nov. 2006
+<a href="http://david.koontzfamily.org/articles/Masterview.pdf">MasterView presentation</a> to Phoenix Rails User Group - May 15, 2007
 <div class="explanation">
-A quick overview of MasterView (history, objectives, features) by Deb Lewis at the <a href="http://sdruby.com" target="_blank">San Diego Ruby</a> User's Group.
-(Podcast recording available at <a href="http://podcasts.sdruby.com" target="_blank">podcasts.sdruby.com</a>.)
+An explanation of MasterView starting from the problem is solves through details of how it works by David Koontz at the <a href="http://azonrails.org/" target="_blank">Phoenix Rails</a> User's Group.
 </div>
 </li>
-<li><a href="presentations/mtnwestruby2007/masterview_evolution_070316.html">MasterView Evolution</a> -  Mountain West Ruby Conference - March 16, 2007
+<li><a href="http://mtnwestrubyconf2007.confreaks.com/session05.html">MasterView Evolution from Mountain West Ruby Conference - March 16, 2007 [Video + Screencast (1 hr)]</a> | <a href="presentations/mtnwestruby2007/masterview_evolution_070316.html">[ Slides ]</a>
 <div class="explanation">
 Presentation by Jeff Barczewski at Mountain West Ruby 2007 on the MasterView template system for Rails and how its implementation has evolved from its conception in 2005 into a capable Rails plugin.
 </div>
 </li>
+<li>
+<a href="presentations/sdruby-Nov2006/MasterView_FlyBy.pdf">MasterView FlyBy</a> - SD Ruby - Nov. 2006
+<div class="explanation">
+A quick overview of MasterView (history, objectives, features) by Deb Lewis at the <a href="http://sdruby.com" target="_blank">San Diego Ruby</a> User's Group.
+(Podcast recording available at <a href="http://podcasts.sdruby.com" target="_blank">podcasts.sdruby.com</a>.)
+</div>
+</li>
 </ul>
 
-<h2>Videos</h2>
+<h2>Videos / Screencasts</h2>
 <ul>
+<li><a href="http://masterview.org/media/html-to-live/screencast.html">Screencast from RailsConf 2007</a>
+- Demonstrating using MasterView to take pure HTML prototype and quickly make it a live web Rails app. Also shows how prototype can continued to be edited throughout project life cycle and changes are instantly available in application.
+<a href="http://masterview.org/media/html-to-live/screencast.html">[ Screencast 5 minutes, no audio, 25MB flash, non-streaming ]</a> |
+<a href="http://masterview.org/media/html-to-live/index.html">[ Slides only]</a>
+<br/><br/>
+<a href="http://masterview.org/media/html-to-live/screencast.html"><img src="images/masterview_html_to_live_thumb.gif" title="MasterView HTML to Live app screencast - RailsConf 2007" alt="MasterView HTML to Live screencast - RailsConf 2007"/></a>
+<br/><br/>
+</li>
+
 <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)<br /><br />
 <a href="http://masterview.org/videos/demo_short.html"><img src="screenshots/generated_list_thumbnail.png" title="MasterView short video" alt="MasterView short video" /></a><br /><br />
 
@@ -79,6 +95,12 @@ Presentation by Jeff Barczewski at Mountain West Ruby 2007 on the MasterView tem
 <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)<br /><br />
 <a href="http://masterview.org/videos/masterview_quick_start.html"><img src="screenshots/masterview_admin_thumbnail.png" title="MasterView quick-start video" alt="MasterView quick-start video" /></a><br /><br />
 </li>
+
+
+<li><a href="http://mtnwestrubyconf2007.confreaks.com/session05.html">MasterView Evolution from Mountain West Ruby Conference - March 16, 2007 [Video + Screencast (1 hr)]</a> | <a href="presentations/mtnwestruby2007/masterview_evolution_070316.html">[ Slides ]</a>
+<br/><br/>
+<a href="http://mtnwestrubyconf2007.confreaks.com/session05.html"><img src="http://mtnwestrubyconf2007.confreaks.com/images/session05_preview.png" title="MasterView Evolution video/screencast" alt="MasterView Evolution video/screencast"/></a>
+</li>
 </ul>
 
 <h2>Screenshots</h2>

data/lib/masterview/analyzer.rb

@@ -10,18 +10,43 @@ module MasterView
 
     module Common
 
+      ImportToNonImportDir = {
+        "import_render" => "gen_partial",
+        "import" => "generate",
+      }
+
+      NonImportToImportDir = ImportToNonImportDir.invert
+
       def calc_hash(data)
         #MasterView::Log.warn { 'hash= '+data.hash.to_s+' data='+data }
         data.gsub( /\s+/, ' ' ).hash #collapse whitespace
       end
 
       def src_hash(data_orig)
-        mv_ns = DirectiveRegistry.current.mv_namespace_prefix
-        data = data_orig.gsub mv_ns+'import_render', mv_ns+'gen_partial'
-        data = data.gsub mv_ns+'import', mv_ns+'generate'
+        data = convert_import_to_non_import_dirs(data_orig)
         calc_hash(data)
       end
 
+      # gsub any import directives with non-import directives and return, makes clone before gsub
+      def convert_import_to_non_import_dirs(text)
+        text_clone = text.clone
+        mv_ns = DirectiveRegistry.current.mv_namespace_prefix
+        ImportToNonImportDir.sort.reverse.each do |i,n| # reverse order to substitute longer items first
+          text_clone.gsub! mv_ns+i, mv_ns+n  # mv:import_render to mv:gen_partial  and mv:import to mv:generate
+        end
+        text_clone
+      end
+
+      # gsub any non-import directives with import directives and return, makes clone before gsub
+      def convert_non_import_to_import_dirs(text)
+        text_clone = text.clone
+        mv_ns = DirectiveRegistry.current.mv_namespace_prefix
+        NonImportToImportDir.sort.reverse.each do |i,n| # reverse order to substitute longer items first
+          text_clone.gsub! mv_ns+i, mv_ns+n  # mv:gen_partial to mv:import_render and mv:generate to mv:import
+        end
+        text_clone
+      end
+
     end
 
     class ContentEntry
@@ -36,14 +61,15 @@ module MasterView
     end
 
     class StackEntry
-      attr_accessor :name, :buffer, :depth, :import, :parts
+      attr_accessor :name, :buffer, :depth, :import, :parts, :page_attributes
 
-      def initialize(name, depth, import)
+      def initialize(name, depth, import, page_attributes)
         @name = name
         @depth = depth
         @import = import
         @buffer = []
         @parts = 0
+        @page_attributes = page_attributes  # directives that are unique to page and ignored during synchronization
       end
 
       def inc_parts
@@ -52,12 +78,13 @@ module MasterView
     end
 
     class ListEntry
-      attr_accessor :name, :index, :import
+      attr_accessor :name, :index, :import, :page_attributes
       attr_writer :hash_invalid
-      def initialize(name, index, import)
+      def initialize(name, index, import, page_attributes)
         @name = name
         @index = index
         @import = import
+        @page_attributes = page_attributes
       end
 
       def hash_invalid?
@@ -164,6 +191,7 @@ module MasterView
         # expand the target specification to the actual path for import/generate directives in case of rebuilding
         path = nil
         import = false
+        page_attributes = { }
         @mv_processing_directives.each_pair { | mv_attr_name, directive_type_flags |
           if attributes.has_key?( mv_attr_name )
             expanded_attr_value = @keyword_expander.expand_keywords(attributes[mv_attr_name])
@@ -171,6 +199,8 @@ module MasterView
             if directive_type_flags[:partial]
               partial = find_string_val_in_string_hash( expanded_attr_value, :partial )
               path = render_partial_name_to_file_name(partial, @default_extname)
+              page_attributes[partial] = expanded_attr_value  # save all the page specific values of gen_partial and import_partial by path
+              attributes[mv_attr_name] = ":partial => '#{partial}'" # exclude others for comparison will be put back
             else
               path = expanded_attr_value
             end
@@ -181,7 +211,7 @@ module MasterView
 
         if path
           store_last_buffer false
-          @stack << StackEntry.new(path, @depth, import)
+          @stack << StackEntry.new(path, @depth, import, page_attributes)
         end
 
         unless @stack.empty?
@@ -217,11 +247,11 @@ module MasterView
 
       def end_element(uri, localname, qname)
         unless @stack.empty?
-          if @stack.last.buffer.last == '>' && !ExpandAlwaysElements.include?(qname) #simplify empty elements
+          if @stack.last.buffer.last == '>' && MasterView::TemplateProcessing::Renderer::XHTMLEmptyElementNameSet.include?(qname) #collapse
             @stack.last.buffer.pop
             @stack.last.buffer << '/>'
           else
-            @stack.last.buffer << '</' << "#{qname}>" #must output </ as separate string so simplify_empty_elements can find it
+            @stack.last.buffer << '</' << "#{qname}>" #must output </ as separate string so simplify_empty_elements can find it, though currently not using simplify_empty_elements in rebuilding only in parser for generation
           end
         end
 
@@ -246,33 +276,35 @@ module MasterView
 
       def store_last_buffer(end_element)
           unless @stack.empty?
-            @stack.last.inc_parts
-            index = end_element ? -1 : @stack.last.parts-1
-            data = @stack.last.buffer.join
+            last_stack_entry = @stack.last
+            last_stack_entry.inc_parts
+            index = end_element ? -1 : last_stack_entry.parts-1
+            data = last_stack_entry.buffer.join
             unless @prolog.empty?
               data = @prolog.join + data
               @prolog = []
             end
+
             hash_invalid = false;
-            if @stack.last.import
+            if last_stack_entry.import
               if only_check_hash?
                 hash = src_hash(data)
-                bdata = @builder.data(@stack.last.name, index)
+                bdata = @builder.data(last_stack_entry.name, index)
                 hash_invalid = src_hash(bdata) != hash
                 if hash_invalid
                   Log.debug { 'hash_invalid contents'}
                   Log.debug { 'src='+bdata }
                   Log.debug { 'imp='+data }
                 end
-                #hash_invalid = @builder.hash(@stack.last.name, index) != hash
+                #hash_invalid = @builder.hash(last_stack_entry.name, index) != hash
               end
             elsif !only_check_hash?
-              @content[@stack.last.name] ||= []
-              @content[@stack.last.name] << ContentEntry.new(data)
+              @content[last_stack_entry.name] ||= []
+              @content[last_stack_entry.name] << ContentEntry.new(data)
             end
 
-            @stack.last.buffer = []
-            @list << ListEntry.new(@stack.last.name, index, @stack.last.import)
+            last_stack_entry.buffer = []
+            @list << ListEntry.new(last_stack_entry.name, index, last_stack_entry.import, last_stack_entry.page_attributes)
 
             if only_check_hash? #only set these flags if doing hash_check, not accurate for first round parse
               @list.last.hash_invalid = hash_invalid

data/lib/masterview/initializer.rb

@@ -694,7 +694,7 @@ module MasterView
 
       # Rails application options
       self.parse_masterview_templates_at_startup = true
-      self.reparse_changed_masterview_templates = on_rails? ? (not ActionController::Base.perform_caching) : false
+      self.reparse_changed_masterview_templates = (on_rails? && defined?(::ActionController)) ? (not ::ActionController::Base.perform_caching) : false # when in cruise control ActionController was not defined yet
       self.admin_auth_mixin = nil # if defined then this module will be included in MasterView controller
       self.enable_admin_pages = is_development
       self.enable_view_rhtml = is_development

data/lib/masterview/masterview_version.rb

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

data/lib/masterview/parser.rb

@@ -430,7 +430,7 @@ module MasterView
       last = nil
       content.flatten!
       content.each do |item|
-        if next_to_last == '>' && last == '</' && XHTMLEmptyElementNameSet.include?(current_element_name)
+        if next_to_last == '>' && last == '</' && XHTMLEmptyElementNameSet.include?(current_element_name) # collapse
           ret.pop #remove '>'
           ret.pop #remove '</'
           ret << ' />' # adding in a space to make xhtml more compatible with html editors and older browsers
@@ -617,6 +617,8 @@ module MasterView
         generate_attribute = attributes[@renderer.mv_generate_attr] || '' # check if we need to add to existing generate
         generate_attribute = path + (generate_attribute.blank? ? '' : ', '+generate_attribute)
         attributes[@renderer.mv_generate_attr] = generate_attribute
+        page_locals = @renderer.keyword_expander.resolveAttrAndDelete(attributes, "mvpg:locals") #todo make this dynamic
+        value = (value.trim.empty?) ? page_locals : "#{value}, :locals => {#{page_locals}}" if page_locals #todo need to handle trailing }
         @renderer.append_raw( ERB_CONTENT_START+'render( '+value+' )'+ERB_CONTENT_END )
       end
     end

data/lib/masterview/template_spec.rb

@@ -4,8 +4,20 @@ module MasterView
   # template. It contains the information on all the parts that make up the template
   # and the status of them (whether they are up to date or out of sync).
   class TemplateSpec
+    include Analyzer::Common
+    include DirectiveHelpers
     attr_accessor :path, :status, :message, :gen_parts, :build_list
 
+    # setup a class instance gen_partial_re that is created on use so that namespace is already setup
+    class << self
+      attr_accessor :gen_partial_regex_cached
+
+      def gen_partial_re
+        self.gen_partial_regex_cached ||= Regexp.new(
+            "#{DirectiveRegistry.current.mv_namespace_prefix}gen_partial\\s*=\\s*((\")([^\"]*)\"|(')([^']*'))" )
+      end
+    end
+
     class Status
       OK = 'OK'
       ImportsOutdated = 'Imports(s) outdated'
@@ -116,10 +128,37 @@ module MasterView
       @build_list.each do |li|
         #Log.debug { li.inspect }
         con = builder.data(li.name, li.index)
+
+        unless li.page_attributes.empty? # if we have page_attributes, reinsert them now, currently only inserting for partials
+          gpmatch = TemplateSpec.gen_partial_re.match(con)
+
+          if gpmatch
+            gen_partial_all = gpmatch[0]
+            gp_quote_char = gpmatch[2] || gpmatch[4]
+            gen_partial_fullattr = gpmatch[3] || gpmatch[5]
+
+            # determine what partial page we are rendering to see if we have any page specific attributes
+            partial = find_string_val_in_string_hash(gen_partial_fullattr, :partial)
+            if partial
+              partial_pa = li.page_attributes[partial]   # retrieve page specific attribute by file name
+              if partial_pa  # if we have one, replace it in the text
+                mv_ns = DirectiveRegistry.current.mv_namespace_prefix
+                con.gsub! TemplateSpec.gen_partial_re, "#{mv_ns}gen_partial=#{gp_quote_char}#{partial_pa}#{gp_quote_char}"
+              end
+            end
+          end
+
+#           sorted_page_att_arr = li.page_attributes.sort{ |a,b| a[0].to_s <=> b[0].to_s } #[[a, 2], [b, 1]]
+#           sorted_page_att = sorted_page_att_arr.collect{ |a| "#{a[0]}=\"#{a[1]}\"" } # a="2"
+#           pg_att_ins = sorted_page_att.join(' ')
+#           mv_ns = DirectiveRegistry.current.mv_namespace_prefix
+#           con.gsub! "#{mv_ns}gen_partial", "#{pg_att_ins} #{mv_ns}gen_partial"
+
+          #Log.debug { con.inspect }
+        end
+
         if li.import
-          mv_ns = DirectiveRegistry.current.mv_namespace_prefix
-          con = con.gsub mv_ns+'generate', mv_ns+'import'
-          con.gsub! mv_ns+'gen_partial', mv_ns+'import_render'
+          con = convert_non_import_to_import_dirs(con) #gsub mv:gen_partial to mv:import_render and mv:generate to mv:import
         end
         out << con
       end
@@ -176,7 +215,7 @@ module MasterView
       li = from_spec.build_list.first
       li.import = true
       to_spec.build_list << li
-      to_spec.build_list << MasterView::Analyzer::ListEntry.new('empty_shell_contents', -1, false)
+      to_spec.build_list << MasterView::Analyzer::ListEntry.new('empty_shell_contents', -1, false, {} )
       li = from_spec.build_list.last
       li.import = true
       to_spec.build_list << li

data/test/unit/#run_parser_test.rb#

@@ -0,0 +1,82 @@
+#!/usr/bin/env ruby
+
+require 'test/unit'
+currentPath = File.dirname(__FILE__)
+
+require File.join( currentPath, '../../lib/masterview/initializer' )
+config = MasterView::Configuration.new( :app_root_path => '/path/to/my/app' )
+  #   config.template_src_dir_path = "masterview/templates"
+  #   config.template_dst_dir_path = "masterview/output"
+  #   #...set other config options...
+  #   MasterView::Initializer.run( :process, config )
+
+
+require File.join( currentPath, '../../lib/masterview' )
+
+
+  #   require 'masterview/initializer'
+  #   config = MasterView::Configuration.new( :app_root_path => '/path/to/my/app' )
+  #   config.template_src_dir_path = "masterview/templates"
+  #   config.template_dst_dir_path = "masterview/output"
+  #   #...set other config options...
+  #   MasterView::Initializer.run( :process, config )
+
+
+class TestParser < Test::Unit::TestCase
+  CurrentPath = File.dirname(__FILE__)
+  TestFixturesDir = File.join(CurrentPath, '../fixtures/templates')
+  MasterViewHTMLFile = 'product.html'
+  TmpOutputDir = File.join(CurrentPath, '../tmp/views')
+
+  def setup
+    FileUtils.remove_dir(TmpOutputDir, true)
+    @template_mio_tree = MasterView::MIO::FileMIOTree.new(TestFixturesDir, '.html')
+    @template_mio = @template_mio_tree.path(MasterViewHTMLFile)
+    @erb_mio_tree = MasterView::MIO::FileMIOTree.new(TmpOutputDir, '.rhtml')
+    @orig_generate_rhtml_files_setting = MasterView::ConfigSettings.generate_rhtml_files
+  end
+
+  def teardown
+    MasterView::ConfigSettings.generate_rhtml_files = @orig_generate_rhtml_files_setting
+    @template_mio_tree = nil
+    @template_mio = nil
+    @erb_mio_tree = nil
+    @orig_generate_rhtml_files_setting = nil
+  end
+
+  def test_parser_run
+    MasterView::Parser.parse_mio( @template_mio, @erb_mio_tree)
+    assert File.exist?(TmpOutputDir+'/layouts/product.rhtml')
+    assert File.exist?(TmpOutputDir+'/product/_form.rhtml')
+    assert File.exist?(TmpOutputDir+'/product/edit.rhtml')
+    assert File.exist?(TmpOutputDir+'/product/list.rhtml')
+    assert File.exist?(TmpOutputDir+'/product/new.rhtml')
+    assert File.exist?(TmpOutputDir+'/product/show.rhtml')
+  end
+
+
+  def test_gen_rhtml
+    # mimic what masterview.rake#mv:parse does
+    MasterView::ConfigSettings.generate_rhtml_files = true
+    @template_mio_tree.find(:pattern => MasterView::TemplateFilenamePattern ) do |mio|
+      puts 'Generated erb/rhtml files from '+mio.pathname.to_s
+      MasterView::Parser.parse_mio(mio, MasterView::IOMgr.erb)
+    end
+    if MasterView::ConfigSettings.generate_rhtml_files
+      puts 'Generated erb/rhtml output was created in app/views/** tree'
+    else
+      puts "\nNote: config.generate_rhtml_files was false, so rails reads erb/rhtml directly from MasterView, and thus files were parsed but not serialized to file system. Set config.generate_rhtml_files = true (in config/masterview/settings.rb) and rerun this command to generate rhtml to the file system"
+    end
+
+
+    assert File.exist?(TmpOutputDir+'/layouts/product.rhtml')
+    assert File.exist?(TmpOutputDir+'/product/_form.rhtml')
+    assert File.exist?(TmpOutputDir+'/product/edit.rhtml')
+    assert File.exist?(TmpOutputDir+'/product/list.rhtml')
+    assert File.exist?(TmpOutputDir+'/product/new.rhtml')
+    assert File.exist?(TmpOutputDir+'/product/show.rhtml')
+  end
+
+end
+
+

data/test/unit/template_spec_test.rb

@@ -125,6 +125,48 @@ class TestTemplateSpec < Test::Unit::TestCase
     assert_equal %w{ bar/baz.rhtml cat/_foo.rhtml layout/foo.rhtml }, spec2.gen_parts
   end
 
+  def test_imports_not_outdated_ignore_page_directives
+    content_hash = {}
+    template1 = <<-END
+      <html mv:import="layout/foo.rhtml">
+        <body>
+          <div mv:import="bar/baz.rhtml">
+            <div mv:import_render=":partial => 'cat/foo', :locals => {:title => 'foo bar'}">
+              Hello
+            </div>
+          </div>
+        </body>
+      </html>
+    END
+    spec1 = MasterView::TemplateSpec.scan_template(template1, 'hello', content_hash)
+    template2 = <<-END
+      <html mv:generate="layout/foo.rhtml">
+        <body>
+          <div mv:generate="bar/baz.rhtml">
+            <div mv:gen_partial=":partial => 'cat/foo', :locals=> {:title => 'cat dog'}">
+              Hello
+            </div>
+          </div>
+        </body>
+      </html>
+    END
+    spec2 = MasterView::TemplateSpec.scan_template(template2, 'world', content_hash)
+
+    invalid_parts = MasterView::TemplateSpec.template_out_of_sync?(template1, 'hello', content_hash)
+    spec1.update_status_from_invalid_parts(invalid_parts)
+    assert_equal [], invalid_parts
+    assert_equal MasterView::TemplateSpec::Status::OK, spec1.status
+    assert_equal '', spec1.message
+    assert_equal [], spec1.gen_parts
+
+    invalid_parts = MasterView::TemplateSpec.template_out_of_sync?(template2, 'world', content_hash)
+    spec2.update_status_from_invalid_parts(invalid_parts)
+    assert_equal [], invalid_parts
+    assert_equal MasterView::TemplateSpec::Status::OK, spec2.status
+    assert_equal '', spec2.message
+    assert_equal %w{ bar/baz.rhtml cat/_foo.rhtml layout/foo.rhtml }, spec2.gen_parts
+  end
+
   def test_imports_outdated
     content_hash = {}
     template1 = <<-END
@@ -167,7 +209,7 @@ class TestTemplateSpec < Test::Unit::TestCase
     assert_equal '', spec2.message
     assert_equal %w{ bar/baz.rhtml cat/_foo.rhtml layout/foo.rhtml }, spec2.gen_parts
   end
-  
+
   def test_rebuild_template
     content_hash = {}
     template1 = <<-END
@@ -219,6 +261,291 @@ END
     assert_equal expected_rebuilt_template.strip, rebuilt_template
   end
 
+  def test_rebuild_template_simplify_elements
+    content_hash = {}
+    template1 = <<-END
+<html mv:import="layout/foo.rhtml">
+  <body>
+    This should make it outdated
+    <div mv:import="bar/baz.rhtml">
+      <div mv:import_render=":partial => 'cat/foo'">
+        Hello this will also make this outdated
+      </div>
+    </div>
+  </body>
+</html>
+END
+    spec1 = MasterView::TemplateSpec.scan_template(template1, 'hello', content_hash)
+    template2 = <<-END
+<html mv:generate="layout/foo.rhtml">
+  <body>
+    <label></label>
+    <textarea></textarea>
+    <script></script>
+    <br></br>
+    <hr></hr>
+    <div mv:generate="bar/baz.rhtml">
+      <div mv:gen_partial=":partial => 'cat/foo'">
+        Hello
+      </div>
+    </div>
+  </body>
+</html>
+END
+    spec2 = MasterView::TemplateSpec.scan_template(template2, 'world', content_hash)
+
+    invalid_parts = MasterView::TemplateSpec.template_out_of_sync?(template1, 'hello', content_hash)
+    spec1.update_status_from_invalid_parts(invalid_parts)
+    assert_equal %w{ cat/_foo.rhtml layout/foo.rhtml }, invalid_parts
+    assert_equal MasterView::TemplateSpec::Status::ImportsOutdated, spec1.status
+    assert_equal 'Outdated parts: cat/_foo.rhtml, layout/foo.rhtml', spec1.message
+    assert_equal [], spec1.gen_parts
+
+    expected_rebuilt_template = <<-END
+<html mv:import="layout/foo.rhtml">
+  <body>
+    <label></label>
+    <textarea></textarea>
+    <script></script>
+    <br/>
+    <hr/>
+    <div mv:import="bar/baz.rhtml">
+      <div mv:import_render=":partial => 'cat/foo'">
+        Hello
+      </div>
+    </div>
+  </body>
+</html>
+END
+
+    rebuilt_template = spec1.rebuild_template(content_hash)
+    assert_equal expected_rebuilt_template.strip, rebuilt_template
+  end
+
+  def test_rebuild_template_with_page_attributes
+    content_hash = {}
+    template1 = <<-END
+<html mv:import="layout/foo.rhtml">
+  <body>
+    This should make it outdated
+    <div mv:import="bar/baz.rhtml">
+      <div mv:import_render=":partial => 'cat/foo', :locals => {:title => 'dogs like cats'}">
+        Hello this will also make this outdated
+      </div>
+    </div>
+  </body>
+</html>
+END
+    spec1 = MasterView::TemplateSpec.scan_template(template1, 'hello', content_hash)
+    template2 = <<-END
+<html mv:generate="layout/foo.rhtml">
+  <body>
+    <div mv:generate="bar/baz.rhtml">
+      <div mv:gen_partial=":partial => 'cat/foo', :locals => {:title => 'blue sky'}" zebra=":zen => 'phone'">
+        Hello
+      </div>
+    </div>
+  </body>
+</html>
+END
+    spec2 = MasterView::TemplateSpec.scan_template(template2, 'world', content_hash)
+
+    invalid_parts = MasterView::TemplateSpec.template_out_of_sync?(template1, 'hello', content_hash)
+    spec1.update_status_from_invalid_parts(invalid_parts)
+    assert_equal %w{ cat/_foo.rhtml layout/foo.rhtml }, invalid_parts
+    assert_equal MasterView::TemplateSpec::Status::ImportsOutdated, spec1.status
+    assert_equal 'Outdated parts: cat/_foo.rhtml, layout/foo.rhtml', spec1.message
+    assert_equal [], spec1.gen_parts
+
+    expected_rebuilt_template = <<-END
+<html mv:import="layout/foo.rhtml">
+  <body>
+    <div mv:import="bar/baz.rhtml">
+      <div mv:import_render=":partial => 'cat/foo', :locals => {:title => 'dogs like cats'}" zebra=":zen => 'phone'">
+        Hello
+      </div>
+    </div>
+  </body>
+</html>
+END
+
+    rebuilt_template = spec1.rebuild_template(content_hash)
+    assert_equal expected_rebuilt_template.strip, rebuilt_template
+  end
+
+  def test_rebuild_template_with_page_attributes_nested_partials
+    content_hash = {}
+    template1 = <<-END
+<html mv:import="layout/foo.rhtml">
+  <body>
+    This should make it outdated
+    <div mv:import="bar/baz.rhtml">
+      <div mv:import_render=":partial => 'cat/foo', :locals => {:title => 'dogs like cats'}">
+        Hello this will also make this outdated
+        <div mv:import_render=":partial => 'green/red', :locals => {:rows => 5}">
+          My inner partial which should get fully replaced
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+END
+    spec1 = MasterView::TemplateSpec.scan_template(template1, 'hello', content_hash)
+    template2 = <<-END
+<html mv:generate="layout/foo.rhtml">
+  <body>
+    <div mv:generate="bar/baz.rhtml">
+      <div mv:gen_partial=":partial => 'cat/foo', :locals => {:title => 'blue sky'}">
+        Hello
+        <div mv:gen_partial=":partial => 'green/red', :locals => {:rows => 10}">
+          My inner partial
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+END
+    spec2 = MasterView::TemplateSpec.scan_template(template2, 'world', content_hash)
+
+    invalid_parts = MasterView::TemplateSpec.template_out_of_sync?(template1, 'hello', content_hash)
+    spec1.update_status_from_invalid_parts(invalid_parts)
+    assert_equal %w{ cat/_foo.rhtml green/_red.rhtml layout/foo.rhtml }, invalid_parts
+    assert_equal MasterView::TemplateSpec::Status::ImportsOutdated, spec1.status
+    assert_equal 'Outdated parts: cat/_foo.rhtml, green/_red.rhtml, layout/foo.rhtml', spec1.message
+    assert_equal [], spec1.gen_parts
+
+    expected_rebuilt_template = <<-END
+<html mv:import="layout/foo.rhtml">
+  <body>
+    <div mv:import="bar/baz.rhtml">
+      <div mv:import_render=":partial => 'cat/foo', :locals => {:title => 'dogs like cats'}">
+        Hello
+        <div mv:import_render=":partial => 'green/red', :locals => {:rows => 5}">
+          My inner partial
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+END
+
+    rebuilt_template = spec1.rebuild_template(content_hash)
+    assert_equal expected_rebuilt_template.strip, rebuilt_template
+  end
+
+  def test_rebuild_template_page_attributes_multiple_partials_same_name
+    content_hash = {}
+    template1 = <<-END
+<html mv:import="layout/foo.rhtml">
+  <body>
+    This should make it outdated
+    <div mv:import="bar/baz.rhtml">
+      <div mv:import_render=":partial => 'cat/foo', :locals => {:title => 'dogs like cats'}">
+        Hello this will also make this outdated
+      </div>
+       text here
+      <div mv:import_render=":partial => 'cat/foo', :locals => {:title => 'frogs like water'}">
+        Hello this will also make this outdated
+      </div>
+    </div>
+  </body>
+</html>
+END
+    spec1 = MasterView::TemplateSpec.scan_template(template1, 'hello', content_hash)
+    template2 = <<-END
+<html mv:generate="layout/foo.rhtml">
+  <body>
+    <div mv:generate="bar/baz.rhtml">
+      <div mv:gen_partial=":partial => 'cat/foo', :locals => {:title => 'blue sky'}">
+        Hello
+      </div>
+      text here
+      <div mv:import_render=":partial => 'cat/foo', :locals => {:title => 'dark sky'}">
+        Hello replaced
+      </div>
+    </div>
+  </body>
+</html>
+END
+    spec2 = MasterView::TemplateSpec.scan_template(template2, 'world', content_hash)
+
+    invalid_parts = MasterView::TemplateSpec.template_out_of_sync?(template1, 'hello', content_hash)
+    spec1.update_status_from_invalid_parts(invalid_parts)
+    assert_equal %w{ cat/_foo.rhtml layout/foo.rhtml }, invalid_parts
+    assert_equal MasterView::TemplateSpec::Status::ImportsOutdated, spec1.status
+    assert_equal 'Outdated parts: cat/_foo.rhtml, layout/foo.rhtml', spec1.message
+    assert_equal [], spec1.gen_parts
+
+    expected_rebuilt_template = <<-END
+<html mv:import="layout/foo.rhtml">
+  <body>
+    <div mv:import="bar/baz.rhtml">
+      <div mv:import_render=":partial => 'cat/foo', :locals => {:title => 'dogs like cats'}">
+        Hello
+      </div>
+      text here
+      <div mv:import_render=":partial => 'cat/foo', :locals => {:title => 'frogs like water'}">
+        Hello
+      </div>
+    </div>
+  </body>
+</html>
+END
+
+    rebuilt_template = spec1.rebuild_template(content_hash)
+    assert_equal expected_rebuilt_template.strip, rebuilt_template
+  end
+
+  def test_rebuild_template_page_attributes_multiple_partials_mixed_gen_and_import
+    content_hash = {}
+    template1 = <<-END
+<html mv:generate="layout/foo.rhtml">
+  <body>
+    <div mv:generate="bar/baz.rhtml">
+      <div mv:gen_partial=":partial => 'cat/foo', :locals => {:title => 'blue sky'}">
+        Hello
+      </div>
+      text here
+      <div mv:import_render=":partial => 'cat/foo', :locals => {:title => 'dark sky'}">
+        Hello replaced
+      </div>
+    </div>
+  </body>
+</html>
+END
+    spec1 = MasterView::TemplateSpec.scan_template(template1, 'hello', content_hash)
+
+    invalid_parts = MasterView::TemplateSpec.template_out_of_sync?(template1, 'hello', content_hash)
+    spec1.update_status_from_invalid_parts(invalid_parts)
+    assert_equal %w{ cat/_foo.rhtml }, invalid_parts
+    assert_equal MasterView::TemplateSpec::Status::ImportsOutdated, spec1.status
+    assert_equal 'Outdated parts: cat/_foo.rhtml', spec1.message
+    assert_equal %w{ bar/baz.rhtml cat/_foo.rhtml layout/foo.rhtml }, spec1.gen_parts
+
+    expected_rebuilt_template = <<-END
+<html mv:generate="layout/foo.rhtml">
+  <body>
+    <div mv:generate="bar/baz.rhtml">
+      <div mv:gen_partial=":partial => 'cat/foo', :locals => {:title => 'blue sky'}">
+        Hello
+      </div>
+      text here
+      <div mv:import_render=":partial => 'cat/foo', :locals => {:title => 'dark sky'}">
+        Hello
+      </div>
+    </div>
+  </body>
+</html>
+END
+
+    rebuilt_template = spec1.rebuild_template(content_hash)
+    assert_equal expected_rebuilt_template.strip, rebuilt_template
+  end
+
+
+
+
+
   # test the creation of an empty shell using simply the source and action inferring the rest
   def test_create_empty_shell_for_action
     source = <<-END

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: masterview
 version: !ruby/object:Gem::Version 
-  version: 0.3.3
-date: 2007-07-01 00:00:00 -05:00
+  version: 0.3.4
+date: 2007-10-04 00:00:00 -05:00
 summary: A (x)html friendly template engine for rails with the power of layouts, and partials.
 require_paths: 
 - lib
@@ -246,6 +246,7 @@ files:
 - test/unit/deprecated_directive_base_test.rb
 - test/unit/example_directive_base_old_test.rb
 - test/unit/deprecated_directive_base_example_test.rb
+- test/unit/#run_parser_test.rb#
 - test/unit/short_path_calc_test.rb
 - test/xtras/config_initialize_standalone.rb
 - test/xtras/config-mv-logger_config.rb