RubyGems - masterview - Versions diffs - 0.0.17 → 0.1.0 - Mend

masterview 0.0.17 → 0.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (26) hide show

data/CHANGELOG +4 -0
data/README +22 -6
data/RELEASE_NOTES +26 -3
data/Rakefile +1 -0
data/TODO +2 -0
data/init.rb +1 -0
data/lib/masterview/analyzer.rb +252 -0
data/lib/masterview/directive_helpers.rb +10 -0
data/lib/masterview/directives/import.rb +22 -0
data/lib/masterview/directives/import_render.rb +23 -0
data/lib/masterview/extras/app/controllers/masterview_controller.rb +78 -0
data/lib/masterview/extras/app/views/masterview/admin/create.rhtml +96 -0
data/lib/masterview/extras/app/views/masterview/admin/empty.rhtml +15 -0
data/lib/masterview/extras/app/views/masterview/admin/list.rhtml +97 -0
data/lib/masterview/extras/rails_init.rb +5 -0
data/lib/masterview/extras/watcher.rb +12 -11
data/lib/masterview/masterview_version.rb +2 -2
data/lib/masterview/parser.rb +29 -18
data/lib/masterview/template_spec.rb +226 -0
data/lib/masterview.rb +16 -1
data/test/import_render_test.rb +30 -0
data/test/import_test.rb +29 -0
data/test/template_file_watcher_test.rb +1 -1
data/test/template_spec_test.rb +344 -0
data/test/template_test.rb +76 -0
metadata +18 -2

data/test/import_test.rb ADDED Viewed

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+require 'test/unit'
+currentPath = File.dirname(__FILE__)
+require File.join( currentPath, '../lib/masterview' )
+require File.join( currentPath, '../lib/masterview/directives/import')
+class TestImport < Test::Unit::TestCase
+  include MasterView::Directives
+  def setup
+    @directives = MasterView::DirectiveSet.new
+  end
+  def test_import
+    import_tag = MasterView::Tag.new(@directives, 'bar', {}, :normal, nil)
+    @directives.directives = []
+    attr_value = 'foo/bar'
+    @directives << Import.new(attr_value)
+    dcs = @directives.determine_dcs(:stag)
+    dcs.context = import_tag.create_context
+    assert_equal nil, dcs.render
+    dcs = @directives.determine_dcs(:etag)
+    dcs.context = import_tag.create_context
+    assert_equal nil, dcs.render
+  end
+end

data/test/template_file_watcher_test.rb CHANGED Viewed

@@ -11,7 +11,7 @@ class TestTemplateFileWatcher < Test::Unit::TestCase
   MVFilenamePattern = '*.html'
   TmpOutputDir = File.join(CurrentPath, '../tmp/views')
-  MVProductFile = File.join(CurrentPath, '../examples/product.html')
+  MVProductFile = File.expand_path File.join(CurrentPath, '../examples/product.html')
   def setup
     FileUtils.remove_dir(TmpOutputDir, true)

data/test/template_spec_test.rb ADDED Viewed

