markaby 0.7.1 → 0.7.2

data/Markaby.gemspec

@@ -1,115 +1,100 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{markaby}
-  s.version = "0.7.1"
+  s.version = "0.7.2"
 
   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-08-19}
+  s.authors = [%q{_why}, %q{Tim Fletcher}, %q{John Barton}, %q{spox}, %q{smtlaissezfaire}]
+  s.date = %q{2011-08-23}
   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/sinatra.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/layouts/layout.mab",
-     "spec/markaby/rails/views/markaby/_a_partial.mab",
-     "spec/markaby/rails/views/markaby/_form_for_with_body_in_erb.erb",
-     "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/commented_out_template.mab",
-     "spec/markaby/rails/views/markaby/correct_template_values.mab",
-     "spec/markaby/rails/views/markaby/double_output.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/views/markaby/renders_form_for_with_erb_body.mab",
-     "spec/markaby/rails/views/markaby/routes.mab",
-     "spec/markaby/rails/views/markaby/yielding.mab",
-     "spec/markaby/rails/views/markaby/yielding_content_for_with_block_helper.mab",
-     "spec/markaby/rails/views/markaby/yielding_two.mab",
-     "spec/markaby/rails/views/markaby/yielding_with_content_for.mab",
-     "spec/markaby/rails_spec.rb",
-     "spec/markaby/rails_version_spec.rb",
-     "spec/markaby/sinatra/app.rb",
-     "spec/markaby/sinatra/sinatra_spec.rb",
-     "spec/markaby/sinatra/views/helpers.mab",
-     "spec/markaby/sinatra/views/layout.mab",
-     "spec/markaby/sinatra/views/markaby_template.mab",
-     "spec/markaby/sinatra/views/scope_instance_variables.mab",
-     "spec/markaby/sinatra/views/simple_html.mab",
-     "spec/markaby/sinatra/views/variables.mab",
-     "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"
+    "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/sinatra.rb",
+    "lib/markaby/tags.rb",
+    "lib/markaby/tilt.rb",
+    "spec/markaby/builder_spec.rb",
+    "spec/markaby/css_proxy_test.rb",
+    "spec/markaby/fragment_test.rb",
+    "spec/markaby/markaby_other_static.mab",
+    "spec/markaby/markaby_spec.rb",
+    "spec/markaby/markaby_test.rb",
+    "spec/markaby/rails/spec_helper.rb",
+    "spec/markaby/rails/views/layouts/layout.mab",
+    "spec/markaby/rails/views/markaby/_a_partial.mab",
+    "spec/markaby/rails/views/markaby/_form_for_with_body_in_erb.erb",
+    "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/commented_out_template.mab",
+    "spec/markaby/rails/views/markaby/correct_template_values.mab",
+    "spec/markaby/rails/views/markaby/double_output.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/views/markaby/renders_form_for_with_erb_body.mab",
+    "spec/markaby/rails/views/markaby/routes.mab",
+    "spec/markaby/rails/views/markaby/yielding.mab",
+    "spec/markaby/rails/views/markaby/yielding_content_for_with_block_helper.mab",
+    "spec/markaby/rails/views/markaby/yielding_two.mab",
+    "spec/markaby/rails/views/markaby/yielding_with_content_for.mab",
+    "spec/markaby/rails_test.rb",
+    "spec/markaby/rails_version_spec.rb",
+    "spec/markaby/sinatra/app.rb",
+    "spec/markaby/sinatra/sinatra_spec.rb",
+    "spec/markaby/sinatra/views/helpers.mab",
+    "spec/markaby/sinatra/views/layout.mab",
+    "spec/markaby/sinatra/views/markaby_template.mab",
+    "spec/markaby/sinatra/views/scope_instance_variables.mab",
+    "spec/markaby/sinatra/views/simple_html.mab",
+    "spec/markaby/sinatra/views/variables.mab",
+    "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://markaby.github.com/markaby/}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.require_paths = [%q{lib}]
+  s.rubygems_version = %q{1.8.6}
   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/sinatra/app.rb",
-     "spec/markaby/sinatra/sinatra_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

data/README.rdoc

@@ -72,8 +72,10 @@ If you are looking for sinatra support pre 0.7, see http://github.com/sbfaulkner
 
 == Using Markaby with other frameworks
 
