masterview 0.2.5 → 0.3.0

data/test/tmp/views/product/list.rhtml

@@ -2,7 +2,7 @@
 	  <div class="product_list sidebar">
 	    <h1>Tasks:</h1>
 	    <ul>
-	      <li><%= link_to 'Create new product', :action => 'new' %></li>
+	      <li><%= link_to( 'Create new product', { :action => 'new' }, :class => "new_link" ) %></li>
 	    </ul> 
 	  </div>
 
@@ -23,8 +23,8 @@
 	      <%= render( :partial => 'product/product', :collection => @products ) %>
 	      </table>
 
-	      <% if @product_pages.current.previous %><%= link_to 'Previous page', :page => @product_pages.current.previous %><% end %>
-	      <% if @product_pages.current.next %><%= link_to 'Next page', :page => @product_pages.current.next %><% end %>
+	      <% if( @product_pages.current.previous ) -%><%= link_to( 'Previous page', { :page => @product_pages.current.previous }, :class => "previous_link" ) %><% end -%>
+	      <% if( @product_pages.current.next ) -%><%= link_to( 'Next page', { :page => @product_pages.current.next }, :class => "next_link" ) %><% end -%>
 
 	    </div>                      
 	  </div>

data/test/tmp/views/product/new.rhtml

@@ -2,14 +2,14 @@
 	  <div class="product_new sidebar">
 	    <h1>Tasks:</h1>
 	    <ul>
-	      <li><%= link_to 'Back to overview', :action => 'list' %></li>
+	      <li><%= link_to( 'Back to overview', { :action => 'list' }, :class => "list_link" ) %></li>
 	    </ul> 
 	  </div>
 
 	  <div class="product_new content">
 	    <h1>Products</h1>
 
-	    <%= form_tag :action => 'new' %>
+	    <%= form_tag( :action => 'new' ) %>
 
 	    <div class="form">	
 	      <h2>Creating product</h2>
@@ -20,10 +20,10 @@
 
 	    <br />
 	    <div class="product_new operations">
-	      <%= submit_tag 'OK' %>
+	      <%= submit_tag( 'OK', :class => "primary save_button" ) %>
 	      <input class="cancel_button" onclick="window.location.href = '<%= url_for :action => %q{list} %>';" style="width: auto;" type="button" value="Cancel" />
 	    </div>
 
-	    <%= end_form_tag %>
+	    </form>
 	  </div>
 	</div>

data/test/tmp/views/product/show.rhtml

@@ -2,8 +2,8 @@
 	  <div class="product_show sidebar">
 	    <h1>Tasks:</h1>
 	    <ul>
-	      <li><%= link_to 'Back to overview', :action => 'list' %></li>
-	      <li><%= link_to 'Edit this product', :action => 'edit', :id => @product.id %></li>
+	      <li><%= link_to( 'Back to overview', { :action => 'list' }, :class => "list_link" ) %></li>
+	      <li><%= link_to( 'Edit this product', { :action => 'edit', :id => @product.id }, :class => "edit_link" ) %></li>
 	    </ul>
 	  </div>
 

data/test/unit/attr_string_parser_test.rb

@@ -0,0 +1,105 @@
+#!/usr/bin/env ruby
+
+require 'test/unit'
+currentPath = File.dirname(__FILE__)
+require File.join( currentPath, '../../lib/masterview' )
+
+class TestAttrStringParser < Test::Unit::TestCase
+
+  # test subject
+  AttrStringParser = MasterView::AttrStringParser
+
+  def verify_arg_parsing( attr_value, expected_args )
+    parsed_args = AttrStringParser.new(attr_value).parse
+    #assert_equal expected_args.size, parsed_args.size, "Wrong num args in parsed_args=#{parsed_args.inspect}"
+    assert_equal expected_args, parsed_args, "GOT: parsed_args=#{parsed_args.inspect}"
+  end
+
+  def test_one_arg_value
+    attr_value = 'foo'
+    expected_args = [ attr_value ]  #just foo
+    verify_arg_parsing( attr_value, expected_args )
+  end
+
+  def test_multiple_arg_values
+    attr_value = 'foo, bar, wingding'
+    expected_args = attr_value.split(',').collect {|x| x.strip}
+    verify_arg_parsing( attr_value, expected_args )
+  end
+
+  def test_multi_word_value
+    attr_value = 'one, and a two, and a three lets go'
+    expected_args = attr_value.split(',').collect {|x| x.strip}  
+    verify_arg_parsing( attr_value, expected_args )
+  end
+
+  def test_omitted_arg
+    attr_value = 'one, two, skip the one after this,, five'
+    expected_args = attr_value.split(',').collect {|x| x.strip} 
+    assert_equal '', expected_args[3], 'Omitted arg is parsed as empty string (not nil)'
+    verify_arg_parsing( attr_value, expected_args )
+  end
+
+  # assoc of an unwrapped hash gets parsed as one entry (deliberate or accidental?!)
+  def test_single_assoc
+    attr_value = ':foo => :bar'
+    expected_args = [ attr_value ]
+    verify_arg_parsing( attr_value, expected_args )
+  end
+
+  # multiple assocs of an unwrapped hash get parsed as one entry (deliberate or accidental?!)
+  def test_multiple_assocs
+    attr_value = ':foo => :bar, :option => "bing", :default => 5'
+    #expected_args = [ ':foo => :bar', ':option => "bing"', ':default => 5' ]
+    expected_args = [ attr_value ]
+    verify_arg_parsing( attr_value, expected_args )
+  end
+
+  # wrapped hash gets parsed as a single hash literal string
+  def test_single_entry_hash
+    attr_value = '{ :foo => :bar }'
+    expected_args = [ attr_value ]  # client has to eval the hash literal themselves
+    verify_arg_parsing( attr_value, expected_args )
+  end
+
+  # wrapped hash gets parsed as a single hash literal string
+  def test_multiple_entry_hash
+    attr_value = '{ :foo => :bar, :option => "bing" }'
+    expected_args = [ attr_value ]  # client has to eval the hash literal themselves
+    verify_arg_parsing( attr_value, expected_args )
+  end
+
+  def test_positional_and_wrapped_hash_args
+    attr_value = 'arg1, arg2, { :foo => :bar, :option => "bing" }'
+    expected_args = [ 'arg1', 'arg2', '{ :foo => :bar, :option => "bing" }' ]
+    verify_arg_parsing( attr_value, expected_args )
+  end
+
+  # hash entries must be wrapped if any subsequent parms follow
+  def test_positional_and_embedded_wrapped_hash_args
+    attr_value = 'arg1, arg2, { :foo => :bar, :option => "bing" }, trailingArg1, trailingArg2'
+    expected_args = [ 'arg1', 'arg2', '{ :foo => :bar, :option => "bing" }', 'trailingArg1', 'trailingArg2' ]
+    verify_arg_parsing( attr_value, expected_args )
+  end
+
+  # unwrapped hash assocs gobble up any trailing positional args, so this shouldn't be used
+  def test_positional_and_unwrapped_hash_args
+    attr_value = 'arg1,, arg3, :foo => :bar, :option => "bing", trailingArg-MUNCHED!'
+    expected_args = [ 'arg1', '', 'arg3', ':foo => :bar, :option => "bing", trailingArg-MUNCHED!' ]
+    verify_arg_parsing( attr_value, expected_args )
+    assert_equal 4, expected_args.size, 'trailing arg gets captured by the hash lit, so no number 5'
+  end
+
+  def test_list_arg
+    attr_value = '[one, two, three]'
+    expected_args = [attr_value]
+    verify_arg_parsing( attr_value, expected_args )
+  end
+
+  def test_positional_and_list_arg
+    attr_value = 'arg1, arg2, [one, two, three], arg4'
+    expected_args = [ 'arg1', 'arg2', '[one, two, three]', 'arg4' ]
+    verify_arg_parsing( attr_value, expected_args )
+  end
+
+end

data/test/unit/case_insensitive_hash_mod_test.rb

@@ -0,0 +1,104 @@
+#!/usr/bin/env ruby
+
+require 'test/unit'
+currentPath = File.dirname(__FILE__)
+require File.join( currentPath, '../../lib/masterview' )
+
+class TestCaseInsensitiveHashMod < Test::Unit::TestCase
+
+  def setup
+    @h = MasterView::CaseInsensitiveHash.new
+    @h.replace( { :a => :A, 'b' => :B, 'C' => :C, 0 => 0, 1 => 1, :z => [1,2], 'y' => { :foo => :bar}, :aa => :AA, 'bb' => :BB, 'CC' => :CC, 'dD' => :DD} )
+  end
+
+  def test_get
+    assert_equal 0, @h[0]
+    assert_equal 1, @h[1]
+
+    assert_equal :A, @h[:a]
+    assert_equal :B, @h[:b]
+    assert_equal :C, @h[:c]
+    assert_equal [1,2], @h[:z]
+    assert_equal( { :foo => :bar }, @h[:y] )
+    assert_equal :AA, @h[:aa]
+    assert_equal :BB, @h[:bb]
+    assert_equal :CC, @h[:cc]
+    assert_equal :DD, @h[:dd]
+
+    assert_equal :A, @h['a']
+    assert_equal :B, @h['b']
+    assert_equal :C, @h['c']
+    assert_equal [1,2], @h['z']
+    assert_equal( { :foo => :bar }, @h['y'] )
+    assert_equal :AA, @h['aa']
+    assert_equal :BB, @h['bb']
+    assert_equal :CC, @h['cc']
+    assert_equal :DD, @h['dd']
+
+    assert_equal :A, @h['A']
+    assert_equal :B, @h['B']
+    assert_equal :C, @h['C']
+    assert_equal [1,2], @h['Z']
+    assert_equal( { :foo => :bar }, @h['Y'] )
+    assert_equal :AA, @h['AA']
+    assert_equal :BB, @h['BB']
+    assert_equal :CC, @h['CC']
+    assert_equal :DD, @h['DD']
+
+    assert_equal :AA, @h['Aa']
+    assert_equal :BB, @h['Bb']
+    assert_equal :CC, @h['Cc']
+    assert_equal :DD, @h['Dd']
+
+    assert_equal :AA, @h['aA']
+    assert_equal :BB, @h['bB']
+    assert_equal :CC, @h['cC']
+    assert_equal :DD, @h['dD']
+
+    assert_equal :AA, @h[:aA]
+    assert_equal :BB, @h[:bB]
+    assert_equal :CC, @h[:cC]
+    assert_equal :DD, @h[:dD]
+  end
+
+  def test_set
+    @h[:b] = 'bbb'
+    @h['c'] = 'ccc'
+    @h['onClick'] = 'hello'
+    @h[:onMove] = 'moved'
+    @h.store(:aa, 'aaaa')
+    @h.store('bB', 'bbbb')
+    @h.store('Class', 'red')
+
+    assert_equal 'bbb', @h[:b]
+    assert_equal 'ccc', @h[:c]
+    assert_equal 'aaaa', @h[:aa]
+    assert_equal 'bbbb', @h[:bb]
+    assert_equal 'hello', @h[:onclick]
+    assert_equal 'moved', @h[:onmove]
+
+    assert_equal 'bbb', @h['b']
+    assert_equal 'ccc', @h['c']
+    assert_equal 'aaaa', @h['aA']
+    assert_equal 'bbbb', @h[:Bb]
+    assert_equal 'hello', @h['onclick']
+    assert_equal 'moved', @h['ONMOVE']
+
+    assert_equal [0,1,:a,:aa,"b","bb","C","CC","Class","dD","onClick",:onMove,"y",:z], @h.keys.sort { |a,b| a.to_s.downcase <=> b.to_s.downcase }
+  end
+
+  def test_get_lowercase_str_value
+    @h[:method] = 'POST' 
+    @h[:upper_array] = [:HELLO, 'WORLD']
+    assert_equal 'a', @h.get_lowercase_str_value('a')
+    assert_equal 'b', @h.get_lowercase_str_value('b')
+    assert_equal 'c', @h.get_lowercase_str_value('c')
+    assert_equal '0', @h.get_lowercase_str_value('0')
+    assert_equal '[1, 2]', @h.get_lowercase_str_value('z')
+    assert_equal '{:foo=>:bar}', @h.get_lowercase_str_value('y')
+    assert_equal 'post', @h.get_lowercase_str_value('method')
+    assert_equal '[:hello, "world"]', @h.get_lowercase_str_value('upper_array')
+  end
+
+  
+end

data/test/unit/config_settings_test.rb

@@ -6,7 +6,7 @@ require File.join( currentPath, '../../lib/masterview/initializer' )
 
 class TestConfiguration < Test::Unit::TestCase
   CurrentPath = File.dirname(__FILE__)
-  #TestCasesDir = File.join(CurrentPath, '../..')
+  TestCasesDir = File.expand_path( File.join(CurrentPath, '..') )
   TestFixturesDir = File.join(CurrentPath, '../fixtures/configs')
 
   def setup
@@ -22,10 +22,22 @@ class TestConfiguration < Test::Unit::TestCase
     code_base_from_install_dir = "#{config.mv_installation_dir}/lib/masterview"
     assert File.directory?( code_base_from_install_dir ), "no lib/masterview code dir at mv_installation_dir='#{config.mv_installation_dir}'"
 
+    # MasterView::ConfigSettings.mv_code_base_dir is the lib/masterview directory
     assert_equal code_base_from_install_dir, config.mv_code_base_dir, "inconsistent mv_code_base_dir='#{config.mv_code_base_dir}'"
 
   end
 
+  # these are interesting for directive developers, who need DirectiveTestHelpers
+  def test_mv_install_test_dir_refs
+
+    # default settings for standalone operation
+    config = MasterView::Configuration.new
+
+    # "#{MasterView::ConfigSettings.mv_installation_dir}/test" is the test directory
+    mv_test_dir_from_config_settings_root = "#{config.mv_installation_dir}/test"
+    assert_equal TestCasesDir, mv_test_dir_from_config_settings_root
+
+  end
 
   def test_default_settings_standalone
 

data/test/unit/default_generate_mio_filter_test.rb

@@ -6,11 +6,11 @@ require File.join( currentPath, '../../lib/masterview' )
 require File.join( currentPath, '../test_helper' )
 
 class TestDefaultGenerateMIOFilter < Test::Unit::TestCase
-  include MasterView::DefaultGenerateMIOFilter
+  include MasterView::MIO::DefaultGenerateMIOFilter
 
   def setup
-    MasterView::IOMgr.template = MasterView::StringHashMIOTree.new({}, '.rhtml', :logging => true, :default_generate => true )
-    MasterView::IOMgr.erb = MasterView::StringHashMIOTree.new({}, '.rhtml', :logging => true)
+    MasterView::IOMgr.template = MasterView::MIO::StringHashMIOTree.new({}, '.rhtml', :logging => true, :default_generate => true )
+    MasterView::IOMgr.erb = MasterView::MIO::StringHashMIOTree.new({}, '.rhtml', :logging => true)
   end
 
 

data/test/unit/deprecated_directive_base_test.rb

