RubyGems - markaby - Versions diffs - 0.5 → 0.6.6 - Mend

markaby 0.5 → 0.6.6

Files changed (59) hide show

data/.gitignore +4 -0
data/CHANGELOG.rdoc +79 -0
data/Markaby.gemspec +103 -0
data/{README → README.rdoc} +14 -6
data/Rakefile +71 -14
data/VERSION +1 -0
data/garlic.rb +29 -0
data/init.rb +6 -0
data/lib/markaby.rb +4 -9
data/lib/markaby/builder.rb +156 -143
data/lib/markaby/builder_tags.rb +64 -0
data/lib/markaby/cssproxy.rb +36 -34
data/lib/markaby/kernel_method.rb +7 -0
data/lib/markaby/rails.rb +64 -39
data/lib/markaby/rails/current.rb +46 -0
data/lib/markaby/rails/deprecated.rb +124 -0
data/lib/markaby/rails/rails_builder.rb +50 -0
data/lib/markaby/tags.rb +158 -130
data/lib/markaby/tilt.rb +21 -0
data/spec/markaby/builder_spec.rb +118 -0
data/spec/markaby/css_proxy_spec.rb +47 -0
data/spec/markaby/fragment_spec.rb +10 -0
data/spec/markaby/markaby_other_static.mab +1 -0
data/spec/markaby/markaby_spec.rb +232 -0
data/spec/markaby/rails/spec_helper.rb +21 -0
data/spec/markaby/rails/views/markaby/_a_partial.mab +3 -0
data/spec/markaby/rails/views/markaby/_partial_child_with_locals.mab +1 -0
data/spec/markaby/rails/views/markaby/access_to_helpers.mab +1 -0
data/spec/markaby/rails/views/markaby/broken.mab +7 -0
data/spec/markaby/rails/views/markaby/correct_template_values.mab +5 -0
data/spec/markaby/rails/views/markaby/form_for.mab +2 -0
data/spec/markaby/rails/views/markaby/form_for_with_fields.mab +3 -0
data/spec/markaby/rails/views/markaby/form_for_with_multiple_fields.mab +4 -0
data/spec/markaby/rails/views/markaby/no_values_passed.mab +3 -0
data/spec/markaby/rails/views/markaby/partial_parent.mab +1 -0
data/spec/markaby/rails/views/markaby/partial_parent_with_locals.mab +7 -0
data/spec/markaby/rails/views/markaby/render_erb_without_explicit_render_call.erb +1 -0
data/spec/markaby/rails/views/markaby/render_explicit_but_empty_markaby_layout.mab +0 -0
data/spec/markaby/rails/views/markaby/render_mab_without_explicit_render_call.mab +3 -0
data/spec/markaby/rails/views/markaby/render_with_ivar.mab +3 -0
data/spec/markaby/rails/views/markaby/renders_erb.rhtml +1 -0
data/spec/markaby/rails_spec.rb +249 -0
data/spec/markaby/rails_version_spec.rb +37 -0
data/spec/markaby/tilt/erb.erb +1 -0
data/spec/markaby/tilt/locals.mab +1 -0
data/spec/markaby/tilt/markaby.mab +1 -0
data/spec/markaby/tilt/markaby_other_static.mab +1 -0
data/spec/markaby/tilt/render_twice.mab +1 -0
data/spec/markaby/tilt/scope.mab +1 -0
data/spec/markaby/tilt/yielding.mab +2 -0
data/spec/markaby/tilt_spec.rb +86 -0
data/spec/spec.opts +2 -0
data/spec/spec_helper.rb +39 -0
metadata +132 -52
data/lib/markaby/metaid.rb +0 -16
data/lib/markaby/template.rb +0 -12
data/setup.rb +0 -1551
data/test/test_markaby.rb +0 -109
data/tools/rakehelp.rb +0 -106

data/.gitignore ADDED

@@ -0,0 +1,4 @@
+doc
+coverage
+.garlic
+pkg

data/CHANGELOG.rdoc ADDED

