glimmer 0.1.0.0 → 0.1.2

data/lib/parent.rb

@@ -0,0 +1,5 @@
+module Parent
+  def process_block(block)
+    raise "must be implemented by a class"
+  end
+end

data/{src → lib}/shine.rb

@@ -1,24 +1,21 @@
-# Copyright (C) 2007-2008 Annas Al Maleh
-# Licensed under the LGPL. See /COPYING.LGPL for more details.
-
-require File.dirname(__FILE__) + "/glimmer"
-
-class Array
-  include Glimmer
-  
-  alias original_compare <=>
-  
-  def <=>(other)
-    if (self[0].class.name == "RWidget")
-      add_contents(self[0]) {
-        if (other.size == 2)
-          eval("#{self[1]} bind (other[0], other[1])")
-        elsif (other.size == 3)
-          eval("#{self[1]} bind (other[0], other[1], other[2])")
-        end
-      }
-    else
-      original_compare(other)
-    end
-  end
-end
+require File.dirname(__FILE__) + "/glimmer"
+
+class Array
+  include Glimmer
+  
+  alias original_compare <=>
+  
+  def <=>(other)
+    if (self[0].class.name == "RWidget")
+      add_contents(self[0]) {
+        if (other.size == 2)
+          eval("#{self[1]} bind (other[0], other[1])")
+        elsif (other.size == 3)
+          eval("#{self[1]} bind (other[0], other[1], other[2])")
+        end
+      }
+    else
+      original_compare(other)
+    end
+  end
+end

data/{src → lib}/xml_command_handlers.rb

@@ -1,18 +1,15 @@
-# Copyright (C) 2007-2008 Annas Al Maleh
-# Licensed under the LGPL. See /COPYING.LGPL for more details.
-
-require File.dirname(__FILE__) + "/command_handler_chain_factory"
-require File.dirname(__FILE__) + "/xml_command_handlers/xml_name_space_command_handler"
-require File.dirname(__FILE__) + "/xml_command_handlers/xml_text_command_handler"
-require File.dirname(__FILE__) + "/xml_command_handlers/xml_tag_command_handler"
-require File.dirname(__FILE__) + "/xml_command_handlers/html_command_handler"
-require File.dirname(__FILE__) + "/xml_command_handlers/xml_command_handler"
-
-# edit to add more command handlers and extend Glimmer
-CommandHandlerChainFactory.set_command_handlers(
-  XmlNameSpaceCommandHandler.new,
-  XmlTextCommandHandler.new,
-  XmlTagCommandHandler.new,
-  HtmlCommandHandler.new,
-  XmlCommandHandler.new
-)
+require File.dirname(__FILE__) + "/command_handler_chain_factory"
+require File.dirname(__FILE__) + "/xml_command_handlers/xml_name_space_command_handler"
+require File.dirname(__FILE__) + "/xml_command_handlers/xml_text_command_handler"
+require File.dirname(__FILE__) + "/xml_command_handlers/xml_tag_command_handler"
+require File.dirname(__FILE__) + "/xml_command_handlers/html_command_handler"
+require File.dirname(__FILE__) + "/xml_command_handlers/xml_command_handler"
+
+# edit to add more command handlers and extend Glimmer
+CommandHandlerChainFactory.def_dsl(:xml,
+  XmlNameSpaceCommandHandler.new,
+  XmlTextCommandHandler.new,
+  XmlTagCommandHandler.new,
+  HtmlCommandHandler.new,
+  XmlCommandHandler.new
+)

data/{src → lib}/xml_command_handlers/html_command_handler.rb

