lapillus 0.0.2 → 0.0.3

data/lib/lapillus/containers.rb

@@ -33,6 +33,7 @@ module REXML
   end
 end
 
+require 'lapillus/html_visitor'
 module Lapillus
   class Webpage < Container
     
@@ -40,15 +41,15 @@ module Lapillus
       super("")
     end
     
-    def render(html=default_htmlfile)
-      # @html is al File
-      #    html = @html if !@html.nil?
-      doc = REXML::Document.new html
+ def render_2(template=default_htmlfile)
+      doc = REXML::Document.new template
       root_element = doc.root
-      new_root_element = render_container(root_element)
-      return doc.doctype.to_s + new_root_element.to_s.gsub('&apos;',"'").gsub('&quot;','"')
+      visitor = HtmlVisitor.new(self)
+      root_element.accept(visitor)
+      return doc.doctype.to_s + visitor.container_output.root.to_s.gsub('&apos;',"'").gsub('&quot;','"')
     end
-    
+    alias render render_2
+        
     def default_htmlfile
       htmlfile = "html/" + self.class.to_s + ".html"
       File.new( htmlfile ) 
@@ -61,7 +62,7 @@ module Lapillus
       block = parent.class.block(identifier)
       raise "listview without a block! #{self.path}" if block.nil?
       value.each_with_index { |item, index| 
-        new_component = ListItem.new(index, item) 
+        new_component = ListItem.new("item#{index}".intern, :model => item) 
         new_component.parent = self #NOTE: I could do this in the constructor!
         new_component.instance_exec(item, &block)
         @components << new_component
@@ -79,23 +80,17 @@ module Lapillus
     def size #NOTE: move to container?
       return components.size
     end
-    #TODO: remove duplication
+    #NOTE: in theory a user could also give a path as a String instead of an index
     def [](index)
       index = index.to_i if index.kind_of?(String)
       return components[index]
     end
-    def component(index)
-      index = index.to_i if index.kind_of?(String)
-      return components[index]
-    end
     
-    #TODO: result is a duplicate with super class method!
-    def render_container(listview_element)
-      result = REXML::Element.new(listview_element)
+    def render_children(visitor, listview_element)
       components.each {|container|
-        container.render_children(listview_element,result)
+        visitor.current_container = container
+        container.render_children(visitor, listview_element)
       }
-      return result
     end
   end
   
@@ -111,15 +106,12 @@ module Lapillus
         raise "Unknown key: #{key}" if key!=:model and key!=:property  
       }
       raise "no block supplied!" if !block_given?
-      internal_add_component(id) { ListView.new(id, options[:model], options[:property]) }
+      internal_add_component(id) { ListView.new(id, options) }
       internal_add_block(id, block)
     end
   end
   
   class Form < Container
-    def initialize(id, value=nil)
-      super(id, value)
-    end
     def on_submit_handler=function
       @function=function
     end
@@ -136,7 +128,7 @@ module Lapillus
     end
     def post(values) 
       components.each {|component| component.post(values)}
-      if values.keys.find {|key| key.include?(identifier)}
+      if values.keys.find {|key| key.include?(identifier.to_s)}
         on_submit(values['submit'].nil? ? nil : values['submit'].string)
       end
     end 
@@ -146,7 +138,7 @@ module Lapillus
   class BookmarkablePageLink < Container
     attr_reader :page_parameters, :page_url
     def initialize(id, page_url, page_parameters)
-      super(id, nil)
+      super(id)
       @page_url = page_url
       @page_parameters = page_parameters
     end
@@ -168,18 +160,16 @@ module Lapillus
   end
   
   class Fragment < Container
-    def initialize(id, fragment_id, model=nil)
-      super(id, model)
+    def initialize(id, fragment_id, options={})
+      super(id, options)
       @fragment_id = fragment_id
     end
     
-    def render_container(container_element)
-      root_node=container_element.root
+    def render_children(visitor, template_element)
+      root_node = template_element.root
       fragment = REXML::XPath.first( root_node, "//*[@lapillus:id=\"#{@fragment_id}\"]" )
       raise "Fragment with identifier "+@fragment_id+" not found!" if fragment == nil 
