masterview 0.1.3 → 0.1.5

data/CHANGELOG

@@ -1,3 +1,7 @@
+0.1.5 - May 31st - Remove app_[ENV] customization hook in leau of a block based initializer approach (similar to rails) from Deborah Lewis which would allow customization from the environment config files.
+
+0.1.4 - May 30th - Apply patch by Deborah Lewis to allow customized generated comment. Add omit_tag directive to conditionally suppress output of element tag. Add user configuration user.rb, user_RAILS_ENV.rb
+
 0.1.3 - May 29th - Fixed generators to use m.file not m.template on non-erb files
 
 0.1.2 - May 29th - Fix empty.rhtml not being found from rake mv:copy_layout

data/README

@@ -45,7 +45,7 @@ If you can use gems you may simply do the following
 
 gem install masterview_gem_pack
 
-Now your gem is installed and you can skip these steps in the future. After creating your rails directory, change directory to it and run the following to create a very lightweight plugin instance for this application mainly consisting of an init.rb file which will get loaded at runtime. This init.rb refers to the gem for everything but allows you to override any constants or setup that has been provided. See MasterView module masterview.rb for a list of the available constants.
+Now your gem is installed and you can skip these steps in the future. After creating your rails directory, change directory to it and run the following to create a very lightweight plugin instance for this application mainly consisting of an init.rb file which will get loaded at runtime. This init.rb refers to the gem for everything but allows you to override any constants or setup that has been provided. See MasterView module masterview.rb for a list of the available constants. 
 
 script/generate masterview_plugin
 
@@ -53,7 +53,7 @@ After this MasterView is ready for use. Skip down to the Usage section for more
 
 === Installation without using gems, install as plugin
 
-script/plugin install svn://rubyforge.org/var/svn/masterview
+script/plugin install svn://rubyforge.org/var/svn/masterview/tags/latest
 
 This will copy entire MasterView system into your vendor/plugin/masterview directory. You may tweak its init.rb to override any MasterView constants at runtime. See MasterView module masterview.rb for a list of available constants. Note that if you don't have svn (subversion) installed, you may also retrieve the plugin package (masterview_plugin.tgz or masterview_plugin.zip) from http://rubyforge.org/projects/masterview and simply extract into vendor/plugins/masterview 
 
@@ -386,6 +386,22 @@ mv:link_to_remote="linkToRemoteOptions"
 
 	<%= link_to_remote 'New product', :action => 'new' %>
 
+mv:omit_tag="evalString"
+	Omit the element tag if the evalString is empty or evaluates to true. For example...
+
+	<span mv:omit_tag="">hello</span>
+
+	  becomes
+
+	hello
+
+	<span mv:omit_tag="@test">hello</span>
+
+	  becomes
+
+	<% if @test %><span><% end %>hello<% if @test %></span><% end %>
+
+
 mv:password_field="user, password"
 	Replaces the tag with a password_field helper using the attribute as well as merging any html 
 	attributes that have been set by the designer, for example...

data/RELEASE_NOTES

@@ -66,7 +66,7 @@ After this MasterView is ready for use. Skip down to the Usage section for more
 
 === Installation without using gems, install as plugin
 
-script/plugin install svn://rubyforge.org/var/svn/masterview
+script/plugin install svn://rubyforge.org/var/svn/masterview/tags/latest
 
 This will copy entire MasterView system into your vendor/plugin/masterview directory. You may tweak its init.rb to override any MasterView constants at runtime. See MasterView module masterview.rb for a list of available constants. Note that if you don't have svn (subversion) installed, you may also retrieve the plugin package (masterview_plugin.tgz or masterview_plugin.zip) from http://rubyforge.org/projects/masterview and simply extract into vendor/plugins/masterview 
 

data/init.rb

@@ -34,6 +34,7 @@ require 'masterview'
 
 module ::MasterView
   #override any constants here, see masterview.rb for more
