RubyGems - hobo - Versions diffs - 0.7.3 → 0.7.4 - Mend

hobo 0.7.3 → 0.7.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (46) hide show

data/hobo_files/plugin/taglibs/rapid_navigation.dryml CHANGED

@@ -21,12 +21,15 @@
 </def>
+<def tag="main-nav"><magic-nav class="main-nav"/></def>
 <!--- Account Navigation (log in / out / signup) -->
 <def tag="account-nav">
   <ul with="&current_user" class="account-nav" param>
     <if test="&logged_in?">
-      <li class='nav-item' param="logged-in-as">Logged in as <view:login/></li>
+      <li class='nav-item' param="logged-in-as"><a to="&current_user">Logged in as <view:login/></a></li>
       <li class='nav-item' param="account"><a action="account">Account</a></li>
       <li class='nav-item' param="log-out"><a href="&logout_url">Log out</a></li>
     </if>
@@ -42,13 +45,7 @@
 <!--- Pagination Navigation -->
 <def tag="page-nav" attrs="params">
-  <if test="&this.try.page_count._? > 1">
-    <page-n-of-count/> -
-    <first-page-link    params="&params" param>|&lt;</first-page-link>
-    <previous-page-link params="&params" param>Previous</previous-page-link>
-    <next-page-link     params="&params" param>Next</next-page-link>
-    <last-page-link     params="&params" param>&gt|</last-page-link>
-  </if>
+  <%= will_paginate this, attributes.symbolize_keys.reverse_merge(:inner_window => 2, :prev_label => "&laquo; Prev") %>
 </def>

data/hobo_files/plugin/taglibs/rapid_pages.dryml CHANGED

@@ -1,9 +1,9 @@
-<def tag="base-page" attrs="title, doctype">
-  <% title ||= default_page_title %>
+<def tag="base-page" attrs="title, full-title, doctype">
+  <% full_title ||= "#{title} : #{app_name}" %>
   <doctype param version="&doctype || 'HTML 4.01 STRICT'"/>
   <html>
     <head param>
-      <title param><%= title.gsub(/<.*?>/, '') %></title>
+      <title param><%= full_title.gsub(/<.*?>/, '') %></title>
       <do param="stylesheets">
         <stylesheet name="reset"/>
         <stylesheet name="hobo-rapid"/>
@@ -17,7 +17,7 @@
     </head>
     <body onload="Hobo.applyEvents();" param/>
-</html>
+  </html>
 </def>
@@ -30,7 +30,7 @@
         <live-search param if="&defined_route? :site_search"/>
         <nav param>
           <account-nav if="&Hobo::User.default_user_model" param/>
-          <do param="main-nav"><magic-nav class="main-nav"/></do>
+          <main-nav param/>
         </nav>
       </header>
       <section class="page-content" param="content">
@@ -41,6 +41,7 @@
         <footer class="content-footer" param="content-footer"/>
       </section>
       <footer class="page-footer" param/>
+      <part-contexts-javascripts/>
     </body:>
   </base-page>
 </def>
@@ -65,17 +66,17 @@
 <def tag="index-page">
   <set model="&this.try.member_class || self.model"/>
   <set model-name="&model.name.titleize"/>
-  <page title="All #{type_name :with => model, :pluralize => true}" merge>
+  <page title="All #{type_name :with => model, :plural => true}" merge>
     <body: class="index-page #{type_id model}" param/>
     <content-header: param>
-      <heading param><type-name with="&model"/></heading>
-      <p class="note" if param>There <count part="item-count" prefix="are"/></p>
+      <heading param><type-name with="&model" plural/></heading>
+      <p class="note" if param>There <count prefix="are"/></p>
     </content-header:>
     <content-body: param>
       <nav param="top-pagination-nav"><page-nav/></nav>
-      <collection param/>
+      <collection param><empty-message:></empty-message:></collection>
       <nav param="bottom-pagination-nav"><page-nav/></nav>
     </content-body>