-      new_element = REXML::Element.new(container_element)   
-      render_children(fragment, new_element)
-      return new_element
+      super(visitor, fragment)
     end
   end
   
@@ -200,35 +190,28 @@ module Lapillus
   
   #TODO: whats in a name
   class RemotePanel < Container
-    def render_container(container_element)
-      #NOTE: duplicated in Webpage class above
+    def render_children(visitor, template_element)
       doc = REXML::Document.new default_htmlfile
       root_node = doc.root
       fragment = REXML::XPath.first( root_node, "//body")
       raise "Body element not found!" if fragment == nil
-      new_element = REXML::Element.new(container_element)   
-      render_children(fragment, new_element)
-      render_to_element(new_element)
-      render_behaviours(new_element)
-      return new_element
+      super(visitor, fragment)
     end
-    
-    #NOTE: duplicate between render and render_container
-    def render(html=default_htmlfile)
-      # @html is al File
-      #    html = @html if !@html.nil?
-      doc = REXML::Document.new html
+
+   #duplicate with webpage!
+   def render_2(template=default_htmlfile)
+      doc = REXML::Document.new template
       root_element = doc.root
-      new_element = REXML::Element.new(root_element)   
-      render_children(root_element, new_element)
-      return doc.doctype.to_s + new_element.to_s
+      visitor = HtmlVisitor.new(self)
+      root_element.accept(visitor)
+      return doc.doctype.to_s + visitor.container_output.root.to_s.gsub('&apos;',"'").gsub('&quot;','"')
     end
-    
+    alias render render_2
+        
     #duplicate with methods in webpage!
     def default_htmlfile
       htmlfile = "html/" + self.class.to_s + ".html"
       File.new( htmlfile ) 
     end   
-    
   end
 end

data/lib/lapillus/dispatcher.rb

@@ -11,6 +11,8 @@ class Dispatcher
   def Dispatcher.dispatch(cgi, application)
     #    @@guard.synchronize do
     request_method = cgi.env_table['REQUEST_METHOD']
+#    puts "Dispatcher.dispatch(#{cgi},#{application}): request_method=#{request_method}"
+#    puts "cgi=#{cgi.to_yaml}"
     case request_method
     when "GET"
       Dispatcher.get(cgi, application)
@@ -29,7 +31,7 @@ class Dispatcher
     #    log = WEBrick::Log.new
     #    log.info("URI path= #{cgi.env_table['PATH_INFO']}")
     
-#    puts;puts cgi.env_table.each {|k,v| puts k.to_s+":"+v.to_s};puts    
+    #puts;puts cgi.env_table.each {|k,v| puts k.to_s+":"+v.to_s};puts    
     
     session = Dispatcher.get_session(cgi)
     
@@ -59,27 +61,28 @@ class Dispatcher
       #NOTICE: non existing cgi variables are return as empty string
       if cgi.has_key?'menuitem'
         listener.on_menu(cgi['menuitem'])
-        store_page_in_session(page,path_info,session)
-        path_to_redirect_to = cgi.env_table['REQUEST_URI']
-        path_to_redirect_to = path_to_redirect_to.split("?")[0]
-        puts "!!"+path_to_redirect_to
-        cgi.out({"status" => "302", "Location" => path_to_redirect_to}) do
-  ""
-        end
-        #        cgi.header("Location" => path_to_redirect_to)
-        #        cgi.out(HTTPHEADER) { page.render }
+        render_page_and_store_in_session(request_cycle, page, session, cgi, path_info)
         return
-        
       else
         if path_to_component!=""
           component = page[path_to_component]
           listener.on_drop(component)
+        elsif cgi.has_key? 'event'
+          parameters=Hash.new
+          unnecessary_keys=['listener','event']
+          cgi.keys.each{|key|
+            parameters[key]=cgi[key] unless unnecessary_keys.include? key
+          }
+          listener.send(cgi['event'], parameters)        
+        elsif cgi.has_key? 'periodic_update'
+          #puts "[#{Time.new}] has it changed yet?"
         else
           listener.on_click
         end
         store_page_in_session(page,path_info,session)
         
         cgi.out(HTTPHEADER) { listener.render_component }