-Markaby has a Tilt module, so in principle, any web framework that supports
-Tilt can/will also support Markaby.
+Tilt has a Markaby module, so in principle, any web framework that supports
+Tilt will also support Markaby.  See the appropriate tilt documentation:
+
+  http://github.com/rtomayko/tilt
 
 
 == Using Markaby as a Ruby class
@@ -309,3 +311,7 @@ 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.
 
+== Patches from contributors:
+
+aredridel (Aria Stewart - aredridel@nbtsc.org)
+  - Make exceptions inherit from StandardError (f259c0)

data/Rakefile

@@ -1,5 +1,6 @@
 require 'rake'
-require 'spec/rake/spectask'
+require 'rspec/core/rake_task'
+require 'rake/testtask'
 require 'rake/clean'
 
 begin
@@ -14,14 +15,14 @@ rescue LoadError
   puts "Could not load hanna-rdoc.  Please install with mislav-hanna package"
 end
 
-task :default => :spec
+task :default => [:spec, :test]
 
-desc 'Run the specs'
-Spec::Rake::SpecTask.new do |t|
-  t.warning = false
-  t.spec_opts = ["--color"]
+Rake::TestTask.new(:test) do |t|
+  t.pattern = 'spec/markaby/*_test.rb'
 end
 
+RSpec::Core::RakeTask.new(:spec)
+
 begin
   require 'jeweler'
 

data/VERSION

@@ -1 +1 @@
-0.7.1
+0.7.2

data/lib/markaby.rb

@@ -22,7 +22,7 @@ module Markaby
   version_file = File.expand_path(File.dirname(__FILE__) + "/../VERSION")
   VERSION      = File.read(version_file).strip
 
-  class InvalidXhtmlError < Exception; end
+  class InvalidXhtmlError < StandardError; end
 end
 
 require 'builder' unless defined?(Builder)

data/lib/markaby/builder.rb

@@ -178,6 +178,13 @@ module Markaby
                 raise InvalidXhtmlError, "id `#{ele_id}' already used (id's must be unique)."
               end
             end
+            if AttrsBoolean.include? atname
+              if v
+                attrs[k] = atname.to_s
+              else
+                attrs.delete k
+              end
+            end
           end
         end
       end
@@ -187,7 +194,7 @@ module Markaby
         block = proc { text(str) }
       end
 
-      f = fragment { @builder.method_missing(tag, *args, &block) }
+      f = fragment { @builder.tag!(tag, *args, &block) }
       @used_ids[ele_id] = f if ele_id
       f
     end
@@ -276,8 +283,8 @@ module Markaby
       @transformed_stream = false
     end
 
-    if RUBY_VERSION_ID >= 191
-      undef_method :to_s, :inspect, :==
+    [:to_s, :inspect, :==].each do |method|
+      undef_method method if method_defined?(method)
     end
 
   private

data/lib/markaby/tags.rb

@@ -19,6 +19,13 @@ module Markaby
   AttrHAlign = [:align, :char, :charoff]
   AttrVAlign = [:valign]
   Attrs      = AttrCore + AttrI18n + AttrEvents
+  
+  AttrsBoolean = [
+    :checked, :disabled, :multiple, :readonly, :selected, # standard forms
+    :autofocus, :required, :novalidate, :formnovalidate, # HTML5 forms
+    :defer, :ismap, # <script defer>, <img ismap>
+    :compact, :declare, :noresize, :noshade, :nowrap # deprecated or unused
+  ]
 
   # All the tags and attributes from XHTML 1.0 Strict
   class XHTMLStrict

data/lib/markaby/tilt.rb

@@ -3,40 +3,6 @@ require 'tilt'
 
 module Markaby
   module Tilt
-    class Template < ::Tilt::Template
-      class TiltBuilder < Markaby::Builder
-        def __capture_markaby_tilt__(&block)
-          __run_markaby_tilt__ do
-            text capture(&block)
-          end
-        end
-      end
-
-      def evaluate(scope, locals, &block)
-        builder = TiltBuilder.new({}, scope)
-        builder.locals = locals
-
-        if block
-          builder.instance_eval <<-CODE, __FILE__, __LINE__
-            def __run_markaby_tilt__
-              #{data}
-            end
-          CODE
-
-          builder.__capture_markaby_tilt__(&block)
-        else
-          builder.instance_eval(data, __FILE__, __LINE__)
-        end
-
-        builder.to_s
-      end
-
-      def prepare; end
-    end
+    Template = ::Tilt::MarkabyTemplate
   end