@@ -0,0 +1,344 @@
+#!/usr/bin/env ruby
+require 'test/unit'
+currentPath = File.dirname(__FILE__)
+require File.join( currentPath, '../lib/masterview' )
+class TestTemplateSpec < Test::Unit::TestCase
+  CurrentPath = File.dirname(__FILE__)
+  MasterViewHTMLFile = File.join(CurrentPath, '../examples/product.html')
+  MasterViewHTMLImportFile = File.join(CurrentPath, '../examples/test.import')
+  def setup
+  end
+  def test_scan
+    content_hash = {}
+    template = <<-END
+      <html mv:generate="layout/foo.rhtml">
+        <body>
+          <div mv:generate="bar/baz.rhtml">
+            <div mv:gen_render=":partial => 'cat/foo'">
+              Hello
+            </div>
+          </div>
+        </body>
+      </html>
+    END
+    spec = MasterView::TemplateSpec.scan_template(template, 'hello', content_hash)
+    assert_equal MasterView::TemplateSpec::Status::OK, spec.status
+    assert_equal '', spec.message
+    assert_equal %w{ bar/baz.rhtml cat/_foo.rhtml layout/foo.rhtml }, spec.gen_parts
+  end
+  def test_badxhtml
+    content_hash = {}
+    template = <<-END
+      <html mv:generate="layout/foo.rhtml">
+        </breakthisxhtml>
+        <body>
+          <div mv:generate="bar/baz.rhtml">
+            <div mv:gen_render=":partial => 'cat/foo'">
+              Hello
+            </div>
+          </div>
+        </body>
+      </html>
+    END
+    spec = MasterView::TemplateSpec.scan_template(template, 'hello', content_hash)
+    assert_equal MasterView::TemplateSpec::Status::InvalidXHTML, spec.status
+    assert_not_equal '', spec.message
+    assert_equal [], spec.gen_parts
+  end
+  def test_conflicts
+    content_hash = {}
+    template = <<-END
+      <html mv:generate="layout/foo.rhtml">
+        <body>
+          <div mv:generate="bar/baz.rhtml">
+            <div mv:gen_render=":partial => 'cat/foo'">
+              Hello
+            </div>
+          </div>
+        </body>
+      </html>
+    END
+    spec1 = MasterView::TemplateSpec.scan_template(template, 'hello', content_hash)
+    template2 = <<-END
+      <html mv:generate="layout/foo.rhtml">
+        <body>
+          <div mv:import="bar/baz.rhtml">
+            <div mv:gen_render=":partial => 'cat/foo'">
+              Hello
+            </div>
+          </div>
+        </body>
+      </html>
+    END
+    spec = MasterView::TemplateSpec.scan_template(template2, 'world', content_hash)
+    assert_equal MasterView::TemplateSpec::Status::Conflicts, spec.status
+    assert_not_equal '', spec.message
+    assert_equal %w{ cat/_foo.rhtml layout/foo.rhtml }, spec.gen_parts
+  end
+  def test_imports_not_outdated
+    content_hash = {}
+    template1 = <<-END
+      <html mv:import="layout/foo.rhtml">
+        <body>
+          <div mv:import="bar/baz.rhtml">
+            <div mv:import_render=":partial => 'cat/foo'">
+              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_render=":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, 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, 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
+      <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>
+          <div mv:generate="bar/baz.rhtml">
+            <div mv:gen_render=":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, 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
+    invalid_parts = MasterView::TemplateSpec.template_out_of_sync?(template2, 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_rebuild_template
+    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>
+    <div mv:generate="bar/baz.rhtml">
+      <div mv:gen_render=":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, 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'">
+        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
+<html mv:generate="layout/foo.rhtml">
+  <body>
+    <div mv:generate="foo/bar.rhtml">
+      <div mv:gen_render=":partial => 'foo/messages'">
+        Hello
+      </div>
+    </div>
+  </body>
+</html>
+END
+    source.strip!
+    empty_erb = <<-END
+<div id="<%= @controller_file_name %>_<%= @action_name %>" mv:generate="<%= @controller_view_dir_name %>/<%= @action_name %>.rhtml">
+  controller_file_name=<%= @controller_file_name %>
+</div>
+END
+    empty_erb.strip!
+    expected_result = <<-END
+<html mv:import="layout/foo.rhtml">
+  <body>
+    <div id="foo_cat" mv:generate="foo/cat.rhtml">
+  controller_file_name=foo
+</div>
+  </body>
+</html>
+END
+    src_path = 'foo_bar.html'
+    content_hash = {}
+    template_spec_to_copy_from = MasterView::TemplateSpec.scan_template(source, src_path, content_hash) # setup content_hash since not getting from dir
+    options = { :template_source => source, :content_hash => content_hash }
+    result = MasterView::TemplateSpec.create_empty_shell_for_action(src_path, 'cat', empty_erb, options)
+    assert_equal expected_result.strip, result
+  end
+  # test the creation of an empty shell using simply the source and action inferring the rest, src_path = app/views/masterview/foo_bar.html
+  def test_create_empty_shell_for_action_full_path
+    source = <<-END
+<html mv:generate="layout/foo.rhtml">
+  <body>
+    <div mv:generate="foo/bar.rhtml">
+      <div mv:gen_render=":partial => 'foo/messages'">
+        Hello
+      </div>
+    </div>
+  </body>
+</html>
+END
+    source.strip!
+    empty_erb = <<-END
+<div id="<%= @controller_file_name %>_<%= @action_name %>" mv:generate="<%= @controller_view_dir_name %>/<%= @action_name %>.rhtml">
+  controller_file_name=<%= @controller_file_name %>
+</div>
+END
+    empty_erb.strip!
+    expected_result = <<-END
+<html mv:import="layout/foo.rhtml">
+  <body>
+    <div id="foo_cat" mv:generate="foo/cat.rhtml">
+  controller_file_name=foo
+</div>
+  </body>
+</html>
+END
+    src_path = 'app/views/masterview/foo_bar.html'
+    content_hash = {}
+    template_spec_to_copy_from = MasterView::TemplateSpec.scan_template(source, src_path, content_hash) # setup content_hash since not getting from dir
+    options = { :template_source => source, :content_hash => content_hash }
+    result = MasterView::TemplateSpec.create_empty_shell_for_action(src_path, 'cat', empty_erb, options)
+    assert_equal expected_result.strip, result
+  end
+  # test the creation of an empty shell using simply the source and action inferring the rest, src_path = foo_bar
+  def test_create_empty_shell_for_action_no_ext
+    source = <<-END
+<html mv:generate="layout/foo.rhtml">
+  <body>
+    <div mv:generate="foo/bar.rhtml">
+      <div mv:gen_render=":partial => 'foo/messages'">
+        Hello
+      </div>
+    </div>
+  </body>
+</html>
+END
+    source.strip!
+    empty_erb = <<-END
+<div id="<%= @controller_file_name %>_<%= @action_name %>" mv:generate="<%= @controller_view_dir_name %>/<%= @action_name %>.rhtml">
+  controller_file_name=<%= @controller_file_name %>
+</div>
+END
+    empty_erb.strip!
+    expected_result = <<-END
+<html mv:import="layout/foo.rhtml">
+  <body>
+    <div id="foo_cat" mv:generate="foo/cat.rhtml">
+  controller_file_name=foo
+</div>
+  </body>
+</html>
+END
+    src_path = 'foo_bar'
+    content_hash = {}
+    template_spec_to_copy_from = MasterView::TemplateSpec.scan_template(source, src_path, content_hash) # setup content_hash since not getting from dir
+    options = { :template_source => source, :content_hash => content_hash }
+    result = MasterView::TemplateSpec.create_empty_shell_for_action(src_path, 'cat', empty_erb, options)
+    assert_equal expected_result.strip, result
+  end
+end

data/test/template_test.rb CHANGED Viewed

@@ -59,6 +59,22 @@ class TestTemplate < Test::Unit::TestCase
     assert_template_result expected, template
   end
+  def test_multi_gen_render
+    template = <<-END
+      <div mv:generate='foo/bar'>
+        <span mv:replace="h product[:price]">foo bar</span>
+        <div mv:gen_render=":partial => 'baz/caz'">
+          <span mv:content="h product[:name]">hello world</span>
+        </div>
+      </div>
+    END
+    expected = {
+      'foo/bar' => "<div><%= h product[:price] %><%= render( :partial => 'baz/caz' ) %></div>",
+      'baz/_caz.rhtml' => "<div><span><%= h product[:name] %></span></div>"
+    }
+    assert_template_result expected, template
+  end
   def test_multi_spec_dir
     template = <<-END
       <div mv:generate='foo/bar'>
@@ -215,4 +231,64 @@ class TestTemplate < Test::Unit::TestCase
     assert_template_result expected, template
   end
+  def test_import
+    template = <<-END
+      <div mv:import='foo/bar'>
+        <span mv:replace="h product[:price]">foo bar</span>
+      </div>
+    END
+    expected = { }
+    assert_template_result expected, template
+  end
+  def test_import2
+    template = <<-END
+      <div mv:import='foo/bar'>
+        <div mv:generate='cat/dog'>Hello World</div>
+      </div>
+    END
+    expected = {
+      'cat/dog' => "<div>Hello World</div>"
+    }
+    assert_template_result expected, template
+  end
+  def test_import3
+    template = <<-END
+      <div mv:generate='foo/bar'>
+        Hello
+        <div mv:import='cat/dog'>
+          Clown
+          <div mv:generate='egg/flower'>
+            Wow
+          </div>
+        </div>
+      </div>
+    END
+    expected = {
+      'egg/flower' => "<div>Wow </div>",
+      'foo/bar' => "<div>Hello </div>"
+    }
+    assert_template_result expected, template
+  end
+  def test_import_render
+    template = <<-END
+      <div mv:generate='foo/bar'>
+        Hello
+        <div mv:import_render=":partial => 'cat/dog'">
+          Clown
+          <div mv:generate='egg/flower'>
+            Wow
+          </div>
+        </div>
+      </div>
+    END
+    expected = {
+      'foo/bar' => "<div>Hello <%= render( :partial => 'cat/dog' ) %></div>",
+      'egg/flower' => "<div>Wow </div>"
+    }
+    assert_template_result expected, template
+  end
 end

metadata CHANGED Viewed

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: masterview
 version: !ruby/object:Gem::Version
-  version: 0.0.17
-date: 2006-05-04 00:00:00 -05:00
+  version: 0.1.0
+date: 2006-05-29 00:00:00 -05:00
 summary: A (x)html friendly template engine for rails with the power of layouts, and partials.
 require_paths:
 - lib
@@ -49,6 +49,8 @@ files:
 - 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
@@ -63,6 +65,7 @@ files:
 - lib/masterview/directives/elsif.rb
 - lib/masterview/directives/form.rb
 - lib/masterview/directives/submit.rb
+- lib/masterview/directives/import.rb
 - lib/masterview/directives/insert_generated_comment.rb
 - lib/masterview/directives/stylesheet_link.rb
 - lib/masterview/directives/javascript_include.rb
@@ -71,8 +74,18 @@ files:
 - 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
+- lib/masterview/extras/app/controllers
+- lib/masterview/extras/app/views
+- 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
 - test/run_parser_test.rb
 - test/test_helper.rb
 - test/template_file_watcher_test.rb
@@ -96,8 +109,11 @@ files:
 - test/content_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
 - Rakefile
 - RELEASE_NOTES