+        #puts "Dispatcher.get: listener.render_component=#{listener.render_component}"
         return
       end
     end
@@ -92,14 +95,6 @@ class Dispatcher
       page_identifier = application.bookmarkable_pages[pagepath].to_s
     end
     
-#    attribute = "pagemap_#{page_identifier}"
-#    page = session[attribute][1] if !session[attribute].nil?
-    page = session[path_info]
-    if !page.nil? #&& path_info == session[attribute][0]
-        render_page_and_store_in_session(request_cycle, page, session, cgi, path_info)
-        return
-    end
-    
     pathparts=path_info.split('/')
 #    puts "pathparts.length #{pathparts.length}"
 #    puts pathparts.join("::")
@@ -116,11 +111,12 @@ class Dispatcher
     render_page_and_store_in_session(request_cycle, page, session, cgi, path_info)
   end
   
+  #TODO: add test!
   def Dispatcher.post(cgi, application)
     session = Dispatcher.get_session(cgi)
     
     request_cycle = RequestCycle.new(session)
-    RequestCycle.set=request_cycle
+    RequestCycle.set(request_cycle)
 #    puts "cgi_page=#{cgi['page'].string}"
     page = restore_page_from_session(cgi['page'].string, cgi.env_table['PATH_INFO'], session)
     
@@ -155,6 +151,7 @@ class Dispatcher
 #    page_info = [path_info, page]  #value
 #    puts "Storing: "+pagename
 #    puts "STORING path_info: "+path_info
+#    puts page.to_yaml
     session[path_info] = page
     # NOTE: We need to close the session before we can start streaming the output
     session.close
@@ -162,18 +159,32 @@ class Dispatcher
   
     #TODO: restrict the number of pages remembered
   def Dispatcher.restore_page_from_session(page_identifier, path_info, session)
-    #puts "Restoring: "+page_identifier
+#    puts "Restoring: "+page_identifier
 #    attribute = "pagemap_#{page_identifier}"
-#        puts "RESTORING path_info: "+path_info
 #    page_info = session[attribute]
+ #   puts "RESTORING path_info: "+path_info
 #    page = page_info[1]
-#    puts "session=#{session.to_yaml}"
-#    puts "path_info=[#{path_info}]"
+ #   puts "session=<#{session.to_yaml}>"
+  #  puts "path_info=[#{path_info}]"
     page = session[path_info]
     raise "page expired!" if (page==nil)          
     return page  #if path_info == page_info[0]
 #    return nil
   end    
+  def dump_cookies(cgi)
+      puts cgi.cookies.each_value { |cookie| 
+      puts "name    #{cookie.name}"
+		  puts "values  #{ cookie.value }"
+		  puts "valuesize  #{ cookie.value.size }"
+			#  if cookie.value.size == 2
+			#    cookie.value = cookie.values[1]
+			#  end
+		  puts "path    #{ cookie.path }"
+		  puts "domain  #{ cookie.domain }"
+		  puts "expires #{ cookie.expires }"
+		  puts "secure  #{ cookie.secure }"
+	 }
+  end
 end
 
 

data/lib/lapillus/form_components.rb

@@ -9,6 +9,7 @@ module Lapillus
     def render_to_element(element)
       element.attributes['name'] = path
     end 
+    
     def value
       return super if has_model?
       return parent.model.send(identifier) if parent.has_model?
@@ -22,14 +23,17 @@ module Lapillus
         model.send(property.to_s+"=", new_value)
       end
     end
-    
   end
   
   class FormTextComponent < FormComponent
+    def initialize(id, options={})
+      options[:model] = '' if options[:model].nil? 
+      super(id, options)
+    end
+    
     def render_to_element(element)
       super
       text = value
-      text = '' if text.nil?  # TODO: should this be done here, or is this the responsibility of the model ?
       render_text(element, text)
     end
     