@@ -1,49 +1,45 @@
-# Copyright (C) 2007-2008 Annas Al Maleh
-# Licensed under the LGPL. See /COPYING.LGPL for more details.
-
-require "facets/dictionary"
-require File.dirname(__FILE__) + "/../command_handler"
-require File.dirname(__FILE__) + "/models/node"
-
-class HtmlCommandHandler
-  include CommandHandler
-  
-  def can_handle?(parent, command_symbol, *args, &block)
-    (parent == nil or parent.is_a?(Node)) and
-    (args.size == 0 or ((args.size == 1) and ((args[0].is_a?(Hash)) or (args[0].is_a?(Hash)))))
-  end
-  
-  def do_handle(parent, command_symbol, *args, &block)
-    attributes = Dictionary.new
-    attributes = args[0] if (args.size == 1) 
-    append_id_and_class_attributes(command_symbol.to_s, attributes)
-    tag_name = parse_tag_name(command_symbol.to_s)
-    Node.new(parent, tag_name, attributes, &block)
-  end
-  
-  def parse_tag_name(command)
-    match_data = command.match("_")
-    if (match_data.to_a.size > 0)
-      command.match("_").pre_match
-    else
-      command
-    end
-  end
-  
-  def append_id_and_class_attributes(command, attributes)
-    class_only_match = command.match("__.+").to_s
-    if class_only_match.length > 0
-      class_value = class_only_match[2, class_only_match.length] 
-    else
-      match_data = command.match("_[^_]+")
-      return unless match_data
-      match = match_data.to_s
-      id_value = match[1, match.length] if match.length > 0
-      attributes[:id] = id_value if id_value
-      match2 = match_data.post_match.match("_[^_]+").to_s if match_data.post_match
-      class_value = match2[1, match2.length] if match2.length > 0
-    end
-    attributes[:class] = class_value if class_value
-  end
-  
-end
+require File.dirname(__FILE__) + "/../command_handler"
+require File.dirname(__FILE__) + "/models/node"
+
+class HtmlCommandHandler
+  include CommandHandler
+  
+  def can_handle?(parent, command_symbol, *args, &block)
+    (parent == nil or parent.is_a?(Node)) and
+    (args.size == 0 or ((args.size == 1) and ((args[0].is_a?(Hash)) or (args[0].is_a?(Hash)))))
+  end
+  
+  def do_handle(parent, command_symbol, *args, &block)
+    attributes = Hash.new
+    attributes = args[0] if (args.size == 1) 
+    append_id_and_class_attributes(command_symbol.to_s, attributes)
+    tag_name = parse_tag_name(command_symbol.to_s)
+    Node.new(parent, tag_name, attributes, &block)
+  end
+  
+  def parse_tag_name(command)
+    match_data = command.match("_")
+    if (match_data.to_a.size > 0)
+      command.match("_").pre_match
+    else
+      command
+    end
+  end
+  
+  def append_id_and_class_attributes(command, attributes)
+    class_only_match = command.match("__.+").to_s
+    if class_only_match.length > 0
+      class_value = class_only_match[2, class_only_match.length] 
+    else
+      match_data = command.match("_[^_]+")
+      return unless match_data
+      match = match_data.to_s
+      id_value = match[1, match.length] if match.length > 0
+      attributes[:id] = id_value if id_value
+      match2 = match_data.post_match.match("_[^_]+").to_s if match_data.post_match
+      class_value = match2[1, match2.length] if match2.length > 0
+    end
+    attributes[:class] = class_value if class_value
+  end
+  
+end

data/{src → lib}/xml_command_handlers/models/depth_first_search_iterator.rb

@@ -1,20 +1,17 @@
-# Copyright (C) 2007-2008 Annas Al Maleh
-# Licensed under the LGPL. See /COPYING.LGPL for more details.
-
-class DepthFirstSearchIterator
-  def initialize(node, node_visitor)
-    @node = node
-    @node_visitor = node_visitor
-  end
-  
-  def iterate
-    process(@node)
-  end
-  
-  def process(node)
-    @node_visitor.process_before_children(node)
-    node.children.each { |child| process(child) } unless node.is_a?(String)
-    @node_visitor.process_after_children(node)
-  end
-  
-end
+class DepthFirstSearchIterator
+  def initialize(node, node_visitor)
+    @node = node
+    @node_visitor = node_visitor
+  end
+  
+  def iterate
+    process(@node)
+  end
+  
+  def process(node)
+    @node_visitor.process_before_children(node)
+    node.children.each { |child| process(child) } unless node.is_a?(String)
+    @node_visitor.process_after_children(node)
+  end
+  
+end

data/{src → lib}/xml_command_handlers/models/name_space_visitor.rb

@@ -1,21 +1,18 @@
-# Copyright (C) 2007-2008 Annas Al Maleh
-# Licensed under the LGPL. See /COPYING.LGPL for more details.
-
-require File.dirname(__FILE__) + "/node_visitor"
-
-class NameSpaceVisitor < NodeVisitor
-  
-  def initialize(name_space_name)
-    @name_space_name = name_space_name
-  end
-  
-  def process_before_children(node)
-    return if node.is_a?(String)
-    node.name_space = Node.new(nil, @name_space_name, nil) if node and !node.name_space
-  end
-  
-  def process_after_children(node)
-    #NOOP
-  end
-  
+require File.dirname(__FILE__) + "/node_visitor"
+
+class NameSpaceVisitor < NodeVisitor
+  
+  def initialize(name_space_name)
+    @name_space_name = name_space_name
+  end
+  
+  def process_before_children(node)
+    return if node.is_a?(String)
+    node.name_space = Node.new(nil, @name_space_name, nil) if node and !node.name_space
+  end
+  
+  def process_after_children(node)
+    #NOOP
+  end
+  
 end

data/{src → lib}/xml_command_handlers/models/node.rb

@@ -1,83 +1,80 @@
-# Copyright (C) 2007-2008 Annas Al Maleh
-# Licensed under the LGPL. See /COPYING.LGPL for more details.
-
-require File.dirname(__FILE__) + "/depth_first_search_iterator"
-require File.dirname(__FILE__) + "/xml_visitor"
-
-class Node
-  include Parent, Glimmer
-  
-  attr_accessor :children, :name, :contents, :attributes, :is_name_space, :is_attribute, :name_space, :parent
-    
-  def initialize(parent, name, attributes, &contents)
-    @is_name_space = false
-    @children = []
-    @parent = parent
-    if (parent and parent.is_name_space)
-      @name_space = parent
-      @parent = @name_space.parent
-    end
-    @parent.children << self if @parent
-    @name = name
-    @contents = contents
-    @attributes = attributes
-    if @attributes
-      @attributes.each_key do |attribute|
-        if attribute.is_a?(Node)
-          attribute.is_attribute = true 
-          attribute.parent.children.delete(attribute) if attribute.parent
-          attribute.parent = nil #attributes do not usually have parents
-        end
-      end
-      p attributes
-    end
-  end
-  
-  def method_missing(symbol, *args, &block)
-    @is_name_space = true
-    parent.children.delete(self) if parent
-    Glimmer.add_contents(self) {@tag = super}
-    @tag
-  end
-  
-  def to_xml
-    xml_visitor = XmlVisitor.new
-    DepthFirstSearchIterator.new(self, xml_visitor).iterate
-    xml_visitor.document
-  end
-   
-  def process_block(block)
-    return_value = block.call(@widget)
-    if return_value.is_a?(String) and !@children.include?(return_value)
-      text = return_value
-      first_match = text.match(/[#][^{]+[{][^}]+[}]/)
-      match = first_match
-      while (match) 
-        Glimmer.module_eval(text_command(match.pre_match))
-        tag_text = match.to_s
-        Glimmer.module_eval(rubyize(tag_text))
-        text = tag_text
-        post_match = match.post_match
-        match = text.match(/[#]\w+[{]\w+[}]/)
-      end
-      Glimmer.module_eval(text_command(post_match)) if post_match
-      @children << return_value unless first_match
-    end
-  end
-  
-  def text_command(text)
-    "text \"#{text}\""
-  end
-  
-  def rubyize(text)
-    text = text.gsub(/[}]/, '"}')
-    text = text.gsub(/[{]/, '{"')
-    text = text.gsub(/[#]/, '')
-  end
-
-  #override Object default id method and route it to Glimmer engine
-  def id
-    method_missing(:id)
-  end
-  
-end
+require File.dirname(__FILE__) + "/depth_first_search_iterator"
+require File.dirname(__FILE__) + "/xml_visitor"
+
+class Node
+  include Parent, Glimmer
+  
+  attr_accessor :children, :name, :contents, :attributes, :is_name_space, :is_attribute, :name_space, :parent
+    
+  def initialize(parent, name, attributes, &contents)
+    @is_name_space = false
+    @children = []
+    @parent = parent
+    if (parent and parent.is_name_space)
+      @name_space = parent
+      @parent = @name_space.parent
+    end
+    @parent.children << self if @parent
+    @name = name
+    @contents = contents
+    @attributes = attributes
+    if @attributes
+      @attributes.each_key do |attribute|
+        if attribute.is_a?(Node)
+          attribute.is_attribute = true 
+          attribute.parent.children.delete(attribute) if attribute.parent
+          attribute.parent = nil #attributes do not usually have parents
+        end
+      end
+      p attributes
+    end
+  end
+  
+  def method_missing(symbol, *args, &block)
+    @is_name_space = true
+    parent.children.delete(self) if parent
+    Glimmer.add_contents(self) {@tag = super}
+    @tag
+  end
+  
+  def to_xml
+    xml_visitor = XmlVisitor.new
+    DepthFirstSearchIterator.new(self, xml_visitor).iterate
+    xml_visitor.document
+  end
+   
+  def process_block(block)
+    return_value = block.call(@widget)
+    if return_value.is_a?(String) and !@children.include?(return_value)
+      text = return_value
+      first_match = text.match(/[#][^{]+[{][^}]+[}]/)
+      match = first_match
+      while (match) 
+        Glimmer.module_eval(text_command(match.pre_match))
+        tag_text = match.to_s
+        Glimmer.module_eval(rubyize(tag_text))
+        text = tag_text
+        post_match = match.post_match
+        match = text.match(/[#]\w+[{]\w+[}]/)
+      end
+      Glimmer.module_eval(text_command(post_match)) if post_match
+      @children << return_value unless first_match
+    end
+  end
+  
+  def text_command(text)
+    "text \"#{text}\""
+  end
+  
+  def rubyize(text)
+    text = text.gsub(/[}]/, '"}')
+    text = text.gsub(/[{]/, '{"')
+    text = text.gsub(/[#]/, '')
+  end
+
+  #override Object default id method and route it to Glimmer engine
+  def id
+    method_missing(:id)
+  end
+  
+end

data/{src → lib}/xml_command_handlers/models/node_visitor.rb

@@ -1,12 +1,9 @@
-# Copyright (C) 2007-2008 Annas Al Maleh
-# Licensed under the LGPL. See /COPYING.LGPL for more details.
-
-class NodeVisitor
-	def process_before_children
-		raise "must be implemented by a class"
-	end
-	
-	def process_after_children
-		raise "must be implemented by a class"
-	end
+class NodeVisitor
+	def process_before_children
+		raise "must be implemented by a class"
+	end
+	
+	def process_after_children
+		raise "must be implemented by a class"
+	end
 end

data/{src → lib}/xml_command_handlers/models/xml_visitor.rb

@@ -1,62 +1,59 @@
-# Copyright (C) 2007-2008 Annas Al Maleh
-# Licensed under the LGPL. See /COPYING.LGPL for more details.
-
-require File.dirname(__FILE__) + "/node_visitor"
-
-class XmlVisitor < NodeVisitor
-  
-  attr_reader :document
-  
-  def initialize
-    @document = ""
-  end
-  
-  def process_before_children(node)
-    if (node.is_a?(String))
-      @document << node
-      return
-    end
-    begin_open_tag(node)
-    append_attributes(node) if node.attributes
-    end_open_tag(node)
-  end
-  
-  def process_after_children(node)
-    return if (node.is_a?(String))
-    append_close_tag(node)
-  end
-  
-  def begin_open_tag(node)
-    @document << "<"
-    @document << "#{node.name_space.name}:" if node.name_space
-    @document << node.name
-  end
-  
-  def end_open_tag(node)
-    if (node.contents) 
-      @document << ">"
-    else
-      @document << " " if node.attributes.keys.size > 0
-      @document << "/>"
-    end
-  end
-  
-  def append_close_tag(node)
-    if (node.contents)
-      @document << "</"
-      @document << "#{node.name_space.name}:" if node.name_space
-      @document << "#{node.name}>"
-    end
-  end
-  
-  def append_attributes(node)
-    puts "Take 3"
-    p node.attributes
-    node.attributes.each_key do |attribute|
-      attribute_name = attribute
-      attribute_name = "#{attribute.name_space.name}:#{attribute.name}" if attribute.is_a?(Node)
-      @document << " #{attribute_name}=\"#{node.attributes[attribute]}\""
-    end
-  end
-  
+require File.dirname(__FILE__) + "/node_visitor"
+
+class XmlVisitor < NodeVisitor
+  
+  attr_reader :document
+  
+  def initialize
+    @document = ""
+  end
+  
+  def process_before_children(node)
+    if (node.is_a?(String))
+      @document << node
+      return
+    end
+    begin_open_tag(node)
+    append_attributes(node) if node.attributes
+    end_open_tag(node)
+  end
+  
+  def process_after_children(node)
+    return if (node.is_a?(String))
+    append_close_tag(node)
+  end
+  
+  def begin_open_tag(node)
+    @document << "<"
+    @document << "#{node.name_space.name}:" if node.name_space
+    @document << node.name
+  end
+  
+  def end_open_tag(node)
+    if (node.contents) 
+      @document << ">"
+    else
+      @document << " " if node.attributes.keys.size > 0
+      @document << "/>"
+    end
+  end
+  
+  def append_close_tag(node)
+    if (node.contents)
+      @document << "</"
+      @document << "#{node.name_space.name}:" if node.name_space
+      @document << "#{node.name}>"
+    end
+  end
+  
+  def append_attributes(node)
+    puts "Take 3"
+    p node.attributes
+    node.attributes.each_key do |attribute|
+      attribute_name = attribute
+      attribute_name = "#{attribute.name_space.name}:#{attribute.name}" if attribute.is_a?(Node)
+      @document << " #{attribute_name}=\"#{node.attributes[attribute]}\""
+    end
+  end
+  
 end