masterview 0.2.5 → 0.3.0

data/test/unit/directive_else_test.rb

@@ -3,29 +3,32 @@
 require 'test/unit'
 currentPath = File.dirname(__FILE__)
 require File.join( currentPath, '../../lib/masterview' )
-require File.join( currentPath, '../../lib/masterview/directives/else')
+#require File.join( currentPath, '../../lib/masterview/directives/else')
+require File.join( currentPath, '../directive_test_helper' )
+DirectiveTestHelpers.load_masterview_directive('else')
 
 class TestElse < Test::Unit::TestCase
-  include MasterView::Directives
+  include DirectiveTestHelpers
 
-  def setup
-    @directives = MasterView::DirectiveSet.new
-  end
+  Else = MasterView::Directives::Else  # test subject
+
+  ELEMENT_TAG = 'div'
 
   def test_else
-    parent_tag = MasterView::Tag.new(@directives, 'div', {}, :normal, nil)
-    parent_tag.content = ['<% if true %>hello world', '<% end %>']
 
-    else_tag = MasterView::Tag.new(@directives, 'bar', {}, :normal, parent_tag)
-    @directives.directives = []
+    # initial mv:if element gets wrapped by if/end erb conditions
+    tag_content = [ '<% if true -%>hello world', '<% end -%>' ] 
+    if_tag = create_template_element ELEMENT_TAG, :content => tag_content
+
+    else_tag = create_template_element ELEMENT_TAG, :parent_tag => if_tag
     attr_value = 'not used'
-    @directives << Else.new(attr_value)
-    dcs = @directives.determine_dcs(:stag)
-    dcs.context = else_tag.create_context
+    create_directive Else, attr_value
+    assert_equal 1, element_directives.size, 'clean reset of directives for new element'
+
+    assert_equal "<% else -%>", render_element_event(:stag)
+    assert_equal "<% if true -%>hello world", if_tag.content.join, 'else directive modifies preceding tag by removing its end marker when it adds itself to the output'
+    assert_equal "<% end -%>", render_element_event(:etag)
 
-    assert_equal "<% else %>", dcs.render.join
-    assert_equal "<% if true %>hello world", parent_tag.content.join
-    assert_equal "<% end %>", @directives.determine_dcs(:etag).render.join
   end
 
 end

data/test/unit/directive_elsif_test.rb

@@ -3,29 +3,31 @@
 require 'test/unit'
 currentPath = File.dirname(__FILE__)
 require File.join( currentPath, '../../lib/masterview' )
-require File.join( currentPath, '../../lib/masterview/directives/elsif')
+#require File.join( currentPath, '../../lib/masterview/directives/elsif')
+require File.join( currentPath, '../directive_test_helper' )
+DirectiveTestHelpers.load_masterview_directive('elsif')
 
 class TestElsif < Test::Unit::TestCase
-  include MasterView::Directives
+  include DirectiveTestHelpers
 
-  def setup
-    @directives = MasterView::DirectiveSet.new
-  end
+  Elsif = MasterView::Directives::Elsif  # test subject
+
+  ELEMENT_TAG = 'div'
 
   def test_elsif
-    parent_tag = MasterView::Tag.new(@directives, 'div', {}, :normal, nil)
-    parent_tag.content = ['<% if true %>hello world', '<% end %>']
 
-    elsif_tag = MasterView::Tag.new(@directives, 'bar', {}, :normal, parent_tag)
-    @directives.directives = []
+    # initial mv:if element gets wrapped by if/end erb conditions
+    tag_content = [ '<% if( true ) -%>hello world', '<% end -%>' ]
+    if_tag = create_template_element ELEMENT_TAG, :content => tag_content
+
+    elseif_tag = create_template_element ELEMENT_TAG, :parent_tag => if_tag
     attr_value = '@foobar'
-    @directives << Elsif.new(attr_value)
-    dcs = @directives.determine_dcs(:stag)
-    dcs.context = elsif_tag.create_context
+    create_directive Elsif, attr_value
+    assert_equal 1, element_directives.size, 'clean reset of directives for new element'
 