@@ -51,7 +55,7 @@ module Lapillus
     options.keys.each {|key|
       raise "Unknown key: #{key}" if key!=:model and key!=:property  
     }
-    internal_add_component(id) { TextField.new(id, options[:model]||"", options[:property]) }
+    internal_add_component(id) { TextField.new(id, options)}
   end
     
   class TextArea < FormTextComponent
@@ -64,7 +68,7 @@ module Lapillus
     options.keys.each {|key|
       raise "Unknown key: #{key}" if key!=:model and key!=:property  
     }
-    internal_add_component(id) { TextArea.new(id, options[:model]||"", options[:property]) }
+    internal_add_component(id) { TextArea.new(id, options) }
   end
     
   class FileUploadField < FormComponent
@@ -74,7 +78,7 @@ module Lapillus
     options.keys.each {|key|
       raise "Unknown key: #{key}" if key!=:model and key!=:property  
     }
-    internal_add_component(id) { FileUploadField.new(id, options[:model]||"", options[:property]) }
+    internal_add_component(id) { FileUploadField.new(id, options) }
   end
 
   class PasswordTextField < TextField
@@ -82,7 +86,7 @@ module Lapillus
     end
   end
   
-  def Container.password_textfield(id, model="", options={})
-    internal_add_component(id) { PasswordTextField.new(id, model, options[:property]) }
+  def Container.password_textfield(id, options={})
+    internal_add_component(id) { PasswordTextField.new(id, options) }
   end
 end

data/lib/lapillus/html_visitor.rb

@@ -0,0 +1,68 @@
+module Lapillus
+  class NullComponent < RenderableComponent
+    #TODO: move to standard container class? 
+    def render_children(visitor, element)
+          element.children.each do |child|
+        #        puts child.class
+        child.accept(visitor)
+      end
+    end
+  end
+  
+  class HtmlVisitor
+    #INFO: there are 4 elements to remember
+    #INFO: 1 current template html element
+    #INFO: 2 current output html element
+    #INFO: 3 current component to render
+    #INFO: 4 current container to get components from
+    attr_accessor :container_output #TODO: rename!
+    attr_accessor :current_container
+    
+    def initialize(webpage)
+      @container_output = REXML::Document.new
+      @current_container = webpage
+    end
+    
+    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]
+      else
+        child_component = NullComponent.new          
+      end
+
+      child_component.render_container(self, element)
+    end
+    def visit_text(text)
+      container_output.add_text(text.value)
+    end
+    def visit_comment(comment)
+      new_comment = REXML::Comment.new(comment)
+      container_output.add(new_comment)  
+    end
+  end
+end  
+  
+  
+  
+  
+  require 'rexml/document'
+  module REXML
+    class Element
+      def accept(visitor)
+        visitor.visit_element(self)
+      end
+    end
+    class Text
+      def accept(visitor)
+        visitor.visit_text(self)
+      end
+    end
+    class Comment
+      def accept(visitor)
+        visitor.visit_comment(self)
+      end
+    end
+  end

data/lib/lapillus/pager.rb

@@ -12,12 +12,12 @@ module Lapillus
       @pages = pages
       @current = 1
       @block = block
-      @navigation = Lapillus::Container.new("navigation")
-      @first_button = FirstButton.new("first", self)
-      @previous_button = PreviousButton.new("previous", self)
-      @next_button = NextButton.new("next", self)
-      @last_button = LastButton.new("last", self)
-      @position = Label.new("position")
+      @navigation = Lapillus::Container.new(:navigation)
+      @first_button = FirstButton.new(:first, self)
+      @previous_button = PreviousButton.new(:previous, self)
+      @next_button = NextButton.new(:next, self)
+      @last_button = LastButton.new(:last, self)
+      @position = Label.new(:position)
       navigation.add(first_button)
       navigation.add(previous_button)
       navigation.add(next_button)
@@ -30,7 +30,7 @@ module Lapillus
     #components are recreated and stuff; split in constructor/on_render
     #also parent and path do not work
     def build_hierarchy
