erector 0.4.200 → 0.5.0

data/lib/erector.rb

@@ -3,7 +3,6 @@ dir = File.dirname(__FILE__)
 require 'cgi'
 require "activesupport"
 require "#{dir}/erector/extensions/object"
-require "#{dir}/erector/doc"
 require "#{dir}/erector/raw_string"
 require "#{dir}/erector/widget"
 require "#{dir}/erector/unicode"

data/lib/erector/extensions/object.rb

@@ -11,8 +11,8 @@ class Object
     CGI.unescapeHTML(to_s)
   end
 
-  # OMGWTF :-)
   def escape_single_quotes
     self.gsub(/[']/, '\\\\\'')
   end
 end
+

data/lib/erector/rails/extensions/action_controller.rb

@@ -1,17 +1,8 @@
-ActionController::Base.class_eval do
-  def render_widget(widget_class, assigns=@assigns)
-    @__widget_class = widget_class
-    @__widget_assigns = assigns
-    add_variables_to_assigns
-    render :inline => "<% @__widget_class.new(self, @__widget_assigns, StringIO.new(_erbout)).render %>"
-  end
-
-  def render_with_erector_widget(*options, &block)
-    if options.first.is_a?(Hash) && widget = options.first.delete(:widget)
-      render_widget widget, @assigns, &block
-    else
-      render_without_erector_widget *options, &block
-    end
-  end
-  alias_method_chain :render, :erector_widget
+dir = File.dirname(__FILE__)
+if (
+  ActionController::Base.instance_methods + ActionController::Base.private_instance_methods).
+  include?("add_variables_to_assigns")
+  require File.expand_path("#{dir}/action_controller/1.2.5/action_controller")
+else
+  require File.expand_path("#{dir}/action_controller/2.2.0/action_controller")
 end

data/lib/erector/rails/extensions/action_controller/1.2.5/action_controller.rb

@@ -0,0 +1,17 @@
+ActionController::Base.class_eval do
+  def render_widget(widget_class, assigns=@assigns)
+    @__widget_class = widget_class
+    @__widget_assigns = assigns
+    add_variables_to_assigns
+    render :inline => "<% @__widget_class.new(self, @__widget_assigns, _erbout).render %>"
+  end
+
+  def render_with_erector_widget(*options, &block)
+    if options.first.is_a?(Hash) && widget = options.first.delete(:widget)
+      render_widget widget, @assigns, &block
+    else
+      render_without_erector_widget *options, &block
+    end
+  end
+  alias_method_chain :render, :erector_widget
+end

data/lib/erector/rails/extensions/action_controller/2.2.0/action_controller.rb

@@ -0,0 +1,26 @@
+ActionController::Base.class_eval do
+  def render_widget(widget_class, assigns=nil)
+    @__widget_class = widget_class
+    if assigns
+      @__widget_assigns = assigns
+    else
+      @__widget_assigns = {}
+      variables = instance_variable_names
+      variables -= protected_instance_variables
+      variables.each do |name|
+        @__widget_assigns[name.sub('@', "")] = instance_variable_get(name)
+      end
+    end
+    response.template.send(:_evaluate_assigns_and_ivars)
+    render :inline => "<% @__widget_class.new(self, @__widget_assigns, output_buffer).render %>"
+  end
+
+  def render_with_erector_widget(*options, &block)
+    if options.first.is_a?(Hash) && widget = options.first.delete(:widget)
+      render_widget widget, @assigns, &block
+    else
+      render_without_erector_widget *options, &block
+    end
+  end
+  alias_method_chain :render, :erector_widget
+end

data/lib/erector/rails/extensions/widget.rb

@@ -1,26 +1,15 @@
 module Erector
   Widget.class_eval do
     include ActionController::UrlWriter
-    attr_reader :_erbout
-
-    after_initialize do
-      @_erbout = doc.string
-    end
-
-    def fake_erbout
-      warn "fake_erbout is deprecated. You don't need to use it anymore."
-      yield
-    end
 
     # helpers returning raw text
     [
-        :image_tag,
-        :javascript_include_tag,
-        :define_javascript_functions,
-        :stylesheet_link_tag,
-        :sortable_element,
-        :sortable_element_js,
-        :text_field_with_auto_complete,
+      :image_tag,
+      :javascript_include_tag,
+      :stylesheet_link_tag,
+      :sortable_element,
+      :sortable_element_js,
+      :text_field_with_auto_complete,
     ].each do |helper_name|
       define_method helper_name do |*args|
         begin
@@ -34,11 +23,11 @@ module Erector
 
     # helpers returning raw text whose first parameter is HTML escaped
     [
-        :link_to,
-        :link_to_remote,
-        :mail_to,
-        :button_to,
-        :submit_tag,
+      :link_to,
+      :link_to_remote,
+      :mail_to,
+      :button_to,
+      :submit_tag,
     ].each do |helper_name|
 
       method_def =<<-METHOD_DEF
@@ -118,4 +107,11 @@ module Erector
       helpers.pluralize(*args)
     end    
   end
+end
+
+dir = File.dirname(__FILE__)
+if ActionView::Base.instance_methods.include?("output_buffer")
+  require "#{dir}/widget/2.2.0/widget"
+else
+  require "#{dir}/widget/1.2.5/widget"
 end

data/lib/erector/rails/extensions/widget/1.2.5/widget.rb

@@ -0,0 +1,18 @@
+module Erector
+  Widget.class_eval do
+    attr_reader :_erbout
+
+    after_initialize do
+      @_erbout = output
+    end
+
+    def define_javascript_functions(*args)
+      begin
+        text raw(helpers.define_javascript_functions(*args))
+      rescue => e
+        puts e.backtrace.join("\n\t")
+        raise e
+      end
+    end
+  end
+end

data/lib/erector/rails/extensions/widget/2.2.0/widget.rb

@@ -0,0 +1,23 @@
+module Erector
+  Widget.class_eval do
+    def output
+      if helpers.respond_to?(:output_buffer)
+        helpers.output_buffer
+      else
+        @output
+      end
+    end
+
+    def capture_with_helpers(&block)
+      if helpers
+        helpers.capture(&block)
+      else
+        capture_without_helpers(&block)
+      end
+    end
+    alias_method_chain :capture, :helpers
+
+    # This is here to force #helpers.capture to return the output
+    def __in_erb_template; end
+  end
+end

data/lib/erector/rails/supported_rails_versions.rb

@@ -5,7 +5,9 @@ module Erector
       "1.99.0" => {'version' => '1.99.0', 'git_tag' => 'v2.0.0_RC1'},
       "2.0.2" => {'version' => '2.0.2', 'git_tag' => 'v2.0.2'},
       "2.1.0" => {'version' => '2.1.0', 'git_tag' => 'v2.1.0'},
-#      "edge" => {'version' => 'edge', 'git_tag' => 'master'},
+      "2.2.0" => {'version' => '2.2.0', 'git_tag' => 'v2.2.0'},
+      "2.2.2" => {'version' => '2.2.2', 'git_tag' => 'v2.2.2'},
+#      "edge" => {'version' => 'edge', 'git_tag' => 'master'}, #TODO: Readd edge support
     }
   end
 end