@@ -0,0 +1,30 @@
+#!/usr/bin/env ruby
+
+require 'test/unit'
+currentPath = File.dirname(__FILE__)
+require File.join( currentPath, '../../lib/masterview' )
+require File.join( currentPath, '../../lib/masterview/deprecated/directive_base' )
+
+class TestDirectiveBase < Test::Unit::TestCase
+  def setup
+    @base = MasterView::DirectiveBase.new('')
+  end
+
+  def test_quote
+    assert_equal '\'hello\'', @base.quote('hello')
+  end
+
+  def test_quote_if
+    assert_equal '\'helloWorld0123\'', @base.quote_if('helloWorld0123')
+    assert_equal 'hello world', @base.quote_if('hello world')
+    assert_equal 'hello,world', @base.quote_if('hello,world')
+    assert_equal 'hello(world)', @base.quote_if('hello(world)')
+    assert_equal ':hello', @base.quote_if(':hello')
+    assert_equal '\"hello world\"', @base.quote_if('\"hello world\"')
+    assert_equal '%q{helloworld}', @base.quote_if('%q{helloworld}')
+    assert_equal 'hello.world', @base.quote_if('hello.world')
+    assert_equal 'hel/lo.w_orld', @base.quote_if('hel/lo.w_orld')
+    assert_equal '\'\'', @base.quote_if('')
+  end
+
+end

data/test/unit/directive_attr_test.rb

@@ -3,50 +3,126 @@
 require 'test/unit'
 currentPath = File.dirname(__FILE__)
 require File.join( currentPath, '../../lib/masterview' )
-require File.join( currentPath, '../../lib/masterview/directives/attr')
+#require File.join( currentPath, '../../lib/masterview/directives/attr')
+require File.join( currentPath, '../directive_test_helper' )
+DirectiveTestHelpers.load_masterview_directive('attr')
 
 class TestAttr < Test::Unit::TestCase
-  include MasterView::Directives
+  include DirectiveTestHelpers
+
+  Attr = MasterView::Directives::Attr  # test subject
+
+  ELEMENT_TAG = 'div'
+  TEMPLATE_ELEMENT_ATTR_NAME = 'foo'
+  TEMPLATE_ELEMENT_ATTR_VALUE = 'bar'
+  TEMPLATE_ELEMENT_ATTRIBUTES = { TEMPLATE_ELEMENT_ATTR_NAME => TEMPLATE_ELEMENT_ATTR_VALUE }
 
   def setup
-    @directives = MasterView::DirectiveSet.new
-    @tag = MasterView::Tag.new(@directives, 'foo', {'bar' => 'cat'}, :normal, nil)
+    create_template_element ELEMENT_TAG, :attributes => TEMPLATE_ELEMENT_ATTRIBUTES
   end
 
-  def test_hello
-    @directives.directives = []
-    attr_value = "{:hello => 'world'}"
-    @directives << Attr.new(attr_value)
-    dcs = @directives.determine_dcs(:stag)
-    dcs.context = @tag.create_context
-    assert_equal '', dcs.render.join
-    assert_equal 'cat', dcs.context[:tag].attributes['bar']
-    assert_equal 'world', dcs.context[:tag].attributes['hello']
+  def test_metadata
+    assert_equal MasterView::ConfigSettings.namespace_prefix, Attr.namespace_prefix
   end
 
-  def test_hello_hi
-    @directives.directives = []
+  def check_element_rendering(expected_unchanged_attributes, expected_changedAttributes, expected_added_attributes)
+
+    num_original_attrs = element_attrs.size()  # original attributes on the template element before mv:attr applied
+    num_unchanged_attributes = expected_unchanged_attributes.size()
+    num_changed_attributes = expected_changedAttributes.size()
+    num_new_attributes = expected_added_attributes.size()
+
+    # mv:attr directive manipulates the element's attributes, but doesn't directly act on the output
+    # It thus has an effect when the normal element processing occurs
+    assert_equal '', render_element_event(:stag)  ##err... when does the stag actually get emitted?
+
+    assert_equal num_original_attrs, num_unchanged_attributes + num_changed_attributes, 'Oops: programmer error'
+
+    expected_unchanged_attributes.each_pair { | attr_name, expected_value |
+      assert_equal expected_value, element_attr_value(attr_name), 'Original attribute is not affected'
+    }
+    expected_changedAttributes.each_pair { | attr_name, expected_value |
+      assert_equal expected_value, element_attr_value(attr_name), 'Original attribute should be changed'
+    }
+    expected_added_attributes.each_pair { | attr_name, expected_value |
+      assert_equal expected_value, element_attr_value(attr_name), 'New attribute specified in the directive should be added'
+    }
+
+    assert_equal element_attrs.size(), num_original_attrs + num_new_attributes, 'Should end up with exactly original attributes + new attributes'
+
+  end
+
+  # test adding an attribute to the element (wrapped hash arg)
+  def test_add_using_hash_notation
+
+    attr_value = "{ :hello => 'world' }"
+    create_directive Attr, attr_value
+
+    check_element_rendering(
+      TEMPLATE_ELEMENT_ATTRIBUTES,  # original
+      {},  # no changes
+      eval(attr_value)  # new
+      )
+
+  end
+
+  # test adding multiple attributes to the element (unwrapped hash assocs notation)
+  def test_add_using_bare_keywords_notation
+
     attr_value = ":hello => 'world', :hi => 'there'"
