lapillus 0.0.3 → 0.0.4

data/lib/changelog.txt

@@ -1,3 +1,9 @@
+Changes Lapillus 0.0.3 --> 0.0.4
+- Added MonkeyPatch for Ruby 1.8.6 REXML bug
+  See: http://www.intertwingly.net/blog/2007/11/02/MonkeyPatch-for-Ruby-1-8-6
+- Added fix and tests for MultiView component
+- Added fix and test for ListView component
+
 Changes Lapillus 0.0.2 --> 0.0.3
 - Refactoring: Component identifiers have become Symbols instead of Strings
 - Refactoring: use named parameters in Component constructor to set options (like :visible=false) 
@@ -5,7 +11,7 @@ Changes Lapillus 0.0.2 --> 0.0.3
 - Refactoring: Lapillus now works with ruby 1.8.6 (version contains some changes in the REXML API)  
 - Refactoring: HTML rendering is now done using the visitor pattern instead of recursion 
 - First version of the Lapillus website (Thanks to Joris van Zundert)
-  URL: http://hi3.huygensinstituut.nl:2000/
+  URL: http://lapi.llus.org 
 
 
 Changes Lapillus 0.0.1 --> 0.0.2

data/lib/lapillus/base.rb

@@ -46,7 +46,7 @@ module Lapillus
       result_dom = visitor.container_output.root
       element = REXML::XPath.first( result_dom, "//*[@id=\"#{path}\"]" )
       if element == nil 
-        message = "Identifier "+path+" not found! in "+doc.to_s
+        message = "Identifier "+path+" not found! in "+result_dom.to_s
         raise message
       end
       formatter = REXML::Formatters::Default.new

data/lib/lapillus/containers.rb

@@ -91,6 +91,7 @@ module Lapillus
         visitor.current_container = container
         container.render_children(visitor, listview_element)
       }
+      visitor.current_container = self.parent
     end
   end
   

data/lib/lapillus/html_visitor.rb

@@ -1,3 +1,19 @@
+# FIX FOR REXML BUG IN RUBY 1.8.6
+# See: http://www.intertwingly.net/blog/2007/11/02/MonkeyPatch-for-Ruby-1-8-6
+
+require 'rexml/document'
+doc = REXML::Document.new '<doc xmlns="ns"><item name="foo"/></doc>'
+if not doc.root.elements["item[@name='foo']"]
+  class REXML::Element
+    def attribute( name, namespace=nil )
+      prefix = nil
+      prefix = namespaces.index(namespace) if namespace
+      prefix = nil if prefix == 'xmlns'
+      attributes.get_attribute( "#{prefix ? prefix + ':' : ''}#{name}" )
+    end
+  end
+end
+
 module Lapillus
   class NullComponent < RenderableComponent
     #TODO: move to standard container class? 
@@ -25,10 +41,10 @@ module Lapillus
     
     def visit_element(element)
       return if element.name=="fragment"
-      #puts "rendering: #{element.name}"
       component_id = element.attributes['lapillus:id']
       if !component_id.nil?
         child_component = current_container[component_id]
+        #puts "rendering: #{element.name} with #{component_id} -> #{child_component.class} from #{current_container.class}"
       else
         child_component = NullComponent.new          
       end

data/lib/lapillus/multiview.rb

@@ -15,19 +15,18 @@ class MultiView < Lapillus::Component
     @mode=views[0].identifier
   end
   
-  def current_view(id=mode)
+  def current_view
     @views.each do |v|
-      return v  if v.identifier == id
+      return v  if v.identifier == mode
     end
     raise "view with identifier #{id} not found!"
     nil
   end
   
-  def render_container(html)
+  def render_children(visitor, html)
     singleview = current_view
-    result = singleview.render_container(html)
-    render_behaviours(result)
-    return result
+    visitor.current_container = singleview
+    singleview.render_children(visitor, html)
   end
   
   # TODO: add test

data/test/tc_containers.rb

@@ -81,6 +81,17 @@ class TC_containers < Test::Unit::TestCase
       label :text, :model => text
     end
   end
+  
+  class TestWebpage2 < Webpage
+    attr_accessor :values
+    listview :listview, :model => :values do |text|
+      label :text, :model => text
+    end
+    attr_accessor :values2
+    listview :listview2, :model => :values2 do |text|
+      label :text, :model => text
+    end
+  end
 
   def test_listview_components
     test = TestWebpage.new
@@ -113,6 +124,26 @@ class TC_containers < Test::Unit::TestCase
     assert_equal(expected, result)
   end
   
+  def test_listview_rendering_with_two_lists
+    html = html_template('<span lapillus:id="listview">'+
+      '<p><span lapillus:id="text">Comment text goes here.</span>'+
+      '</p></span>'+
+      '<span lapillus:id="listview2">'+
+      '<p><span lapillus:id="text">Comment text goes here.</span>'+
+      '</p></span>')
+    expected = expected_html('<span lapillus:id="listview">'+
+      '<p><span lapillus:id="text">first</span>'+
+      '</p></span>'+
+      '<span lapillus:id="listview2">'+
+      '<p><span lapillus:id="text">second</span>'+
+      '</p></span>')
+    testpanel = TestWebpage2.new
+    testpanel.values = ["first"]
+    testpanel.values2 = ["second"]
+    result = testpanel.render(html)
+    assert_equal(expected, result)
+  end
+ 
   def test_listview_set_value
     test = TestWebpage.new
     test.values = ["first","second"]