-    assert_equal "<% elsif #{attr_value} %>", dcs.render.join
-    assert_equal "<% if true %>hello world", parent_tag.content.join
-    assert_equal "<% end %>", @directives.determine_dcs(:etag).render.join
+    assert_equal "<% elsif( #{attr_value} ) -%>", render_element_event(:stag)
+    assert_equal "<% if( true ) -%>hello world", if_tag.content.join, 'elseif directive modifies preceding tag by removing its end marker when it adds itself to the output'
+    assert_equal "<% end -%>", render_element_event(:etag)
   end
 
 end

data/test/unit/directive_form_remote_test.rb

@@ -0,0 +1,59 @@
+#!/usr/bin/env ruby
+
+require 'test/unit'
+currentPath = File.dirname(__FILE__)
+require File.join( currentPath, '../../lib/masterview' )
+#require File.join( currentPath, '../../lib/masterview/directives/form_remote')
+require File.join( currentPath, '../directive_test_helper' )
+DirectiveTestHelpers.load_masterview_directive('form_remote')
+
+class TestFormRemote < Test::Unit::TestCase
+  include DirectiveTestHelpers
+
+  FormRemote = MasterView::Directives::FormRemote  # test subject
+
+  ELEMENT_TAG = 'form'
+
+  def test_metadata
+    assert_equal MasterView::ConfigSettings.namespace_prefix, FormRemote.namespace_prefix
+    assert_equal 'form_remote', FormRemote.attribute_name
+  end
+
+  def test_default
+    create_template_element ELEMENT_TAG
+    attr_value = ":action => 'create'"
+    create_directive FormRemote, attr_value
+    assert_equal "<%= form_remote_tag( :action => 'create' ) %>", render_element_event(:stag)
+    assert_equal "</form>", render_element_event(:etag)
+  end
+
+  def test_get
+    create_template_element ELEMENT_TAG, :attributes => { 'method' => 'get' }
+    attr_value = ":action => 'create'"
+    create_directive FormRemote, attr_value
+    assert_equal "<%= form_remote_tag( :action => 'create', :method => \"get\" ) %>", render_element_event(:stag)
+  end
+
+  def test_get_uppercase
+    create_template_element ELEMENT_TAG, :attributes => { 'method' => 'GET'}
+    attr_value = ":action => 'create'"
+    create_directive FormRemote, attr_value
+    assert_equal "<%= form_remote_tag( :action => 'create', :method => \"GET\" ) %>", render_element_event(:stag)
+    assert_equal "</form>", render_element_event(:etag)
+  end
+
+  def test_post
+    create_template_element ELEMENT_TAG, :attributes => { 'method' => 'post' }
+    attr_value = ":action => 'create'"
+    create_directive FormRemote, attr_value
+    assert_equal "<%= form_remote_tag( :action => 'create', :method => \"post\" ) %>", render_element_event(:stag)
+  end
+
+  def test_post_uppercase
+    create_template_element ELEMENT_TAG, :attributes => { 'method' => 'POST' }
+    attr_value = ":action => 'create'"
+    create_directive FormRemote, attr_value
+    assert_equal "<%= form_remote_tag( :action => 'create', :method => \"POST\" ) %>", render_element_event(:stag)
+  end
+
+end

data/test/unit/directive_form_test.rb

@@ -3,64 +3,56 @@
 require 'test/unit'
 currentPath = File.dirname(__FILE__)
 require File.join( currentPath, '../../lib/masterview' )
-require File.join( currentPath, '../../lib/masterview/directives/form')
+#require File.join( currentPath, '../../lib/masterview/directives/form')
+require File.join( currentPath, '../directive_test_helper' )
+DirectiveTestHelpers.load_masterview_directive('form')
 
 class TestForm < Test::Unit::TestCase
-  include MasterView::Directives
+  include DirectiveTestHelpers
 
-  def setup
-    @directives = MasterView::DirectiveSet.new
+  Form = MasterView::Directives::Form  # test subject
+
+  ELEMENT_TAG = 'form'
+
+  def test_metadata
+    assert_equal MasterView::ConfigSettings.namespace_prefix, Form.namespace_prefix
+    assert_equal 'form', Form.attribute_name
   end
 
   def test_default
-    tag = MasterView::Tag.new(@directives, 'foo', {}, :normal, nil)
-    @directives.directives = []
+    create_template_element ELEMENT_TAG
     attr_value = ":action => 'create'"
-    @directives << Form.new(attr_value)
-    dcs = @directives.determine_dcs(:stag)
-    dcs.context = tag.create_context
-    assert_equal "<%= form_tag :action => 'create' %>", dcs.render
-    assert_equal "<%= end_form_tag %>", @directives.determine_dcs(:etag).render
+    create_directive Form, attr_value
+    assert_equal "<%= form_tag( :action => 'create' ) %>", render_element_event(:stag)
+    assert_equal "</form>", render_element_event(:etag)
   end
 
-  def test_get_uc
-    tag = MasterView::Tag.new(@directives, 'foo', { 'method' => 'GET'}, :normal, nil)
-    @directives.directives = []
+  def test_get
+    create_template_element ELEMENT_TAG, :attributes => { 'method' => 'get' }
     attr_value = ":action => 'create'"
-    @directives << Form.new(attr_value)
-    dcs = @directives.determine_dcs(:stag)
-    dcs.context = tag.create_context
-    assert_equal "<%= form_tag {:action => 'create'}, :method => \"get\" %>", dcs.render
+    create_directive Form, attr_value
+    assert_equal "<%= form_tag( { :action => 'create' }, :method => \"get\" ) %>", render_element_event(:stag)
   end
 
-  def test_get
-    tag = MasterView::Tag.new(@directives, 'foo', { 'method' => 'get' }, :normal, nil)
-    @directives.directives = []
+  def test_get_uppercase
+    create_template_element ELEMENT_TAG, :attributes => { 'method' => 'GET'}
     attr_value = ":action => 'create'"
-    @directives << Form.new(attr_value)
-    dcs = @directives.determine_dcs(:stag)
-    dcs.context = tag.create_context
-    assert_equal "<%= form_tag {:action => 'create'}, :method => \"get\" %>", dcs.render
+    create_directive Form, attr_value
+    assert_equal "<%= form_tag( { :action => 'create' }, :method => \"GET\" ) %>", render_element_event(:stag)
   end
 
-  def test_post_uc
-    tag = MasterView::Tag.new(@directives, 'foo', { 'method' => 'POST' }, :normal, nil)
-    @directives.directives = []
+  def test_post
+    create_template_element ELEMENT_TAG, :attributes => { 'method' => 'post' }
     attr_value = ":action => 'create'"
-    @directives << Form.new(attr_value)
-    dcs = @directives.determine_dcs(:stag)
-    dcs.context = tag.create_context
-    assert_equal "<%= form_tag :action => 'create' %>", dcs.render
+    create_directive Form, attr_value
+    assert_equal "<%= form_tag( { :action => 'create' }, :method => \"post\" ) %>", render_element_event(:stag)
   end
 
-  def test_post
-    tag = MasterView::Tag.new(@directives, 'foo', { 'method' => 'post' }, :normal, nil)
-    @directives.directives = []
+  def test_post_uppercase
+    create_template_element ELEMENT_TAG, :attributes => { 'method' => 'POST' }
     attr_value = ":action => 'create'"
-    @directives << Form.new(attr_value)
-    dcs = @directives.determine_dcs(:stag)
-    dcs.context = tag.create_context
-    assert_equal "<%= form_tag :action => 'create' %>", dcs.render
+    create_directive Form, attr_value
+    assert_equal "<%= form_tag( { :action => 'create' }, :method => \"POST\" ) %>", render_element_event(:stag)
   end
 
 end

data/test/unit/directive_global_inline_erb_test.rb