data/lib/erector/rails/template_handlers/1.2.5/action_view_template_handler.rb

@@ -0,0 +1,32 @@
+module ActionView #:nodoc:
+  module TemplateHandlers #:nodoc:
+    class Erector
+      def self.line_offset
+        2
+      end
+
+      attr_reader :view
+      def initialize(view)
+        @view = view
+      end
+
+      def compilable?
+        true
+      end
+
+      ActionView::Base.register_template_handler :rb, ActionView::TemplateHandlers::Erector
+
+      def render(template, local_assigns)
+        relative_path_parts = view.first_render.split('/')
+        require_dependency view.template_file_path
+
+        dot_rb = /\.rb$/
+        widget_class = relative_path_parts.inject(Views) do |mod, node|
+          mod.const_get(node.gsub(dot_rb, '').gsub(".html", "").camelize)
+        end
+        render_method = view.is_partial_template? ? 'render_partial' : 'render'
+        widget_class.new(view, view.assigns).to_s(render_method)
+      end
+    end
+  end
+end

data/lib/erector/rails/template_handlers/2.0.0/action_view_template_handler.rb

@@ -0,0 +1,36 @@
+module ActionView #:nodoc:
+  module TemplateHandlers #:nodoc:
+    class Erector < TemplateHandler
+      def self.line_offset
+        2
+      end
+
+      attr_reader :view
+      def initialize(view)
+        @view = view
+      end
+
+      def compilable?
+        true
+      end
+      undef :compile
+
+      ActionView::Base.register_template_handler :rb, ActionView::TemplateHandlers::Erector
+
+      def render(template, local_assigns)
+        relative_path_parts = view.first_render.split('/')
+        file_name = relative_path_parts.last
+        require_dependency(view.template_file_path)
+
+        dot_rb = /\.rb$/
+        widget_class = relative_path_parts.inject(Views) do |mod, node|
+          mod.const_get(node.gsub(dot_rb, '').gsub(".html", "").camelize)
+        end
+        render_method = view.is_partial_template? ? 'render_partial' : 'render'
+        widget = widget_class.new(view, view.assigns)
+        widget.to_s(render_method)
+      end
+    end
+  end
+end
+

data/lib/erector/rails/template_handlers/2.1.0/action_view_template_handler.rb

@@ -0,0 +1,31 @@
+module ActionView #:nodoc:
+  module TemplateHandlers #:nodoc:
+    class Erector < TemplateHandler
+      include Compilable
+      def self.line_offset
+        2
+      end
+
+      ActionView::Template.instance_eval do
+        register_template_handler :rb, ActionView::TemplateHandlers::Erector
+      end
+
+      def compile(template)
+        relative_path_parts = template.path.split('/')
+
+        is_partial = relative_path_parts.last =~ /^_/
+        require_dependency File.expand_path(template.filename)
+
+        widget_class_parts = relative_path_parts.inject(['Views']) do |class_parts, node|
+          class_parts << node.gsub(/^_/, "").gsub(/(\.html)?\.rb$/, '').classify
+          class_parts
+        end
+        widget_class_name = widget_class_parts.join("::")
+        render_method = is_partial ? 'render_partial' : 'render'
+
+        erb_template = "<% #{widget_class_name}.new(self, controller.assigns, _erbout).#{render_method} %>"
+        ::ERB.new(erb_template, nil, ActionView::Base.erb_trim_mode).src
+      end
+    end
+  end
+end

