merb-builder 0.9.2 → 0.9.3

data/Rakefile

@@ -3,7 +3,7 @@ require 'rake/gempackagetask'
 
 PLUGIN = "merb-builder"
 NAME = "merb-builder"
-VERSION = "0.9.2"
+VERSION = "0.9.3"
 AUTHOR = "Jonathan Younger"
 EMAIL = "jonathan@daikini.com"
 HOMEPAGE = "http://merb-plugins.rubyforge.org/merb-builder/"
@@ -20,25 +20,28 @@ spec = Gem::Specification.new do |s|
   s.author = AUTHOR
   s.email = EMAIL
   s.homepage = HOMEPAGE
-  s.add_dependency('merb-core', '>= 0.9.2')
+  s.add_dependency('merb-core', '>= 0.9.3')
+  s.add_dependency('builder', '>= 2.0.0')
   s.require_path = 'lib'
   s.autorequire = PLUGIN
-  s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,specs}/**/*")
+  s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,spec}/**/*")
 end
 
 Rake::GemPackageTask.new(spec) do |pkg|
   pkg.gem_spec = spec
 end
 
+install_home = ENV['GEM_HOME'] ? "-i #{ENV['GEM_HOME']}" : ""
+
 task :install => [:package] do
-  sh %{sudo gem install pkg/#{NAME}-#{VERSION} --no-update-sources}
+  sh %{sudo gem install #{install_home} pkg/#{NAME}-#{VERSION} --no-update-sources}
 end
 
 namespace :jruby do
 
   desc "Run :package and install the resulting .gem with jruby"
   task :install => :package do
-    sh %{#{SUDO} jruby -S gem install pkg/#{NAME}-#{Merb::VERSION}.gem --no-rdoc --no-ri}
+    sh %{#{SUDO} jruby -S gem install #{install_home} pkg/#{NAME}-#{Merb::VERSION}.gem --no-rdoc --no-ri}
   end
   
 end

data/lib/merb-builder/template.rb

@@ -28,7 +28,36 @@ module Merb::Template
       name    
     end
   
-    module Mixin; end
+    module Mixin
+      def _builder_buffer(the_binding)
+        @_buffer = eval("xml", the_binding, __FILE__, __LINE__)
+      end
+      # ==== Parameters
+      # *args:: Arguments to pass to the block.
+      # &block:: The template block to call.
+      #
+      # ==== Returns
+      # String:: The output of the block.
+      #
+      # ==== Examples
+      # Capture being used in a .html.erb page:
+      # 
+      #   @foo = capture do
+      #     xml.instruct!
+      #     xml.foo do
+      #       xml.bar "baz"
+      #     end
+      #     xml.target!
+      #   end
+      def capture_builder(*args, &block)
+        block.call(*args)
+      end
+
+      def concat_builder(string, binding)
+        _builder_buffer(binding) << string
+      end
+      
+    end
     Merb::Template.register_extensions(self, %w[builder]) 
   end
 end

data/spec/builder_spec.rb

@@ -0,0 +1,56 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+describe "Builder" do
+  before(:each) do
+    @xml = ::Builder::XmlMarkup.new :indent => 2
+    @xml.instruct!
+  end
+  
+  it "should be able to render Builder templates" do
+    c = dispatch_to(BuilderController, :index, :format => "xml")
+    @xml.hello "World"
+    c.body.should == @xml.target!
+  end
+  
+  it "should be able to render partial Builder templates" do
+    c = dispatch_to(PartialBuilder, :index, :format => "xml")
+    @xml.hello "World"
+    c.body.should == @xml.target!
+  end
+  
+  it "should be able to have ivars defined in both the controller and the parent template" do
+    c = dispatch_to(PartialIvars, :index, :format => "xml")
+    @xml.p "Partial Builder"
+    c.body.should == @xml.target!
+  end
+  
+  it "should use the builder configuration in Merb::Config" do
+    c = dispatch_to(BuilderConfig, :index, :format => "xml")
+    xml = ::Builder::XmlMarkup.new :indent => 4
+    xml.instruct!
+    xml.foo do
+      xml.bar "baz"
+    end
+    c.body.should == xml.target!
+  end
+  
+  it "should capture_builder properly" do
+    c = dispatch_to(CaptureBuilder, :index, :format => "xml")
+    xml = ::Builder::XmlMarkup.new :indent => 4
+    xml.instruct!
+    xml.comment! "I would not say such things if I were you"
+    xml.node 'Capture'
+    
+    c.body.should == xml.target!
+  end
+  
+  it "should concat_builder properly" do
+    c = dispatch_to(ConcatBuilder, :index, :format => "xml")
+    xml = ::Builder::XmlMarkup.new :indent => 4
+    xml.instruct!
+    xml.node 'Concat'
+    
+    c.body.should == xml.target!.chomp
+  end
+  
+end

data/spec/controllers/builder.rb

@@ -0,0 +1,32 @@
+class BuilderController < Merb::Controller
+  provides :xml
+  self._template_root = File.dirname(__FILE__) / "views"
+  def index
+    render
+  end
+end
+
+class PartialBuilder < BuilderController
+end
+
+class BuilderConfig < BuilderController
+end
+
+class PartialIvars < BuilderController
+  def index
+    @var1 = "Partial"
+    render
+  end
+end
+
+class CaptureBuilder < BuilderController
+end
+
+module Merb::ConcatBuilderHelper
+  def concatter(&blk)
+    concat("<node>Concat</node>", blk.binding)
+  end
+end
+
+class ConcatBuilder < BuilderController
+end

data/spec/controllers/views/builder_config/index.xml.builder

@@ -0,0 +1,4 @@
+xml.instruct!
+xml.foo do
+  xml.bar "baz"
+end

data/spec/controllers/views/builder_controller/index.xml.builder

@@ -0,0 +1,2 @@
+xml.instruct!
+xml.hello 'World'

data/spec/controllers/views/capture_builder/index.xml.builder

@@ -0,0 +1,5 @@
+xml.instruct!
+@foo = capture do
+  xml.comment!('I would not say such things if I were you')
+end	
+xml.node 'Capture'

data/spec/controllers/views/concat_builder/index.xml.builder

@@ -0,0 +1,4 @@
+xml.instruct!
+concatter do
+  xml.comment!('I would not do that if I were you')
+end

data/spec/controllers/views/partial_builder/_partial_builder.xml.builder

@@ -0,0 +1 @@
+xml.hello 'World'

data/spec/controllers/views/partial_builder/index.xml.builder

@@ -0,0 +1,2 @@
+xml.instruct!
+xml << partial(:partial_builder)

data/spec/controllers/views/partial_ivars/_partial_builder.xml.builder

@@ -0,0 +1 @@
+xml.p "#{@var1} #{@var2}"

data/spec/controllers/views/partial_ivars/index.xml.builder

@@ -0,0 +1,3 @@
+@var2 = "Builder"
+xml.instruct!
+xml << partial(:partial_builder)

data/spec/spec_helper.rb

@@ -0,0 +1,14 @@
+$TESTING=true
+$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+require "rubygems"
+require "merb-core"
+require "spec"
+
+require "merb-builder"
+require File.dirname(__FILE__) / "controllers" / "builder"
+
+Merb.start :environment => 'test', :builder => { "indent" => 4 }
+
+Spec::Runner.configure do |config|
+  config.include Merb::Test::RequestHelper  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb-builder
 version: !ruby/object:Gem::Version 
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors: 
 - Jonathan Younger
@@ -9,7 +9,7 @@ autorequire: merb-builder
 bindir: bin
 cert_chain: []
 
-date: 2008-03-24 00:00:00 -05:00
+date: 2008-05-04 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -19,7 +19,16 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.2
+        version: 0.9.3
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: builder
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.0.0
     version: 
 description: Merb plugin that provides Builder support
 email: jonathan@daikini.com
@@ -39,6 +48,25 @@ files:
 - lib/merb-builder
 - lib/merb-builder/template.rb
 - lib/merb-builder.rb
+- spec/builder_spec.rb
+- spec/controllers
+- spec/controllers/builder.rb
+- spec/controllers/views
+- spec/controllers/views/builder_config
+- spec/controllers/views/builder_config/index.xml.builder
+- spec/controllers/views/builder_controller
+- spec/controllers/views/builder_controller/index.xml.builder
+- spec/controllers/views/capture_builder
+- spec/controllers/views/capture_builder/index.xml.builder
+- spec/controllers/views/concat_builder
+- spec/controllers/views/concat_builder/index.xml.builder
+- spec/controllers/views/partial_builder
+- spec/controllers/views/partial_builder/_partial_builder.xml.builder
+- spec/controllers/views/partial_builder/index.xml.builder
+- spec/controllers/views/partial_ivars
+- spec/controllers/views/partial_ivars/_partial_builder.xml.builder
+- spec/controllers/views/partial_ivars/index.xml.builder
+- spec/spec_helper.rb
 has_rdoc: true
 homepage: http://merb-plugins.rubyforge.org/merb-builder/
 post_install_message: