rhodes 2.0.0.beta1 → 2.0.0.beta2

data/Manifest.txt

@@ -164,6 +164,25 @@ lib/extensions/rholang/lang_se.rb
 lib/extensions/rholang/lang_sr.rb
 lib/extensions/rholang/rhoerror_ru.rb
 lib/extensions/rholang/rhomsg_ru.rb
+lib/extensions/rhoxml/rexml/child.rb
+lib/extensions/rhoxml/rexml/document.rb
+lib/extensions/rhoxml/rexml/element.rb
+lib/extensions/rhoxml/rexml/encoding.rb
+lib/extensions/rhoxml/rexml/encodings/US-ASCII.rb
+lib/extensions/rhoxml/rexml/encodings/UTF-16.rb
+lib/extensions/rhoxml/rexml/encodings/UTF-8.rb
+lib/extensions/rhoxml/rexml/namespace.rb
+lib/extensions/rhoxml/rexml/node.rb
+lib/extensions/rhoxml/rexml/parent.rb
+lib/extensions/rhoxml/rexml/parseexception.rb
+lib/extensions/rhoxml/rexml/parsers/baseparser.rb
+lib/extensions/rhoxml/rexml/parsers/treeparser.rb
+lib/extensions/rhoxml/rexml/parsers/xpathparser.rb
+lib/extensions/rhoxml/rexml/set.rb
+lib/extensions/rhoxml/rexml/source.rb
+lib/extensions/rhoxml/rexml/xmltokens.rb
+lib/extensions/rhoxml/rexml/xpath.rb
+lib/extensions/rhoxml/rexml/xpath_parser.rb
 lib/extensions/set/set.rb
 lib/extensions/uri/uri/common.rb
 lib/extensions/uri/uri/ftp.rb
@@ -221,7 +240,6 @@ lib/test/framework_test.rb
 lib/test/rho_stubs.rb
 lib/test/syncdb.sqlite
 LICENSE
-LICENSING_OPTIONS
 Manifest.txt
 platform/android/build/android.rake
 platform/android/build/androidcommon.rb
@@ -341,6 +359,7 @@ platform/android/Rhodes/src/com/rhomobile/rhodes/ui/AboutDialog.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/ui/LogOptionsDialog.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/ui/LogViewDialog.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/uri/MailUriHandler.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/uri/SmsUriHandler.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/uri/TelUriHandler.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/uri/UriHandler.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/uri/VideoUriHandler.java
@@ -352,7 +371,6 @@ platform/bb/build/MANIFEST.MF
 platform/bb/build/RhoBundleAlx.erb
 platform/bb/build/rhodes_build.files
 platform/bb/build/rhodesApp.csl
-platform/bb/build/rhodesApp.rapc
 platform/bb/build/rhodesAppAlx.erb
 platform/bb/build/RubyVM_build.files
 platform/bb/build/RubyVM_MANIFEST.MF
@@ -1412,6 +1430,7 @@ platform/shared/rubyext/RhoRuby.cpp
 platform/shared/rubyext/RhoRuby.h
 platform/shared/rubyext/System.cpp
 platform/shared/rubyext/WebView.h
+platform/shared/rubyJVM/src/com/rho/Capabilities.java
 platform/shared/rubyJVM/src/com/rho/Convert.java
 platform/shared/rubyJVM/src/com/rho/DateTimeTokenizer.java
 platform/shared/rubyJVM/src/com/rho/db/DBAdapter.java
@@ -3522,7 +3541,6 @@ res/generators/templates/model/new.erb
 res/generators/templates/model/show.bb.erb
 res/generators/templates/model/show.erb
 res/generators/templates/model/spec.rb
-res/generators/templates/source/source_adapter.rb
 res/generators/templates/spec/app/fileutils.rb
 res/generators/templates/spec/app/mspec/expectations/expectations.rb
 res/generators/templates/spec/app/mspec/expectations/should.rb
@@ -3641,7 +3659,6 @@ res/generators/templates/spec/app/spec/webview_spec.rb
 res/generators/templates/spec/app/spec_runner.rb
 res/generators/templates/spec/app/SpecRunner/controller.rb
 res/generators/templates/spec/app/SpecRunner/index.erb
-rhobuild.yml
 rhobuild.yml.example
 rhodes.gemspec
 spec/framework_spec/app/Account/config.rb

data/README.textile

@@ -1,8 +1,8 @@
 h1. Rhodes
 
-The "Rhodes framework":http://github.com/rhomobile/rhodes/tree/master is a framework for building locally executing, device-optimized mobile applications for smartphone devices. These applications are optimized for interacting with transactional enterprise application backends (with synced local data via "RhoSync":http://github.com/rhomobile/rhosync/tree/master). Rhodes is now available for iPhone, Windows Mobile, Research in Motion (Blackberry) and Symbian smartphones.  
+The "Rhodes framework":http://github.com/rhomobile/rhodes is a framework for building locally executing, device-optimized mobile applications for smartphone devices. These applications are optimized for interacting with transactional enterprise application backends (with synced local data via "RhoSync":http://github.com/rhomobile/rhosync). Rhodes is now available for iPhone, Windows Mobile, Research in Motion (Blackberry) and Symbian smartphones.  
 
-Rhodes is available as an open source product under the "GNU Public License": http://gplv3.fsf.org/ for developers prepared to abide by the GPL and open source their own application.  For developers building closed source applications (either within an enterprise or as independent software vendors selling to other companies) we offer a "commercial license":http://rhomobile.com/products/licensing.  Contact sales@rhomobile.com for details
+Rhodes is available as an open source product under the MIT license.  For developers interested a commercial license is still "available":http://rhomobile.com/products/rhodes/license/.
 
 h2. INTRODUCTION  
 
@@ -20,7 +20,7 @@ Rhodes features an application generator called rhogen that generates  a control
 
   rhogen app appname
 
-This will generate a config.rb and an index.html file.  Currently config.rb is focused on describing what source to sync with.  Modify the URL that you see in this file with whatever your RhoSync server URL and source ID are for this particular "source" or data model.   It is assumed that you've already set up a RhoSync "source adapter" as described by the RhoSync README.
+This will generate a config.rb and an index.html file.  Currently config.rb is focused on describing what source to sync with.  Modify the URL that you see in this file with whatever your RhoSync server URL and source ID are for this particular "source" or data model.   It is assumed that you've already set up a RhoSync "source adapter" as described by the "RhoSync docs":http://wiki.rhomobile.com/index.php/RhoSync_2.0.
 
 h3. Generate a Model and Associated Controller and Templates
 
@@ -33,43 +33,12 @@ This will generate a controller as the file controller.rb and several views as a
     * edit - to edit the actual object
     * show - to show the object attributes
 
-h2. DIRECTORY STRUCTURE
-
-The Rhodes directory structure is outlined below.  In a default Rhodes application, there are several subdirectories inside of an app directory, one for each model or synced data object. For example, there might be subdirectories called Account, Employee, and Case. Each model subdirectory contains a controller in the file controller.rb. These subdirectories each contain a set of template files as Embedded Ruby (ERB) files. These control how data from the model is displayed and what links are available to other actions. Note that this structure is reminiscent of Rails and MERB's structure, but is a bit simpler by design.
-
-	  /appname
-	    build.yml (contains the settings for running builds)
-	    rhoconfig.txt (contains settings for setting the default start and options path)
-	    Rakefile
-	    /public (contains static resources for the generated objects)
-	      /css
-	      /images
-	      /js
-	    /app
-	      index.erb
-	      layout.erb
-	      loading.html  
-	      /modelname (for example Account)
-		    config.rb
-	        index.erb
-	        new.erb
-	        edit.erb
-	        show.erb
-	        controller.rb  
-	      /modelname (for example Case)
-	        config.rb
-	        index.erb
-	        new.erb
-	        edit.erb
-	        show.erb
-	        controller.rb
-
 
 h2. MORE RESOURCES
 
-There is a "tutorial available":http://rhomobile.com/wiki/index.php?title=Mobilizing_Your_Application_with_Rhomobile on the "Rhomobile site":http://www.rhomobile.com.  This includes thorough and current platform by platform build instructions.
+There is a "tutorial available":http://rhomobile.com/wiki/index.php/Mobilizing_Your_Application_with_Rhomobile on the "Rhomobile site":http://www.rhomobile.com.  This includes thorough and current platform by platform build instructions.
 
-The "Rhodes spec":http://rhomobile.com/wiki/index.php?title=Rhodes is also available on the "Rhomobile documentation wiki":http://rhomobile.com/wiki/index.php?title=Rhomobile. 
+The "Rhodes spec":http://rhomobile.com/wiki/index.php/Rhodes is also available on the "Rhomobile documentation wiki":http://rhomobile.com/wiki/index.php?title=Rhomobile. 
 
 For further questions "email us":mailto:info@rhomobile.com or join the "Google Group":http://groups.google.com/group/rhomobile.
 

data/Rakefile

@@ -275,6 +275,11 @@ def common_bundle_start(startdir, dest)
     end
   end
 
+  if $excludeextlib  
+      chdir dest
+      $excludeextlib.each {|e| Dir.glob(e).each {|f| rm f}}
+  end
+  
   chdir startdir
   #throw "ME"
   cp_r app + '/app',File.join($srcdir,'apps')

data/lib/build/jake.rb

@@ -241,7 +241,9 @@ class Jake
 
       if cldc and icon
         f.write "MIDlet-1: " + title + "," + icon + ",\n"
-        f.write "RIM-MIDlet-Flags-1: 1\n"
+        puts "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! service_enabled: #{$service_enabled}"
+        $stdout.flush
+        f.write "RIM-MIDlet-Flags-1: 1\n" if $service_enabled
       end
 
       f.close

data/lib/extensions/rexml/rexml/document.rb

@@ -7,7 +7,9 @@ require "rexml/instruction"
 require "rexml/rexml"
 require "rexml/parseexception"
 require "rexml/output"
+if !defined? RHO_ME
 require "rexml/parsers/baseparser"
+end
 require "rexml/parsers/streamparser"
 require "rexml/parsers/treeparser"
 

data/lib/extensions/rexml/rexml/parsers/baseparser.rb

@@ -1,7 +1,3 @@
-if defined? RHO_ME
-
-else
-
 require 'rexml/parseexception'
 require 'rexml/undefinednamespaceexception'
 require 'rexml/source'
@@ -533,5 +529,3 @@ end
   when :end_doctype
   end
 =end
-
-end

data/lib/extensions/rhoxml/rexml/child.rb

@@ -0,0 +1,96 @@
+require "rexml/node"
+
+module REXML
+  ##
+  # A Child object is something contained by a parent, and this class
+  # contains methods to support that.  Most user code will not use this
+  # class directly.
+  class Child
+    include Node
+    attr_reader :parent		# The Parent of this object
+
+    # Constructor.  Any inheritors of this class should call super to make
+    # sure this method is called.
+    # parent::
+    #   if supplied, the parent of this child will be set to the
+    #   supplied value, and self will be added to the parent
+    def initialize( parent = nil )
+      @parent = nil  
+      # Declare @parent, but don't define it.  The next line sets the 
+      # parent.
+      parent.add( self ) if parent
+    end
+
+    # Replaces this object with another object.  Basically, calls
+    # Parent.replace_child
+    #
+    # Returns:: self
+    def replace_with( child )
+      @parent.replace_child( self, child )
+      self
+    end
+
+    # Removes this child from the parent.
+    #
+    # Returns:: self
+    def remove
+      unless @parent.nil?
+        @parent.delete self
+      end
+      self
+    end
+
+    # Sets the parent of this child to the supplied argument.
+    #
+    # other::
+    #   Must be a Parent object.  If this object is the same object as the
+    #   existing parent of this child, no action is taken. Otherwise, this
+    #   child is removed from the current parent (if one exists), and is added
+    #   to the new parent.
+    # Returns:: The parent added
+    def parent=( other )
+      return @parent if @parent == other
+      @parent.delete self if defined?( @parent ) and @parent
+      @parent = other
+    end
+
+    alias :next_sibling :next_sibling_node
+    alias :previous_sibling :previous_sibling_node
+
+    # Sets the next sibling of this child.  This can be used to insert a child
+    # after some other child.
+    #  a = Element.new("a")
+    #  b = a.add_element("b")
+    #  c = Element.new("c")
+    #  b.next_sibling = c
+    #  # => <a><b/><c/></a>
+    def next_sibling=( other )
+      parent.insert_after self, other
+    end
+
+    # Sets the previous sibling of this child.  This can be used to insert a 
+    # child before some other child.
+    #  a = Element.new("a")
+    #  b = a.add_element("b")
+    #  c = Element.new("c")
+    #  b.previous_sibling = c
+    #  # => <a><b/><c/></a>
+    def previous_sibling=(other)
+      parent.insert_before self, other
+    end
+
+    # Returns:: the document this child belongs to, or nil if this child
+    # belongs to no document
+    def document
+      return parent.document unless parent.nil?
+      nil
+    end
+
+    # This doesn't yet handle encodings
+    def bytes
+      encoding = document.encoding
+
+      to_s
+    end
+  end
+end

data/lib/extensions/rhoxml/rexml/document.rb

@@ -0,0 +1,527 @@
+require "rexml/element"
+#require "rexml/xmldecl"
+#require 'rexml/text'
+require "rexml/source"
+#require "rexml/doctype"
+=begin
+require "rexml/comment"
+
+require "rexml/instruction"
+require "rexml/rexml"
+require "rexml/parseexception"
+require "rexml/output"
+=end
+if !defined? RHO_ME
+require "rexml/parsers/baseparser"
+end
+#require "rexml/parsers/streamparser"
+
+require "rexml/parsers/treeparser"
+
+module REXML
+  class Comment < Child
+    include Comparable
+    START = "<!--"
+    STOP = "-->"
+
+    # The content text
+
+    attr_accessor :string
+    
+    ##
+    # Constructor.  The first argument can be one of three types:
+    # @param first If String, the contents of this comment are set to the 
+    # argument.  If Comment, the argument is duplicated.  If
+    # Source, the argument is scanned for a comment.
+    # @param second If the first argument is a Source, this argument 
+    # should be nil, not supplied, or a Parent to be set as the parent 
+    # of this object
+    def initialize( first, second = nil )
+      #puts "IN COMMENT CONSTRUCTOR; SECOND IS #{second.type}"
+      super(second)
+      if first.kind_of? String
+        @string = first
+      elsif first.kind_of? Comment
+        @string = first.string
+      end
+    end
+
+    def clone
+      Comment.new self
+    end
+    
+    alias :to_s :string
+
+    ##
+    # Compares this Comment to another; the contents of the comment are used
+    # in the comparison.
+    def <=>(other)
+      other.to_s <=> @string
+    end
+
+    ##
+    # Compares this Comment to another; the contents of the comment are used
+    # in the comparison.
+    def ==( other )
+      other.kind_of?( Comment ) and
+      (other <=> self) == 0
+    end
+
+    def node_type
+      :comment
+    end
+  end
+
+  # Represents an XML DOCTYPE declaration; that is, the contents of <!DOCTYPE
+  # ... >.  DOCTYPES can be used to declare the DTD of a document, as well as
+  # being used to declare entities used in the document.
+  class DocType < Parent
+    include XMLTokens
+  end
+
+  class XMLDecl < Child
+    include Encoding
+
+    DEFAULT_VERSION = "1.0";
+    DEFAULT_ENCODING = "UTF-8";
+    DEFAULT_STANDALONE = "no";
+    START = '<\?xml';
+    STOP = '\?>';
+
+    attr_accessor :version, :standalone
+    attr_reader :writeencoding, :writethis
+
+    def initialize(version=DEFAULT_VERSION, encoding=nil, standalone=nil)
+      @writethis = true
+      @writeencoding = !encoding.nil?
+      if version.kind_of? XMLDecl
+        super()
+        @version = version.version
+        self.encoding = version.encoding
+        @writeencoding = version.writeencoding
+        @standalone = version.standalone
+      else
+        super()
+        @version = version
+        self.encoding = encoding
+        @standalone = standalone
+      end
+      @version = DEFAULT_VERSION if @version.nil?
+    end
+
+    def clone
+      XMLDecl.new(self)
+    end
+
+    # indent::
+    #   Ignored.  There must be no whitespace before an XML declaration
+    # transitive::
+    #   Ignored
+    # ie_hack::
+    #   Ignored
+    def write(writer, indent=-1, transitive=false, ie_hack=false)
+      return nil unless @writethis or writer.kind_of? Output
+      writer << START.sub(/\\/u, '')
+      if writer.kind_of? Output
+        writer << " #{content writer.encoding}"
+      else
+        writer << " #{content encoding}"
+      end
+      writer << STOP.sub(/\\/u, '')
+    end
+
+    def ==( other )
+      other.kind_of?(XMLDecl) and
+      other.version == @version and
+      other.encoding == self.encoding and
+      other.standalone == @standalone
+    end
+
+    def xmldecl version, encoding, standalone
+      @version = version
+      self.encoding = encoding
+      @standalone = standalone
+    end
+
+    def node_type
+      :xmldecl
+    end
+
+    alias :stand_alone? :standalone
+    alias :old_enc= :encoding=
+
+    def encoding=( enc )
+      if enc.nil?
+        @@old_enc = "UTF-8"
+        @writeencoding = false
+      else
+        @@old_enc = enc
+        @writeencoding = true
+      end
+      self.dowrite
+    end
+
+    # Only use this if you do not want the XML declaration to be written;
+    # this object is ignored by the XML writer.  Otherwise, instantiate your
+    # own XMLDecl and add it to the document.
+    #
+    # Note that XML 1.1 documents *must* include an XML declaration
+    def XMLDecl.default
+      rv = XMLDecl.new( "1.0" )
+      rv.nowrite
+      rv
+    end
+
+    def nowrite
+      @writethis = false
+    end
+
+    def dowrite
+      @writethis = true
+    end
+
+    def inspect
+      START.sub(/\\/u, '') + " ... " + STOP.sub(/\\/u, '')
+    end
+
+    private
+    def content(enc)
+      rv = "version='#@version'"
+      rv << " encoding='#{enc}'" if @writeencoding || enc !~ /utf-8/i
+      rv << " standalone='#@standalone'" if @standalone
+      rv
+    end
+  end
+
+  # Represents a full XML document, including PIs, a doctype, etc.  A
+  # Document has a single child that can be accessed by root().
+  # Note that if you want to have an XML declaration written for a document
+  # you create, you must add one; REXML documents do not write a default
+  # declaration for you.  See |DECLARATION| and |write|.
+  class Document < Element
+    # A convenient default XML declaration.  If you want an XML declaration,
+    # the easiest way to add one is mydoc << Document::DECLARATION
+    # +DEPRECATED+
+    # Use: mydoc << XMLDecl.default
+    DECLARATION = XMLDecl.default
+
+    # Constructor
+    # @param source if supplied, must be a Document, String, or IO. 
+    # Documents have their context and Element attributes cloned.
+    # Strings are expected to be valid XML documents.  IOs are expected
+    # to be sources of valid XML documents.
+    # @param context if supplied, contains the context of the document;
+    # this should be a Hash.
+    def initialize( source = nil, context = {} )
+      @entity_expansion_count = 0
+      super()
+      @context = context
+      return if source.nil?
+      if source.kind_of? Document
+        @context = source.context
+        super source
+      else
+        build(  source )
+      end
+    end
+
+    def node_type
+      :document
+    end
+
+    # Should be obvious
+    def clone
+      Document.new self
+    end
+
+    # According to the XML spec, a root node has no expanded name
+    def expanded_name
+      ''
+      #d = doc_type
+      #d ? d.name : "UNDEFINED"
+    end
+
+    alias :name :expanded_name
+
+    # We override this, because XMLDecls and DocTypes must go at the start
+    # of the document
+    def add( child )
+      #puts "document.add: #{child}"
+      if child.kind_of? XMLDecl
+        @children.unshift child
+        child.parent = self
+      elsif child.kind_of? DocType
+        # Find first Element or DocType node and insert the decl right 
+        # before it.  If there is no such node, just insert the child at the
+        # end.  If there is a child and it is an DocType, then replace it.
+        insert_before_index = 0
+        @children.find { |x| 
+          insert_before_index += 1
+          x.kind_of?(Element) || x.kind_of?(DocType)
+        }
+        if @children[ insert_before_index ] # Not null = not end of list
+          if @children[ insert_before_index ].kind_of DocType
+            @children[ insert_before_index ] = child
+          else
+            @children[ index_before_index-1, 0 ] = child
+          end
+        else  # Insert at end of list
+          @children[insert_before_index] = child
+        end
+        child.parent = self
+      else
+        rv = super
+        raise "attempted adding second root element to document" if @elements.size > 1
+        rv
+      end
+    end
+    alias :<< :add
+
+    def add_element(arg=nil, arg2=nil)
+      #puts "document.add_element: #{arg}; #{arg2}"
+      rv = super
+      raise "attempted adding second root element to document" if @elements.size > 1
+      rv
+    end
+
+    # @return the root Element of the document, or nil if this document
+    # has no children.
+    def root
+      elements[1]
+      #self
+      #@children.find { |item| item.kind_of? Element }
+    end
+
+    # @return the DocType child of the document, if one exists,
+    # and nil otherwise.
+    def doctype
+      @children.find { |item| item.kind_of? DocType }
+    end
+
+    # @return the XMLDecl of this document; if no XMLDecl has been
+    # set, the default declaration is returned.
+    def xml_decl
+      rv = @children[0]
+      return rv if rv.kind_of? XMLDecl
+      rv = @children.unshift(XMLDecl.default)[0]
+    end
+
+    # @return the XMLDecl version of this document as a String.
+    # If no XMLDecl has been set, returns the default version.
+    def version
+      xml_decl().version
+    end
+
+    # @return the XMLDecl encoding of this document as a String.
+    # If no XMLDecl has been set, returns the default encoding.
+    def encoding
+      xml_decl().encoding
+    end
+
+    # @return the XMLDecl standalone value of this document as a String.
+    # If no XMLDecl has been set, returns the default setting.
+    def stand_alone?
+      xml_decl().stand_alone?
+    end
+
+    # Write the XML tree out, optionally with indent.  This writes out the
+    # entire XML document, including XML declarations, doctype declarations,
+    # and processing instructions (if any are given).
+    #
+    # A controversial point is whether Document should always write the XML
+    # declaration (<?xml version='1.0'?>) whether or not one is given by the
+    # user (or source document).  REXML does not write one if one was not
+    # specified, because it adds unnecessary bandwidth to applications such
+    # as XML-RPC.
+    #
+    # See also the classes in the rexml/formatters package for the proper way
+    # to change the default formatting of XML output
+    #
+    # _Examples_
+    #   Document.new("<a><b/></a>").serialize
+    #
+    #   output_string = ""
+    #   tr = Transitive.new( output_string )
+    #   Document.new("<a><b/></a>").serialize( tr )
+    #
+    # output::
+    #	  output an object which supports '<< string'; this is where the
+    #   document will be written.
+    # indent::
+    #   An integer.  If -1, no indenting will be used; otherwise, the
+    #   indentation will be twice this number of spaces, and children will be
+    #   indented an additional amount.  For a value of 3, every item will be 
+    #   indented 3 more levels, or 6 more spaces (2 * 3). Defaults to -1
+    # transitive::
+    #   If transitive is true and indent is >= 0, then the output will be
+    #   pretty-printed in such a way that the added whitespace does not affect
+    #   the absolute *value* of the document -- that is, it leaves the value
+    #   and number of Text nodes in the document unchanged.
+    # ie_hack::
+    #   Internet Explorer is the worst piece of crap to have ever been
+    #   written, with the possible exception of Windows itself.  Since IE is
+    #   unable to parse proper XML, we have to provide a hack to generate XML
+    #   that IE's limited abilities can handle.  This hack inserts a space 
+    #   before the /> on empty tags.  Defaults to false
+    def write( output=$stdout, indent=-1, transitive=false, ie_hack=false )
+      if xml_decl.encoding != "UTF-8" && !output.kind_of?(Output)
+        output = Output.new( output, xml_decl.encoding )
+      end
+      formatter = if indent > -1
+          if transitive
+            require "rexml/formatters/transitive"
+            REXML::Formatters::Transitive.new( indent, ie_hack )
+          else
+            REXML::Formatters::Pretty.new( indent, ie_hack )
+          end
+        else
+          REXML::Formatters::Default.new( ie_hack )
+        end
+      formatter.write( self, output )
+    end
+
+    
+    def Document::parse_stream( source, listener )
+      Parsers::StreamParser.new( source, listener ).parse
+    end
+
+    @@entity_expansion_limit = 10_000
+
+    # Set the entity expansion limit. By default the limit is set to 10000.
+    def Document::entity_expansion_limit=( val )
+      @@entity_expansion_limit = val
+    end
+
+    # Get the entity expansion limit. By default the limit is set to 10000.
+    def Document::entity_expansion_limit
+      return @@entity_expansion_limit
+    end
+
+    attr_reader :entity_expansion_count
+    
+    def record_entity_expansion
+      @entity_expansion_count += 1
+      if @entity_expansion_count > @@entity_expansion_limit
+        raise "number of entity expansions exceeded, processing aborted."
+      end
+    end
+
+    private
+    def build( source )
+      Parsers::TreeParser.new( source, self ).parse
+    end
+  end
+
+  class Text < Child
+    include Comparable
+
+    attr_accessor :raw    
+    
+    def initialize(arg, respect_whitespace=false, parent=nil, raw=nil, 
+      entity_filter=nil )
+
+      @raw = false
+
+      if parent
+        super( parent )
+        @raw = parent.raw 
+      else
+        @parent = nil
+      end
+
+      @raw = raw unless raw.nil?
+      @entity_filter = entity_filter
+      @normalized = @unnormalized = nil
+
+      if arg.kind_of? String
+        @string = arg.clone
+        @string.squeeze!(" \n\t") unless respect_whitespace
+      else  
+          if arg.kind_of? Text
+            @string = arg.to_s
+            @raw = arg.raw
+          else
+            raise "Illegal argument of type #{arg.type} for Text constructor (#{arg})"
+          end
+      end
+      
+      @string.gsub!( /\r\n?/, "\n" )
+    end
+
+    def node_type
+      :text
+    end
+
+    def empty?
+      @string.size==0
+    end
+
+
+    def clone
+      return Text.new(self)
+    end
+
+
+    # Appends text to this text node.  The text is appended in the +raw+ mode
+    # of this text node.
+    def <<( to_append )
+      @string << to_append.gsub( /\r\n?/, "\n" )
+    end
+
+
+    # +other+ a String or a Text
+    # +returns+ the result of (to_s <=> arg.to_s)
+    def <=>( other )
+      to_s() <=> other.to_s
+    end
+
+    def doctype
+      if @parent
+        doc = @parent.document
+        doc.doctype if doc
+      end
+    end
+
+    def to_s
+      @string
+    end
+
+    def inspect
+      @string.inspect
+    end
+
+    def value
+      #TODO: 
+      #return @unnormalized if @unnormalized
+      #@unnormalized = Text::unnormalize( @string, doctype )
+      
+      @string
+    end
+
+    #TODO optimize it - regular expressions is slow on BB
+=begin    
+    def Text::unnormalize( string, doctype=nil, filter=nil, illegal=nil )
+      string.gsub( /\r\n?/, "\n" ).gsub( REFERENCE ) {
+        ref = $&
+        if ref[1] == ?#
+          if ref[2] == ?x
+            [ref[3...-1].to_i(16)].pack('U*')
+          else
+            [ref[2...-1].to_i].pack('U*')
+          end
+        elsif ref == '&amp;'
+          '&'
+        elsif filter and filter.include?( ref[1...-1] )
+          ref
+        elsif doctype
+          doctype.entity( ref[1...-1] ) or ref
+        else
+          entity_value = DocType::DEFAULT_ENTITIES[ ref[1...-1] ]
+          entity_value ? entity_value.value : ref
+        end
+      }
+    end
+=end
+  end
+  
+end