RubyGems - lapillus - Versions diffs - 0.0.2 → 0.0.3 - Mend

lapillus 0.0.2 → 0.0.3

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 (31) hide show

data/examples/guest_book.rb +5 -5
data/examples/hello_world.rb +1 -1
data/examples/{persons.rb → personspage.rb} +4 -4
data/examples/tc_hello_world.rb +11 -11
data/examples/{tc_persons.rb → tc_personspage.rb} +2 -2
data/html/{Persons.html → Personspage.html} +0 -0
data/lib/changelog.txt +10 -0
data/lib/lapillus/base.rb +82 -82
data/lib/lapillus/behaviours.rb +53 -38
data/lib/lapillus/components.rb +9 -7
data/lib/lapillus/containers.rb +32 -49
data/lib/lapillus/dispatcher.rb +35 -24
data/lib/lapillus/form_components.rb +11 -7
data/lib/lapillus/html_visitor.rb +68 -0
data/lib/lapillus/pager.rb +8 -8
data/test/tc_base.rb +2 -2
data/test/tc_behaviours.rb +29 -7
data/test/tc_bookmarkablepagelink.rb +5 -5
data/test/tc_components.rb +42 -21
data/test/tc_containers.rb +22 -18
data/test/tc_examples.rb +18 -18
data/test/tc_form.rb +15 -15
data/test/tc_fragments.rb +8 -6
data/test/tc_hierarchy.rb +1 -1
data/test/tc_lapillus.rb +2 -2
data/test/tc_lapillus_testers.rb +6 -6
data/test/tc_multiview.rb +7 -7
data/test/tc_pager.rb +5 -3
data/test/tc_rendering.rb +4 -4
data/test/ts_all_test.rb +0 -1
metadata +6 -5

data/test/tc_components.rb CHANGED Viewed

@@ -13,8 +13,8 @@ end
 class TC_Components < Test::Unit::TestCase
   def test_component_id_no_value
-    component = Component.new("id")
-    assert_equal("id", component.identifier)
+    component = Component.new(:id)
+    assert_equal(:id, component.identifier)
     assert(!component.has_model?)
   end
@@ -61,7 +61,7 @@ class TC_Components < Test::Unit::TestCase
     def webpage.default_htmlfile
       return '<html><span lapillus:id="label">My Label</span></html>'
     end
-    label = Label.new("label", "My Label")
+    label = Label.new(:label, :model => "My Label")
     webpage.add(label)
     html = label.render_component
     assert_equal("My Label", html)
@@ -71,9 +71,9 @@ class TC_Components < Test::Unit::TestCase
     def webpage.default_htmlfile
       return '<html><span lapillus:id="panel"><!-- <span lapillus:id="remark">Bla</span> --><span lapillus:id="visible">huh</span></span></html>'
     end
-    panel = Panel.new("panel")
-    remark = Label.new("remark", "whatever")
-    label = Label.new("visible", "My Label")
+    panel = Panel.new(:panel)
+    remark = Label.new(:remark, :model => "whatever")
+    label = Label.new(:visible, :model => "My Label")
     panel.add(remark)
     panel.add(label)
     webpage.add(panel)
@@ -99,7 +99,7 @@ class TC_Components < Test::Unit::TestCase
   end
   def test_label
-    label = Label.new("label", "hello world")
+    label = Label.new(:label, :model => "hello world")
     html = html_template('<span lapillus:id="label">this text should not be visible</span>')
     expectation = expected_html('<span lapillus:id="label">hello world</span>')
     webpage.add(label)
@@ -108,7 +108,7 @@ class TC_Components < Test::Unit::TestCase
   end
   def test_label_ignore_newlines
-    label = Label.new("label", "hello world\nbye")
+    label = Label.new(:label, :model => "hello world\nbye")
     html = html_template('<span lapillus:id="label">this text should not be visible</span>')
     expectation = expected_html("<span lapillus:id=\"label\">hello world\nbye</span>")
     webpage.add(label)
@@ -117,7 +117,7 @@ class TC_Components < Test::Unit::TestCase
   end
   def test_label_xml_escaping
-    label = Label.new("label", "hello world < > ' & \" ")
+    label = Label.new(:label, :model => "hello world < > ' & \" ")
     html = html_template('<span lapillus:id="label">this text should not be visible</span>')
     expectation = expected_html('<span lapillus:id="label">hello world &lt; &gt; \' &amp; " </span>')
     webpage.add(label)
@@ -134,7 +134,7 @@ class TC_Components < Test::Unit::TestCase
   end
   def test_multilinelabel_paragraphs
-    label = MultiLineLabel.new("label", "a paragraph\n\n")
+    label = MultiLineLabel.new(:label, :model => "a paragraph\n\n")
     webpage.add(label)
     html = html_template('<span lapillus:id="label">this text should not be visible</span>')
     expectation = expected_html('<span lapillus:id="label"><p>a paragraph</p></span>')
@@ -143,7 +143,7 @@ class TC_Components < Test::Unit::TestCase
   end
   def test_multilinelabel_paragraphs_2
-    label = MultiLineLabel.new("label", "a paragraph\n\n\nnext paragraph\n\n")
+    label = MultiLineLabel.new(:label, :model => "a paragraph\n\n\nnext paragraph\n\n")
     webpage.add(label)
     html = html_template('<span lapillus:id="label">this text should not be visible</span>')
     expectation = expected_html('<span lapillus:id="label"><p>a paragraph</p><p>next paragraph</p></span>')
@@ -152,7 +152,7 @@ class TC_Components < Test::Unit::TestCase
   end
   def test_multilinelabel_newlines
-    label = MultiLineLabel.new("label", "hello world\nbye")
+    label = MultiLineLabel.new(:label, :model => "hello world\nbye")
     webpage.add(label)
      html = html_template('<span lapillus:id="label">this text should not be visible</span>')
     expectation = expected_html('<span lapillus:id="label">hello world<br/>bye</span>')
@@ -161,7 +161,7 @@ class TC_Components < Test::Unit::TestCase
   end
   def test_multilinelabel_newlines_2
-    label = MultiLineLabel.new("label", "hello world\nbye\n")
+    label = MultiLineLabel.new(:label, :model => "hello world\nbye\n")
     webpage.add(label)
      html = html_template('<span lapillus:id="label">this text should not be visible</span>')
     expectation = expected_html('<span lapillus:id="label">hello world<br/>bye<br/></span>')
@@ -171,7 +171,7 @@ class TC_Components < Test::Unit::TestCase
   def test_multilinelabel_combi_br_p
-    label = MultiLineLabel.new("label", "a \nparagraph\n\n")
+    label = MultiLineLabel.new(:label, :model => "a \nparagraph\n\n")
     webpage.add(label)
      html = html_template('<span lapillus:id="label">this text should not be visible</span>')
     expectation = expected_html('<span lapillus:id="label"><p>a <br/>paragraph</p></span>')
@@ -180,7 +180,7 @@ class TC_Components < Test::Unit::TestCase
   end
   def test_multilabel_with_html_content
-    label = MultiLineLabel.new("label", "a \n<p>paragraph</p>\n\n")
+    label = MultiLineLabel.new(:label, :model => "a \n<p>paragraph</p>\n\n")
     label.html_content=true
     webpage.add(label)
      html = html_template('<span lapillus:id="label">this text should not be visible</span>')
@@ -194,7 +194,7 @@ class TC_Components < Test::Unit::TestCase
   end
   def test_multilinelabel_empty_string
-    label = MultiLineLabel.new("label", "")
+    label = MultiLineLabel.new(:label, :model => "")
     webpage.add(label)
      html = html_template('<span lapillus:id="label">this text should not be visible</span>')
     expectation = expected_html('<span lapillus:id="label"></span>')
@@ -209,7 +209,7 @@ class TC_Components < Test::Unit::TestCase
   end
   def test_add_behaviour
-    test_component = Component.new("test")
+    test_component = Component.new(:test)
     test_behaviour = TestBehaviour.new
     test_component.add_behaviour(test_behaviour)
     assert(test_component.has_behaviour?(TestBehaviour))
@@ -218,7 +218,7 @@ class TC_Components < Test::Unit::TestCase
   end
   def test_remove_behaviour
-    test_component = Component.new("test")
+    test_component = Component.new(:test)
     test_behaviour = TestBehaviour.new
     test_component.add_behaviour(test_behaviour)
     assert(test_component.has_behaviour?(TestBehaviour))
@@ -227,7 +227,7 @@ class TC_Components < Test::Unit::TestCase
   end
   class ImagePage < Webpage
-    image "my_image", :model => "picture1.jpg", :root_url => "/application"
+    image :my_image, :model => "picture1.jpg", :root_url => "/application"
   end
   def test_image
@@ -250,9 +250,30 @@ END
     assert_equal(expected.strip, result)
   end
+  def test_image_url_escaping
+    html = <<END
+<html>
+<body>
+  <img lapillus:id='my_image'/>
+</body>
+</html>
+END
+    expected = <<END
+<html>
+<body>
+  <img src="/application/images/url%23to%23be%23escaped/picture1.jpg" lapillus:id="my_image"/>
+</body>
+</html>
+END
+    page = ImagePage.new
+    page.my_image.model="url#to#be#escaped/picture1.jpg"
+    result = page.render(html)
+    assert_equal(expected.strip, result)
+  end
   class ListViewImagePage < Webpage
-    listview "my_images", :model => ["pic1.jpg", "pic2.jpg"] do |the_image|
-      image "my_image", :model => the_image, :root_url => "/application"
+    listview :my_images, :model => ["pic1.jpg", "pic2.jpg"] do |the_image|
+      image :my_image, :model => the_image, :root_url => "/application"
     end
   end

data/test/tc_containers.rb CHANGED Viewed

@@ -25,8 +25,8 @@ class TC_containers < Test::Unit::TestCase
   end
   def test_container
-    container = Container.new("container")
-    component = Component.new("component")
+    container = Container.new(:container)
+    component = Component.new(:component)
     container.add(component)
     assert_equal([component], container.components)
     assert(component.has_parent?)
@@ -35,9 +35,9 @@ class TC_containers < Test::Unit::TestCase
   end
   def test_hierarchy
-    first = Container.new("first")
-    second = Container.new("second")
-    three = Component.new("three")
+    first = Container.new(:first)
+    second = Container.new(:second)
+    three = Component.new(:three)
     first.add(second.add(three))
     assert_equal([first, second, three], three.hierarchy)
     assert_equal(first, three.webpage)
@@ -46,9 +46,9 @@ class TC_containers < Test::Unit::TestCase
   end
   def test_path
-    first = Container.new("first")
-    second = Container.new("second")
-    three = Component.new("three")
+    first = Container.new(:first)
+    second = Container.new(:second)
+    three = Component.new(:three)
     first.add(second.add(three))
     assert_equal("second.three", three.path)
     assert_equal("second", second.path)
@@ -56,10 +56,10 @@ class TC_containers < Test::Unit::TestCase
   end
  def test_get
-    first = Container.new("first")
-    second = Container.new("second")
-    three = Component.new("three")
-    four = Component.new("four")
+    first = Container.new(:first)
+    second = Container.new(:second)
+    three = Component.new(:three)
+    four = Component.new(:four)
     second.add(four)
     first.add(second.add(three))
     assert_equal(three, first["second.three"])
@@ -77,8 +77,8 @@ class TC_containers < Test::Unit::TestCase
   class TestWebpage < Webpage
     attr_accessor :values
-    listview "listview", :model => :values do |text|
-      label "text", :model => text
+    listview :listview, :model => :values do |text|
+      label :text, :model => text
     end
   end
@@ -90,9 +90,13 @@ class TC_containers < Test::Unit::TestCase
     label2 = listview[1].text
     assert_equal("first", label1.value)
     assert_equal("second", label2.value)