-end
-
-module Tilt
-  MarkabyTemplate = Markaby::Tilt::Template
-  register :mab, MarkabyTemplate
-end
+end

data/spec/markaby/markaby_spec.rb

@@ -1,78 +1,12 @@
 require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
 
-class MarkabyTest < Test::Unit::TestCase
-  def teardown
-    Markaby::Builder.restore_defaults!
-  end
-
-  def test_simple
-    assert_equal "<hr/>", mab { hr }
-    assert_equal "<hr/><br/>", mab { hr; br }
-    assert_equal "<p>foo</p>", mab { p 'foo' }
-    assert_equal "<p>foo</p>", mab { p { 'foo' } }
-  end
-
-  def test_classes_and_ids
-    assert_equal %{<div class="one"></div>},     mab { div.one '' }
-    assert_equal %{<div class="one two"></div>}, mab { div.one.two '' }
-    assert_equal %{<div id="three"></div>},      mab { div.three! '' }
-    assert_equal %{<hr class="hidden"/>},        mab { hr.hidden }
-
-    out = mab { input.foo :id => 'bar' }
-    out.should match("<input.*class=\"foo\".*/>")
-    out.should match("<input.*name=\"bar\".*/>")
-  end
-
-  def test_escaping
-    assert_equal "<h1>Apples &amp; Oranges</h1>", mab { h1 'Apples & Oranges' }
-    assert_equal "<h1>Apples & Oranges</h1>", mab { h1 { 'Apples & Oranges' } }
-    assert_equal "<h1 class=\"fruits&amp;floots\">Apples</h1>", mab { h1 'Apples', :class => 'fruits&floots' }
-  end
-
-  def test_capture
-    builder = Markaby::Builder.new
-    assert builder.to_s.empty?
-    assert_equal "<h1>TEST</h1>", builder.capture { h1 'TEST' }
-    assert builder.to_s.empty?
-    assert mab { capture { h1 'hello world' }; nil }.empty?
-    assert_equal mab { div { h1 'TEST' } }, mab { div { capture { h1 'TEST' } } }
-  end
-
-  def test_ivars
-    html = "<div><h1>Steve</h1><div><h2>Gerald</h2></div><h3>Gerald</h3></div>"
-    assert_equal html, mab { div { @name = 'Steve'; h1 @name; div { @name = 'Gerald'; h2 @name }; h3 @name } }
-    assert_equal html, mab { div { @name = 'Steve'; h1 @name; self << capture { div { @name = 'Gerald'; h2 @name } }; h3 @name } }
-    assert_equal html, mab(:name => 'Steve') { div { h1 @name; self << capture { div { @name = 'Gerald'; h2 @name } }; h3 @name } }
-  end
-
-  def test_ivars_without_at_symbol
-    assert_equal "<h1>Hello World</h1>", mab { @message = 'Hello World'; h1 message }
-  end
-
-  def spec_helpers
-    Markaby::Builder.ignored_helpers.clear
-    assert_equal %{squirrels}, mab({}, MarkabyTestHelpers) { pluralize('squirrel') }
-    assert_equal %{<a href="">edit</a>}, mab({}, MarkabyTestHelpers) { link_to('edit') }
-    assert mab({}, MarkabyTestHelpers) { @output_helpers = false; link_to('edit'); nil }.empty?
-    Markaby::Builder.ignore_helpers :pluralize
-    assert_exception(NoMethodError, "undefined method `pluralize'", {}, MarkabyTestHelpers) { pluralize('squirrel') }
-  end
-
-  def test_uses_helper_instance_variable
-    helper = Module.new do
-      @some_ivar = :ivar_value
-    end
-
-    builder = Markaby::Builder.new({}, helper)
-    assert_equal :ivar_value, builder.some_ivar
-  end
-
+describe Markaby do
   it "can assign helpers after instantiation" do
     helper = mock 'helper', :foo => :bar
 
     builder = Markaby::Builder.new
     builder.helper = helper
-    assert_equal :bar, builder.foo
+    builder.foo.should == :bar
   end
 
   it "should be able to set a local" do
@@ -240,4 +174,11 @@ class MarkabyTest < Test::Unit::TestCase
     builder = Markaby::Builder.new({}, klass.new)
     builder.capture { @hello }.should == "hello there"
   end
+
+  describe Markaby::InvalidXhtmlError do
+    it "should inherit from StandardError" do
+      Markaby::InvalidXhtmlError.superclass.should == StandardError
+    end
+  end
 end