+  #Note that you may also put your override configuration in vendor/plugins/masterview/user.rb and user_development.rb, user_test.rb, ...
   #DefaultDirectiveLoadPaths.push File.join( File.dirname(__FILE__), 'directives') #uncomment if you want to add a local directives dir
   #DefaultParserOptions = { :tidy => false, :escape_erb => true }
   #TidyPath = '/usr/lib/libtidy.so'

data/lib/masterview/directive_helpers.rb

@@ -10,6 +10,7 @@ module MasterView
     #higher priority (lower value) will be executed first in chain
     module DirectivePriorities
       Highest = 0
+      UltraHigh = 0x3FFFFFFF/16
       VeryHigh =   0x3FFFFFFF/8
       High =   0x3FFFFFFF/4
       MediumHigh = 0x3FFFFFFF/3
@@ -17,6 +18,7 @@ module MasterView
       MediumLow = (0x3FFFFFFF/3)*2
       Low =    (0x3FFFFFFF/4)*3
       VeryLow = (0x3FFFFFFF/8)*7
+      UltraLow = (0x3FFFFFFF/16)*15
       Lowest = 0x3FFFFFFF 
     end
 

data/lib/masterview/directives/insert_generated_comment.rb

@@ -5,7 +5,7 @@ module MasterView
     # and should not be edited, else changes could be lost. It includes the path to
     # the original file that should be edited instead
     class Insert_generated_comment < MasterView::DirectiveBase
-      Generated_comment_text = <<-END
+      Generated_comment_text = MasterView::GeneratedCommentTemplate || <<-END
 #    WARNING - This file was generated by MasterView plugin. 
 #    Do not edit this file otherwise you may lose your changes
 #    when this file is re-generated.
@@ -14,11 +14,11 @@ module MasterView
   END
 
       def priority
-        DirectivePriorities::Lowest
+        DirectivePriorities::VeryLow
       end
 
       def stag(directive_call_stack)
-        comment = "\n<% \n" + Generated_comment_text  + "#    "+ attr_value + "\n%>"
+        comment = "\n<% \n" + Generated_comment_text  + "#    "+ attr_value + "\n-%>"
 
         ret = []
         ret << directive_call_stack.render

data/lib/masterview/directives/omit_tag.rb

@@ -0,0 +1,32 @@
+module MasterView
+  module Directives
+
+    # omit tag if attr_value is empty or if at runtime the condition evaluates to true
+    # mv:omit_tag="" will not render the tag,
+    # mv:omit_tag="true" will not render the tag,
+    # mv:omit_tag="false" will render the tag
+    class Omit_tag < MasterView::DirectiveBase
+      def priority
+        DirectivePriorities::UltraLow
+      end
+
+      def stag(dcs)
+        ret = []
+        unless attr_value.empty?
+          ret << erb('if '+attr_value)
+          ret << dcs.render
+          ret << erb('end')
+        end
+      end
+
+      def etag(dcs)
+        ret = []
+        unless attr_value.empty?
+          ret << erb('if '+attr_value)
+          ret << dcs.render
+          ret << erb('end')
+        end
+      end
+    end
+  end
+end

data/lib/masterview/masterview_version.rb

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

data/lib/masterview.rb

@@ -61,6 +61,14 @@ module MasterView
   # the generated file should not be manually edited, false = generate the warning comments
   OmitGeneratedComments = false
 
+  # template for comment inserted in generated files from MasterView master
+  GeneratedCommentTemplate = <<-END
+#    WARNING - This is a generated file created by MasterView. 
+#    Do not edit - changes will be lost when this file is re-generated.
+# 
+#    To make changes, edit the MasterView source file located at: 
+  END
+
   # relative path from RAILS_ROOT to where backup files should be created before rebuilding/updating a template file, use nil to suppress backups
   DirectoryForRebuildBackups = 'tmp/masterview/rebuild/backups'
 

data/test/omit_tag_test.rb