@@ -3,28 +3,39 @@
 require 'test/unit'
 currentPath = File.dirname(__FILE__)
 require File.join( currentPath, '../../lib/masterview' )
-require File.join( currentPath, '../../lib/masterview/directives/global_inline_erb')
+#require File.join( currentPath, '../../lib/masterview/directives/global_inline_erb')
+require File.join( currentPath, '../directive_test_helper' )
+DirectiveTestHelpers.load_masterview_directive('global_inline_erb')
 
 class TestGlobalInlineErb < Test::Unit::TestCase
-  include MasterView::Directives
+  include DirectiveTestHelpers
 
-  def setup
-    @directives = MasterView::DirectiveSet.new
-  end
+  Global_inline_erb = MasterView::Directives::GlobalInlineErb  # test subject
+
+  ELEMENT_TAG = 'dummy'
+  TEMPLATE_HELLO_ATTR_VALUE = 'foo bar {{{=hello world}}}'
+  ERBIZED_HELLO_ATTR_VALUE = 'foo bar <%=hello world%>'
+  TEMPLATE_WORLD_ATTR_VALUE = '{{{fine}}}'
+  ERBIZED_WORLD_ATTR_VALUE = '<%fine%>'
+  TEMPLATE_ELEMENT_ATTRIBUTES = { 'hello' => TEMPLATE_HELLO_ATTR_VALUE, 'world' => TEMPLATE_WORLD_ATTR_VALUE }
 
   def test_hello
-    @tag = MasterView::Tag.new(@directives, 'foo', {'hello' => 'foo bar {{{=hello world}}}', 'world' => '{{{fine}}}'}, :normal, nil)
-    @directives.directives = []
-    @directives << Global_inline_erb.new
-    @directives << MasterView::SimpleRenderHandler.new
-    dcs = @directives.determine_dcs(:stag)
-    dcs.context = @tag.create_context
-    assert_equal '<foo hello="foo bar <%=hello world%>" world="<%fine%>">', dcs.render.join
-    #assert_equal "<%= #{attr_value} %>", dcs.context[:tag].content
-
-    dcs = @directives.determine_dcs(:characters)
-    dcs.context = @tag.create_context(:content_part => 'more text here {{{= foo(bar) }}} more then {{{exec {:hello => :world} }}} finally')
-    assert_equal 'more text here <%= foo(bar) %> more then <%exec {:hello => :world} %> finally', dcs.render.join
+
+    test_tag = create_template_element ELEMENT_TAG, :attributes => TEMPLATE_ELEMENT_ATTRIBUTES
+    create_directive Global_inline_erb, ''
+    append_default_render_handler
+    assert_equal 2, element_directives.size, 'we want our directive processor and a rendering backstop'
+
+    render_result = render_element_event(:stag)
+    assert_equal "<#{ELEMENT_TAG} hello=\"#{ERBIZED_HELLO_ATTR_VALUE}\" world=\"#{ERBIZED_WORLD_ATTR_VALUE}\">", render_result
+    #assert_equal "<%= #{attr_value} %>", test_tag.content.join
+
+    template_content = 'more text here {{{= foo(bar) }}} more then {{{exec {:hello => :world} }}} finally'
+    erbized_content = 'more text here <%= foo(bar) %> more then <%exec {:hello => :world} %> finally'
+    context_values = { :content_part => template_content }
+    render_result = render_element_event( :characters, context_values )
+    assert_equal erbized_content, render_result
+
   end
 
 end

data/test/unit/directive_grid_test_notready.rb

