wee 0.5.0 → 0.6.0

data/lib/wee/renderer/html/brushes.rb

@@ -47,45 +47,36 @@ class Brush::GenericEncodedTextBrush < Brush
   end
 end
 
-module Brush::ToCallback
-  private
+class Brush::GenericTagBrush < Brush
 
-  def to_callback(symbol, args, block)
-    raise ArgumentError if symbol and block
-    if symbol
-      Wee::LiteralMethodCallback.new(@canvas.current_component, symbol, *args)
-    else
-      raise ArgumentError if not args.empty?
-      block
+  class << self
+    private
+
+    def bool_attr(*attrs)
+      attrs.each { |a|
+        class_eval " 
+          def #{ a }(bool=true)
+            if bool
+              @attributes['#{ a }'] = nil
+            else
+              @attributes.delete('#{ a }')
+            end
+            self
+          end
+        "
+      }
     end
-  end
-end
-
-class Brush::GenericTagBrush < Brush
 
-  def self.bool_attr(*attrs)
-    attrs.each { |a|
-      class_eval " 
-        def #{ a }(bool=true)
-          if bool
-            @attributes['#{ a }'] = nil
-          else
-            @attributes.delete('#{ a }')
+    def html_attr(*attrs)
+      attrs.each { |a|
+        class_eval " 
+          def #{ a }(value)
+            html_attr('#{ a }', value)
           end
-          self
-        end
-      "
-    }
-  end
+        "
+      }
+    end
 
-  def self.html_attr(*attrs)
-    attrs.each { |a|
-      class_eval " 
-        def #{ a }(value)
-          html_attr('#{ a }', value)
-        end
-      "
-    }
   end
 
   private
@@ -99,8 +90,45 @@ class Brush::GenericTagBrush < Brush
     self
   end
 
+  # Converts the arguments into a callable object.
+  #
+  def to_callback(symbol, args, block)
+    raise ArgumentError if symbol and block
+    if symbol.nil?
+      raise ArgumentError if not args.empty?
+      block
+    else
+      if symbol.is_a?(Symbol) or symbol.is_a?(String)
+        Wee::LiteralMethodCallback.new(@canvas.current_component, symbol, *args)
+      else
+        raise ArgumentError if not args.empty?
+        symbol
+      end
+    end
+  end
+
   public
 
+  def __input_callback(symbol=nil, *args, &block)
+    name(@canvas.register_callback(:input, to_callback(symbol, args, block)))
+  end
+
+  def __action_callback(symbol=nil, *args, &block)
+    name(@canvas.register_callback(:action, to_callback(symbol, args, block)))
+  end
+
+  # The callback id is listed in the URL (not as a form-data field)
+
+  def __actionurl_callback(symbol=nil, *args, &block)
+    __set_url(@canvas.url_for_callback(to_callback(symbol, args, block)))
+  end
+
+  # The callback id is listed in the URL (not as a form-data field)
+
+  def __actionurl_named_callback(name, symbol=nil, *args, &block)
+    __set_url(@canvas.url_for_named_callback(name, to_callback(symbol, args, block)))
+  end
+
   def method_missing(id, attr)
     html_attr(id.to_s, attr)
   end
@@ -117,8 +145,6 @@ class Brush::GenericTagBrush < Brush
     html_attr("class", c)
   end
 
-  include Brush::ToCallback
-
   def onclick_callback(symbol=nil, *args, &block)
     raise ArgumentError if symbol and block
     url = @canvas.url_for_callback(to_callback(symbol, args, block))
@@ -128,8 +154,7 @@ class Brush::GenericTagBrush < Brush
   # This method construct the css-class attribute by looking up the property
   # from the current component.
 
-  def css_class_for(c)
-    prop = 'css.' + c
+  def css_class_for(prop)
     val = @canvas.current_component.lookup_property(prop)
     raise "no property found for: <#{ prop }>" if val.nil?
     css_class(val)
@@ -167,8 +192,7 @@ class Brush::ImageTag < Brush::GenericSingleTagBrush
   # This method construct the src attribute by looking up the property from the
   # current component.
 
-  def src_for(s)
-    prop = "img." + s
+  def src_for(prop)
     val = @canvas.current_component.lookup_property(prop)
     raise "no property found for: <#{ prop }>" if val.nil?
     src(val)
@@ -248,7 +272,6 @@ class Brush::TableRowTag < Brush::GenericTagBrush
   end
 end
 
-
 class Brush::InputTag < Brush::GenericSingleTagBrush
   def initialize
     super('input')
@@ -262,48 +285,13 @@ class Brush::InputTag < Brush::GenericSingleTagBrush
   end
 end
 