@@ -86,7 +87,7 @@
         <if with="&model.user_new current_user">
           <section class="create-new">
             <h2>New <type-name/></h2>
-            <form><field-list/><submit label="Create #{type_name}"/></form>
+            <form><field-list param="new-field-list"/><submit label="Create"/></form>
           </section>
         </if>
       </else>
@@ -97,7 +98,7 @@
 <def tag="new-page">
   <page title="New #{type_name}" merge>
-    <body: class="new-page #{type_name.underscore}" param/>
+    <body: class="new-page #{type_name :dasherize => true}" param/>
     <content-header: param>
       <heading param>New <type-name title/></heading>
     </content-header>
@@ -106,7 +107,7 @@
       <error-messages param/>
       <form param>
-        <field-list skip-associations="has_many" param/>
+        <field-list param/>
         <div class="actions" param="actions">
           <submit label="Create #{type_name}" param/><do param="back-link"> or <a>Cancel</a></do>
         </div>
@@ -117,61 +118,75 @@
 <def tag="show-page" attrs="primary-collection">
-  <set primary-collection-name="&(primary_collection || self.primary_collection_name).to_s"/>
+  <set primary-collection-name="&(primary_collection || self.primary_collection_name).to_s" model="&this.class"/>
+  <set boolean-fields="&model.columns.select {|c| c.type == :boolean }.*.name"/>
+  <set skip-fields="&boolean_fields + [model.name_attribute, model.primary_content_attribute, model.creator_attribute, model.dependent_on.first].compact"/>
+  <set flags="&boolean_fields.map {|f| f.titleize if this.send(f)}.compact.join(', ')"/>
   <page merge title="#{name :no_wrapper => true}">
     <body: class="show-page #{type_name :dasherize => true}" param/>
     <content-header: param>
       <if with="&this.dependent_on.reject{|x| x.is_a?(Hobo::User)}.first">
-        <div class="container"><a/></div>
+        <div class="container"><a>&laquo; <name/></a></div>
       </if>
-      <heading param><%= this %></heading>
-      <creation-details param/>
+      <heading param><this/></heading>
+      <div class="flags"><flags/></div>
+      <creation-details param/>
       <do field="&primary_collection_name" if="&primary_collection_name" param="primary-collection-count">
         <association-count class="primary-collection-count" part="primary-collection-count"/>
       </do>
-      <a action="edit" class="edit" if="&can_edit?" param="edit-link">Edit <type-name/></a>
+      <a action="edit" class="edit" if="&linkable?(:edit) && can_edit?" param="edit-link">Edit <type-name/></a>
     </content-header>
     <content-body: param>
       <primary-content param/>
-      <field-list skip="&[this.class.name_attribute, this.class.primary_content_attribute, this.class.creator_attribute, this.class.dependent_on.first].compact "
-                  skip-associations="has_many" param/>
-      <section class="primary-collection" field="&primary_collection_name" if="&primary_collection_name">
-        <h2 param="primary-collection-title"><%= primary_collection_name.titleize %></h2>
-        <do param="primary-collection">
-          <collection part="primary-collection"/>
-        </do>
-        <if test="can_create?">
-          <nav class="new-link"><a action="new" if="&linkable?(:new) && can_create?"/></nav>
-          <else>
-            <section class="create-new" with="&new_for_current_user">
-              <h2>Add <A-or-An word="&primary_collection_name.singularize.titleize"/></h2>
-              <form update="primary-collection, primary-collection-count"
-                    message="Adding #{primary_collection_name.singularize.titleize}..." reset-form>
-                <field-list skip="#{@this.class.reverse_reflection(@this.send(primary_collection_name).proxy_reflection.name).name}"
-                            skip-associations="has_many" param="primary-collection-field-list"/>
-                <submit label="Create #{primary_collection_name.singularize.titleize}"/>
-              </form>
-            </section>
-          </else>
-        </if>
-      </section>
+      <field-list skip="&skip_fields" skip-associations="has_many" param/>
+      <with-primary-collection name="&primary_collection_name" if="&primary_collection_name">
+        <section class="primary-collection">
+          <h2 param="primary-collection-title"><primary-collection-name.titleize/></h2>
+          <do param="primary-collection">
+            <collection part="primary-collection">
+              <card:><delete-button: update="primary-collection-count"></delete-button:></card:>
+            </collection>
+          </do>
+          <do with="&@this.send(primary_collection_name)">
+            <if test="&can_create?" param="primary-collection-add">
+              <nav class="new-link"><a action="new" if="&linkable?(:new) && can_create?"/></nav>
+              <else>
+                <section class="create-new" with="&new_for_current_user">
+                  <h2>Add <A-or-An word="&primary_collection_name.singularize.titleize"/></h2>
+                  <form update="primary-collection, primary-collection-count"
+                        message="Adding #{primary_collection_name.singularize.titleize}..." reset-form>
+                    <field-list skip="#{@this.class.reverse_reflection(@this.send(primary_collection_name).proxy_reflection.name).name}"
+                                skip-associations="has_many" param="primary-collection-field-list"/>
+                    <submit label="Add"/>
+                  </form>
+                </section>
+              </else>
+            </if>
+          </do>
+        </section>
+      </with-primary-collection>
     </content-body:>
     <aside: param>
       <section class="preview-collections">
