markaby 0.5 → 0.6.6

data/lib/markaby/tags.rb

@@ -1,107 +1,114 @@
 module Markaby
-
-  FORM_TAGS = [ :form, :input, :select, :textarea ]
-  SELF_CLOSING_TAGS = [ :base, :meta, :link, :hr, :br, :param, :img, :area, :input, :col ]
-  NO_PROXY = [ :hr, :br ]
+  FORM_TAGS         = [ :form, :input, :select, :textarea ]
+  SELF_CLOSING_TAGS = [ :base, :meta, :link, :hr, :br, :param, :img, :area, :input, :col, :frame ]
 
   # Common sets of attributes.
-  AttrCore = [:id, :class, :style, :title]
-  AttrI18n = [:lang, 'xml:lang'.intern, :dir]
-  AttrEvents = [:onclick, :ondblclick, :onmousedown, :onmouseup, :onmouseover, :onmousemove, 
-      :onmouseout, :onkeypress, :onkeydown, :onkeyup]
-  AttrFocus = [:accesskey, :tabindex, :onfocus, :onblur]
+  AttrCore   = [:id, :class, :style, :title]
+  AttrI18n   = [:lang, 'xml:lang'.intern, :dir]
+  AttrEvents = [:onclick,
+                :ondblclick,
+                :onmousedown,
+                :onmouseup,
+                :onmouseover,
+                :onmousemove,
+                :onmouseout,
+                :onkeypress,
+                :onkeydown,
+                :onkeyup]
+  AttrFocus  = [:accesskey, :tabindex, :onfocus, :onblur]
   AttrHAlign = [:align, :char, :charoff]
   AttrVAlign = [:valign]
-  Attrs = AttrCore + AttrI18n + AttrEvents
+  Attrs      = AttrCore + AttrI18n + AttrEvents
 
   # All the tags and attributes from XHTML 1.0 Strict
   class XHTMLStrict
     class << self
       attr_accessor :tags, :tagset, :forms, :self_closing, :doctype
     end