-    assert_equal("listview.0.text", label1.path)
-    assert_equal("listview.1.text", label2.path)
+    assert_equal("listview.item0.text", label1.path)
+    assert_equal("listview.item1.text", label2.path)
+    assert_equal(label1, test["listview.item0.text"])
+    assert_equal(label2, test["listview.item1.text"])
   end
   def test_listview_rendering
     html = html_template('<span lapillus:id="listview">'+
@@ -135,7 +139,7 @@ class TC_containers < Test::Unit::TestCase
   #just copy the body
   def test_remote_panel_render_from_within_webpage
     webpage = TestPage.new #NOTE: uses html/TestPage.html
-    remote_panel = TestRemotePanel.new("remote_panel") # html/TestRemotePanel.html
+    remote_panel = TestRemotePanel.new(:remote_panel) # html/TestRemotePanel.html
     webpage.add(remote_panel)
     expected = <<EOF
 <html>
@@ -151,7 +155,7 @@ EOF
   end
   def test_remote_panel_render_indepent_from_webpage
-    remote_panel = TestRemotePanel.new("remote_panel") # html/TestRemotePanel.html  end
+    remote_panel = TestRemotePanel.new(:remote_panel) # html/TestRemotePanel.html  end
     expected = <<EOF
 <html>
 <title>

data/test/tc_examples.rb CHANGED Viewed

@@ -11,7 +11,7 @@ class TC_examples < Test::Unit::TestCase
   end
   class MyLabelWebpage < Webpage
-    label "my_label"
+    label :my_label
   end
   def test_new_label
@@ -24,7 +24,7 @@ class TC_examples < Test::Unit::TestCase
 #TODO: example with two labels, with different identifiers
   class MyLabelWebpage2 < Webpage
-    label "label", :model => "Hello world!"
+    label :label, :model => "Hello world!"
   end
   def test_label
@@ -49,7 +49,7 @@ class TC_examples < Test::Unit::TestCase
   class MyLabelWebpage3 < Webpage
     attr_reader :person
-    label "person_label", :model => :person
+    label :person_label, :model => :person
     def initialize(person)
       super()
@@ -69,7 +69,7 @@ class TC_examples < Test::Unit::TestCase
   class MyLabelWebpage4 < Webpage
     attr_reader :person
-    label "person_name", :model => :person, :property => :name
+    label :person_name, :model => :person, :property => :name
     def initialize(person)
       super()
@@ -88,9 +88,9 @@ class TC_examples < Test::Unit::TestCase
   #TODO: add example with a listview with a model and a property
   class MyListViewWebpage < Webpage
-    listview "listview", :model => ["value1", "value2"] do |item|
-      label "item", :model => item
-      label "another_thing", :model => "message"
+    listview :listview, :model => ["value1", "value2"] do |item|
+      label :item, :model => item
+      label :another_thing, :model => "message"
     end
   end
@@ -106,8 +106,8 @@ class TC_examples < Test::Unit::TestCase
   class MyListViewWebpage2 < Webpage
     attr_reader :persons
-    listview "personlist", :model => :persons do |person|
-      label "name", :model => person, :property => :name
+    listview :personlist, :model => :persons do |person|
+      label :name, :model => person, :property => :name
     end
     def initialize
@@ -127,10 +127,10 @@ class TC_examples < Test::Unit::TestCase
   end
   class MyForm < Form
-    textfield "textfield"
-    password_textfield "password"
-    textarea "textarea"
-    fileuploadfield "fileuploadfield"
+    textfield :textfield
+    password_textfield :password
+    textarea :textarea
+    fileuploadfield :fileuploadfield
     def on_submit(button)
       puts "the user entered #{textfield.value}"
@@ -138,7 +138,7 @@ class TC_examples < Test::Unit::TestCase
   end
   def test_form
-    form = MyForm.new("my_form")
+    form = MyForm.new(:my_form)
     assert_equal(4, form.components.size)
     assert_equal("", form.textfield.value)
     assert_equal("", form.password.value)
@@ -158,25 +158,25 @@ class TC_examples < Test::Unit::TestCase
   end
   class MyForm2 < Form
-    textfield "textfield", :model => :model, :property => :property1
+    textfield :textfield, :model => :model, :property => :property1
   end
   def test_form_with_model
     model = MyModel.new
     model.property1 = "value1"
-    form = MyForm2.new("my_form", model)
+    form = MyForm2.new(:my_form, :model => model)
     assert_equal(1, form.components.size)
     assert_equal("value1", form.textfield.value)
   end
   class MyPanel < Panel
     alias person model
-    label "name", :model => :person, :property => :name
+    label :name, :model => :person, :property => :name
   end
   class MyPanelWebpage < Webpage
     attr_reader :person
-    panel "panel", MyPanel, :person
+    panel :panel, MyPanel, :model => :person
     def initialize(person)
       super()

data/test/tc_form.rb CHANGED Viewed

@@ -45,7 +45,7 @@ class TC_Form < Test::Unit::TestCase
   def test_form
     html = html_template("more stuff here")
     page = TestPage.new
-    form = MyForm.new("test_form")
+    form = MyForm.new(:test_form)
     page.add(form)
     result = page.render(html)
     assert_equal(expected_html("more stuff here"), result)
@@ -66,7 +66,7 @@ class TC_Form < Test::Unit::TestCase
   class MyTextfieldForm < Form
     attr_reader :comment
-    textfield "field", :model => :comment, :property => :field
+    textfield :field, :model => :comment, :property => :field
     def initialize(id, comment)
       super(id)
       @comment = comment
@@ -79,7 +79,7 @@ class TC_Form < Test::Unit::TestCase
     html = html_template('<input type="text" lapillus:id="field"/>')
     comment = Comment.new("supernice")
     page = Webpage.new
-    form = MyTextfieldForm.new("test_form", comment)
+    form = MyTextfieldForm.new(:test_form, comment)
     page.add(form)
     result = page.render(html)
     assert_equal(expected_html2('<input name="test_form.field" type="text" lapillus:id="field" value="supernice"/>'), result)
@@ -90,7 +90,7 @@ class TC_Form < Test::Unit::TestCase
     class MyAreaForm < Form
       attr_reader :comment
-      textarea "area", :model => :comment, :property => :area
+      textarea :area, :model => :comment, :property => :area
       def initialize(id, comment)
         super(id)
         @comment = comment
@@ -103,7 +103,7 @@ class TC_Form < Test::Unit::TestCase
     comment = Comment.new("test test test")
     html = html_template('<textarea lapillus:id="area">some text</textarea>')
     page = Webpage.new
-    form = MyAreaForm.new("test_form", comment)
+    form = MyAreaForm.new(:test_form, comment)
     page.add(form)
     result = page.render(html)
     assert_equal(expected_html2('<textarea name="test_form.area" lapillus:id="area">test test test</textarea>'), result)
@@ -122,7 +122,7 @@ class TC_Form < Test::Unit::TestCase
   class MyUploadfieldForm < Form
     attr_reader :upload_file
-    fileuploadfield "upload_field", :model => :upload_file, :property => :upload_file
+    fileuploadfield :upload_field, :model => :upload_file, :property => :upload_file
     def initialize(id, upload_file)
       super(id)
       @upload_file = upload_file
@@ -135,7 +135,7 @@ class TC_Form < Test::Unit::TestCase
     upload_file = UploadFile.new( "some file huh?" )
     html = html_template('<input lapillus:id="upload_field" type="file"/>')
     page = Webpage.new
-    form = MyUploadfieldForm.new("test_form", upload_file)
+    form = MyUploadfieldForm.new(:test_form, upload_file)
     page.add(form)
     result = page.render(html)
     assert_equal(expected_html2('<input name="test_form.upload_field" type="file" lapillus:id="upload_field"/>'), result)
@@ -147,7 +147,7 @@ class TC_Form < Test::Unit::TestCase
   class TestForm < Form
     alias comment model
-    textarea "area", :model => :comment, :property => :area
+    textarea :area, :model => :comment, :property => :area
     def on_submit(button)
     end
   end
@@ -155,14 +155,14 @@ class TC_Form < Test::Unit::TestCase
   def test_form_model
     html = html_template('<textarea lapillus:id="area">some text</textarea>'    )
     page = TestPage.new
-    page.add(TestForm.new("test_form", Comment.new("nice")))
+    page.add(TestForm.new(:test_form, :model => Comment.new("nice")))
     result = page.render(html)
     assert_equal(expected_html('<textarea name="test_form.area" lapillus:id="area">nice</textarea>'), result)
   end
     class ComplexForm < Form
-      fileuploadfield "uploadveld"
+      fileuploadfield :uploadveld
       def on_submit(button)
       end
     end
@@ -184,7 +184,7 @@ EOF
 <input name="page" type="hidden" value="Lapillus::Webpage"/></form></html>
 EOF
       webpage = Lapillus::Webpage.new
-      webpage.add ComplexForm.new("add_form")
+      webpage.add ComplexForm.new(:add_form)
       output = webpage.render html
       assert_equal(expected.strip, output)
     end
@@ -207,8 +207,8 @@ EOF
     def test_post_1_webpage_with_multiple_forms
       webpage = Webpage.new
-      form1 = Form1.new("form1")
-      form2 = Form2.new("form2")
+      form1 = Form1.new(:form1)
+      form2 = Form2.new(:form2)
       webpage.add(form1)
       webpage.add(form2)
       hash = {"form2.field" => "value"}
@@ -219,8 +219,8 @@ EOF
     def test_form_within_panel
       webpage = Webpage.new
-      panel = Panel.new("panel")
-      form2 = Form2.new("form2")
+      panel = Panel.new(:panel)
+      form2 = Form2.new(:form2)
       webpage.add(panel)
       panel.add(form2)
       hash = {"form2.field" => "value"}

data/test/tc_fragments.rb CHANGED Viewed

@@ -1,6 +1,8 @@
 require 'lapillus'
 require 'test/unit'
+include Lapillus
 class TC_Fragment < Test::Unit::TestCase
   def test_fragment
     html = <<EOF
@@ -26,7 +28,7 @@ EOF
 EOF
     page = Webpage.new
-    page.add Fragment.new("myPanel", "frag1")
+    page.add Fragment.new(:myPanel, "frag1")
     output = page.render(html)
     assert_equal(expected.strip, output.strip)
   end
@@ -55,13 +57,13 @@ EOF
 EOF
     page = Webpage.new
-    page.add Fragment.new("myPanel", "frag1")
+    page.add Fragment.new(:myPanel, "frag1")
     output = page.render(html)
     assert_equal(expected.strip, output.strip)
   end
     class MyFragment < Fragment
-      label "label", :model => "Hello World"
+      label :label, :model => "Hello World"
     end
   def test_fragment_with_components_as_children
@@ -88,7 +90,7 @@ EOF
 EOF
     page = Webpage.new
-    page.add(MyFragment.new("myPanel", "frag1"))
+    page.add(MyFragment.new(:myPanel, "frag1"))
     output = page.render(html)
     assert_equal(expected.strip, output.strip)
   end
@@ -96,7 +98,7 @@ EOF
   class WeirdFragment < Fragment
     def initialize(id, frag)
       super(id, frag)
-      add Panel.new("properties")
+      add Panel.new(:properties)
     end
   end
@@ -107,7 +109,7 @@ EOF
     '  <span class="propertiespanel" lapillus:id=\'properties\'>properties</span>'+
     '</lapillus:fragment></html>'
     page = Webpage.new
-    page.add(WeirdFragment.new("toolbar_panel", "toolbar"))
+    page.add(WeirdFragment.new(:toolbar_panel, "toolbar"))
     output = page.render(html)
     assert_equal(expected, output)
   end

data/test/tc_hierarchy.rb CHANGED Viewed

@@ -12,7 +12,7 @@ class TC_Hierarchy < Test::Unit::TestCase
   def test_hierarchy_matches
     webpage = Webpage.new
-    webpage.add(TestComponent.new("component"))
+    webpage.add(TestComponent.new(:component))
     html = "<html><div lapillus:id=\"component\"></div></html>"
     output = webpage.render(html)
     assert_equal('<html><div lapillus:id="component"/></html>', output)

data/test/tc_lapillus.rb CHANGED Viewed

@@ -9,7 +9,7 @@ class TC_lapillus < Test::Unit::TestCase
   class MyForm < Form
     attr_reader :value
-    textfield "textfield"
+    textfield :textfield
     def initialize(id)
       super(id)
       @value = FormValue.new
@@ -21,7 +21,7 @@ class TC_lapillus < Test::Unit::TestCase
   def test_form
     testpage = Webpage.new
-    testpage.add(MyForm.new("form"))
+    testpage.add(MyForm.new(:form))
     form = testpage["form"]
     form.on_submit
     assert_equal("value submitted", form.value.variable)

data/test/tc_lapillus_testers.rb CHANGED Viewed

@@ -16,19 +16,19 @@ class TestObject
 end
 class LapillusTesterTestPage < Webpage
-  label "label", :model => "Label Text"
+  label :label, :model => "Label Text"
   def initialize()
-    @@testObject = TestObject.new("Naam","Titel")
+    @@testObject = TestObject.new("Naam", "Titel")
     super()
-    add(TestForm.new("form", @@testObject))
-    add(BookmarkablePageLink.new("link",LinkedPage,Hash.new))
+    add(TestForm.new(:form, @@testObject))
+    add(BookmarkablePageLink.new(:link ,LinkedPage,Hash.new))
   end
   class TestForm < Form
     attr_reader :test_object
-    textfield "name", :model => :test_object, :property => :name
-    textfield "title", :model => :test_object, :property => :title
+    textfield :name, :model => :test_object, :property => :name
+    textfield :title, :model => :test_object, :property => :title
     def initialize(id, test_object)
       super(id)
       @test_object = test_object

data/test/tc_multiview.rb CHANGED Viewed

@@ -3,18 +3,18 @@ require 'lapillus/multiview'
 class TC_MultiView < Test::Unit::TestCase
   def test_current_view
-    view1 = SingleView.new("show")
-    view2 = SingleView.new("edit")
-    multi_view = MultiView.new("id", [view1, view2])
+    view1 = SingleView.new(:show)
+    view2 = SingleView.new(:edit)
+    multi_view = MultiView.new(:id, [view1, view2])
     assert_equal(view1.identifier, multi_view.mode)
     assert_equal(view1, multi_view.current_view)
   end
   def test_mode
-    view1 = SingleView.new("show")
-    view2 = SingleView.new("edit")
-    multi_view = MultiView.new("id", [view1, view2])
-    multi_view.mode = "edit"
+    view1 = SingleView.new(:show)
+    view2 = SingleView.new(:edit)
+    multi_view = MultiView.new(:id, [view1, view2])
+    multi_view.mode = :edit
     assert_equal(view2, multi_view.current_view)
   end

data/test/tc_pager.rb CHANGED Viewed

@@ -1,6 +1,8 @@
 require 'test/unit'
 require 'lapillus/pager'
+include Lapillus
 #component tester
 class ComponentTester
   def initialize(component)
@@ -22,8 +24,8 @@ class TC_Pager < Test::Unit::TestCase
   attr_reader :pager, :tester
   def setup
     pages = [ "first page", "second page", "third page", "fourth page" ]
-    @pager = Pager.new("pager", pages) do |page_content|
-      add(Label.new("content", page_content))
+    @pager = Pager.new(:pager, pages) do |page_content|
+      add(Label.new(:content, :model => page_content))
     end
     @tester = ComponentTester.new(pager)
   end
@@ -35,7 +37,7 @@ class TC_Pager < Test::Unit::TestCase
   end
   def test_no_content
-    pager = Pager.new("pager", []) do end
+    pager = Pager.new(:pager, []) do end
     assert(!pager['page'].visible?)
     assert(!pager['navigation'].visible?)
   end