-        <with-fields fields="&non_through_collections - [primary_collection_name._?.to_sym]">
+        <with-fields fields="&non_through_collections - [(primary_collection_name.to_sym unless primary_collection_name.blank?)]">
           <collection-preview class="#{this_field.dasherize}"/>
         </with-fields>
       </section>
     </aside:>
   </page>
 </def>
@@ -187,7 +202,7 @@
     <content-body: param>
       <error-messages param/>
       <form param>
-        <field-list skip-associations="has_many" param/>
+        <field-list param/>
         <div class="actions" param="actions">
           <submit label="Save Changes" param/><do param="back-link"> or <a>Cancel</a></do>
         </div>
@@ -211,8 +226,7 @@
       <error-messages/>
       <form param>
-        <field-list skip="#{@association.origin.class.reverse_reflection(association_name.to_sym).name}"
-                    skip-associations="has_many" param/>
+        <field-list skip="#{@association.origin.class.reverse_reflection(association_name.to_sym).name}" param/>
         <div class="actions" param="actions">
           <submit label="Create #{association_name.singularize.titleize}" param/>
           <do param="back-link"> or <a with="&@association.origin">Cancel</a></do>
@@ -329,3 +343,13 @@
 <def tag="default-page-title"><%= t = this.to_s; ; "#{t.blank? ? '' : t + ' - '}#{app_name}" %></def>
+<def tag="with-primary-collection" attrs="name"><%
+  ivar = "@#{this.class.name.underscore}_#{name}"
+  if (collection = instance_variable_get(ivar))
+    %><do with="&collection" param="default"/><%
+  else
+    %><do field="&name" param="default"/><%
+  end
+%></def>

data/hobo_files/plugin/taglibs/rapid_plus.dryml CHANGED

@@ -1,5 +1,6 @@
 <def tag="table-plus" attrs="sort-field, sort-direction, sort-columns" >
   <% sort_field ||= @sort_field; sort_direction ||= @sort_direction; sort_columns ||= {} %>
+  <% sort_columns['this'] ||= this.member_class.name_attribute %>
   <div class="table-plus" merge-attrs="&attributes - attrs_for(:with_fields) - attrs_for(:table)">
     <div class="header" param="header">
       <div class="search">
@@ -12,7 +13,7 @@
       </div>
     </div>
-    <table merge-attrs="&attributes & (attrs_for(:table) + attrs_for(:with_fields))" merge-params>
+    <table merge-attrs="&attributes & (attrs_for(:table) + attrs_for(:with_fields))" empty merge-params>
       <field-heading-row:>
         <with-field-names merge-attrs="&all_attributes & attrs_for(:with_fields)">
           <% col = sort_columns[scope.field_path] || scope.field_path