-
-module Brush::InputCallbackMixin
-  public
-
-  def callback(symbol=nil, *args, &block)
-    raise ArgumentError if symbol and block
-    name(@canvas.register_callback(:input, to_callback(symbol, args, block)))
-  end
-
-  include Brush::ToCallback 
-end
-
-module Brush::ActionCallbackMixin
-  public
-
-  def callback(symbol=nil, *args, &block)
-    raise ArgumentError if symbol and block
-    name(@canvas.register_callback(:action, to_callback(symbol, args, block)))
-  end
-
-  include Brush::ToCallback
-end
-
-# The callback id is listed in the URL (not as a form-data field)
-module Brush::ActionURLCallbackMixin
-  public
-
-  def callback(symbol=nil, *args, &block)
-    raise ArgumentError if symbol and block
-    __set_url(@canvas.url_for_callback(to_callback(symbol, args, block)))
-  end
-
-  include Brush::ToCallback
-end
-
 class Brush::TextAreaTag < Brush::GenericTagBrush
-  include Brush::InputCallbackMixin
-
   def initialize
     super('textarea')
   end
 
+  alias callback __input_callback
+
   html_attr :name, :rows, :cols, :tabindex, :accesskey, :onfocus, :onblur, :onselect, :onchange
   bool_attr :disabled, :readonly
 
@@ -321,8 +309,6 @@ class Brush::SelectOptionTag < Brush::GenericTagBrush
 end
 
 class Brush::SelectListTag < Brush::GenericTagBrush
-  include Brush::InputCallbackMixin
-
   def initialize(items)
     super('select')
     @items = items
@@ -339,32 +325,34 @@ class Brush::SelectListTag < Brush::GenericTagBrush
 
   bool_attr :multiple
 
-  alias __old_callback callback
-  private :__old_callback
-  def callback(symbol=nil, &block)
-    raise ArgumentError if symbol and block
-    block = Wee::LiteralMethodCallback.new(@canvas.current_component, symbol) unless block
-
-    @callback = block
+  def callback(symbol=nil, *args, &block)
+    @callback = to_callback(symbol, args, block)
     self
   end
 
+  class SelectListCallback < Struct.new(:callback, :items, :is_multiple)
+    def call(input)
+      choosen = input.list.map {|idx| 
+        idx = Integer(idx)
+        raise "invalid index in select list" if idx < 0 or idx > items.size
+        items[idx]
+      }
+      if choosen.size > 1 and not is_multiple
+        raise "choosen more than one element from a non-multiple select list" 
+      end
+      callback.call(choosen)
+    end
+  end
+
   def with
     @labels ||= @items.collect { |i| i.to_s }
     @selected ||= Array.new
 
     if @callback
-      __old_callback {|input|
-        choosen = input.list.map {|idx| 
-          idx = Integer(idx)
-          raise "invalid index in select list" if idx < 0 or idx > @items.size
-          @items[idx]
-        }
-        if choosen.size > 1 and not @attributes.has_key?('multiple')
-          raise "choosen more than one element from a non-multiple select list" 
-        end
-        @callback.call(choosen)
-      }
+      # A callback was specified. We have to wrap it inside a
+      # SelectListCallback object as we want to perform some 
+      # additional actions.
+      __input_callback(SelectListCallback.new(@callback, @items, @attributes.has_key?('multiple')))
     end
 
     super do
@@ -376,32 +364,30 @@ class Brush::SelectListTag < Brush::GenericTagBrush
 end
 
 class Brush::TextInputTag < Brush::InputTag
-  include Brush::InputCallbackMixin
-
   def initialize
     super
     type('text')
   end
+
+  alias callback __input_callback
 end
 
 class Brush::FileUploadTag < Brush::InputTag
-  include Brush::InputCallbackMixin
-
   def initialize
     super
     type('file')
   end
-end
-
 
+  alias callback __input_callback
+end
 
 class Brush::SubmitButtonTag < Brush::InputTag
-  include Brush::ActionCallbackMixin
-
   def initialize
     super
     type('submit')
   end
+
+  alias callback __action_callback
 end
 
 # NOTE: The form-fields returned by a image-button-tag is browser-specific.
@@ -412,19 +398,18 @@ end
 # generate a "name" fields in the request, to make this image-button work. 
 
 class Brush::ImageButtonTag < Brush::InputTag
-  include Brush::ActionCallbackMixin
-
   def initialize
     super
     type('image')
   end
 
+  alias callback __action_callback
+
   def value(v)
     raise "specified value will not be used in the request"
   end
 end
 
-
 class Brush::TableDataTag < Brush::GenericTagBrush
   def initialize
     super('td')
@@ -441,10 +426,7 @@ class Brush::TableHeaderTag < Brush::GenericTagBrush
   end
 end
 
-
 class Brush::FormTag < Brush::GenericTagBrush
-  include Brush::ActionURLCallbackMixin
-
   def initialize
     super('form')
     @attributes['method'] = 'POST'
@@ -453,11 +435,14 @@ class Brush::FormTag < Brush::GenericTagBrush
   html_attr :action, :enctype
 
   alias __set_url action
+  alias callback __actionurl_callback
+  alias named_callback __actionurl_named_callback
 
   def with(*args, &block)
     # If no action was specified, use a dummy one.
     unless @attributes.has_key?('action')
       req = @canvas.rendering_context.request