data/lib/erector/rails/template_handlers/2.2.0/action_view_template_handler.rb

@@ -0,0 +1,46 @@
+module ActionView #:nodoc:
+  module TemplateHandlers #:nodoc:
+    class Erector < TemplateHandler
+      include Compilable
+      def self.line_offset
+        2
+      end
+
+      ActionView::Template.instance_eval do
+        register_template_handler :rb, ActionView::TemplateHandlers::Erector
+      end
+
+      def compile(template)
+        relative_path_parts = template.path.split('/')
+
+        is_partial = relative_path_parts.last =~ /^_/
+        require_dependency File.expand_path(template.filename)
+
+        widget_class_parts = relative_path_parts.inject(['Views']) do |class_parts, node|
+          class_parts << node.gsub(/^_/, "").gsub(/(\.html)?\.rb$/, '').classify
+          class_parts
+        end
+        widget_class_name = widget_class_parts.join("::")
+        render_method = is_partial ? 'render_partial' : 'render'
+
+        erb_template = <<-ERB
+        <%
+          assigns = instance_variables.inject({}) do |hash, name|
+            hash[name.sub('@', "")] = instance_variable_get(name)
+            hash
+          end
+
+          widget = #{widget_class_name}.new(self, assigns, output_buffer)
+          widget.#{render_method}
+        %>
+        ERB
+        ::ERB.new(
+          erb_template,
+          nil,
+          ::ActionView::TemplateHandlers::ERB.erb_trim_mode,
+          "@output_buffer"
+        ).src
+      end
+    end
+  end
+end

data/lib/erector/rails/template_handlers/action_view_template_handler.rb

@@ -1,92 +1,14 @@
-module ActionView #:nodoc:
-  module TemplateHandlers #:nodoc:
-    class Erector
-      def self.line_offset
-        2
-      end
-
-      attr_reader :view
-      def initialize(view)
-        @view = view
-      end
-
-      def compilable?
-        true
-      end
-
-      if ActionView.const_defined?(:Template)
-        ActionView::Template.instance_eval do
-          register_template_handler :rb, ActionView::TemplateHandlers::Erector
-        end
-
-        def compile_template(template)
-          relative_path_parts = view.first_render.split('/')
-          require_dependency view.finder.pick_template(
-            template.path,
-            view.finder.pick_template_extension(template.path)
-          )
-
-          dot_rb = /\.rb$/
-          widget_class_parts = relative_path_parts.inject(['Views']) do |class_parts, node|
-            class_parts << node.gsub(dot_rb, '').camelize
-            class_parts
-          end
-          widget_class_name = widget_class_parts.join("::")
-          render_method = template.is_a?(ActionView::PartialTemplate) ? 'render_partial' : 'render'
-
-          erb_template = "<% #{widget_class_name}.new(self, controller.assigns, StringIO.new(_erbout)).#{render_method} %>"
-          ::ERB.new(erb_template, nil, @view.erb_trim_mode).src
-        end
-
-        def render(template)
-          relative_path_parts = view.first_render.split('/')
-          require_dependency view.finder.pick_template(
-            template.path,
-            view.finder.pick_template_extension(template.path)
-          )
-
-          dot_rb = /\.rb$/
-          widget_class = relative_path_parts.inject(Views) do |mod, node|
-            mod.const_get(node.gsub(dot_rb, '').camelize)
-          end
-          render_method = template.is_a?(ActionView::PartialTemplate) ? 'render_partial' : 'render'
-          widget_class.new(view, view.assigns).to_s(render_method)
-        end
-      else
-        ActionView::Base.instance_eval do
-          if respond_to?(:register_template_handler)
-            register_template_handler :rb, ActionView::TemplateHandlers::Erector
-          end
-        end
-
-        def compile(template)
-          relative_path_parts = view.first_render.split('/')
-          require_dependency view.template_file_path
-
-          dot_rb = /\.rb$/
-          widget_class_parts = relative_path_parts.inject(['Views']) do |class_parts, node|
-            class_parts << node.gsub(dot_rb, '').camelize
-            class_parts
-          end
-          widget_class_name = widget_class_parts.join("::")
-          render_method = view.is_partial_template? ? 'render_partial' : 'render'
-
-          erb_template = "<% #{widget_class_name}.new(self, controller.assigns, StringIO.new(_erbout)).#{render_method} %>"
-          ::ERB.new(erb_template, nil, @view.erb_trim_mode).src
-        end
-
-        def render(template, local_assigns)
-          relative_path_parts = view.first_render.split('/')
-          require_dependency view.template_file_path
-
-          dot_rb = /\.rb$/
-          widget_class = relative_path_parts.inject(Views) do |mod, node|
-            mod.const_get(node.gsub(dot_rb, '').camelize)
-          end
-          render_method = view.is_partial_template? ? 'render_partial' : 'render'
-          widget_class.new(view, view.assigns).to_s(render_method)
-        end
-      end
+dir = File.dirname(__FILE__)
+if ActionView.const_defined?(:TemplateHandlers)
+  if ::ActionView::TemplateHandlers::const_defined?(:Compilable)
+    if ActionView.const_defined?(:TemplateHandlers) && ::ActionView::TemplateHandlers::ERB.respond_to?(:erb_trim_mode)
+      require File.expand_path("#{dir}/2.2.0/action_view_template_handler")
+    else
+      require File.expand_path("#{dir}/2.1.0/action_view_template_handler")
     end