+

data/spec/markaby/markaby_test.rb

@@ -0,0 +1,251 @@
+require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
+
+class MarkabyTest < Test::Unit::TestCase
+  def teardown
+    Markaby::Builder.restore_defaults!
+  end
+
+  def test_simple
+    assert_equal "<hr/>", mab { hr }
+    assert_equal "<hr/><br/>", mab { hr; br }
+    assert_equal "<p>foo</p>", mab { p 'foo' }
+    assert_equal "<p>foo</p>", mab { p { 'foo' } }
+  end
+
+  def test_classes_and_ids
+    assert_equal %{<div class="one"></div>},     mab { div.one '' }
+    assert_equal %{<div class="one two"></div>}, mab { div.one.two '' }
+    assert_equal %{<div id="three"></div>},      mab { div.three! '' }
+    assert_equal %{<hr class="hidden"/>},        mab { hr.hidden }
+
+    out = mab { input.foo :id => 'bar' }
+    out.should match("<input.*class=\"foo\".*/>")
+    out.should match("<input.*name=\"bar\".*/>")
+  end
+
+  def test_escaping
+    assert_equal "<h1>Apples &amp; Oranges</h1>", mab { h1 'Apples & Oranges' }
+    assert_equal "<h1>Apples & Oranges</h1>", mab { h1 { 'Apples & Oranges' } }
+    assert_equal "<h1 class=\"fruits&amp;floots\">Apples</h1>", mab { h1 'Apples', :class => 'fruits&floots' }
+  end
+
+  def test_capture
+    builder = Markaby::Builder.new
+    assert builder.to_s.empty?
+    assert_equal "<h1>TEST</h1>", builder.capture { h1 'TEST' }
+    assert builder.to_s.empty?
+    assert mab { capture { h1 'hello world' }; nil }.empty?
+    assert_equal mab { div { h1 'TEST' } }, mab { div { capture { h1 'TEST' } } }
+  end
+
+  def test_ivars
+    html = "<div><h1>Steve</h1><div><h2>Gerald</h2></div><h3>Gerald</h3></div>"
+    assert_equal html, mab { div { @name = 'Steve'; h1 @name; div { @name = 'Gerald'; h2 @name }; h3 @name } }
+    assert_equal html, mab { div { @name = 'Steve'; h1 @name; self << capture { div { @name = 'Gerald'; h2 @name } }; h3 @name } }
+    assert_equal html, mab(:name => 'Steve') { div { h1 @name; self << capture { div { @name = 'Gerald'; h2 @name } }; h3 @name } }
+  end
+
+  def test_ivars_without_at_symbol
+    assert_equal "<h1>Hello World</h1>", mab { @message = 'Hello World'; h1 message }
+  end
+
+  def spec_helpers
+    Markaby::Builder.ignored_helpers.clear
+    assert_equal %{squirrels}, mab({}, MarkabyTestHelpers) { pluralize('squirrel') }
+    assert_equal %{<a href="">edit</a>}, mab({}, MarkabyTestHelpers) { link_to('edit') }
+    assert mab({}, MarkabyTestHelpers) { @output_helpers = false; link_to('edit'); nil }.empty?
+    Markaby::Builder.ignore_helpers :pluralize
+    assert_exception(NoMethodError, "undefined method `pluralize'", {}, MarkabyTestHelpers) { pluralize('squirrel') }
+  end
+
+  def test_uses_helper_instance_variable
+    helper = Module.new do
+      @some_ivar = :ivar_value
+    end
+
+    builder = Markaby::Builder.new({}, helper)
+    assert_equal :ivar_value, builder.some_ivar
+  end
+end
+
+describe Markaby do
+  it "can assign helpers after instantiation" do
+    helper = mock 'helper', :foo => :bar
+
+    builder = Markaby::Builder.new
+    builder.helper = helper
+    builder.foo.should == :bar
+  end
+
+  it "should be able to set a local" do
+    builder = Markaby::Builder.new
+    builder.locals = { :foo => "bar" }
+    builder.foo.should == "bar"
+  end
+
+  it "should be able to set a different local value" do
+    builder = Markaby::Builder.new
+    builder.locals = { :foo => "baz" }
+    builder.foo.should == "baz"
+  end
+
+  it "should assign the correct key" do
+    builder = Markaby::Builder.new
+    builder.locals = { :key => :value }
+    builder.key.should == :value
+  end
+
+  it "should be able to assign multiple locals" do
+    builder = Markaby::Builder.new
+
+    builder.locals = { :one => "two", :three => "four" }
+
+    builder.one.should == "two"
+    builder.three.should == "four"
+  end
+
+  def test_builder_bang_methods
+    assert_equal "<?xml version=\"1.0\" encoding=\"UTF-8\"?>", mab { instruct! }
+  end
+
+  it "should be able to produce the correct html from a fragment" do
+    str = ""
+    str += "<div>"
+    str += "<h1>Monkeys</h1>"
+    str += "<h2>Giraffes <small>Miniature</small> and <strong>Large</strong></h2>"
+    str += "<h3>Donkeys</h3>"
+    str += "<h4>Parakeet <b><i>Innocent IV</i></b> in Classic Chartreuse</h4>"
+    str += "</div>"
+
+    generated = mab {
+      div {
+        h1 "Monkeys"
+        h2 {
+          "Giraffes #{small('Miniature')} and #{strong 'Large'}"
+        }
+        h3 "Donkeys"
+        h4 { "Parakeet #{b { i 'Innocent IV' }} in Classic Chartreuse" }
+      }
+    }
+
+    generated.should == str
+  end
+
+  def test_fragments
+    assert_equal %{<div><h1>Monkeys</h1><h2>Giraffes <strong>Miniature</strong></h2><h3>Donkeys</h3></div>},
+        mab { div { h1 "Monkeys"; h2 { "Giraffes #{strong 'Miniature' }" }; h3 "Donkeys" } }
+
+    assert_equal %{<div><h1>Monkeys</h1><h2>Giraffes <small>Miniature</small> and <strong>Large</strong></h2><h3>Donkeys</h3><h4>Parakeet <strong>Large</strong> as well...</h4></div>},
+        mab { div { @a = small 'Miniature'; @b = strong 'Large'; h1 "Monkeys"; h2 { "Giraffes #{@a} and #{@b}" }; h3 "Donkeys"; h4 { "Parakeet #{@b} as well..." } } }
+  end
+
+  def test_invalid_xhtml
+    assert_exception(NoMethodError, "undefined method `dav'") { dav {} }
+    assert_exception(Markaby::InvalidXhtmlError, "no attribute `styl' on div elements") { div(:styl => 'ok') {} }
+    assert_exception(Markaby::InvalidXhtmlError, "no attribute `class' on tbody elements") { tbody.okay {} }
+  end
+
+  def test_full_doc_transitional
+    doc = mab { xhtml_transitional { head { title 'OKay' } } }
+    assert doc =~ /^<\?xml version="1.0" encoding="UTF-8"\?>/
+    assert doc.include?(%{"-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">})
+    assert doc.include?(%{<title>OKay</title>})
+  end
+
+  def test_full_doc_strict
+    doc = mab { xhtml_strict { head { title 'OKay' } } }
+    assert doc =~ /^<\?xml version="1.0" encoding="UTF-8"\?>/
+    assert doc.include?(%{"-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">})
+    assert doc.include?(%{<title>OKay</title>})
+  end
+
+  def test_full_doc_frameset
+    doc = mab { xhtml_frameset { head { title 'OKay' } } }
+    assert doc =~ /^<\?xml version="1.0" encoding="UTF-8"\?>/
+    assert doc.include?(%{"-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">})
+    assert doc.include?(%{<title>OKay</title>})
+  end
+
+  def test_root_attributes_can_be_changed
+    doc = mab { xhtml_strict(:lang => 'fr') { head { title { 'Salut!' } } } }
+    assert doc.include?(%{"-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">})
+    assert doc.include?(%{<title>Salut!</title>})
+    assert doc.include?(%{ lang="fr"})
+  end
+
+  def version_file
+    File.expand_path(File.dirname(__FILE__) + "/../../VERSION")
+  end
+
+  def test_markaby_should_have_correct_version
+    assert_equal Markaby::VERSION, File.read(version_file).strip
+  end
+
+  def test_duplicate_usage_of_same_id
+    assert_raises Markaby::InvalidXhtmlError do
+      mab do
+        p.one!
+        p.one!
+      end
+    end
+  end
+
+  # auto validation
+
+  def test_tagging_with_invalid_tag_should_raise_error
+    assert_raises Markaby::InvalidXhtmlError do
+      mab do
+        tag! :an_invalid_tag
+      end
+    end
+  end
+
+  def test_self_closing_html_tag_with_block_throws_errors
+    assert_raises Markaby::InvalidXhtmlError do
+      mab do
+        html_tag :img do
+        end
+      end
+    end
+  end
+
+  def test_local_assigning
+    builder = Markaby::Builder.new(:variable => :a_value)
+
+    assert_equal :a_value, builder.variable
+  end
+
+  def test_local_assignment_with_strings
+    builder = Markaby::Builder.new("variable" => :a_value)
+    assert_equal :a_value, builder.variable
+  end
+
+  def test_local_assignment_prefers_symbols_to_strings
+    builder = Markaby::Builder.new("variable" => "string_value", :variable => :symbol_value)
+    assert_equal :symbol_value, builder.variable
+  end
+
+  def test_method_missing_should_call_tag_if_no_tagset_present
+    Markaby::Builder.set(:tagset, nil)
+
+    builder = Markaby::Builder.new
+    builder.something.should == "<something/>"
+  end
+
+  it "should copy instance variables from a helper object" do
+    klass = Class.new do
+      def initialize
+        @hello = "hello there"
+      end
+    end
+
+    builder = Markaby::Builder.new({}, klass.new)
+    builder.capture { @hello }.should == "hello there"
+  end
+
+  describe Markaby::InvalidXhtmlError do
+    it "should inherit from StandardError" do
+      Markaby::InvalidXhtmlError.superclass.should == StandardError
+    end
+  end
+end

