RubyGems - tilt - Versions diffs - 0.9 → 0.10 - Mend

Files changed (11) hide show

data/README.md +2 -0
data/TEMPLATES.md +53 -0
data/lib/tilt.rb +51 -4
data/test/tilt_erbtemplate_test.rb +17 -0
data/test/tilt_erubistemplate_test.rb +17 -0
data/test/tilt_mustache_views/external.rb +10 -5
data/test/tilt_radiustemplate_test.rb +66 -0
data/test/tilt_sasstemplate_test.rb +2 -2
data/test/tilt_template_test.rb +16 -0
data/tilt.gemspec +7 -2
metadata +20 -6

data/README.md CHANGED Viewed

@@ -33,6 +33,8 @@ Support for these template engines is included with the package:
     Mustache                   .mustache         mustache
     RDiscount                  .markdown         rdiscount
     RedCloth                   .textile          redcloth
+    RDoc                       .rdoc             rdoc
+    Radius                     .radius           radius
 See [TEMPLATES.md][t] for detailed information on template engine
 options and supported features.

data/TEMPLATES.md CHANGED Viewed

@@ -432,3 +432,56 @@ engine in a threaded environment.
 ### See also
  * [RDoc](http://rdoc.sourceforge.net/doc/index.html)
+<a name='radius'></a>
+Radius (`radius`)
+-----------------
+Radius is the template language used by Radiant CMS. It is a tag
+language designed to be valid XML/HTML.
+### Example
+    <html>
+    <body>
+      <h1><r:title /></h1>
+      <ul class="<r:type />">
+      <r:repeat times="3">
+        <li><r:hello />!</li>
+      </r:repeat>
+      </ul>
+      <r:yield />
+    </body>
+    </html>
+### Usage
+To render a template such as the one above.
+    scope = OpenStruct.new
+    scope.title = "Radius Example"
+    scope.hello = "Hello, World!"
+    require 'radius'
+    template = Tilt::RadiusTemplate.new('example.radius', :tag_prefix=>'r')
+    template.render(scope, :type=>'hlist'){ "Jackpot!" }
+The result will be:
+    <html>
+    <body>
+      <h1>Radius Example</h1>
+      <ul class="hlist">
+        <li>Hello, World!</li>
+        <li>Hello, World!</li>
+        <li>Hello, World!</li>
+      </ul>
+      Jackpot!
+    </body>
+    </html>
+### See also
+* [Radius](http://radius.rubyforge.org/)
+* [Radiant](http://radiantcms.org/)

data/lib/tilt.rb CHANGED Viewed

@@ -1,7 +1,7 @@
 require 'digest/md5'
 module Tilt
-  VERSION = '0.9'
+  VERSION = '0.10'
   @template_mappings = {}
@@ -350,18 +350,29 @@ module Tilt
   # ERB template implementation. See:
   # http://www.ruby-doc.org/stdlib/libdoc/erb/rdoc/classes/ERB.html
   class ERBTemplate < Template
+    @@default_output_variable = '_erbout'
+    def self.default_output_variable
+      @@default_output_variable
+    end
+    def self.default_output_variable=(name)
+      @@default_output_variable = name
+    end
     def initialize_engine
       return if defined? ::ERB
       require_template_library 'erb'
     end
     def prepare
-      @outvar = (options[:outvar] || '_erbout').to_s
+      @outvar = options[:outvar] || self.class.default_output_variable
       @engine = ::ERB.new(data, options[:safe], options[:trim], @outvar)
     end
     def precompiled_template(locals)
-      @engine.src
+      source = @engine.src
+      source
     end
     def precompiled_preamble(locals)
@@ -414,7 +425,7 @@ module Tilt
     def prepare
       @options.merge!(:preamble => false, :postamble => false)
-      @outvar = (options.delete(:outvar) || '_erbout').to_s
+      @outvar = options.delete(:outvar) || self.class.default_output_variable
       engine_class = options.delete(:engine_class)
       engine_class = ::Erubis::EscapedEruby if options.delete(:escape_html)
       @engine = (engine_class || ::Erubis::Eruby).new(data, options)
@@ -752,4 +763,40 @@ module Tilt
     end
   end
   register 'coffee', CoffeeTemplate
+  # Radius Template
+  # http://github.com/jlong/radius/
+  class RadiusTemplate < Template
+    def initialize_engine
+      return if defined? ::Radius
+      require_template_library 'radius'
+    end
+    def prepare
+    end
+    def evaluate(scope, locals, &block)
+      context = Class.new(Radius::Context).new
+      context.define_tag("yield") do
+        block.call
+      end
+      locals.each do |tag, value|
+        context.define_tag(tag) do
+          value
+        end
+      end
+      (class << context; self; end).class_eval do
+        define_method :tag_missing do |tag, attr, &block|
+          scope.__send__(tag)  # any way to support attr as args?
+        end
+      end
+      options = {:tag_prefix => 'r'}.merge(@options)
+      parser = Radius::Parser.new(context, options)
+      parser.parse(data)
+    end
+  end
+  register 'radius', RadiusTemplate
 end

data/test/tilt_erbtemplate_test.rb CHANGED Viewed

@@ -29,6 +29,23 @@ class ERBTemplateTest < Test::Unit::TestCase
     assert_equal "Hey Joe!", template.render(scope)
   end
+  class MockOutputVariableScope
+    attr_accessor :exposed_buffer
+  end
+  test "exposing the buffer to the template by default" do
+    begin
+      Tilt::ERBTemplate.default_output_variable = '@_out_buf'
+      template = Tilt::ERBTemplate.new { '<% self.exposed_buffer = @_out_buf %>hey' }
+      scope = MockOutputVariableScope.new
+      template.render(scope)
+      assert_not_nil scope.exposed_buffer
+      assert_equal scope.exposed_buffer, 'hey'
+    ensure
+      Tilt::ERBTemplate.default_output_variable = '_erbout'
+    end
+  end
   test "passing a block for yield" do
     template = Tilt::ERBTemplate.new { 'Hey <%= yield %>!' }
     assert_equal "Hey Joe!", template.render { 'Joe' }

data/test/tilt_erubistemplate_test.rb CHANGED Viewed

@@ -26,6 +26,23 @@ begin
       assert_equal "Hey Joe!", template.render(scope)
     end
+    class MockOutputVariableScope
+      attr_accessor :exposed_buffer
+    end
+    test "exposing the buffer to the template by default" do
+      begin
+        Tilt::ErubisTemplate.default_output_variable = '@_out_buf'
+        template = Tilt::ErubisTemplate.new { '<% self.exposed_buffer = @_out_buf %>hey' }
+        scope = MockOutputVariableScope.new
+        template.render(scope)
+        assert_not_nil scope.exposed_buffer
+        assert_equal scope.exposed_buffer, 'hey'
+      ensure
+        Tilt::ErubisTemplate.default_output_variable = '_erbout'
+      end
+    end
     test "passing a block for yield" do
       template = Tilt::ErubisTemplate.new { 'Hey <%= yield %>!' }
       assert_equal "Hey Joe!", template.render { 'Joe' }

data/test/tilt_mustache_views/external.rb CHANGED Viewed

@@ -1,9 +1,14 @@
-require 'mustache'
+begin
+  require 'mustache'
-module Views
-  class External < Mustache
-    def hello
-      "Stached"
+  module Views
+    class External < Mustache
+      def hello
+        "Stached"
+      end
     end
   end
+rescue LoadError => boom
+  # silently fail, disabled message already displayed
 end

data/test/tilt_radiustemplate_test.rb ADDED Viewed

@@ -0,0 +1,66 @@
+require 'contest'
+require 'tilt'
+begin
+  require 'radius'
+  class RadiusTemplateTest < Test::Unit::TestCase
+    test "registered for '.radius' files" do
+      assert_equal Tilt::RadiusTemplate, Tilt['test.radius']
+    end
+    test "preparing and evaluating templates on #render" do
+      template = Tilt::RadiusTemplate.new { |t| "Hello World!" }
+      assert_equal "Hello World!", template.render
+    end
+    test "passing locals" do
+      template = Tilt::RadiusTemplate.new { "Hey <r:name />!" }
+      assert_equal "Hey Joe!", template.render(nil, :name => 'Joe')
+    end
+    class ExampleRadiusScope
+      def beer; 'wet'; end
+      def whisky; 'wetter'; end
+    end
+    test "combining scope and locals when scope responds" do
+      template = Tilt::RadiusTemplate.new {
+        'Beer is <r:beer /> but Whisky is <r:whisky />.'
+      }
+      scope = ExampleRadiusScope.new
+      assert_equal "Beer is wet but Whisky is wetter.", template.render(scope)
+    end
+    test "precedence when locals and scope define same variables" do
+      template = Tilt::RadiusTemplate.new {
+        'Beer is <r:beer /> but Whisky is <r:whisky />.'
+      }
+      scope = ExampleRadiusScope.new
+      assert_equal "Beer is great but Whisky is greater.",
+        template.render(scope, :beer => 'great', :whisky => 'greater')
+    end
+    #test "handles local scope" do
+    #  beer   = 'wet'
+    #  whisky = 'wetter'
+    #
+    #  template = Tilt::RadiusTemplate.new {
+    #    'Beer is <r:beer /> but Whisky is <r:whisky />.'
+    #  }
+    #  assert_equal "Beer is wet but Whisky is wetter.", template.render(self)
+    #end
+    test "passing a block for yield" do
+      template = Tilt::RadiusTemplate.new {
+        'Beer is <r:yield /> but Whisky is <r:yield />ter.'
+      }
+      assert_equal "Beer is wet but Whisky is wetter.",
+        template.render({}) { 'wet' }
+    end
+  end
+rescue LoadError => boom
+  warn "Tilt::RadiusTemplate (disabled)\n"
+end

data/test/tilt_sasstemplate_test.rb CHANGED Viewed

@@ -11,8 +11,8 @@ begin
     end
     test "compiles and evaluates the template on #render" do
-      template = Tilt::SassTemplate.new { |t| "#main\n  :background-color #0000ff" }
-      assert_equal "#main {\n  background-color: #0000ff; }\n", template.render
+      template = Tilt::SassTemplate.new { |t| "#main\n  :background-color #0000f1" }
+      assert_equal "#main {\n  background-color: #0000f1; }\n", template.render
     end
   end

data/test/tilt_template_test.rb CHANGED Viewed

@@ -122,6 +122,8 @@ class TiltTemplateTest < Test::Unit::TestCase
   end
   class Person
+    CONSTANT = "Bob"
     attr_accessor :name
     def initialize(name)
       @name = name
@@ -138,4 +140,18 @@ class TiltTemplateTest < Test::Unit::TestCase
     inst = SourceGeneratingMockTemplate.new { |t| 'Hey #{yield}!' }
     assert_equal "Hey Joe!", inst.render(Object.new){ 'Joe' }
   end
+  test "template which accesses a constant" do
+    inst = SourceGeneratingMockTemplate.new { |t| 'Hey #{CONSTANT}!' }
+    assert_equal "Hey Bob!", inst.render(Person.new("Joe"))
+  end
+  class FastPerson < Person
+    include Tilt::CompileSite
+  end
+  test "template which accesses a constant with Tilt::CompileSite" do
+    inst = SourceGeneratingMockTemplate.new { |t| 'Hey #{CONSTANT}!' }
+    assert_equal "Hey Bob!", inst.render(FastPerson.new("Joe"))
+  end
 end

data/tilt.gemspec CHANGED Viewed

@@ -3,8 +3,8 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.name = 'tilt'
-  s.version = '0.9'
-  s.date = '2010-04-11'
+  s.version = '0.10'
+  s.date = '2010-05-27'
   s.description = "Generic interface to multiple Ruby template engines"
   s.summary     = s.description
@@ -31,6 +31,7 @@ Gem::Specification.new do |s|
     test/tilt_liquidtemplate_test.rb
     test/tilt_mustache_views/external.rb
     test/tilt_mustachetemplate_test.rb
+    test/tilt_radiustemplate_test.rb
     test/tilt_rdiscounttemplate_test.rb
     test/tilt_rdoctemplate_test.rb
     test/tilt_redclothtemplate_test.rb
@@ -42,6 +43,9 @@ Gem::Specification.new do |s|
   ]
   # = MANIFEST =
+  s.default_executable = 'tilt'
+  s.executables = ['tilt']
   s.test_files = s.files.select {|path| path =~ /^test\/.*_test.rb/}
   s.add_development_dependency 'contest'
   s.add_development_dependency 'builder'
@@ -52,6 +56,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'liquid'
   s.add_development_dependency 'less'
   s.add_development_dependency 'coffee-script'
+  s.add_development_dependency 'radius'
   s.extra_rdoc_files = %w[COPYING]

metadata CHANGED Viewed

@@ -4,8 +4,8 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments:
   - 0
-  - 9
-  version: "0.9"
+  - 10
+  version: "0.10"
 platform: ruby
 authors:
 - Ryan Tomayko
@@ -13,8 +13,8 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2010-04-11 00:00:00 -07:00
-default_executable:
+date: 2010-05-27 00:00:00 -07:00
+default_executable: tilt
 dependencies:
 - !ruby/object:Gem::Dependency
   name: contest
@@ -126,10 +126,22 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id009
+- !ruby/object:Gem::Dependency
+  name: radius
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        segments:
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id010
 description: Generic interface to multiple Ruby template engines
 email: r@tomayko.com
-executables: []
+executables:
+- tilt
 extensions: []
 extra_rdoc_files:
@@ -152,6 +164,7 @@ files:
 - test/tilt_liquidtemplate_test.rb
 - test/tilt_mustache_views/external.rb
 - test/tilt_mustachetemplate_test.rb
+- test/tilt_radiustemplate_test.rb
 - test/tilt_rdiscounttemplate_test.rb
 - test/tilt_rdoctemplate_test.rb
 - test/tilt_redclothtemplate_test.rb
@@ -206,6 +219,7 @@ test_files:
 - test/tilt_lesstemplate_test.rb
 - test/tilt_liquidtemplate_test.rb
 - test/tilt_mustachetemplate_test.rb
+- test/tilt_radiustemplate_test.rb
 - test/tilt_rdiscounttemplate_test.rb
 - test/tilt_rdoctemplate_test.rb
 - test/tilt_redclothtemplate_test.rb

tilt 0.9 → 0.10