Merge smtlaissezfaire/markaby

JamieS · Sep 10, 2010 · 46af278 · 46af278
2 parents b05e8da + d931d46
commit 46af278
Show file tree

Hide file tree

Showing 9 changed files with 125 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -34,6 +34,7 @@ Support for these template engines is included with the package:
     RedCloth                   .textile          redcloth
     RDoc                       .rdoc             rdoc
     Radius                     .radius           radius
+    Markaby                    .mab              markaby
 
 See [TEMPLATES.md][t] for detailed information on template engine
 options and supported features.

diff --git a/lib/tilt.rb b/lib/tilt.rb
@@ -59,7 +59,7 @@ def __tilt__
   end
 
   # Base class for template implementations. Subclasses must implement
-  # the #prepare method and one of the #evaluate or #evaluate_source
+  # the #prepare method and one of the #evaluate or #precompiled_template
   # methods.
   class Template
     # Template source; loaded from a file or given directly.
@@ -790,4 +790,47 @@ def evaluate(scope, locals, &block)
     end
   end
   register 'radius', RadiusTemplate
+
+
+  # Markaby
+  # http://github.com/markaby/markaby
+  class MarkabyTemplate < Template
+    def self.builder_class
+      @builder_class ||= Class.new(Markaby::Builder) do
+        def __capture_markaby_tilt__(&block)
+          __run_markaby_tilt__ do
+            text capture(&block)
+          end
+        end
+      end
+    end
+
+    def initialize_engine
+      return if defined? ::Markaby
+      require_template_library 'markaby'
+    end
+
+    def prepare
+    end
+
+    def evaluate(scope, locals, &block)
+      builder = self.class.builder_class.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
+  end
+  register 'mab', MarkabyTemplate
 end
diff --git a/test/markaby/locals.mab b/test/markaby/locals.mab
@@ -0,0 +1 @@
+li foo
diff --git a/test/markaby/markaby.mab b/test/markaby/markaby.mab
@@ -0,0 +1 @@
+text "hello from markaby!"
diff --git a/test/markaby/markaby_other_static.mab b/test/markaby/markaby_other_static.mab
@@ -0,0 +1 @@
+text "_why?"
diff --git a/test/markaby/render_twice.mab b/test/markaby/render_twice.mab
@@ -0,0 +1 @@
+text "foo"
diff --git a/test/markaby/scope.mab b/test/markaby/scope.mab
@@ -0,0 +1 @@
+li foo
diff --git a/test/markaby/yielding.mab b/test/markaby/yielding.mab
@@ -0,0 +1,2 @@
+text("Hey ")
+yield
diff --git a/test/tilt_markaby_test.rb b/test/tilt_markaby_test.rb
@@ -0,0 +1,73 @@
+require 'contest'
+require 'tilt'
+
+begin
+  require 'markaby'
+
+  class MarkabyTiltTest <  Test::Unit::TestCase
+    def setup
+      @block = lambda do |t|
+        File.read(File.dirname(__FILE__) + "/#{t.file}")
+      end
+    end
+
+    test "should be able to render a markaby template with static html" do
+      tilt = Tilt::MarkabyTemplate.new("markaby/markaby.mab", &@block)
+      assert_equal "hello from markaby!", tilt.render
+    end
+
+    test "should use the contents of the template" do
+      tilt = ::Tilt::MarkabyTemplate.new("markaby/markaby_other_static.mab", &@block)
+      assert_equal "_why?", tilt.render
+    end
+
+    test "should render from a string (given as data)" do
+      tilt = ::Tilt::MarkabyTemplate.new { "html do; end" }
+      assert_equal "<html></html>", tilt.render
+    end
+
+    test "should evaluate a template file in the scope given" do
+      scope = Object.new
+      def scope.foo
+        "bar"
+      end
+
+      tilt = ::Tilt::MarkabyTemplate.new("markaby/scope.mab", &@block)
+      assert_equal "<li>bar</li>", tilt.render(scope)
+    end
+
+    test "should pass locals to the template" do
+      tilt = ::Tilt::MarkabyTemplate.new("markaby/locals.mab", &@block)
+      assert_equal "<li>bar</li>", tilt.render(Object.new, { :foo => "bar" })
+    end
+
+    test "should yield to the block given" do
+      tilt = ::Tilt::MarkabyTemplate.new("markaby/yielding.mab", &@block)
+      eval_scope = Markaby::Builder.new
+
+      output = tilt.render(Object.new, {}) do
+        text("Joe")
+      end
+
+      assert_equal "Hey Joe", output
+    end
+
+    test "should be able to render two templates in a row" do
+      tilt = ::Tilt::MarkabyTemplate.new("markaby/render_twice.mab", &@block)
+
+      assert_equal "foo", tilt.render
+      assert_equal "foo", tilt.render
+    end
+
+    test "should retrieve a Tilt::MarkabyTemplate when calling Tilt['hello.mab']" do
+      assert_equal Tilt::MarkabyTemplate, ::Tilt['./markaby/markaby.mab']
+    end
+
+    test "should return a new instance of the implementation class (when calling Tilt.new)" do
+      assert ::Tilt.new(File.dirname(__FILE__) + "/markaby/markaby.mab").kind_of?(Tilt::MarkabyTemplate)
+    end
+  end
+
+rescue LoadError => boom
+  warn "Tilt::MarkabyTemplate (disabled)\n"
+end