data/spec/markaby/{rails_spec.rb → rails_test.rb}

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), 'rails', 'spec_helper')
+require File.expand_path('../rails/spec_helper', __FILE__)
 
 if RUNNING_RAILS
   class NonSpecificTestController < ActionController::Base

data/spec/spec_helper.rb

@@ -1,6 +1,6 @@
 require 'test/unit'
-require 'spec'
-require 'spec/interop/test'
+require 'test/unit/autorunner'
+require 'rspec'
 
 $:.unshift File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
 
@@ -36,6 +36,9 @@ module Test
   module Unit
     class TestCase
       include TestHelpers
+      def self.it(name, &blk)
+        define_method("test_#{name}", &blk)
+      end
     end
   end
 end

metadata

@@ -1,15 +1,10 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: markaby
-version: !ruby/object:Gem::Version 
-  hash: 1
-  prerelease: false
-  segments: 
-  - 0
-  - 7
-  - 1
-  version: 0.7.1
+version: !ruby/object:Gem::Version
+  version: 0.7.2
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - _why
 - Tim Fletcher
 - John Barton
@@ -18,36 +13,26 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-08-19 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-08-23 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: builder
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70326085518080 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.0.0
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: *70326085518080
 description: Tim Fletcher and _why's ruby driven HTML templating system
 email: scott@railsnewbie.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