@@ -0,0 +1,38 @@
+#!/usr/bin/env ruby
+
+require 'test/unit'
+currentPath = File.dirname(__FILE__)
+require File.join( currentPath, '../../lib/masterview' )
+require File.join( currentPath, '../test_helper' )
+
+class TestGridDirective < Test::Unit::TestCase
+  def setup
+    MasterView::IOMgr.erb = MasterView::StringHashMIOTree.new({}, '.rhtml', :logging => true)
+  end
+
+  def test_grid
+    template = <<-END
+      <div mv:generate='foo/bar'>
+        <table mv:grid="product, :cols => [:name, :description], :sort => [:column, :created_date]">
+          <tr><th>Name</th><th>Description</th></tr>
+          <tr><td>foo</td><td>bar</td></tr>
+        </table>
+      </div>
+    END
+    expected = {
+      'foo/bar' => "<div>
+<table>
+ <tr><th>Name</th><th>Description</th></tr>
+ <%= render :partial => 'store/product', :collection => @products %>
+</table>
+</div>",
+      
+      'store/_product.rhtml' => ""
+    }
+    assert_template_result expected, template
+  end
+
+
+
+
+end

data/test/unit/directive_helpers_test.rb

@@ -0,0 +1,39 @@
+#!/usr/bin/env ruby
+
+require 'test/unit'
+currentPath = File.dirname(__FILE__)
+require File.join( currentPath, '../../lib/masterview' )
+
+class TestDirectiveHelpers < Test::Unit::TestCase
+  include MasterView::DirectiveHelpers
+
+
+  def test_find_last_parent_strings
+    tag = OpenStruct.new
+    tag.parent = OpenStruct.new
+    
+    foo = 'foo'
+    bar = 'bar'
+    baz = 'baz'
+    bar2 = 'bar'
+    hello = 'hello'
+    tag.parent.content = [foo, bar, baz, bar2, hello]
+    assert_equal bar2.object_id, find_last_in_parent(tag, 'bar').object_id
+    assert bar.object_id != find_last_in_parent(tag, 'bar').object_id
+  end
+
+  # test bug found by Sergey Shalatskly where it wasn't searching into arrays properly
+  def test_find_last_parent_strings_and_arrays
+    tag = OpenStruct.new
+    tag.parent = OpenStruct.new
+    
+    foo = 'foo'
+    bar = 'bar'
+    baz = 'baz'
+    bar2 = 'bar'
+    hello = 'hello'
+    tag.parent.content = [foo, bar, [baz, bar2, hello], ['one', 'world'], 'three']
+    assert_equal bar2.object_id, find_last_in_parent(tag, 'bar').object_id
+    assert bar.object_id != find_last_in_parent(tag, 'bar').object_id
+  end
+end

data/test/unit/directive_hidden_field_test.rb

@@ -3,60 +3,75 @@
 require 'test/unit'
 currentPath = File.dirname(__FILE__)
 require File.join( currentPath, '../../lib/masterview' )
-require File.join( currentPath, '../../lib/masterview/directives/hidden_field')
+#require File.join( currentPath, '../../lib/masterview/directives/hidden_field')
+require File.join( currentPath, '../directive_test_helper' )
+DirectiveTestHelpers.load_masterview_directive('hidden_field')
 
 class TestHiddenField < Test::Unit::TestCase
-  include MasterView::Directives
+  include DirectiveTestHelpers
 
-  def setup
-    @directives = MasterView::DirectiveSet.new
+  HiddenField = MasterView::Directives::HiddenField  # test subject
+
+  ELEMENT_TAG = 'input'
+
+  def test_metadata
+    assert_equal MasterView::ConfigSettings.namespace_prefix, HiddenField.namespace_prefix
+    assert_equal 'hidden_field', HiddenField.attribute_name
   end
 
-  def hidden_field_exec(obj, method, other, options)
+  # set up the test case for an input element with mv:hidden directive
+  def create_element_with_hidden_field_directive(obj, method, other_attr_values=nil, attributes={})
+
     attr_value = "#{obj}, #{method}"
-    attr_value << ', ' << other unless other.nil?
-    tag = MasterView::Tag.new(@directives, 'input', options, :normal, nil)
-    @directives.directives = []
-    @directives << Hidden_field.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"
-    dcs.render
+    attr_value << ', ' << other_attr_values unless other_attr_values.nil?
+
+    input_tag = create_template_element ELEMENT_TAG,
+                          :attributes => attributes,
+                          :content => 'hello world'
+    create_directive HiddenField, attr_value
+    assert_equal '', render_element_event(:stag)
+
   end
 
   def test_normal
     obj = ':product'