@@ -0,0 +1,40 @@
+#!/usr/bin/env ruby
+
+require 'test/unit'
+currentPath = File.dirname(__FILE__)
+require File.join( currentPath, '../lib/masterview' )
+require File.join( currentPath, '../lib/masterview/directives/omit_tag')
+
+class TestOmit_tag < Test::Unit::TestCase
+  include MasterView::Directives
+
+  def setup
+    @directives = MasterView::DirectiveSet.new
+  end
+
+  def test_omit_tag
+    tag = MasterView::Tag.new(@directives, 'foo', { 'id' => 'foobar', 'style' => 'test'}, :normal, nil)
+    @directives.directives = []
+    attr_value = ""
+    @directives << Omit_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].content = "hello world"
+    assert_equal nil, dcs.render
+  end
+
+  def test_omit_tag_eval
+    tag = MasterView::Tag.new(@directives, 'foo', { 'id' => 'foobar', 'style' => 'test'}, :normal, nil)
+    @directives.directives = []
+    attr_value = "@test"
+    @directives << Omit_tag.new(attr_value)
+    assert_equal ["<% if @test %>", [], "<% end %>"], @directives.determine_dcs(:stag).render
+    dcs = @directives.determine_dcs(:etag)
+    dcs.context = tag.create_context
+    dcs.context[:tag].content = "hello world"
+    assert_equal ["<% if @test %>", [], "<% end %>"], dcs.render
+  end
+
+
+end

data/test/template_test.rb

@@ -291,4 +291,84 @@ class TestTemplate < Test::Unit::TestCase
     assert_template_result expected, template
   end
 
+  def test_omit_tag
+    template = <<-END
+      <div mv:generate='foo/bar'>
+        <div mv:omit_tag="">
+          <foo>bar</foo>
+        </div>
+      </div>
+    END
+    expected = {
+      'foo/bar' => "<div><foo>bar</foo></div>"
+    }
+    assert_template_result expected, template
+  end
+
+  def test_omit_tag_eval
+    template = <<-END
+      <div mv:generate='foo/bar'>
+        <div mv:omit_tag="@hello">
+          <foo>bar</foo>
+        </div>
+      </div>
+    END
+    expected = {
+      'foo/bar' => "<div><% if @hello %><div><% end %><foo>bar</foo><% if @hello %></div><% end %></div>"
+    }
+    assert_template_result expected, template
+  end
+
+  def test_omit_tag_root
+    template = <<-END
+      <div mv:generate='foo/bar' mv:omit_tag="">
+        hello world
+      </div>
+    END
+    expected = {
+      'foo/bar' => " hello world "
+    }
+    assert_template_result expected, template
+  end
+
+  def test_omit_tag_root_with_children
+    template = <<-END
+      <div mv:generate='foo/bar' mv:omit_tag="">
+        <foo>hello world</foo>
+      </div>
+    END
+    expected = {
+      'foo/bar' => " <foo>hello world</foo>"
+    }
+    assert_template_result expected, template
+  end
+
+  def test_omit_tag_root_with_nested_generate
+    template = <<-END
+      <div mv:generate='foo/bar' mv:omit_tag="">
+        first layer
+        <foo mv:generate='baz/cat' mv:omit_tag="">hello world</foo>
+      </div>
+    END
+    expected = {
+      'foo/bar' => " first layer ",
+      'baz/cat' => "hello world"
+    }
+    assert_template_result expected, template
+  end
+
+  def test_omit_tag_root_with_nested_gen_render
+    template = <<-END
+      <div mv:generate='foo/bar' mv:omit_tag="">
+        first layer
+        <foo mv:gen_render=":partial => 'baz/cat'" mv:omit_tag="">hello world</foo>
+      </div>
+    END
+    expected = {
+      'foo/bar' => " first layer <%= render( :partial => 'baz/cat' ) %>",
+      'baz/_cat.rhtml' => "hello world"
+    }
+    assert_template_result expected, template
+  end
+
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: masterview
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
-date: 2006-05-29 00:00:00 -05:00
+  version: 0.1.5
+date: 2006-05-31 00:00:00 -05:00
 summary: A (x)html friendly template engine for rails with the power of layouts, and partials.
 require_paths: 
 - lib