+  else
+    require File.expand_path("#{dir}/2.0.0/action_view_template_handler")
   end
+else
+  require File.expand_path("#{dir}/1.2.5/action_view_template_handler")
 end

data/lib/erector/version.rb

@@ -1,6 +1,8 @@
 ##
 # Erector view framework
 module Erector
-  VERSION = "0.4.200"
+  if !Erector.const_defined?(:VERSION)
+    VERSION = "0.5.0"
+  end
 end
 

data/lib/erector/widget.rb

@@ -12,11 +12,11 @@ module Erector
   # To render a widget from the outside, instantiate it and call its +to_s+ method.
   # 
   # To call one widget from another, inside the parent widget's render method, instantiate the child widget and call 
-  # its +render_to+ method, passing in +self+ (or self.doc if you prefer). This assures that the same Doc stream
+  # its +render_to+ method, passing in +self+ (or self.output if you prefer). This assures that the same output
   # is used, which gives better performance than using +capture+ or +to_s+.
   # 
   # In this documentation we've tried to keep the distinction clear between methods that *emit* text and those that
-  # *return* text. "Emit" means that it writes Doc to the doc stream; "return" means that it returns a string
+  # *return* text. "Emit" means that it writes to the output stream; "return" means that it returns a string
   # like a normal method and leaves it up to the caller to emit that string if it wants.
   class Widget
     class << self
@@ -32,14 +32,14 @@ module Erector
       # tags which can contain other stuff
       def full_tags
         [
-          'a', 'acronym', 'address', 'b', 'bdo', 'big', 'blockquote', 'body',
-          'button', 'caption', 'center', 'cite', 'code',
+          'a', 'abbr', 'acronym', 'address', 'b', 'bdo', 'big', 'blockquote', 'body',
+          'button', 'caption', 'center', 'cite', 'code', 'col', 'colgroup',
           'dd', 'del', 'div', 'dl', 'dt', 'em',
           'fieldset', 'form', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'head', 'html', 'i',
           'iframe', 'ins', 'kbd', 'label', 'legend', 'li', 'map',
           'noframes', 'noscript', 'ol', 'optgroup', 'option', 'p', 'param', 'pre',
           'samp', 'script', 'select', 'small', 'span', 'strong', 'style', 'sub', 'sup',
-          'table', 'tbody', 'td', 'textarea', 'th', 'thead', 'title', 'tr', 'tt', 'u', 'ul', 'var'
+          'table', 'tbody', 'td', 'textarea', 'tfoot', 'th', 'thead', 'title', 'tr', 'tt', 'u', 'ul', 'var'
         ]
       end
 
@@ -64,19 +64,28 @@ module Erector
       end
     end
 
-    attr_reader :helpers
-    attr_reader :assigns
-    attr_reader :doc
-    attr_reader :block
-    attr_reader :parent
+    cattr_accessor :prettyprint_default
 
-    def initialize(helpers=nil, assigns={}, io = StringIO.new(""), &block)
+    NON_NEWLINEY = {'i' => true, 'b' => true, 'small' => true,
+      'img' => true, 'span' => true, 'a' => true,
+      'input' => true, 'textarea' => true, 'button' => true, 'select' => true
+    }
+
+    SPACES_PER_INDENT = 2
+
+    attr_reader :helpers, :assigns, :block, :parent, :output
+    attr_accessor :enable_prettyprint
+
+    def initialize(helpers=nil, assigns={}, output = "", &block)
       @assigns = assigns
       assign_locals(assigns)
       @helpers = helpers
       @parent = block ? eval("self", block.binding) : nil
-      @doc = Doc.new(io)
+      @output = output
       @block = block
+      @at_start_of_line = true
+      @indent = 0
+      @enable_prettyprint = prettyprint_default
       self.class.after_initialize self
     end
 
@@ -99,7 +108,7 @@ module Erector
     # This flag should be set prior to any rendering being done
     # (for example, calls to to_s or to_pretty).
     def enable_prettyprint(enable)
-      @doc.enable_prettyprint = enable
+      self.enable_prettyprint = enable
       self
     end
 
@@ -108,8 +117,8 @@ module Erector
       enable_prettyprint(true).to_s
     end
 
-    # Entry point for rendering a widget (and all its children). This method creates a new Doc doc stream,
-    # calls this widget's #render method, converts the Doc to a string, and returns the string.
+    # Entry point for rendering a widget (and all its children). This method creates a new output string,
+    # calls this widget's #render method and returns the string.
     #
     # If it's called again later 
     # then it returns the earlier rendered string, which leads to higher performance, but may have confusing
@@ -120,13 +129,13 @@ module Erector
       # If it's useful we should add a test for it.  -ac
       return @__to_s if @__to_s
       send(render_method_name, &blk)
-      @__to_s = @doc.to_s
+      @__to_s = output.to_s
     end
     
     alias_method :inspect, :to_s
 
     # Template method which must be overridden by all widget subclasses. Inside this method you call the magic
-    # #element methods which emit HTML and text to the Doc stream.
+    # #element methods which emit HTML and text to the output string.
     def render
       if @block
         instance_eval(&@block)
@@ -134,14 +143,14 @@ module Erector
     end
 
     # To call one widget from another, inside the parent widget's render method, instantiate the child widget and call 
-    # its +render_to+ method, passing in +self+ (or self.doc if you prefer). This assures that the same Doc stream
+    # its +render_to+ method, passing in +self+ (or self.output if you prefer). This assures that the same output string
     # is used, which gives better performance than using +capture+ or +to_s+.
-    def render_to(doc_or_widget)
-      if doc_or_widget.is_a?(Widget)
-        @parent = doc_or_widget
-        @doc = @parent.doc
+    def render_to(output_or_widget)
+      if output_or_widget.is_a?(Widget)
+        @parent = output_or_widget
+        @output = @parent.output
       else
-        @doc = doc_or_widget
+        @output = output_or_widget
       end
       render
     end
@@ -151,7 +160,7 @@ module Erector
     # This is an experimental erector feature which may disappear in future
     # versions of erector (see #widget in widget_spec in the Erector tests).
     def widget(widget_class, assigns={}, &block)
-      child = widget_class.new(helpers, assigns, doc.output, &block)
+      child = widget_class.new(helpers, assigns, output, &block)
       child.render
     end
 
@@ -174,7 +183,7 @@ module Erector
     # When calling one of these magic methods, put attributes in the default hash. If there is a string parameter,
     # then it is used as the contents. If there is a block, then it is executed (yielded), and the string parameter is ignored.
     # The block will usually be in the scope of the child widget, which means it has access to all the 
-    # methods of Widget, which will eventually end up appending text to the +doc+ Doc stream. See how
+    # methods of Widget, which will eventually end up appending text to the +output+ string. See how
     # elegant it is? Not confusing at all if you don't think about it.
     #
     def element(*args, &block)
@@ -193,7 +202,7 @@ module Erector
       __empty_element__(*args, &block)
     end
 
-    # Returns an HTML-escaped version of its parameter. Leaves the Doc stream untouched. Note that
+    # Returns an HTML-escaped version of its parameter. Leaves the output string untouched. Note that
     # the #text method automatically HTML-escapes its parameter, so be careful *not* to do something like
     # text(h("2<4")) since that will double-escape the less-than sign (you'll get "2&amp;lt;4" instead of
     # "2&lt;4").
@@ -203,7 +212,11 @@ module Erector
 
     # Emits an open tag, comprising '<', tag name, optional attributes, and '>'
     def open_tag(tag_name, attributes={})
-      @doc.open_tag tag_name, attributes
+      indent_for_open_tag(tag_name)
+      @indent += SPACES_PER_INDENT
+
+      output.concat "<#{tag_name}#{format_attributes(attributes)}>"
+      @at_start_of_line = false
     end
 
     # Emits text.  If a string is passed in, it will be HTML-escaped.
@@ -212,7 +225,9 @@ module Erector
     # If another kind of object is passed in, the result of calling
     # its to_s method will be treated as a string would be.
     def text(value)
-      @doc.text value
+      output.concat(value.html_escape)
+      @at_start_of_line = false
+      nil
     end
 
     # Returns text which will *not* be HTML-escaped.
@@ -250,7 +265,15 @@ module Erector
 
     # Emits a close tag, consisting of '<', tag name, and '>'
     def close_tag(tag_name)
-      @doc.close_tag tag_name
+      @indent -= SPACES_PER_INDENT
+      indent()
+
+      output.concat("</#{tag_name}>")
+
+      if newliney(tag_name)
+        output.concat "\n"
+        @at_start_of_line = true
+      end
     end
     
     # Emits the result of joining the elements in array with the separator.
@@ -269,23 +292,23 @@ module Erector
 
     # Emits an XML instruction, which looks like this: <?xml version=\"1.0\" encoding=\"UTF-8\"?>
     def instruct(attributes={:version => "1.0", :encoding => "UTF-8"})
-      @doc.instruct attributes
+      output.concat "<?xml#{format_sorted(sort_for_xml_declaration(attributes))}?>"
     end
 
     # Deprecated synonym of instruct
     alias_method :instruct!, :instruct
 