-    method = ':price'
-    ret = hidden_field_exec(obj, method, nil, { 'type' => 'hidden', 'value' => 'fake text' } )
-    assert_equal "<%= hidden_field #{obj}, #{method} %>", ret 
+    method = 'price'
+    create_element_with_hidden_field_directive(obj, method, nil, { 'type' => 'hidden', 'value' => 'fake text' } )
+    assert_equal "<%= hidden_field( #{obj}, '#{method}' ) %>", render_element_event(:etag)
   end
 
   def test_extra
     obj = ':product'
-    method = ':price'
-    ret = hidden_field_exec(obj, method, "'more', 'stuff'", { 'type' => 'hidden', 'value' => 'fake text' } )
-    assert_equal "<%= hidden_field #{obj}, #{method} %>", ret 
+    method = "'price'"
+    create_element_with_hidden_field_directive(obj, method, "\"'more', 'stuff'\"", { 'type' => 'hidden', 'value' => 'fake text' } )
+    assert_equal "<%= hidden_field( #{obj}, #{method}, \"'more', 'stuff'\" ) %>", render_element_event(:etag)
+  end
+
+  def test_extra2
+    obj = ':product'
+    method = "'price'"
+    create_element_with_hidden_field_directive(obj, method, "'more'", { 'type' => 'hidden', 'value' => 'fake text' } )
+    assert_equal "<%= hidden_field( #{obj}, #{method}, 'more' ) %>", render_element_event(:etag)
   end
 
   def test_all
     obj = ':product'
     method = ':price'
-    ret = hidden_field_exec(obj, method, nil, 
-                          { 
-                            'type' => 'hidden', 'value' => 'fake text' 
+    create_element_with_hidden_field_directive(obj, method, nil,
+                          {
+                            'type' => 'hidden', 'value' => 'fake text'
                           } )
-    assert_equal "<%= hidden_field #{obj}, #{method} %>", ret 
+    assert_equal "<%= hidden_field( #{obj}, #{method} ) %>", render_element_event(:etag)
   end
 
-  def test_all_uc
+  def test_all_uppercase
     obj = ':product'
     method = ':price'
-    ret = hidden_field_exec(obj, method, nil, 
-                          { 
-                            'TYPE' => 'HIDDEN', 'value' => 'fake text' 
+    create_element_with_hidden_field_directive(obj, method, nil,
+                          {
+                            'TYPE' => 'HIDDEN', 'value' => 'fake text'
                           } )
-    assert_equal "<%= hidden_field #{obj}, #{method} %>", ret 
+    assert_equal "<%= hidden_field( #{obj}, #{method} ) %>", render_element_event(:etag)
   end
 
 end

data/test/unit/directive_if_test.rb

@@ -3,21 +3,24 @@
 require 'test/unit'
 currentPath = File.dirname(__FILE__)
 require File.join( currentPath, '../../lib/masterview' )
-require File.join( currentPath, '../../lib/masterview/directives/if')
+#require File.join( currentPath, '../../lib/masterview/directives/if')
+require File.join( currentPath, '../directive_test_helper' )
+DirectiveTestHelpers.load_masterview_directive('if')
 
 class TestIf < Test::Unit::TestCase
-  include MasterView::Directives
+  include DirectiveTestHelpers
+
+  If = MasterView::Directives::If  # test subject
 
   def setup
-    @directives = MasterView::DirectiveSet.new
+    create_template_element
   end
 
   def test_if
-    @directives.directives = []
     attr_value = 'true'
-    @directives << If.new(attr_value)
-    assert_equal "<% if #{attr_value} %>", @directives.determine_dcs(:stag).render.join
-    assert_equal "<% end %>", @directives.determine_dcs(:etag).render.join
+    create_directive If, attr_value
+    assert_equal "<% if( #{attr_value} ) -%>", render_element_event(:stag)
+    assert_equal "<% end -%>", render_element_event(:etag)
   end
 
 end