-    @doctype = ["-//W3C//DTD XHTML 1.0 Strict//EN", "DTD/xhtml1-strict.dtd"]
-    @tagset = {
-      :html => AttrI18n + [:id, :xmlns],
-      :head => AttrI18n + [:id, :profile],
-      :title => AttrI18n + [:id],
-      :base => [:href, :id],
-      :meta => AttrI18n + [:id, :http, :name, :content, :scheme, 'http-equiv'.intern],
-      :link => Attrs + [:charset, :href, :hreflang, :type, :rel, :rev, :media],
-      :style => AttrI18n + [:id, :type, :media, :title, 'xml:space'.intern],
-      :script => [:id, :charset, :type, :src, :defer, 'xml:space'.intern],
-      :noscript => Attrs,
-      :body => Attrs + [:onload, :onunload],
-      :div => Attrs,
-      :p => Attrs,
-      :ul => Attrs,
-      :ol => Attrs,
-      :li => Attrs,
-      :dl => Attrs,
-      :dt => Attrs,
-      :dd => Attrs,
-      :address => Attrs,
-      :hr => Attrs,
-      :pre => Attrs + ['xml:space'.intern],
+
+    @doctype = ['-//W3C//DTD XHTML 1.0 Strict//EN', 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd']
+    @tagset  = {
+      :html       => AttrI18n + [:id, :xmlns],
+      :head       => AttrI18n + [:id, :profile],
+      :title      => AttrI18n + [:id],
+      :base       => [:href, :id],
+      :meta       => AttrI18n + [:id, :http, :name, :content, :scheme, 'http-equiv'.intern],
+      :link       => Attrs    + [:charset, :href, :hreflang, :type, :rel, :rev, :media],
+      :style      => AttrI18n + [:id, :type, :media, :title, 'xml:space'.intern],
+      :script     => [:id, :charset, :type, :src, :defer, 'xml:space'.intern],
+      :noscript   => Attrs,
+      :body       => Attrs + [:onload, :onunload],
+      :div        => Attrs,
+      :p          => Attrs,
+      :ul         => Attrs,
+      :ol         => Attrs,
+      :li         => Attrs,
+      :dl         => Attrs,
+      :dt         => Attrs,
+      :dd         => Attrs,
+      :address    => Attrs,
+      :hr         => Attrs,
+      :pre        => Attrs + ['xml:space'.intern],
       :blockquote => Attrs + [:cite],
-      :ins => Attrs + [:cite, :datetime],
-      :del => Attrs + [:cite, :datetime],
-      :a => Attrs + AttrFocus + [:charset, :type, :name, :href, :hreflang, :rel, :rev, :shape, :coords],
-      :span => Attrs,
-      :bdo => AttrCore + AttrEvents + [:lang, 'xml:lang'.intern, :dir],
-      :br => AttrCore,
-      :em => Attrs,
-      :strong => Attrs,
-      :dfn => Attrs,
-      :code => Attrs,
-      :samp => Attrs,
-      :kbd => Attrs,
-      :var => Attrs,
-      :cite => Attrs,
-      :abbr => Attrs,
-      :acronym => Attrs,
-      :q => Attrs + [:cite],
-      :sub => Attrs,
-      :sup => Attrs,
-      :tt => Attrs,
-      :i => Attrs,
-      :b => Attrs,
-      :big => Attrs,
-      :small => Attrs,
-      :object => Attrs + [:declare, :classid, :codebase, :data, :type, :codetype, :archive, :standby, :height, :width, :usemap, :name, :tabindex],
-      :param => [:id, :name, :value, :valuetype, :type],
-      :img => Attrs + [:src, :alt, :longdesc, :height, :width, :usemap, :ismap],
-      :map => AttrI18n + AttrEvents + [:id, :class, :style, :title, :name],
-      :area => Attrs + AttrFocus + [:shape, :coords, :href, :nohref, :alt],
-      :form => Attrs + [:action, :method, :enctype, :onsubmit, :onreset, :accept, :accept],
-      :label => Attrs + [:for, :accesskey, :onfocus, :onblur],
-      :input => Attrs + AttrFocus + [:type, :name, :value, :checked, :disabled, :readonly, :size, :maxlength, :src, :alt, :usemap, :onselect, :onchange, :accept],
-      :select => Attrs + [:name, :size, :multiple, :disabled, :tabindex, :onfocus, :onblur, :onchange],
-      :optgroup => Attrs + [:disabled, :label],
-      :option => Attrs + [:selected, :disabled, :label, :value],
-      :textarea => Attrs + AttrFocus + [:name, :rows, :cols, :disabled, :readonly, :onselect, :onchange],
-      :fieldset => Attrs,
-      :legend => Attrs + [:accesskey],
-      :button => Attrs + AttrFocus + [:name, :value, :type, :disabled],
-      :table => Attrs + [:summary, :width, :border, :frame, :rules, :cellspacing, :cellpadding],
-      :caption => Attrs,
-      :colgroup => Attrs + AttrHAlign + AttrVAlign + [:span, :width],
-      :col => Attrs + AttrHAlign + AttrVAlign + [:span, :width],
-      :thead => Attrs + AttrHAlign + AttrVAlign,
-      :tfoot => Attrs + AttrHAlign + AttrVAlign,
-      :tbody => Attrs + AttrHAlign + AttrVAlign,
-      :tr => Attrs + AttrHAlign + AttrVAlign,
-      :th => Attrs + AttrHAlign + AttrVAlign + [:abbr, :axis, :headers, :scope, :rowspan, :colspan],
-      :td => Attrs + AttrHAlign + AttrVAlign + [:abbr, :axis, :headers, :scope, :rowspan, :colspan],
-      :h1 => Attrs,
-      :h2 => Attrs,
-      :h3 => Attrs,
-      :h4 => Attrs,
-      :h5 => Attrs,
-      :h6 => Attrs
+      :ins        => Attrs + [:cite, :datetime],
+      :del        => Attrs + [:cite, :datetime],
+      :a          => Attrs + AttrFocus + [:charset, :type, :name, :href, :hreflang, :rel, :rev, :shape, :coords],
+      :span       => Attrs,
+      :bdo        => AttrCore + AttrEvents + [:lang, 'xml:lang'.intern, :dir],
+      :br         => AttrCore,
+      :em         => Attrs,
+      :strong     => Attrs,
+      :dfn        => Attrs,
+      :code       => Attrs,
+      :samp       => Attrs,
+      :kbd        => Attrs,
+      :var        => Attrs,
+      :cite       => Attrs,
+      :abbr       => Attrs,
+      :acronym    => Attrs,
+      :q          => Attrs + [:cite],
+      :sub        => Attrs,
+      :sup        => Attrs,
+      :tt         => Attrs,
+      :i          => Attrs,
+      :b          => Attrs,
+      :big        => Attrs,
+      :small      => Attrs,
+      :object     => Attrs + [:declare, :classid, :codebase, :data, :type, :codetype, :archive, :standby, :height, :width, :usemap, :name, :tabindex],
+      :param      => [:id, :name, :value, :valuetype, :type],
+      :img        => Attrs + [:src, :alt, :longdesc, :height, :width, :usemap, :ismap],
+      :map        => AttrI18n + AttrEvents + [:id, :class, :style, :title, :name],
+      :area       => Attrs + AttrFocus + [:shape, :coords, :href, :nohref, :alt],
+      :form       => Attrs + [:action, :method, :enctype, :onsubmit, :onreset, :accept, :accept],
+      :label      => Attrs + [:for, :accesskey, :onfocus, :onblur],
+      :input      => Attrs + AttrFocus + [:type, :name, :value, :checked, :disabled, :readonly, :size, :maxlength, :src, :alt, :usemap, :onselect, :onchange, :accept],
+      :select     => Attrs + [:name, :size, :multiple, :disabled, :tabindex, :onfocus, :onblur, :onchange],
+      :optgroup   => Attrs + [:disabled, :label],
+      :option     => Attrs + [:selected, :disabled, :label, :value],
+      :textarea   => Attrs + AttrFocus + [:name, :rows, :cols, :disabled, :readonly, :onselect, :onchange],
+      :fieldset   => Attrs,
+      :legend     => Attrs + [:accesskey],
+      :button     => Attrs + AttrFocus + [:name, :value, :type, :disabled],
+      :table      => Attrs + [:summary, :width, :border, :frame, :rules, :cellspacing, :cellpadding],
+      :caption    => Attrs,
+      :colgroup   => Attrs + AttrHAlign + AttrVAlign + [:span, :width],
+      :col        => Attrs + AttrHAlign + AttrVAlign + [:span, :width],
+      :thead      => Attrs + AttrHAlign + AttrVAlign,
+      :tfoot      => Attrs + AttrHAlign + AttrVAlign,
+      :tbody      => Attrs + AttrHAlign + AttrVAlign,
+      :tr         => Attrs + AttrHAlign + AttrVAlign,
+      :th         => Attrs + AttrHAlign + AttrVAlign + [:abbr, :axis, :headers, :scope, :rowspan, :colspan],
+      :td         => Attrs + AttrHAlign + AttrVAlign + [:abbr, :axis, :headers, :scope, :rowspan, :colspan],
+      :h1         => Attrs,
+      :h2         => Attrs,
+      :h3         => Attrs,
+      :h4         => Attrs,
+      :h5         => Attrs,
+      :h6         => Attrs
     }
 
-    @tags = @tagset.keys
-    @forms = @tags & FORM_TAGS
+    @tags         = @tagset.keys
+    @forms        = @tags & FORM_TAGS
     @self_closing = @tags & SELF_CLOSING_TAGS
   end
 
@@ -110,51 +117,56 @@ module Markaby
     class << self
       attr_accessor :tags, :tagset, :forms, :self_closing, :doctype
     end
-    @doctype = ["-//W3C//DTD XHTML 1.0 Transitional//EN", "DTD/xhtml1-transitional.dtd"]
-    @tagset = XHTMLStrict.tagset.merge \
-      :strike => Attrs,
-      :center => Attrs,
-      :dir => Attrs + [:compact], 
+
+    @doctype = ['-//W3C//DTD XHTML 1.0 Transitional//EN', 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd']
+    @tagset = XHTMLStrict.tagset.merge({
+      :strike   => Attrs,
+      :center   => Attrs,
+      :dir      => Attrs + [:compact],
       :noframes => Attrs,
-      :basefont => [:id, :size, :color, :face], 
-      :u => Attrs,
-      :menu => Attrs + [:compact], 
-      :iframe => AttrCore + [:longdesc, :name, :src, :frameborder, :marginwidth, :marginheight, :scrolling, :align, :height, :width],
-      :font => AttrCore + AttrI18n + [:size, :color, :face],
-      :s => Attrs,
-      :applet => AttrCore + [:codebase, :archive, :code, :object, :alt, :name, :width, :height, :align, :hspace, :vspace],
-      :isindex => AttrCore + AttrI18n + [:prompt]
+      :basefont => [:id, :size, :color, :face],
+      :u        => Attrs,
+      :menu     => Attrs + [:compact],
+      :iframe   => AttrCore + [:longdesc, :name, :src, :frameborder, :marginwidth, :marginheight, :scrolling, :align, :height, :width],
+      :font     => AttrCore + AttrI18n + [:size, :color, :face],
+      :s        => Attrs,
+      :applet   => AttrCore + [:codebase, :archive, :code, :object, :alt, :name, :width, :height, :align, :hspace, :vspace],
+      :isindex  => AttrCore + AttrI18n + [:prompt]
+    })
 
     # Additional attributes found in XHTML 1.0 Transitional
-    { :script => [:language],
-      :a => [:target],
-      :td => [:bgcolor, :nowrap, :width, :height],
-      :p => [:align],
-      :h5 => [:align],
-      :h3 => [:align],
-      :li => [:type, :value],
-      :div => [:align],
-      :pre => [:width],
-      :body => [:background, :bgcolor, :text, :link, :vlink, :alink],
-      :ol => [:type, :compact, :start],
-      :h4 => [:align],
-      :h2 => [:align],
+    additional_tags = {
+      :script => [:language],
+      :a      => [:target],
+      :td     => [:bgcolor, :nowrap, :width, :height],
+      :p      => [:align],
+      :h5     => [:align],
+      :h3     => [:align],
+      :li     => [:type, :value],
+      :div    => [:align],
+      :pre    => [:width],
+      :body   => [:background, :bgcolor, :text, :link, :vlink, :alink],
+      :ol     => [:type, :compact, :start],
+      :h4     => [:align],
+      :h2     => [:align],
       :object => [:align, :border, :hspace, :vspace],
-      :img => [:name, :align, :border, :hspace, :vspace],
-      :link => [:target],
+      :img    => [:name, :align, :border, :hspace, :vspace],
+      :link   => [:target],
       :legend => [:align],
-      :dl => [:compact],
-      :input => [:align],
-      :h6 => [:align],
-      :hr => [:align, :noshade, :size, :width],
-      :base => [:target],
-      :ul => [:type, :compact],
-      :br => [:clear],
-      :form => [:name, :target],
-      :area => [:target],
-      :h1 => [:align]
-    }.each do |k, v|
-        @tagset[k] += v
+      :dl     => [:compact],
+      :input  => [:align],
+      :h6     => [:align],
+      :hr     => [:align, :noshade, :size, :width],
+      :base   => [:target],
+      :ul     => [:type, :compact],
+      :br     => [:clear],
+      :form   => [:name, :target],
+      :area   => [:target],
+      :h1     => [:align]
+    }
+
+    additional_tags.each do |k, v|
+      @tagset[k] += v
     end
 
     @tags = @tagset.keys
@@ -162,4 +174,20 @@ module Markaby
     @self_closing = @tags & SELF_CLOSING_TAGS
   end
 
+  # Additional tags found in XHTML 1.0 Frameset
+  class XHTMLFrameset
+    class << self
+      attr_accessor :tags, :tagset, :forms, :self_closing, :doctype
+    end
+
+    @doctype = ['-//W3C//DTD XHTML 1.0 Frameset//EN', 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd']
+    @tagset = XHTMLTransitional.tagset.merge({
+      :frameset => AttrCore + [:rows, :cols, :onload, :onunload],
+      :frame    => AttrCore + [:longdesc, :name, :src, :frameborder, :marginwidth, :marginheight, :noresize, :scrolling]
+    })
+
+    @tags = @tagset.keys
+    @forms = @tags & FORM_TAGS
+    @self_closing = @tags & SELF_CLOSING_TAGS
+  end
 end

data/lib/markaby/tilt.rb

@@ -0,0 +1,21 @@
+require 'tilt'
+
+module Markaby
+  module Tilt
+    class Template < ::Tilt::Template
+      def evaluate(scope, locals, &block)
+        builder = Markaby::Builder.new({}, scope)
+        builder.locals = locals
+        builder.instance_eval(data, __FILE__, __LINE__)
+        builder.to_s
+      end
+
+      def prepare; end
+    end
+  end
+end
+
+module Tilt
+  MarkabyTemplate = Markaby::Tilt::Template
+  register "mab", MarkabyTemplate
+end

data/spec/markaby/builder_spec.rb

@@ -0,0 +1,118 @@
+require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
+
+module Markaby
+  describe Builder do
+    before do
+      Markaby::Builder.restore_defaults!
+    end
+
+    after do
+      Markaby::Builder.restore_defaults!
+    end
+
+    it "should have method missing as a private method" do
+      private_methods = Markaby::Builder.private_instance_methods.dup
+      private_methods.map! { |m| m.to_sym }
+      private_methods.should include(:method_missing)
+    end
+
+    describe "setting options" do
+      it "should be able to restore defaults after setting" do
+        Markaby::Builder.set :indent, 2
+        Markaby::Builder.restore_defaults!
+
+        Markaby::Builder.get(:indent).should == 0
+      end
+
+      it "should be able to set global options" do
+        Markaby::Builder.set :indent, 2
+        Markaby::Builder.get(:indent).should == 2
+      end
+    end
+
+    describe "hidden internal variables" do
+      # internal clobbering by passed in assigns
+      it "should not overwrite internal helpers ivar when assigning a :helpers key" do
+        helper = Class.new do
+          def some_method
+            "a value"
+          end
+        end.new
+
+        builder = Markaby::Builder.new({:helpers => nil}, helper)
+        builder.some_method.should == "a value"
+      end
+    end
+
+    describe "evaluating blocks" do
+      it "should evaluate a pure-string block (without requiring a call to the text method)" do
+        b = Builder.new do
+          "foo"
+        end
+
+        b.to_s.should == "foo"
+      end
+
+      it "should only evaluate the last argument in a pure-string block" do
+        b = Builder.new do
+          "foo"
+          "bar"
+        end
+
+        b.to_s.should == "bar"
+      end
+
+      it "should evaluate pure-strings inside an tag" do
+        b = Builder.new do
+          h1 do
+            "foo"
+          end
+        end
+
+        b.to_s.should == "<h1>foo</h1>"
+      end
+
+      it "should ignore a pure string in the block, even if comes last, if there has been any markup whatsoever" do
+        b = Builder.new do
+          h1
+          "foo"
+        end
+
+        b.to_s.should == "<h1/>"
+      end
+    end
+
+    describe "capture" do
+      before do
+        @builder = Builder.new
+      end
+
+      it "should return the string captured" do
+        out = @builder.capture do
+          h1 "TEST"
+          h2 "CAPTURE ME"
+        end
+
+        out.should == "<h1>TEST</h1><h2>CAPTURE ME</h2>"
+      end
+
+      it "should not change the output buffer" do
+        lambda {
+          @builder.capture do
+            h1 "FOO!"
+          end
+        }.should_not change { @builder.to_s }
+      end
+
+      it "should be able to capture inside a capture" do
+        out = @builder.capture do
+          capture do
+            h1 "foo"
+          end
+        end
+
+        out.should == "<h1>foo</h1>"
+      end
+    end
+  end
+end