-    # Creates a whole new doc stream, executes the block, then converts the doc stream to a string and 
+    # Creates a whole new output string, executes the block, then converts the output string to a string and
     # emits it as raw text. If at all possible you should avoid this method since it hurts performance,
     # and use #render_to instead.
     def capture(&block)
       begin
-        original_doc = @doc
-        @doc = Doc.new(StringIO.new)
+        original_output = output
+        @output = ""
         yield
-        raw(@doc.to_s)
+        raw(output.to_s)
       ensure
-        @doc = original_doc
+        @output = original_output
       end
     end
 
@@ -360,6 +383,14 @@ module Erector
     def url(href)
       a href, :href => href
     end
+
+    def newliney(tag_name)
+      if @enable_prettyprint
+        !NON_NEWLINEY.include?(tag_name)
+      else
+        false
+      end
+    end    
     
 ### internal utility methods
 
@@ -401,8 +432,68 @@ protected
     end
 
     def __empty_element__(tag_name, attributes={})
-      @doc.empty_element tag_name, attributes
+      indent_for_open_tag(tag_name)
+
+      output.concat "<#{tag_name}#{format_attributes(attributes)} />"
+
+      if newliney(tag_name)
+        output.concat "\n"
+        @at_start_of_line = true
+      end
+    end
+
+    def indent_for_open_tag(tag_name)
+      if !@at_start_of_line && newliney(tag_name)
+        output.concat "\n"
+        @at_start_of_line = true
+      end
+
+      indent()
+    end
+
+    def indent()
+      if @at_start_of_line
+        output.concat " " * @indent
+      end
+    end
+
+    def format_attributes(attributes)
+      if !attributes || attributes.empty?
+        ""
+      else
+        format_sorted(sorted(attributes))
+      end
+    end
+
+    def format_sorted(sorted)
+      results = ['']
+      sorted.each do |key, value|
+        if value
+          if value.is_a?(Array)
+            value = [value].flatten.join(' ')
+          end
+          results << "#{key}=\"#{value.html_escape}\""
+        end
+      end
+      return results.join(' ')
+    end
+
+    def sorted(attributes)
+      stringized = []
+      attributes.each do |key, value|
+        stringized << [key.to_s, value]
+      end
+      return stringized.sort
+    end
+
+    def sort_for_xml_declaration(attributes)
+      # correct order is "version, encoding, standalone" (XML 1.0 section 2.8).
+      # But we only try to put version before encoding for now.
+      stringized = []
+      attributes.each do |key, value|
+        stringized << [key.to_s, value]
+      end
+      return stringized.sort{|a, b| b <=> a}
     end
-    
   end
 end

data/spec/erector/indentation_spec.rb

@@ -3,10 +3,11 @@ require File.expand_path("#{File.dirname(__FILE__)}/../spec_helper")
 describe "indentation" do
 
   it "can detect newliney tags" do
-    doc = Erector::Doc.new(StringIO.new(""))
-    doc.enable_prettyprint = true
-    doc.newliney("i").should == false
-    doc.newliney("table").should == true
+    widget = ::Erector::Widget.new
+    string = widget.output
+    widget.enable_prettyprint = true
+    widget.newliney("i").should == false
+    widget.newliney("table").should == true
   end
 
   it "should not add newline for non-newliney tags" do
@@ -125,9 +126,9 @@ END
   
   it "can turn newlines on/off via global variable" do
     Erector::Widget.new { br }.to_s.should == "<br />"
-    Erector::Doc.prettyprint_default = true
+    Erector::Widget.prettyprint_default = true
     Erector::Widget.new { br }.to_s.should == "<br />\n"
-    Erector::Doc.prettyprint_default = false
+    Erector::Widget.prettyprint_default = false
     Erector::Widget.new { br }.to_s.should == "<br />"
   end
   

data/spec/erector/widget_spec.rb

@@ -622,13 +622,13 @@ module WidgetSpec
         class B < Erector::Widget
           def render
             text "B"
-            A.new.render_to(@doc)
+            A.new.render_to(@output)
             text "B"
           end
         end
         b = B.new
         b.to_s.should == "B<p>A</p>B"
-        b.doc.size.should == 10  # B, <p>, A, </p>, B
+        b.output.size.should == 10  # B, <p>, A, </p>, B
       end
 
       it "renders to a widget's doc" do
@@ -641,7 +641,7 @@ module WidgetSpec
         end
         b = B.new
         b.to_s.should == "B<p>A</p>B"
-        b.doc.size.should == 10  # B, <p>, A, </p>, B
+        b.output.size.should == 10  # B, <p>, A, </p>, B
       end
 
       it "passing a widget to text method renders it" do

data/spec/spec_helper.rb

@@ -12,7 +12,6 @@ require "erector/erect"
 require "erector/erected"
 require "spec"
 
-
 Spec::Runner.configure do |config|
   config.mock_with :rr
 end
@@ -43,3 +42,12 @@ end
 # def print(string="")
 #   super string + "\s(#{caller.first.match(/(\w+\.\w+:\d+)|Rakefile:\d+/)[0]})"
 # end