data/test/tc_multiview.rb

@@ -1,5 +1,7 @@
 require 'test/unit'
-require 'lapillus/multiview'
+require 'lapillus'
+
+include Lapillus
 
 class TC_MultiView < Test::Unit::TestCase
   def test_current_view
@@ -18,74 +20,69 @@ class TC_MultiView < Test::Unit::TestCase
     assert_equal(view2, multi_view.current_view)
   end
   
-#  def test_behaviours
-#    html = <<EOF
-#    <html>
-#    <span lapillus:id="multiview">single_view comes here</span>
-#    <lapillus:fragment lapillus:id="single1">
-#      <span lapillus:id="label">some content here</span>
-#    </lapillus:fragment>
-#    <lapillus:fragment lapillus:id="single2">
-#      <a lapillus:id="link" href="#">
-#        <span lapillus:id="link_label">some content here</span>
-#      </a>
-#    </lapillus:fragment>
-#    </html>
-#EOF
-#    single1 = SingleView.new("single1") do
-#      add(Label.new("label", "simple label"))
-#    end
-#    multi_view = MultiView.new("multiview", [single1])
-#    multi_view.value = "single1"
-#    multi_view.add_behaviour(OnClick.new)
-#    page = Webpage.new
-#    page.add multi_view
-#    output = page.render(html)
-#    puts output
-#  end
-
-
-
-
-
-
-
-
-
+  def test_multiview_with_behaviours
+    html = <<EOF
+<html>
+  <span lapillus:id="multiview">single_view comes here</span>
+  <lapillus:fragment lapillus:id="single1">
+    <span lapillus:id="label">some content here</span>
+  </lapillus:fragment>
+  <lapillus:fragment lapillus:id="single2">
+    <a lapillus:id="link" href="#">
+      <span lapillus:id="link_label">some content here</span>
+    </a>
+  </lapillus:fragment>
+</html>
+EOF
+    expected = <<EOF
+<html>
+  <span lapillus:id="multiview" onclick="new Ajax.Request('', { method: 'get', parameters: { listener:'multiview' }}); return false;">
+    <span lapillus:id="label">simple label</span>
+  </span>
+  
+  
+</html>
+EOF
+    single1 = SingleView.new(:single1)
+    single1.add(Label.new(:label, :model => "simple label"))
+    multi_view = MultiView.new(:multiview, [single1])
+    multi_view.mode = :single1
+    multi_view.add_behaviour(OnClick.new)
+    page = Webpage.new
+    page.add multi_view
+    output = page.render(html)
+    assert_equal(expected, output+"\n")
+  end
 
-#  def xtest_switch_view
-#    single1 = SingleView.new("single1") do
-#      add(Label.new("label", "simple label"))
-#    end
-#    single2 = SingleView.new("single2") do
-#      add(AjaxLink.new("link") do
-#        add(Label.new("link_label", "text inside link"))
-#        on_click do
-#          
-#        end
-#      end)
-#    end
-#    multi_view = MultiView.new("multiview", [single1, single2])
-#    multi_view.value = "single1"
-#    html = <<EOF
-#    <html>
-#    <span lapillus:id="multiview">single_view comes here</span>
-#    <lapillus:fragment lapillus:id="single1">
-#      <span lapillus:id="label">some content here</span>
-#    </lapillus:fragment>
-#    <lapillus:fragment lapillus:id="single2">
-#      <a lapillus:id="link" href="#">
-#        <span lapillus:id="link_label">some content here</span>
-#      </a>
-#    </lapillus:fragment>
-#    </html>
-#EOF
-#    page = Webpage.new
-#    page.add multi_view
-#    output = page.render(html)
-#    puts output
-#    assert_equal(single1,multi_view.get_single_view('single1'))
-#  end
+  def test_switch_view
+    single1 = SingleView.new(:single1) 
+    single1.add(Label.new(:label, :model => "simple label"))
+    single2 = SingleView.new(:single2)
+    link = AjaxLink.new(:link)
+    single2.add(link)
+    link.add(Label.new(:link_label, :model=>"text inside link"))
+    multi_view = MultiView.new(:multiview, [single1, single2])
+    multi_view.model = "single1"
+    html = <<EOF
+    <html>
+    <span lapillus:id="multiview">single_view comes here</span>
+    <lapillus:fragment lapillus:id="single1">
+      <span lapillus:id="label">some content here</span>
+    </lapillus:fragment>
+    <lapillus:fragment lapillus:id="single2">
+      <a lapillus:id="link" href="#">
+        <span lapillus:id="link_label">some content here</span>
+      </a>
+    </lapillus:fragment>
+    </html>
+EOF
+    page = Webpage.new
+    page.add multi_view
+    multi_view.mode = :single2
+    output = page.render(html)
+    assert(output.include?("lapillus:id=\"link\""))
+    assert_equal(single2,multi_view.current_view)
+  end
   
 
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: lapillus
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
-date: 2008-01-29 00:00:00 +01:00
+  version: 0.0.4
+date: 2008-02-04 00:00:00 +01:00
 summary: Component based webframework written in Ruby
 require_paths: 
 - lib