-    @directives << Attr.new(attr_value)
-    dcs = @directives.determine_dcs(:stag)
-    dcs.context = @tag.create_context
-    assert_equal '', dcs.render.join
-    assert_equal 'cat', dcs.context[:tag].attributes['bar']
-    assert_equal 'world', dcs.context[:tag].attributes['hello']
-    assert_equal 'there', dcs.context[:tag].attributes['hi']
-  end
-
-  def test_hello_erb
-    @directives.directives = []
-    attr_value = %q":hello => 'world', :hi => 'there', :wow => #{h product.name}"
-    @directives << Attr.new(attr_value)
-    dcs = @directives.determine_dcs(:stag)
-    dcs.context = @tag.create_context
-    assert_equal '', dcs.render.join
-    assert_equal 'cat', dcs.context[:tag].attributes['bar']
-    assert_equal 'world', dcs.context[:tag].attributes['hello']
-    assert_equal 'there', dcs.context[:tag].attributes['hi']
-    assert_equal '{{{= h product.name }}}', dcs.context[:tag].attributes['wow']
+    create_directive Attr, attr_value
+
+    check_element_rendering(
+      TEMPLATE_ELEMENT_ATTRIBUTES,  # original
+      {},  # no changes
+      eval( "{ #{attr_value} }" )  # new
+      )
+
+  end
+
+  def test_add_attribute_with_erb_subst
+
+    attr_value = %q":hello => 'world', :wow => #{product.name}"
+    erbized_attr_value = '{{{= product.name }}}'
+    create_directive Attr, attr_value
+
+    check_element_rendering(
+      TEMPLATE_ELEMENT_ATTRIBUTES,  # original
+      {},  # no changes
+      { :hello => 'world', :wow => erbized_attr_value }  # new
+      )
+
+  end
+
+  # test adding multiple attributes to the element with changes to original markup
+  def test_add_and_change_attributes
+
+    modified_template_attr_value = 'wingding'
+    attr_value = ":hello => 'world', :#{TEMPLATE_ELEMENT_ATTR_NAME} => '#{modified_template_attr_value}'"
+    create_directive Attr, attr_value
+
+    check_element_rendering(
+      {},  # no unchanged
+      { TEMPLATE_ELEMENT_ATTR_NAME => modified_template_attr_value },  # changed
+      eval( "{ #{attr_value.split(',')[0]} }" )  # new
+      )
+
+  end
+
+  # test adding multiple attributes to the element with changes to original markup
+  def test_add_and_change_attribute_with_erb_subst
+
+    modified_template_attr_value = '#{product.name}'
+    erbized_attr_value = '{{{= product.name }}}'
+    attr_value = ":hello => 'world', :#{TEMPLATE_ELEMENT_ATTR_NAME} => " << modified_template_attr_value
+    create_directive Attr, attr_value
+
+    check_element_rendering(
+      {},  # no unchanged
+      { TEMPLATE_ELEMENT_ATTR_NAME => erbized_attr_value },  # changed
+      eval( "{ #{attr_value.split(',')[0]} }" )  # new
+      )
+
   end
 
 end