@@ -0,0 +1,79 @@
+= 0.6.6
+* ruby 1.9.1 support.  Closes Github Issues #10 & #11.
+* Removed Tilt deprecation warnings
+= 0.6.4
+* Fixed a bug in which direct string values to Markaby::Builder wouldn't evaluate:
+    Markaby::Builder.new { 'foo' }.to_s #=> "foo"
+* Fix critical bug with form_for, which was raising an error
+* Introduce proxy object for form_for:
+    form_for :foo do |f|
+      f.text_field :bar
+      f.text_field :baz
+    end
+* Remove support for rails 2.1.x series.  We'll accept patches for them, if anyone cares enough.
+== 0.6.2 / 0.6.3
+* Add basic support for the Tilt templating engine (used with Sinatra):
+  require 'markaby'
+  require 'markaby/tilt'
+== 0.6.1
+* Support the following rails versions:
+    1.2.2, 1.2.3, 1.2.4, 1.2.5, 1.2.6, 2.1.0, 2.1.1, 2.1.2, 2.2.0,
+    2.2.1, 2.2.2, 2.2.3, 2.3.1, 2.3.2, 2.3.2.1, 2.3.3, 2.3.3.1, 2.3.4
+* Only run rails tests when inside a rails plugins
+* Run tests of the various versions of rails with garlic
+* Start conversion to rspec.  Use test/spec temporarily until conversion is done.
+= 0.6
+=== 23 August, 2009
+* Canonical repo changed to http://github.com/joho/markaby
+* Gem moved to Github (using jeweler)
+* Rails init process changed to work with rails > 2.1
+* Default attributes on the root (<html>) element can now be overidden
+* Reworked CssProxy, allowing attributes on hr and br
+* Added Kernel#mab convenience method (require 'markaby/kernel_method')
+* WhenOnRails: Can now use :locals with render_markaby
+* WhenOnRails: Template errors now report line number
+= 0.5
+=== 03 October, 2006
+* XHTML Validation built in.  So, if you have an invalid tag: error.  Invalid attribute: error.
+  And two identical IDs in the same document: error.  Optional, of course.  But handy!
+* New Markaby::Fragment class adds much flexibility.  If it discovers you are using a tag as a string,
+  the tag is removed from the stream.  (<tt>div { strong("Real") + " Giraffes" }</tt>)
+* The prevailing rule now is: if you want it escaped, pass it as an arg.  If not, pass it to a block.
+* Again, escaped: <tt>h1("Me & You Have a Giraffe")</tt>
+* And, not escaped: <tt>h1 { "<a href='/'>Home</a>" }</tt>
+* Less method_missing, meaning: faster calls all around.  Tag methods generated based on doctype.
+* The <tt>html</tt> method doesn't write the doctype tags and meta tags.  You must use <tt>xhtml_transitional</tt> or <tt>xhtml_strict</tt> methods to do that.
+* The <tt>img</tt> method doesn't try to inject an empty alt tag and a zero border.  No more of that.
+= 0.3
+=== 02nd February, 2006
+* Allow Markaby::Builder.new without args.
+* Rails helper method render_markaby.
+= 0.2
+=== 17th January, 2006
+* Public announcement.
+* DOCTYPES, head tags.
+* Works with Rails helpers.
+= 0.1
+=== 05th January, 2006
+* Initial import.

data/Markaby.gemspec ADDED