@@ -32,11 +33,9 @@
         <th if="&all_parameters[:controls]" class="controls"/>
       </field-heading-row>
     </table>
-    <else>
-      <do param="empty-message"/>
-    </else>
+    <do param="empty-message" if="empty?"/>
-    <nav class="page">
+    <nav class="page" if="&this.respond_to? :page_count">
       <page-nav param/>
     </nav>
   </div>

data/hobo_files/plugin/taglibs/rapid_support.dryml CHANGED

@@ -1,12 +1,13 @@
 <def tag="with-fields" attrs="fields, associations, skip, skip-associations, include-timestamps, force-all"><%
+  fields.nil? || associations.nil? or raise ArgumentError, "with-fields -- specify either fields or associations but not both"
   field_names = if associations == "has_many"
                   this.class.reflections.values.select { |refl| refl.macro == :has_many }.map { |refl| refl.name.to_s }
                 elsif fields.nil? || fields == "*" || fields.is_a?(Class)
                   klass = fields.is_a?(Class) ? fields : this.class
                   columns = klass.content_columns.*.name
-                  columns -= %w{created_at updated_at created_on updated_on} unless
-                    include_timestamps
+                  columns -= %w{created_at updated_at created_on updated_on} unless include_timestamps
                   if skip_associations == "has_many"
                     assocs = this.class.reflections.values.reject {|r| r.macro == :has_many }.map &its.name.to_s
@@ -22,7 +23,13 @@
                 end
   field_names -= comma_split(skip) if skip
   field_names = field_names.select {|f| can_view?(this, f)} unless force_all
-  field_names.each do |field| %><with field="&field"><do param="default"/></with><% end
+  field_names.each do |field|
+    if field == "this"
+      %><do param="default"/><%
+    else
+      %><with field="&field"><do param="default"/></with><%
+    end
+  end
 %></def>
 <def tag="with-field-names" attrs="fields, skip, skip-associations, include-timestamps"><%=
@@ -47,7 +54,7 @@
   field_names -= comma_split(skip) if skip
   scope.new_scope do
     field_names.map do |n|
-      scope.field_name = n.to_s.gsub("." , "_")
+      scope.field_name = n == "this" ? this.member_class.name : n.to_s.gsub("." , "_")
       scope.field_path = n
       parameters.default
     end

metadata CHANGED

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hobo
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.4
 platform: ruby
 authors:
 - Tom Locke
@@ -9,10 +9,18 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2008-03-14 00:00:00 +00:00
+date: 2008-04-07 00:00:00 +01:00
 default_executable:
-dependencies: []
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: hobosupport
+  version_requirement:
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.7.4
+    version:
 description:
 email: tom@hobocentral.net
 executables:
@@ -151,6 +159,15 @@ files:
 - hobo_files/plugin/lib/hobo/dryml
 - hobo_files/plugin/lib/hobo/dryml/dryml_builder.rb
 - hobo_files/plugin/lib/hobo/dryml/dryml_support_controller.rb
+- hobo_files/plugin/lib/hobo/dryml/parser
+- hobo_files/plugin/lib/hobo/dryml/parser/attribute.rb
+- hobo_files/plugin/lib/hobo/dryml/parser/base_parser.rb
+- hobo_files/plugin/lib/hobo/dryml/parser/document.rb
+- hobo_files/plugin/lib/hobo/dryml/parser/element.rb
+- hobo_files/plugin/lib/hobo/dryml/parser/elements.rb
+- hobo_files/plugin/lib/hobo/dryml/parser/source.rb
+- hobo_files/plugin/lib/hobo/dryml/parser/text.rb
+- hobo_files/plugin/lib/hobo/dryml/parser/tree_parser.rb
 - hobo_files/plugin/lib/hobo/dryml/part_context.rb
 - hobo_files/plugin/lib/hobo/dryml/scoped_variables.rb
 - hobo_files/plugin/lib/hobo/dryml/tag_parameters.rb