+unless '1.9'.respond_to?(:force_encoding)
+  String.class_eval do
+    begin
+      remove_method :chars
+    rescue NameError
+      # OK
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: erector
 version: !ruby/object:Gem::Version 
-  version: 0.4.200
+  version: 0.5.0
 platform: ruby
 authors: 
 - Pivotal Labs
@@ -9,11 +9,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-12 00:00:00 -04:00
+date: 2008-12-14 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: treetop
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -23,6 +24,7 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: rake
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -32,6 +34,7 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -49,47 +52,63 @@ extensions: []
 extra_rdoc_files: 
 - README.txt
 files: 
-- spec/spec_helper.rb
-- spec/core_spec_suite.rb
-- spec/rails_spec_suite.rb
-- spec/erect
-- spec/erect/rhtml_parser_spec.rb
-- spec/erect/erect_spec.rb
-- spec/erect/erected_spec.rb
 - spec/erector
 - spec/erector/widgets
 - spec/erector/widgets/table_spec.rb
-- spec/erector/doc_spec.rb
+- spec/erector/unicode_builder_spec.rb
 - spec/erector/widget_spec.rb
 - spec/erector/indentation_spec.rb
-- spec/erector/unicode_builder_spec.rb
+- spec/rails_spec_suite.rb
 - spec/spec_suite.rb
-- lib/erector.rb
+- spec/core_spec_suite.rb
+- spec/spec_helper.rb
+- spec/erect
+- spec/erect/erected_spec.rb
+- spec/erect/erect_spec.rb
+- spec/erect/rhtml_parser_spec.rb
 - lib/erector
-- lib/erector/widgets
-- lib/erector/widgets/table.rb
 - lib/erector/rails
-- lib/erector/rails/supported_rails_versions.rb
 - lib/erector/rails/extensions
 - lib/erector/rails/extensions/action_controller.rb
-- lib/erector/rails/extensions/widget.rb
+- lib/erector/rails/extensions/action_controller
+- lib/erector/rails/extensions/action_controller/1.2.5
+- lib/erector/rails/extensions/action_controller/1.2.5/action_controller.rb
+- lib/erector/rails/extensions/action_controller/2.2.0
+- lib/erector/rails/extensions/action_controller/2.2.0/action_controller.rb
+- lib/erector/rails/extensions/widget
+- lib/erector/rails/extensions/widget/1.2.5
+- lib/erector/rails/extensions/widget/1.2.5/widget.rb
+- lib/erector/rails/extensions/widget/2.2.0
+- lib/erector/rails/extensions/widget/2.2.0/widget.rb
 - lib/erector/rails/extensions/action_view.rb
+- lib/erector/rails/extensions/widget.rb
 - lib/erector/rails/template_handlers
 - lib/erector/rails/template_handlers/action_view_template_handler.rb
-- lib/erector/raw_string.rb
-- lib/erector/widgets.rb
-- lib/erector/widget.rb
-- lib/erector/erect.rb
-- lib/erector/unicode_builder.rb
-- lib/erector/doc.rb
+- lib/erector/rails/template_handlers/2.0.0
+- lib/erector/rails/template_handlers/2.0.0/action_view_template_handler.rb
+- lib/erector/rails/template_handlers/2.1.0
+- lib/erector/rails/template_handlers/2.1.0/action_view_template_handler.rb
+- lib/erector/rails/template_handlers/1.2.5
+- lib/erector/rails/template_handlers/1.2.5/action_view_template_handler.rb
+- lib/erector/rails/template_handlers/2.2.0
+- lib/erector/rails/template_handlers/2.2.0/action_view_template_handler.rb
+- lib/erector/rails/supported_rails_versions.rb
+- lib/erector/widgets
+- lib/erector/widgets/table.rb
+- lib/erector/rails.rb
 - lib/erector/extensions
 - lib/erector/extensions/object.rb
-- lib/erector/unicode.rb
-- lib/erector/rhtml.treetop
-- lib/erector/rails.rb
+- lib/erector/erect.rb
 - lib/erector/indenting.rb
+- lib/erector/rhtml.treetop
+- lib/erector/raw_string.rb
 - lib/erector/version.rb
+- lib/erector/widgets.rb
+- lib/erector/unicode.rb
+- lib/erector/unicode_builder.rb
+- lib/erector/widget.rb
 - lib/erector/erected.rb
+- lib/erector.rb
 - README.txt
 - bin/erect
 has_rdoc: true
@@ -115,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: erector
-rubygems_version: 1.1.1
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: Erector is a Builder-like view framework, inspired by Markaby but overcoming some of its flaws

data/lib/erector/doc.rb