@@ -0,0 +1,103 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+Gem::Specification.new do |s|
+  s.name = %q{markaby}
+  s.version = "0.6.6"
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["_why", "Tim Fletcher", "John Barton", "spox", "smtlaissezfaire"]
+  s.date = %q{2010-06-02}
+  s.description = %q{Tim Fletcher and _why's ruby driven HTML templating system}
+  s.email = %q{scott@railsnewbie.com}
+  s.extra_rdoc_files = [
+    "README.rdoc"
+  ]
+  s.files = [
+    ".gitignore",
+     "CHANGELOG.rdoc",
+     "Markaby.gemspec",
+     "README.rdoc",
+     "Rakefile",
+     "VERSION",
+     "garlic.rb",
+     "init.rb",
+     "lib/markaby.rb",
+     "lib/markaby/builder.rb",
+     "lib/markaby/builder_tags.rb",
+     "lib/markaby/cssproxy.rb",
+     "lib/markaby/kernel_method.rb",
+     "lib/markaby/rails.rb",
+     "lib/markaby/rails/current.rb",
+     "lib/markaby/rails/deprecated.rb",
+     "lib/markaby/rails/rails_builder.rb",
+     "lib/markaby/tags.rb",
+     "lib/markaby/tilt.rb",
+     "spec/markaby/builder_spec.rb",
+     "spec/markaby/css_proxy_spec.rb",
+     "spec/markaby/fragment_spec.rb",
+     "spec/markaby/markaby_other_static.mab",
+     "spec/markaby/markaby_spec.rb",
+     "spec/markaby/rails/spec_helper.rb",
+     "spec/markaby/rails/views/markaby/_a_partial.mab",
+     "spec/markaby/rails/views/markaby/_partial_child_with_locals.mab",
+     "spec/markaby/rails/views/markaby/access_to_helpers.mab",
+     "spec/markaby/rails/views/markaby/broken.mab",
+     "spec/markaby/rails/views/markaby/correct_template_values.mab",
+     "spec/markaby/rails/views/markaby/form_for.mab",
+     "spec/markaby/rails/views/markaby/form_for_with_fields.mab",
+     "spec/markaby/rails/views/markaby/form_for_with_multiple_fields.mab",
+     "spec/markaby/rails/views/markaby/no_values_passed.mab",
+     "spec/markaby/rails/views/markaby/partial_parent.mab",
+     "spec/markaby/rails/views/markaby/partial_parent_with_locals.mab",
+     "spec/markaby/rails/views/markaby/render_erb_without_explicit_render_call.erb",
+     "spec/markaby/rails/views/markaby/render_explicit_but_empty_markaby_layout.mab",
+     "spec/markaby/rails/views/markaby/render_mab_without_explicit_render_call.mab",
+     "spec/markaby/rails/views/markaby/render_with_ivar.mab",
+     "spec/markaby/rails/views/markaby/renders_erb.rhtml",
+     "spec/markaby/rails_spec.rb",
+     "spec/markaby/rails_version_spec.rb",
+     "spec/markaby/tilt/erb.erb",
+     "spec/markaby/tilt/locals.mab",
+     "spec/markaby/tilt/markaby.mab",
+     "spec/markaby/tilt/markaby_other_static.mab",
+     "spec/markaby/tilt/render_twice.mab",
+     "spec/markaby/tilt/scope.mab",
+     "spec/markaby/tilt/yielding.mab",
+     "spec/markaby/tilt_spec.rb",
+     "spec/spec.opts",
+     "spec/spec_helper.rb"
+  ]
+  s.homepage = %q{http://joho.github.com/markaby/}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.7}
+  s.summary = %q{Markup as Ruby, write HTML in your native Ruby tongue}
+  s.test_files = [
+    "spec/markaby/builder_spec.rb",
+     "spec/markaby/css_proxy_spec.rb",
+     "spec/markaby/fragment_spec.rb",
+     "spec/markaby/markaby_spec.rb",
+     "spec/markaby/rails/spec_helper.rb",
+     "spec/markaby/rails_spec.rb",
+     "spec/markaby/rails_version_spec.rb",
+     "spec/markaby/tilt_spec.rb",
+     "spec/spec_helper.rb"
+  ]
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<builder>, [">= 2.0.0"])
+    else
+      s.add_dependency(%q<builder>, [">= 2.0.0"])
+    end
+  else
+    s.add_dependency(%q<builder>, [">= 2.0.0"])
+  end
+end

data/{README → README.rdoc} RENAMED

@@ -14,14 +14,20 @@ Write Rails templates in pure Ruby.  Example layout:
       title 'Products: ' + action_name
       stylesheet_link_tag 'scaffold'
     end
     body do
       p flash[:notice], :style => "color: green"
       self << content_for_layout
     end
   end
+Markaby supports many versions of rails:
+  1.2.2, 1.2.3, 1.2.4, 1.2.5, 1.2.6, 2.2.0,
+  2.2.1, 2.2.2, 2.2.3, 2.3.1, 2.3.2, 2.3.2.1,
+  2.3.3, 2.3.3.1, 2.3.4
 == Using Markaby as a Ruby class
 Markaby is flaming easy to call from your Ruby classes.
@@ -69,7 +75,7 @@ that inside these blocks, <tt>self</tt> will be your Markaby::Builder object.
 When you use instance variables in these blocks, they will be instance variables
 of the Markaby::Builder object.
-This doesn't effect Rails users, but when used in regular Ruby code, it can
+This doesn't affect Rails users, but when used in regular Ruby code, it can
 be a bit disorienting.  You are recommended to put your Markaby code in a
 module where it won't mix with anything.
@@ -115,7 +121,7 @@ Which results in:
     </div>
   </div>
-== 3. Validate Your XHTML 1.0 Output
+== 3. Validate Your XHTML 1.0 Output
 If you'd like Markaby to help you assemble valid XHTML documents,
 you can use the <tt>xhtml_transitional</tt> or <tt>xhtml_strict</tt>
@@ -209,7 +215,7 @@ won't work with this technique.
 = A Note About Rails Helpers
-When used in Rails templates, the Rails helper object is passed into
+When used in Rails templates, the Rails helper object is passed into
 Markaby::Builder.  When you call helper methods inside Markaby, the output
 from those methods will be output to the stream.  This is incredibly
 handy, since most Rails helpers output HTML tags.
@@ -231,7 +237,7 @@ If for any reason you have trouble with fragments, you can just
 call the <tt>@helpers</tt> object with the method and you'll get
 the String back and nothing will be output.
-  p { "Total is: #{@helper.number_to_human_size @file_bytes}" }
+  p { "Total is: #{@helpers.number_to_human_size @file_bytes}" }
 Conversely, you may call instance variables from your controller by using
 a method and its value will be returned, nothing will be output.
@@ -249,7 +255,9 @@ a method and its value will be returned, nothing will be output.
 = Credits
 Markaby is a work of immense hope by Tim Fletcher and why the lucky stiff.
+It is maintained by joho, spox, and smtlaissezfaire.
 Thankyou for giving it a whirl.
 Markaby is inspired by the HTML library within cgi.rb.  Hopefully it will
 turn around and take some cues.

data/Rakefile CHANGED

@@ -1,20 +1,77 @@
 require 'rake'
-require 'rake/testtask'
+require 'spec/rake/spectask'
 require 'rake/clean'
-require 'rake/gempackagetask'
-require 'rake/rdoctask'
-require 'tools/rakehelp'
-require 'fileutils'
-include FileUtils
-REV = File.read(".svn/entries")[/committed-rev="(\d+)"/, 1] rescue nil
-VERS = ENV['VERSION'] || "0.5" + (REV ? ".#{REV}" : "")
+begin
+  require 'hanna/rdoctask'
-task :default => [:package]
+  Rake::RDocTask.new do |rdoc|
+    rdoc.rdoc_dir = 'doc/rdoc'
+    rdoc.options << '--line-numbers'
+    rdoc.rdoc_files.add(['README.rdoc', 'CHANGELOG.rdoc', 'lib/**/*.rb'])
+  end
+rescue LoadError
+  puts "Could not load hanna-rdoc.  Please install with mislav-hanna package"
+end
-setup_tests
-setup_rdoc ['README', 'CHANGELOG', 'lib/**/*.rb']
+task :default => :spec
-summary = "Markup as Ruby, write HTML in your native Ruby tongue"
-test_file = "test/test_markaby.rb"
-setup_gem("markaby", VERS,  "Tim Fletcher and _why", summary, [['builder', '>=2.0.0']], test_file)
+desc 'Run the specs'
+Spec::Rake::SpecTask.new do |t|
+  t.warning = false
+  t.spec_opts = ["--color"]
+end
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |gemspec|
+    gemspec.name          = "markaby"
+    gemspec.summary       = "Markup as Ruby, write HTML in your native Ruby tongue"
+    gemspec.description   = "Tim Fletcher and _why's ruby driven HTML templating system"
+    gemspec.email         = "scott@railsnewbie.com"
+    gemspec.homepage      = "http://joho.github.com/markaby/"
+    gemspec.authors       = ["_why", "Tim Fletcher", "John Barton", "spox", "smtlaissezfaire"]
+    gemspec.add_dependency 'builder', '>=2.0.0'
+  end
+rescue LoadError
+  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
+end
+desc "List any Markaby specific warnings"
+task :warnings do
+  `ruby -w test/test_markaby.rb 2>&1`.split(/\n/).each do |line|
+    next unless line =~ /warning:/
+    next if line =~ /builder-/
+    puts line
+  end
+end
+desc "Start a Markaby-aware IRB session"
+task :irb do
+  sh 'irb -I lib -r markaby -r markaby/kernel_method'
+end
+namespace :gemspec do
+  task :commit do
+    sh "git add ."
+    sh "git commit -m 'Update gemspec'"
+  end
+end
+namespace :release do
+  task :patch => [:spec, "version:bump:patch", :update_gemspec, :rerdoc, :tag_release, :build, :push_tags]
+  task :update_gemspec => ["gemspec:generate", "gemspec:validate", "gemspec:commit"]
+  task :tag_release do
+    require File.dirname(__FILE__) + "/lib/markaby"
+    version = "v#{Markaby::VERSION}"
+    sh "git tag #{version}"
+  end
+  task :push_tags do
+    sh "git push --tags"
+  end
+end
+task :release => "release:patch"

data/VERSION ADDED

	@@ -0,0 +1 @@
1	+ 0.6.6

data/garlic.rb ADDED

@@ -0,0 +1,29 @@
+require File.expand_path(File.dirname(__FILE__) + "/lib/markaby/rails")
+garlic do
+  # this plugin
+  repo "markaby", :path => '.'
+  # other repos
+  repo "rails", :url => "git://github.com/rails/rails"
+  # target railses
+  RAILS_TAREGETS = Markaby::Rails::SUPPORTED_RAILS_VERSIONS.map do |version|
+    "v#{version}"
+  end
+  RAILS_TAREGETS.each do |rails|
+    # declare how to prepare, and run each CI target
+    target "Rails: #{rails}", :tree_ish => rails do
+      prepare do
+        plugin "markaby", :clone => true # so we can work in targets
+      end
+      run do
+        cd "vendor/plugins/markaby" do
+          sh "rake"
+        end
+      end
+    end
+  end
+end

data/init.rb ADDED

@@ -0,0 +1,6 @@
+$:.unshift File.expand_path(File.join(File.dirname(__FILE__), 'lib'))
+require 'markaby'
+require 'markaby/rails'
+Markaby::Rails.load

data/lib/markaby.rb CHANGED

@@ -8,7 +8,7 @@ $:.unshift File.expand_path(File.dirname(__FILE__))
 # Markaby is a module containing all of the great Markaby classes that
 # do such an excellent job.
-#
+#
 # * Markaby::Builder: the class for actually calling the Ruby methods
 #   which write the HTML.
 # * Markaby::CSSProxy: a class which adds element classes and IDs to
@@ -19,17 +19,12 @@ $:.unshift File.expand_path(File.dirname(__FILE__))
 # * Markaby::Template: a class for hooking Markaby into Rails as a
 #   proper templating language.
 module Markaby
-  VERSION = '0.5'
+  version_file = File.expand_path(File.dirname(__FILE__) + "/../VERSION")
+  VERSION      = File.read(version_file).strip
   class InvalidXhtmlError < Exception; end
 end
-unless defined?(Builder)
-  require 'rubygems'
-  require 'builder'
-end
+require 'builder' unless defined?(Builder)
 require 'markaby/builder'
 require 'markaby/cssproxy'
-require 'markaby/metaid'
-require 'markaby/template'

data/lib/markaby/builder.rb CHANGED

@@ -1,6 +1,9 @@
 require 'markaby/tags'
+require 'markaby/builder_tags'
 module Markaby
+  RUBY_VERSION_ID = RUBY_VERSION.split(".").join.to_i
   # The Markaby::Builder class is the central gear in the system.  When using
   # from Ruby code, this is the only class you need to instantiate directly.
   #
@@ -19,33 +22,49 @@ module Markaby
   #   puts mab.to_s
   #
   class Builder
+    include Markaby::BuilderTags
-    @@default = {
-      :indent => 0,
-      :output_helpers => true,
+    DEFAULT_OPTIONS = {
+      :indent                 => 0,
+      :output_helpers         => true,
       :output_xml_instruction => true,
-      :output_meta_tag => true,
-      :auto_validation => true,
-      :tagset => Markaby::XHTMLTransitional
+      :output_meta_tag        => true,
+      :auto_validation        => true,
+      :tagset                 => Markaby::XHTMLTransitional,
+      :root_attributes => {
+        :xmlns      => 'http://www.w3.org/1999/xhtml',
+        :'xml:lang' => 'en',
+        :lang       => 'en'
+      }
     }
+    @@options = DEFAULT_OPTIONS.dup
+    def self.restore_defaults!
+      @@options = DEFAULT_OPTIONS.dup
+    end
     def self.set(option, value)
-      @@default[option] = value
+      @@options[option] = value
+    end
+    def self.get(option)
+      @@options[option]
     end
-    def self.ignored_helpers
-      @@ignored_helpers ||= []
-    end
-    def self.ignore_helpers(*helpers)
-      ignored_helpers.concat helpers
-    end
+    def self.ignored_helpers
+      @@ignored_helpers ||= []
+    end
+    def self.ignore_helpers(*helpers)
+      ignored_helpers.concat helpers
+    end
     attr_accessor :output_helpers, :tagset
     # Create a Markaby builder object.  Pass in a hash of variable assignments to
     # +assigns+ which will be available as instance variables inside tag construction
-    # blocks.  If an object is passed in to +helpers+, its methods will be available
+    # blocks.  If an object is passed in to +helper+, its methods will be available
     # from those same blocks.
     #
     # Pass in a +block+ to new and the block will be evaluated.
@@ -58,40 +77,43 @@ module Markaby
     #     end
     #   }
     #
-    def initialize(assigns = {}, helpers = nil, &block)
-      @streams = [[]]
-      @assigns = assigns
-      @elements = {}
+    def initialize(assigns = {}, helper = nil, &block)
+      @streams = [Stream.new]
+      @assigns = assigns.dup
+      @_helper = helper
+      @used_ids = {}
-      @@default.each do |k, v|
-        instance_variable_set("@#{k}", @assigns[k] || v)
+      @@options.each do |k, v|
+        instance_variable_set("@#{k}", @assigns.delete(k) || v)
       end
-      if helpers.nil?
-        @helpers = nil
-      else
-        @helpers = helpers.dup
-        for iv in helpers.instance_variables
-          instance_variable_set(iv, helpers.instance_variable_get(iv))
-        end
+      @assigns.each do |k, v|
+        instance_variable_set("@#{k}", v)
       end
-      unless assigns.nil? || assigns.empty?
-        for iv, val in assigns
-          instance_variable_set("@#{iv}", val)
-          unless @helpers.nil?
-            @helpers.instance_variable_set("@#{iv}", val)
-          end
-        end
-      end
+      @builder = XmlMarkup.new(:indent => @indent, :target => @streams.last)
-      @builder = ::Builder::XmlMarkup.new(:indent => @indent, :target => @streams.last)
-      class << @builder
-          attr_accessor :target, :level
-      end
+      text(capture(&block)) if block
+    end
-      if block
-        text(capture(&block))
+    def helper=(helper)
+      @_helper = helper
+    end
+    def metaclass(&block)
+      metaclass = class << self; self; end
+      metaclass.class_eval(&block)
+    end
+    private :metaclass
+    def locals=(locals)
+      locals.each do |key, value|
+        metaclass do
+          define_method key do
+            value
+          end
+        end
       end
     end
@@ -102,29 +124,26 @@ module Markaby
     # Write a +string+ to the HTML stream without escaping it.
     def text(string)
-      @builder << "#{string}"
+      @builder << string.to_s
       nil
     end
     alias_method :<<, :text
     alias_method :concat, :text
-    # Emulate ERB to satisfy helpers like <tt>form_for</tt>.
-    def _erbout; self end
     # Captures the HTML code built inside the +block+.  This is done by creating a new
     # stream for the builder object, running the block and passing back its stream as a string.
     #
     #   >> Markaby::Builder.new.capture { h1 "TEST"; h2 "CAPTURE ME" }
-    #   => "<h1>TITLE</h1>\n<h2>CAPTURE ME</h2>\n"
+    #   => "<h1>TEST</h1><h2>CAPTURE ME</h2>"
     #
     def capture(&block)
-      @streams.push(builder.target = [])
+      @streams.push(@builder.target = Stream.new)
       @builder.level += 1
       str = instance_eval(&block)
       str = @streams.last.join if @streams.last.any?
       @streams.pop
       @builder.level -= 1
-      builder.target = @streams.last
+      @builder.target = @streams.last
       str
     end
@@ -132,35 +151,43 @@ module Markaby
     # the arguments are the same as the tags implemented via method_missing.
     def tag!(tag, *args, &block)
       ele_id = nil
-      if @auto_validation and @tagset
-          if !@tagset.tagset.has_key?(tag)
-              raise InvalidXhtmlError, "no element `#{tag}' for #{tagset.doctype}"
-          elsif args.last.respond_to?(:to_hash)
-              attrs = args.last.to_hash
-              attrs.each do |k, v|
-                  atname = k.to_s.downcase.intern
-                  unless k =~ /:/ or @tagset.tagset[tag].include? atname
-                      raise InvalidXhtmlError, "no attribute `#{k}' on #{tag} elements"
-                  end
-                  if atname == :id
-                      ele_id = v.to_s
-                      if @elements.has_key? ele_id
-                          raise InvalidXhtmlError, "id `#{ele_id}' already used (id's must be unique)."
-                      end
-                  end
+      if @auto_validation && @tagset
+        if !@tagset.tagset.has_key?(tag)
+          raise InvalidXhtmlError, "no element `#{tag}' for #{tagset.doctype}"
+        elsif args.last.respond_to?(:to_hash)
+          attrs = args.last.to_hash
+          if @tagset.forms.include?(tag) && attrs[:id]
+            attrs[:name] ||= attrs[:id]
+          end
+          attrs.each do |k, v|
+            atname = k.to_s.downcase.intern
+            unless k =~ /:/ or @tagset.tagset[tag].include? atname
+              raise InvalidXhtmlError, "no attribute `#{k}' on #{tag} elements"
+            end
+            if atname == :id
+              ele_id = v.to_s
+              if @used_ids.has_key? ele_id
+                raise InvalidXhtmlError, "id `#{ele_id}' already used (id's must be unique)."
               end
+            end
           end
+        end
       end
       if block
-        str = capture &block
+        str = capture(&block)
         block = proc { text(str) }
       end
       f = fragment { @builder.method_missing(tag, *args, &block) }
-      @elements[ele_id] = f if ele_id
+      @used_ids[ele_id] = f if ele_id
       f
     end
+  private
     # This method is used to intercept calls to helper methods and instance
     # variables.  Here is the order of interception:
     #
@@ -175,95 +202,61 @@ module Markaby
     # method_missing used to be the lynchpin in Markaby, but it's no longer used to handle
     # HTML tags.  See html_tag for that.
     def method_missing(sym, *args, &block)
-      if @helpers.respond_to?(sym, true) && !self.class.ignored_helpers.include?(sym)
-        r = @helpers.send(sym, *args, &block)
-        if @output_helpers and r.respond_to? :to_str
+      if @_helper.respond_to?(sym, true) && !self.class.ignored_helpers.include?(sym)
+        r = @_helper.send(sym, *args, &block)
+        if @output_helpers && r.respond_to?(:to_str)
           fragment { @builder << r }
         else
           r
         end
-      elsif ::Builder::XmlMarkup.instance_methods.include?(sym.to_s)
+      elsif @assigns.has_key?(sym)
+        @assigns[sym]
+      elsif @assigns.has_key?(stringy_key = sym.to_s)
+        # Rails' ActionView assigns hash has string keys for
+        # instance variables that are defined in the controller.
+        @assigns[stringy_key]
+      elsif instance_variables_for(self).include?(ivar = "@#{sym}".to_sym)
+        instance_variable_get(ivar)
+      elsif @_helper && instance_variables_for(@_helper).include?(ivar)
+        @_helper.instance_variable_get(ivar)
+      elsif instance_methods_for(::Builder::XmlMarkup).include?(sym)
         @builder.__send__(sym, *args, &block)
-      elsif instance_variables.include?("@#{sym}")
-        instance_variable_get("@#{sym}")
-      elsif @tagset.nil?
+      elsif !@tagset
         tag!(sym, *args, &block)
       else
-        raise NoMethodError, "no such method `#{sym}'"
+        super
       end
     end
-    # Every HTML tag method goes through an html_tag call.  So, calling <tt>div</tt> is equivalent
-    # to calling <tt>html_tag(:div)</tt>.  All HTML tags in Markaby's list are given generated wrappers
-    # for this method.
-    #
-    # If the @auto_validation setting is on, this method will check for many common mistakes which
-    # could lead to invalid XHTML.
-    def html_tag(sym, *args, &block)
-      if @auto_validation and @tagset.self_closing.include?(sym) and block
-        raise InvalidXhtmlError, "the `\#{sym}' element is self-closing, please remove the block"
+    if RUBY_VERSION_ID >= 191
+      def instance_variables_for(obj)
+        obj.instance_variables
       end
-      if args.empty? and block.nil? and not NO_PROXY.include?(sym)
-        return CssProxy.new do |args, block|
-          if @tagset.forms.include?(sym) and args.last.respond_to?(:to_hash) and args.last[:id]
-            args.last[:name] ||= args.last[:id]
-          end
-          tag!(sym, *args, &block)
-        end
+      def instance_methods_for(obj)
+        obj.instance_methods
       end
-      if not @tagset.self_closing.include?(sym) and args.first.respond_to?(:to_hash)
-        block ||= proc{}
+    else
+      def instance_variables_for(obj)
+        obj.instance_variables.map { |var| var.to_sym }
       end
-      tag!(sym, *args, &block)
-    end
-    XHTMLTransitional.tags.each do |k|
-      class_eval %{
-        def #{k}(*args, &block)
-          html_tag(#{k.inspect}, *args, &block)
-        end
-      }
-    end
-    # Builds a head tag.  Adds a <tt>meta</tt> tag inside with Content-Type
-    # set to <tt>text/html; charset=utf-8</tt>.
-    def head(*args, &block)
-      tag!(:head, *args) do
-        tag!(:meta, "http-equiv" => "Content-Type", "content" => "text/html; charset=utf-8") if @output_meta_tag
-        instance_eval(&block)
+      def instance_methods_for(obj)
+        obj.instance_methods.map { |m| m.to_sym }
       end
     end
-    # Builds an html tag.  An XML 1.0 instruction and an XHTML 1.0 Transitional doctype
-    # are prepended.  Also assumes <tt>:xmlns => "http://www.w3.org/1999/xhtml",
-    # :lang => "en"</tt>.
-    def xhtml_transitional(&block)
-      self.tagset = Markaby::XHTMLTransitional
-      xhtml_html &block
-    end
-    # Builds an html tag with XHTML 1.0 Strict doctype instead.
-    def xhtml_strict(&block)
-      self.tagset = Markaby::XHTMLStrict
-      xhtml_html &block
-    end
-    private
-    def xhtml_html(&block)
-      instruct! if @output_xml_instruction
-      declare!(:DOCTYPE, :html, :PUBLIC, *tagset.doctype)
-      tag!(:html, :xmlns => "http://www.w3.org/1999/xhtml", "xml:lang" => "en", :lang => "en", &block)
-    end
     def fragment
       stream = @streams.last
-      f1 = stream.length
+      start = stream.length
       yield
-      f2 = stream.length - f1
-      Fragment.new(stream, f1, f2)
+      length = stream.length - start
+      Fragment.new(stream, start, length)
     end
+  end
+  class Stream < Array
+    alias_method :to_s, :join
   end
   # Every tag method in Markaby returns a Fragment.  If any method gets called on the Fragment,
@@ -272,17 +265,37 @@ module Markaby
   #
   # For a more practical explanation, check out the README.
   class Fragment < ::Builder::BlankSlate
-    def initialize(s, a, b)
-      @s, @f1, @f2 = s, a, b
+    def initialize(*args)
+      @stream, @start, @length = args
+      @transformed_stream = false
     end
-    def method_missing(*a)
-      unless @str
-        @str = @s[@f1, @f2].to_s
-        @s[@f1, @f2] = [nil] * @f2
-        @str
-      end
-      @str.send(*a)
+    if RUBY_VERSION_ID >= 191
+      undef_method :to_s, :inspect, :==
+    end
+  private
+    def method_missing(*args, &block)
+      transform_stream unless transformed_stream?
+      @str.__send__(*args, &block)
+    end
+    def transform_stream
+      @transformed_stream = true
+      # We can't do @stream.slice!(@start, @length),
+      # as it would invalidate the @starts and @lengths of other Fragment instances.
+      @str = @stream[@start, @length].to_s
+      @stream[@start, @length] = [nil] * @length
+    end
+    def transformed_stream?
+      @transformed_stream
     end
   end
+  class XmlMarkup < ::Builder::XmlMarkup
+    attr_accessor :target, :level
+  end
 end