-files: 
-- .gitignore
+files:
 - CHANGELOG.rdoc
 - Markaby.gemspec
 - README.rdoc
@@ -68,10 +53,11 @@ files:
 - 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/css_proxy_test.rb
+- spec/markaby/fragment_test.rb
 - spec/markaby/markaby_other_static.mab
 - spec/markaby/markaby_spec.rb
+- spec/markaby/markaby_test.rb
 - spec/markaby/rails/spec_helper.rb
 - spec/markaby/rails/views/layouts/layout.mab
 - spec/markaby/rails/views/markaby/_a_partial.mab
@@ -99,7 +85,7 @@ files:
 - spec/markaby/rails/views/markaby/yielding_content_for_with_block_helper.mab
 - spec/markaby/rails/views/markaby/yielding_two.mab
 - spec/markaby/rails/views/markaby/yielding_with_content_for.mab
-- spec/markaby/rails_spec.rb
+- spec/markaby/rails_test.rb
 - spec/markaby/rails_version_spec.rb
 - spec/markaby/sinatra/app.rb
 - spec/markaby/sinatra/sinatra_spec.rb
@@ -119,49 +105,28 @@ files:
 - spec/markaby/tilt_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://markaby.github.com/markaby/
 licenses: []
-
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
-require_paths: 
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Markup as Ruby, write HTML in your native Ruby tongue
-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/sinatra/app.rb
-- spec/markaby/sinatra/sinatra_spec.rb
-- spec/markaby/tilt_spec.rb
-- spec/spec_helper.rb
+test_files: []

data/.gitignore

@@ -1,5 +0,0 @@
-doc
-coverage
-.garlic
-pkg
-_site