+      # TODO?
       @attributes['action'] = req.build_url(req.request_handler_id, req.page_id) 
     end
     super
@@ -465,8 +450,6 @@ class Brush::FormTag < Brush::GenericTagBrush
 end
 
 class Brush::AnchorTag < Brush::GenericTagBrush
-  include Brush::ActionURLCallbackMixin
-
   def initialize
     super('a')
   end
@@ -474,10 +457,12 @@ class Brush::AnchorTag < Brush::GenericTagBrush
   html_attr :href, :title
   alias url href
   alias tooltip title
+
   alias __set_url url
+  alias callback __actionurl_callback
+  alias named_callback __actionurl_named_callback
 end
 
-
 class Brush::Page < Brush
   def title(t)
     @title = t

data/lib/wee/renderer/html/canvas.rb

@@ -63,11 +63,20 @@ class HtmlCanvas < Canvas
   end
 
   generic_tag :html, :head, :body, :title, :style, :h1, :h2, :h3, :h4, :h5, :div
-  generic_single_tag :link
+  generic_tag :div, :span, :ul, :ol, :li
+  generic_single_tag :link, :hr
 
   def url_for_callback(callback)
+    url_for_callback_id(register_callback(:action, callback))
+  end
+
+  def url_for_named_callback(name, callback)
+    url_for_callback_id(register_named_callback(name, :action, callback))
+  end
+
+  def url_for_callback_id(callback_id)
     req = self.rendering_context.request
-    url = req.build_url(req.request_handler_id, req.page_id, register_callback(:action, callback))
+    url = req.build_url(req.request_handler_id, req.page_id, callback_id)
     return url
   end
 
@@ -75,6 +84,10 @@ class HtmlCanvas < Canvas
     self.rendering_context.callbacks.register_for(self.current_component, type, callback)
   end
 
+  def register_named_callback(name, type, callback)
+    self.rendering_context.callbacks.register_named_for(self.current_component, type, callback, name)
+  end
+
   def table(*args, &block)
     handle(Brush::TableTag.new, *args, &block)
   end
@@ -178,6 +191,23 @@ class HtmlCanvas < Canvas
     nil
   end
 
+  require 'erb'
+
+  def template(filename)
+    raise "Template file #{ filename } not found!" unless File.exists?(filename)
+    self.close
+    compiler = ERB::Compiler.new(nil)
+    compiler.put_cmd = 'r << '
+    src = compiler.compile(File.read(filename))
+    if $DEBUG
+      puts "-------------------------"
+      puts src
+      puts "-------------------------"
+    end
+    @current_component.instance_eval(src, '(erb)', 1) 
+    return nil
+  end
+
   private
 
   def handle(brush, *args, &block)

data/lib/wee/request.rb

@@ -6,11 +6,40 @@
 
 class Wee::Request
 
-  attr_reader :request_handler_id, :page_id, :fields
+  DELIM = '=/'
 
-  def initialize(app_path, path, headers, fields)
-    @app_path, @path, @headers = app_path, path, headers
+  attr_accessor :request_handler_id
+  attr_reader :page_id, :fields, :cookies
 
+  def initialize(app_path, path, headers, fields, cookies)
+    @app_path, @path, @headers, @cookies = app_path, path, headers, cookies
+    parse_fields(fields)
+    parse_path
+  end
+
+  def application_path
+    @app_path
+  end
+
+  def build_url(request_handler_id=nil, page_id=nil, callback_id=nil)
+    raise ArgumentError if request_handler_id.nil? and not page_id.nil?
+
+    arr = [request_handler_id, page_id].compact
+
+    url = "" 
+    url << @app_path
+    unless arr.empty?
+      url << '/' if url[-1,1] != '/'  # /appXXX -> /app/XXX
+      url << (DELIM + arr.join('/'))
+    end
+    url << ('?' + callback_id) if callback_id
+
+    return url
+  end
+
+  private
+
+  def parse_fields(fields)
     fields ||= Hash.new
     @fields = Hash.new
 
@@ -29,29 +58,12 @@ class Wee::Request
         end
       end
     end
-    
-    full_app_path, req_path = @path.split('@', 2)
-    @request_handler_id = @page_id = nil
-    @request_handler_id, @page_id = req_path.split('/', 2) if req_path
   end
 
-  def application_path
-    @app_path
+  def parse_path
+    full_app_path, req_path = @path.split(DELIM, 2)
+    @request_handler_id = @page_id = nil
+    @request_handler_id, @page_id = req_path.split('/', 2) if req_path
   end
 
-  def build_url(request_handler_id=nil, page_id=nil, callback_id=nil)
-    raise ArgumentError if request_handler_id.nil? and not page_id.nil?
-
-    arr = [request_handler_id, page_id].compact
-
-    url = "" 
-    url << @app_path
-    unless arr.empty?
-      url << '/' if url[-1,1] != '/'  # /app@ -> /app/@
-      url << ('@' + arr.join('/'))
-    end
-    url << ('?' + callback_id) if callback_id
-
-    return url
-  end
 end