-      @page_container = ListItem.new("page") 
+      @page_container = ListItem.new(:page) 
       @page_container.parent = self #NOTE: I could do this in the constructor!  
       if !@pages.empty?
         @page_container.instance_exec(page_content, &@block)
@@ -52,7 +52,7 @@ module Lapillus
     #TODO: rewrite using closures
     class PagerButton < Lapillus::AjaxLink
       def initialize(id, pager)
-        super(id, pager) #pager is the container to be refreshed!
+        super(id, :model => pager) #pager is the container to be refreshed!
         @pager = pager
       end
     end

data/test/tc_base.rb

@@ -25,7 +25,7 @@ class TC_Base < Test::Unit::TestCase
   #TODO assert exception raised when model is not set!
   def test_component_model_without_symbol
     model = Object.new
-    component = Component.new(:identifier, model)
+    component = Component.new(:identifier, :model => model)
     assert_equal(model, component.model)
     assert_equal(model, component.value)
   end
@@ -42,7 +42,7 @@ class TC_Base < Test::Unit::TestCase
   #Note: value test without property is already done in test_component_model_without_symbol
   def test_component_value_with_property 
     person = Person.new("Jantje")
-    component = Component.new(:id, person, :name)
+    component = Component.new(:id, :model => person, :property => :name)
     assert_equal(person, component.model)
     assert_equal(person.name, component.value)
   end

data/test/tc_behaviours.rb

@@ -2,25 +2,27 @@ require 'test/unit'
 require 'rexml/document'
 require 'lapillus'
 
+include Lapillus
+
 class TC_Behaviours < Test::Unit::TestCase
   def setup
     super()
     @html = "<html><span lapillus:id='component'/></html>"
-    @component = Label.new("component", "")
+    @component = Label.new(:component, :model => "")
     @webpage = Webpage.new
   end
   
   attr_reader :html, :component, :webpage
   
   def test_attribute_modifier
-    component.add_behaviour(AttributeModifier.new("title", "hover"))
+    component.add_behaviour(AttributeModifier.new(:title, :model => "hover"))
     webpage.add(component)
     output = webpage.render(html)
     assert_equal("<html><span title=\"hover\" lapillus:id=\"component\"></span></html>", output)
   end
   
   def test_fade_in
-    component.add_behaviour(FadeIn.new("onmouseover", "id_of_component_to_fade_in"))
+    component.add_behaviour(FadeIn.new(:onmouseover, :model => "id_of_component_to_fade_in"))
     webpage.add(component)
     output = webpage.render(html)
     assert_equal("<html><span onmouseover=\"new Effect.Appear('id_of_component_to_fade_in');\" lapillus:id=\"component\"></span></html>", output)
@@ -44,7 +46,7 @@ class TC_Behaviours < Test::Unit::TestCase
     html="<html><div id='parent'><span lapillus:id='component'/></div></html>"
     webpage.add(component)
     output = webpage.render(html)
-    path=component.path
+#    path=component.path
     expected = "<html><div id=\"parent\"><span id=\"component\" lapillus:id=\"component\"><script language=\"javascript\" type=\"text/javascript\">\n// <![CDATA[\n Droppables.add('component', {\n onDrop: function(element) { \n new Ajax.Updater('component', '', { \n method:'get', parameters: { \n listener:'component',\n component:element.id\n }\n }); return false;\n }\n });\n// ]]>\n</script></span></div></html>"
     assert_equal(expected, output)
   end
@@ -73,7 +75,7 @@ class TC_Behaviours < Test::Unit::TestCase
   end
   
   def test_ajax_link_rendering
-    link = AjaxLink.new("ajaxlink") 
+    link = AjaxLink.new(:ajaxlink) 
     webpage.add(link)
     output = webpage.render("<html><a lapillus:id='ajaxlink'>de link text</a></html>")
     javascript = "new Ajax.Request('', { method: 'get', parameters: { listener:'#{link.path}' }}); return false;"