@@ -168,6 +185,7 @@ files:
 - hobo_files/plugin/lib/hobo/model_support.rb
 - hobo_files/plugin/lib/hobo/rapid_helper.rb
 - hobo_files/plugin/lib/hobo/scopes
+- hobo_files/plugin/lib/hobo/scopes/apply_scopes.rb
 - hobo_files/plugin/lib/hobo/scopes/association_proxy_extensions.rb
 - hobo_files/plugin/lib/hobo/scopes/automatic_scopes.rb
 - hobo_files/plugin/lib/hobo/scopes/defined_scope_proxy_extender.rb
@@ -180,7 +198,6 @@ files:
 - hobo_files/plugin/lib/hobo/user.rb
 - hobo_files/plugin/lib/hobo/user_controller.rb
 - hobo_files/plugin/lib/hobo.rb
-- hobo_files/plugin/lib/rexml.rb
 - hobo_files/plugin/LICENSE.txt
 - hobo_files/plugin/Rakefile
 - hobo_files/plugin/README
@@ -226,7 +243,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version:
 requirements: []
-rubyforge_project:
+rubyforge_project: hobo
 rubygems_version: 1.0.1
 signing_key:
 specification_version: 2

data/hobo_files/plugin/lib/rexml.rb DELETED

@@ -1,443 +0,0 @@
-# Extensions to XML Parsing
-#
-# 1. Hobo needs to process XML as transparently as possibe. In the
-# case of tags that are not defined (i.e. html tags), they should pass
-# through just as they were in the dryml source. Recontructing the
-# tags from the DOM is not good enough. The extensions to REXML in
-# here allow Hobo to use the original start tag source in the output.
-#
-# 2. some fixes/extras to allow error messages with line numbers.
-#
-# 3. Attributes without a RHS are allowed. They are returned as having
-# a value of +true+ (the Ruby value, not the string 'true')
-#
-# 1 and 2 are achieved by adding two instance variables to Element
-# nodes : @start_tag_source and @source_offset
-#
-# So cool that Ruby allows us to redefine a method. Such a shame the method
-# we needed to change happened to be 200 lines long :-(
-require 'rexml/document'
-module REXML
-  module Parsers
-    class TreeParser
-      def initialize( source, build_context = Document.new )
-        @build_context = build_context
-        @parser = Parsers::BaseParser.new(source)
-        @parser.dryml_mode = build_context.context[:dryml_mode]
-      end
-    end
-    class BaseParser
-      DRYML_NAME_STR= "#{NCNAME_STR}(?::(?:#{NCNAME_STR})?)?"
-      DRYML_ATTRIBUTE_PATTERN = /\s*(#{NAME_STR})(?:\s*=\s*(["'])(.*?)\2)?/um
-      DRYML_TAG_MATCH = /^<((?>#{DRYML_NAME_STR}))\s*((?>\s+#{NAME_STR}(?:\s*=\s*(["']).*?\3)?)*)\s*(\/)?>/um
-      DRYML_CLOSE_MATCH = /^\s*<\/(#{DRYML_NAME_STR})\s*>/um
-      attr_writer :dryml_mode
-      def dryml_mode?
-        @dryml_mode
-      end
-      def pull
-        if @closed
-          x, @closed = @closed, nil
-          return [ :end_element, x, false ]
-        end
-        return [ :end_document ] if empty?
-        return @stack.shift if @stack.size > 0
-        @source.read if @source.buffer.size<2
-        if @document_status == nil
-          @source.consume(/^\s*/um)
-          word = @source.match(/(<[^>]*)>/um)
-          word = word[1] unless word.nil?
-          case word
-          when COMMENT_START
-            return [ :comment, @source.match(COMMENT_PATTERN, true)[1] ]
-          when XMLDECL_START
-            results = @source.match(XMLDECL_PATTERN, true)[1]
-            version = VERSION.match(results)
-            version = version[1] unless version.nil?
-            encoding = ENCODING.match(results)
-            encoding = encoding[1] unless encoding.nil?
-            @source.encoding = encoding
-            standalone = STANDALONE.match(results)
-            standalone = standalone[1] unless standalone.nil?
-            return [ :xmldecl, version, encoding, standalone]
-          when INSTRUCTION_START
-            return [ :processing_instruction, *@source.match(INSTRUCTION_PATTERN, true)[1,2] ]
-          when DOCTYPE_START
-            md = @source.match(DOCTYPE_PATTERN, true)
-            identity = md[1]
-            close = md[2]
-            identity =~ IDENTITY
-            name = $1
-            raise REXML::ParseException("DOCTYPE is missing a name") if name.nil?
-            pub_sys = $2.nil? ? nil : $2.strip
-            long_name = $3.nil? ? nil : $3.strip
-            uri = $4.nil? ? nil : $4.strip
-            args = [ :start_doctype, name, pub_sys, long_name, uri ]
-            if close == ">"
-              @document_status = :after_doctype
-              @source.read if @source.buffer.size<2
-              md = @source.match(/^\s*/um, true)
-              @stack << [ :end_doctype ]
-            else
-              @document_status = :in_doctype
-            end
-            return args
-          else
-            @document_status = :after_doctype
-            @source.read if @source.buffer.size<2
-            md = @source.match(/\s*/um, true)
-          end
-        end
-        if @document_status == :in_doctype
-          md = @source.match(/\s*(.*?>)/um)
-          case md[1]
-          when SYSTEMENTITY
-            match = @source.match(SYSTEMENTITY, true)[1]
-            return [ :externalentity, match ]
-          when ELEMENTDECL_START
-            return [ :elementdecl, @source.match(ELEMENTDECL_PATTERN, true)[1] ]
-          when ENTITY_START
-            match = @source.match(ENTITYDECL, true).to_a.compact
-            match[0] = :entitydecl
-            ref = false
-            if match[1] == '%'
-              ref = true
-              match.delete_at 1
-            end
-            # Now we have to sort out what kind of entity reference this is
-            if match[2] == 'SYSTEM'
-              # External reference
-              match[3] = match[3][1..-2] # PUBID
-              match.delete_at(4) if match.size > 4 # Chop out NDATA decl
-              # match is [ :entity, name, SYSTEM, pubid(, ndata)? ]
-            elsif match[2] == 'PUBLIC'
-              # External reference
-              match[3] = match[3][1..-2] # PUBID
-              match[4] = match[4][1..-2] # HREF
-              # match is [ :entity, name, PUBLIC, pubid, href ]
-            else
-              match[2] = match[2][1..-2]
-              match.pop if match.size == 4
-              # match is [ :entity, name, value ]
-            end
-            match << '%' if ref
-            return match
-          when ATTLISTDECL_START
-            md = @source.match(ATTLISTDECL_PATTERN, true)
-            raise REXML::ParseException.new("Bad ATTLIST declaration!", @source) if md.nil?
-            element = md[1]
-            contents = md[0]
-            pairs = {}
-            values = md[0].scan(ATTDEF_RE)
-            values.each do |attdef|
-              unless attdef[3] == "#IMPLIED"
-                attdef.compact!
-                val = attdef[3]
-                val = attdef[4] if val == "#FIXED "
-                pairs[attdef[0]] = val
-              end
-            end
-            return [ :attlistdecl, element, pairs, contents ]
-          when NOTATIONDECL_START
-            md = nil
-            if @source.match(PUBLIC)
-              md = @source.match(PUBLIC, true)
-            elsif @source.match(SYSTEM)
-              md = @source.match(SYSTEM, true)
-            else
-              raise REXML::ParseException.new("error parsing notation: no matching pattern", @source)
-            end
-            return [ :notationdecl, md[1], md[2], md[3] ]
-          when CDATA_END
-            @document_status = :after_doctype
-            @source.match(CDATA_END, true)
-            return [ :end_doctype ]
-          end
-        end
-        begin
-          if @source.buffer[0] == ?<
-            if @source.buffer[1] == ?/
-              last_tag, line_no = @tags.pop
-              #md = @source.match_to_consume('>', CLOSE_MATCH)
-              md = @source.match(dryml_mode? ? DRYML_CLOSE_MATCH : CLOSE_MATCH, true)
-              valid_end_tag = if dryml_mode?
-                                last_tag =~ /^#{Regexp.escape(md[1])}(:.*)?/
-                              else
-                                last_tag == md[1]
-                              end
-              raise REXML::ParseException.new("Missing end tag for "+
-                                              "'#{last_tag}' (line #{line_no}) (got \"#{md[1]}\")",
-                                              @source) unless valid_end_tag
-              return [ :end_element, last_tag, true ]
-            elsif @source.buffer[1] == ?!
-              md = @source.match(/\A(\s*[^>]*>)/um)
-              raise REXML::ParseException.new("Malformed node", @source) unless md
-              if md[0][2] == ?-
-                md = @source.match(COMMENT_PATTERN, true)
-                return [ :comment, md[1] ] if md
-              else
-                md = @source.match(CDATA_PATTERN, true)
-                return [ :cdata, md[1] ] if md
-              end
-              raise REXML::ParseException.new("Declarations can only occur "+
-                "in the doctype declaration.", @source)
-            elsif @source.buffer[1] == ??
-              md = @source.match(INSTRUCTION_PATTERN, true)
-              return [ :processing_instruction, md[1], md[2] ] if md
-              raise REXML::ParseException.new("Bad instruction declaration",
-                @source)
-            else
-              # Get the next tag
-              md = @source.match(dryml_mode? ? DRYML_TAG_MATCH : TAG_MATCH, true)
-              raise REXML::ParseException.new("malformed XML: missing tag start", @source) unless md
-              attrs = []
-              if md[2].size > 0
-                attrs = md[2].scan(dryml_mode? ? DRYML_ATTRIBUTE_PATTERN : ATTRIBUTE_PATTERN)
-                raise REXML::ParseException.new("error parsing attributes: [#{attrs.join ', '}], excess = \"#$'\"",
-                                                @source) if $' and $'.strip.size > 0
-              end
-              if md[4]
-                @closed = md[1]
-              else
-                cl = @source.current_line
-                @tags.push([md[1], cl && cl[2]])
-              end
-              attributes = {}
-              attrs.each { |a,b,c| attributes[a] = (c || true) }
-              return [ :start_element, md[1], attributes, md[0],
-                       @source.respond_to?(:last_match_offset) && @source.last_match_offset ]
-            end
-          else
-            md = @source.match(TEXT_PATTERN, true)
-            if md[0].length == 0
-              @source.match(/(\s+)/, true)
-            end
-            #return [ :text, "" ] if md[0].length == 0
-            # unnormalized = Text::unnormalize(md[1], self)
-            # return PullEvent.new(:text, md[1], unnormalized)
-            return [ :text, md[1] ]
-          end
-        rescue REXML::ParseException
-          raise
-        rescue Exception, NameError => error
-          raise REXML::ParseException.new("Exception parsing", @source, self, (error ? error : $!))
-        end
-        return [ :dummy ]
-      end
-    end
-    class TreeParser
-      def parse
-        tag_stack = []
-        in_doctype = false
-        entities = nil
-        begin
-          while true
-            event = @parser.pull
-            case event[0]
-            when :end_document
-              return
-            when :start_element
-              tag_stack.push(event[1])
-              # find the observers for namespaces
-              @build_context = @build_context.add_element(event[1], event[2])
-              @build_context.start_tag_source = event[3]
-              @build_context.source_offset = event[4]
-            when :end_element
-              tag_stack.pop
-              @build_context.has_end_tag = event[2]
-              @build_context = @build_context.parent
-            when :text
-              if not in_doctype
-                if @build_context[-1].instance_of? Text
-                  @build_context[-1] << event[1]
-                else
-                  @build_context.add(
-                    Text.new(event[1], @build_context.whitespace, nil, true)
-                 ) unless (
-                    event[1].strip.size==0 and
-                    @build_context.ignore_whitespace_nodes
-                 )
-                end
-              end
-            when :comment
-              c = Comment.new(event[1])
-              @build_context.add(c)
-            when :cdata
-              c = CData.new(event[1])
-              @build_context.add(c)
-            when :processing_instruction
-              @build_context.add(Instruction.new(event[1], event[2]))
-            when :end_doctype
-              in_doctype = false
-              entities.each { |k,v| entities[k] = @build_context.entities[k].value }
-              @build_context = @build_context.parent
-            when :start_doctype
-              doctype = DocType.new(event[1..-1], @build_context)
-              @build_context = doctype
-              entities = {}
-              in_doctype = true
-            when :attlistdecl
-              n = AttlistDecl.new(event[1..-1])
-              @build_context.add(n)
-            when :externalentity
-              n = ExternalEntity.new(event[1])
-              @build_context.add(n)
-            when :elementdecl
-              n = ElementDecl.new(event[1])
-              @build_context.add(n)
-            when :entitydecl
-              entities[ event[1] ] = event[2] unless event[2] =~ /PUBLIC|SYSTEM/
-              @build_context.add(Entity.new(event))
-            when :notationdecl
-              n = NotationDecl.new(*event[1..-1])
-              @build_context.add(n)
-            when :xmldecl
-              x = XMLDecl.new(event[1], event[2], event[3])
-              @build_context.add(x)
-            end
-          end
-        rescue REXML::Validation::ValidationException
-          raise
-        rescue
-          raise ParseException.new($!.message, @parser.source, @parser, $!)
-        end
-      end
-    end
-  end
-  class Document
-    attr_accessor :default_attribute_value
-  end
-  class Element
-    def dryml_name
-      expanded_name.sub(/:.*/, "")
-    end
-    attr_accessor :start_tag_source, :source_offset
-    attr_writer :has_end_tag
-    def has_end_tag?
-      @has_end_tag
-    end
-    def parameter_tag?
-      expanded_name =~ /:$/
-    end
-  end
-  class Attribute
-    def initialize_with_dryml(first, second=nil, parent=nil)
-      initialize_without_dryml(first, second, parent)
-      if first.is_a?(String) && second == true
-        @value = true
-      end
-    end
-    alias_method_chain :initialize, :dryml
-    def value_with_dryml
-      if has_rhs?
-        value_without_dryml
-      else
-        element.document.default_attribute_value
-      end
-    end
-    alias_method_chain :value, :dryml
-    def to_string_with_dryml
-      if has_rhs?
-        to_string_without_dryml
-      else
-        @expanded_name
-      end
-    end
-    alias_method_chain :to_string, :dryml
-    def has_rhs?
-      @value != true
-    end
-  end
-end
-module Hobo::Dryml
-  # A REXML source that keeps track of where in the buffer it is
-  class RexSource < REXML::Source
-    def initialize(src)
-      super(src)
-      @buffer_offset = 0
-    end
-    attr_reader :last_match_offset
-    def remember_match(m)
-      if m
-        @last_match = m
-        @last_match_offset = @buffer_offset + m.begin(0)
-        @orig[@last_match_offset..@last_match_offset+m[0].length] == @buffer[m.begin(0)..m.end(0)]
-      end
-      m
-    end
-    def advance_buffer(md)
-      @buffer = md.post_match
-      @buffer_offset += md.end(0)
-    end
-    def scan(pattern, cons=false)
-      raise '!'
-      return nil if @buffer.nil?
-      rv = @buffer.scan(pattern)
-      if cons and rv.size > 0
-        advance_buffer(Regexp.last_match)
-      end
-      rv
-    end
-    def consume(pattern)
-      md = remember_match(pattern.match(@buffer))
-      if md
-        advance_buffer(md)
-        @buffer
-      end
-    end
-    def match(pattern, cons=false)
-      md = remember_match(pattern.match(@buffer))
-      advance_buffer(md) if cons and md
-      return md
-    end
-    def current_line
-      pos = last_match_offset || 0
-      [0, 0, @orig[0..pos].count("\n") + 1]
-    end
-  end
-end