@@ -1,141 +0,0 @@
-module Erector
-  # A proxy to an IO object that adds methods to add xml.
-  class Doc
-
-    cattr_accessor :prettyprint_default
-
-    NON_NEWLINEY = {'i' => true, 'b' => true, 'small' => true,
-      'img' => true, 'span' => true, 'a' => true,
-      'input' => true, 'textarea' => true, 'button' => true, 'select' => true
-    }
-
-    SPACES_PER_INDENT = 2
-
-    attr_accessor :enable_prettyprint
-
-    def initialize(output, options = {})
-      @output = output
-      @at_start_of_line = true
-      @indent = 0
-      @enable_prettyprint = prettyprint_default
-    end
-
-    def output
-      unless @output.eof?
-        @output.seek(0, IO::SEEK_END)
-      end
-      @output
-    end
-
-    def newliney(tag_name)
-      if @enable_prettyprint
-        !NON_NEWLINEY.include?(tag_name)
-      else
-        false
-      end
-    end
-
-    def open_tag(tag_name, attributes={})
-      indent_for_open_tag(tag_name)
-      @indent += SPACES_PER_INDENT
-
-      output.print "<#{tag_name}#{format_attributes(attributes)}>"
-      @at_start_of_line = false
-    end
-
-    def text(value)
-      output.print(value.html_escape)
-      @at_start_of_line = false
-      nil
-    end
-
-    def close_tag(tag_name)
-      @indent -= SPACES_PER_INDENT
-      indent()
-
-      output.print("</#{tag_name}>")
-
-      if newliney(tag_name)
-        output.print "\n"
-        @at_start_of_line = true
-      end
-    end
-
-    def indent_for_open_tag(tag_name)
-      if !@at_start_of_line && newliney(tag_name)
-        output.print "\n"
-        @at_start_of_line = true
-      end
-
-      indent()
-    end
-
-    def indent()
-      if @at_start_of_line
-        output.print " " * @indent
-      end
-    end
-
-    def empty_element(tag_name, attributes={})
-      indent_for_open_tag(tag_name)
-
-      output.print "<#{tag_name}#{format_attributes(attributes)} />"
-
-      if newliney(tag_name)
-        output.print "\n"
-        @at_start_of_line = true
-      end
-    end
-
-    def instruct(attributes={:version => "1.0", :encoding => "UTF-8"})
-      output.print "<?xml#{format_sorted(sort_for_xml_declaration(attributes))}?>"
-    end
-
-    def to_s
-      output.string
-    end
-
-    protected
-    def method_missing(method_name, *args, &blk)
-      output.__send__(method_name, *args, &blk)
-    rescue NoMethodError => e
-      raise NoMethodError, "undefined method `#{method_name}' for #{inspect}"
-    end
-
-    def format_attributes(attributes)
-      return "" if !attributes || attributes.empty?
-      return format_sorted(sorted(attributes))
-    end
-
-    def format_sorted(sorted)
-      results = ['']
-      sorted.each do |key, value|
-        if value
-          if value.is_a?(Array)
-            value = [value].flatten.join(' ')
-          end
-          results << "#{key}=\"#{value.html_escape}\""
-        end
-      end
-      return results.join(' ')
-    end
-
-    def sorted(attributes)
-      stringized = []
-      attributes.each do |key, value|
-        stringized << [key.to_s, value]
-      end
-      return stringized.sort
-    end
-
-    def sort_for_xml_declaration(attributes)
-      # correct order is "version, encoding, standalone" (XML 1.0 section 2.8).
-      # But we only try to put version before encoding for now.
-      stringized = []
-      attributes.each do |key, value|
-        stringized << [key.to_s, value]
-      end
-      return stringized.sort{|a, b| b <=> a}
-    end
-  end
-end

data/spec/erector/doc_spec.rb

@@ -1,55 +0,0 @@
-require File.expand_path("#{File.dirname(__FILE__)}/../spec_helper")
-
-module Erector
-  describe Doc do
-    describe "#output" do
-      it "seeks to the end of the buffer" do
-        string = "Hello"
-        io = StringIO.new(string)
-        doc = Doc.new(io)
-
-        string.concat(" World")
-        doc.text " Again"
-
-        string.should == "Hello World Again"
-      end
-    end
-
-    describe "#method_missing" do
-      context "when passed in io object raises a NoMethodError" do
-        context "when the passed in io object respond_to? method is false" do
-          attr_reader :io
-          before do
-            @io = StringIO.new
-            io.should_not respond_to(:foo)
-            lambda {io.foo}.should raise_error(NoMethodError, /undefined method `foo' for #<StringIO/)
-          end
-
-          it "raises a NoMethodError that originates from within Doc#method_missing" do
-            doc = Doc.new(io)
-            lambda do
-              doc.foo
-            end.should raise_error(NoMethodError, /undefined method `foo' for #<Erector::Doc/)
-          end
-        end
-
-        context "when the passed in io object respond_to? method is true" do
-          attr_reader :io
-          before do
-            @io = StringIO.new
-            stub(io).foo {raise NoMethodError, "Stubbed NoMethodError"}
-            io.should respond_to(:foo)
-            lambda {io.foo}.should raise_error(NoMethodError, "Stubbed NoMethodError")
-          end
-
-          it "raises a NoMethodError that originates from within Doc#method_missing" do
-            doc = Doc.new(io)
-            lambda do
-              doc.foo
-            end.should raise_error(NoMethodError, /undefined method `foo' for #<Erector::Doc/)
-          end
-        end
-      end
-    end
-  end
-end