@@ -96,11 +98,31 @@ class TC_Behaviours < Test::Unit::TestCase
     def webpage.default_htmlfile
       return "<html><span lapillus:id='panel'></span><lapillus:fragment lapillus:id='fragment'>expected result</lapillus:fragment></html>"
     end
-    fragment = Fragment.new("panel", "fragment")
-    link = MyAjaxLink.new("link", fragment)
+    fragment = Fragment.new(:panel, "fragment")
+    link = MyAjaxLink.new(:link, fragment)
     webpage.add(fragment)
     webpage.add(link)  
     assert_equal("expected result", link.on_click)
     
   end
+  
+  class AjaxFormPage < Webpage
+    def initialize()
+      super()
+      form = Form.new(:form)
+      form.add_behaviour(PostWithAjax.new(form))
+      add(form)
+    end
+  end
+  
+  def test_form_with_ajax_post
+    page = AjaxFormPage.new  
+    result = page.render("<html><form lapillus:id='form'></form></html>")
+    expected = <<END
+<html><form enctype=\"multipart/form-data\" onsubmit=\"new Ajax.Updater('form', '', { evalScripts: true, method: 'post', parameters:Form.serialize(this)}); return false;\" method=\"post\" id=\"form\" lapillus:id=\"form\"><input name=\"page\" type=\"hidden\" value=\"TC_Behaviours::AjaxFormPage\"/></form></html>
+END
+    assert_equal(expected.strip, result)
+
+  end
+  
 end

data/test/tc_bookmarkablepagelink.rb

@@ -15,19 +15,19 @@ class TC_BookmarkablePageLink < Test::Unit::TestCase
   
   def test_bookmarkablepagelink
     webpage = Webpage.new
-    webpage.add(BookmarkablePageLink.new("myLink", "", Hash[:key => 'value']))
+    webpage.add(BookmarkablePageLink.new(:myLink, "", Hash[:key => 'value']))
     html = html_template('<a href="#" lapillus:id="myLink">click here</a>')
     result = webpage.render(html)
     assert_equal(expected_html('<a href="/key/value" lapillus:id="myLink">click here</a>'), result)
   end
 
   class MyLink < BookmarkablePageLink
-    label 'text', :model => "this text should be visible"
+    label :text, :model => "this text should be visible"
   end
   
   def test_bookmarkablepagelink_with_label
     webpage = Webpage.new 
-    webpage.add(MyLink.new("myLink", "", Hash[:key => 'value']))
+    webpage.add(MyLink.new(:myLink, "", Hash[:key => 'value']))
     html = html_template('<a href="#" lapillus:id="myLink"><span lapillus:id="text">link_text</span></a>')
     expected = expected_html('<a href="/key/value" lapillus:id="myLink"><span lapillus:id="text">this text should be visible</span></a>')
     result = webpage.render(html)
@@ -36,7 +36,7 @@ class TC_BookmarkablePageLink < Test::Unit::TestCase
   
   def test_bookmarkablepagelink_with_baseurl
     webpage = Webpage.new 
-    webpage.add(BookmarkablePageLink.new("myLink", "/base/page", Hash[:key => 'value']))
+    webpage.add(BookmarkablePageLink.new(:myLink, "/base/page", Hash[:key => 'value']))
     html = html_template('<a href="#" lapillus:id="myLink">text</a>')
     expected = expected_html('<a href="/base/page/key/value" lapillus:id="myLink">text</a>')
     result = webpage.render(html)
@@ -47,7 +47,7 @@ class TC_BookmarkablePageLink < Test::Unit::TestCase
 
   def test_bookmarkablepagelink_with_multiple_page_parameters
     webpage = Webpage.new 
-    webpage.add(BookmarkablePageLink.new("myLink", "", Hash["key" => 'value', "sleutel" => 'waarde']))
+    webpage.add(BookmarkablePageLink.new(:myLink, "", Hash["key" => 'value', "sleutel" => 'waarde']))
     html = html_template('<a href="#" lapillus:id="myLink">click here</a>')
     result = webpage.render(html)
     expected = expected_html('<a href="/key/value/sleutel/waarde" lapillus:id="myLink">click here</a>')