@@ -44,13 +44,13 @@ files:
 - lib/masterview/extras
 - lib/masterview/plugin_load_tracking.rb
 - lib/masterview/directive_helpers.rb
+- lib/masterview/analyzer.rb
 - lib/masterview/runtime_helpers.rb
 - lib/masterview/string_extensions.rb
+- lib/masterview/template_spec.rb
 - lib/masterview/directive_base.rb
 - lib/masterview/masterview_version.rb
 - lib/masterview/parser.rb
-- lib/masterview/template_spec.rb
-- lib/masterview/analyzer.rb
 - lib/masterview/directives/global_inline_erb.rb
 - lib/masterview/directives/link_to_if.rb
 - lib/masterview/directives/preview.rb
@@ -64,17 +64,18 @@ files:
 - lib/masterview/directives/link_to.rb
 - lib/masterview/directives/elsif.rb
 - lib/masterview/directives/form.rb
+- lib/masterview/directives/omit_tag.rb
 - lib/masterview/directives/submit.rb
-- lib/masterview/directives/import.rb
+- lib/masterview/directives/replace.rb
+- lib/masterview/directives/attr.rb
 - lib/masterview/directives/insert_generated_comment.rb
 - lib/masterview/directives/stylesheet_link.rb
 - lib/masterview/directives/javascript_include.rb
+- lib/masterview/directives/import_render.rb
 - lib/masterview/directives/link_to_remote.rb
+- lib/masterview/directives/import.rb
 - lib/masterview/directives/content.rb
-- lib/masterview/directives/replace.rb
 - lib/masterview/directives/text_area.rb
-- lib/masterview/directives/attr.rb
-- lib/masterview/directives/import_render.rb
 - lib/masterview/extras/app
 - lib/masterview/extras/rails_init.rb
 - lib/masterview/extras/watcher.rb
@@ -83,43 +84,44 @@ files:
 - lib/masterview/extras/app/controllers/masterview_controller.rb
 - lib/masterview/extras/app/views/masterview
 - lib/masterview/extras/app/views/masterview/admin
-- lib/masterview/extras/app/views/masterview/admin/create.rhtml
-- lib/masterview/extras/app/views/masterview/admin/empty.rhtml
 - 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
 - test/run_parser_test.rb
 - test/test_helper.rb
-- test/template_file_watcher_test.rb
 - test/global_inline_erb_test.rb
-- test/password_field_test.rb
-- test/text_field_test.rb
-- test/else_test.rb
+- test/template_spec_test.rb
 - test/block_test.rb
+- test/else_test.rb
+- test/template_file_watcher_test.rb
+- test/text_field_test.rb
+- test/hidden_field_test.rb
 - test/example_test.rb
 - test/parser_test.rb
 - test/if_test.rb
-- test/hidden_field_test.rb
+- test/text_area_test.rb
 - test/link_to_test.rb
 - test/elsif_test.rb
 - test/form_test.rb
+- test/omit_tag_test.rb
 - test/submit_test.rb
 - test/javascript_include_test.rb
+- test/password_field_test.rb
 - test/stylesheet_link_test.rb
 - test/filter_helpers_test.rb
-- test/text_area_test.rb
+- test/import_test.rb
+- test/import_render_test.rb
 - test/content_test.rb
+- test/attr_test.rb
 - test/replace_test.rb
 - test/template_test.rb
-- test/template_spec_test.rb
 - test/link_to_if_test.rb
-- test/import_test.rb
-- test/attr_test.rb
-- test/import_render_test.rb
 - CHANGELOG
+- MIT-LICENSE
 - Rakefile
+- TODO
 - RELEASE_NOTES
-- MIT-LICENSE
 - README
-- TODO
 - init.rb
 test_files: []