merb-builder 0.9.7 → 0.9.8

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2008 YOUR NAME
+Copyright (c) 2008 Jonathan Younger
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -2,6 +2,7 @@ require 'rubygems'
 require 'rake/gempackagetask'
 require "extlib"
 require 'merb-core/tasks/merb_rake_helper'
+require "spec/rake/spectask"
 
 ##############################################################################
 # Package && release
@@ -16,7 +17,7 @@ GEM_EMAIL  = "jonathan@daikini.com"
 
 GEM_NAME    = "merb-builder"
 PKG_BUILD   = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
-GEM_VERSION = (Merb::MORE_VERSION rescue "0.9.7") + PKG_BUILD
+GEM_VERSION = (Merb::MORE_VERSION rescue "0.9.8") + PKG_BUILD
 
 RELEASE_NAME    = "REL #{GEM_VERSION}"
 
@@ -34,7 +35,7 @@ spec = Gem::Specification.new do |s|
   s.author = GEM_AUTHOR
   s.email = GEM_EMAIL
   s.homepage = PROJECT_URL
-  s.add_dependency('merb-core', '>= 0.9.7')
+  s.add_dependency('merb-core', '>= 0.9.8')
   s.add_dependency('builder', '>= 2.0.0')
   s.require_path = 'lib'
   s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,spec}/**/*")
@@ -45,15 +46,33 @@ Rake::GemPackageTask.new(spec) do |pkg|
 end
 
 desc "Install the gem"
-task :install => [:package] do
-  sh install_command(GEM_NAME, GEM_VERSION)
+task :install do
+  Merb::RakeHelper.install(GEM_NAME, :version => GEM_VERSION)
 end
 
-namespace :jruby do
+desc "Uninstall the gem"
+task :uninstall do
+  Merb::RakeHelper.uninstall(GEM_NAME, :version => GEM_VERSION)
+end
 
-  desc "Run :package and install the resulting .gem with jruby"
-  task :install => :package do
-    sh jinstall_command(GEM_NAME, GEM_VERSION)
+desc "Create a gemspec file"
+task :gemspec do
+  File.open("#{GEM_NAME}.gemspec", "w") do |file|
+    file.puts spec.to_ruby
   end
+end
 
+desc "Run all examples (or a specific spec with TASK=xxxx)"
+Spec::Rake::SpecTask.new('spec') do |t|
+  t.spec_opts  = ["-cfs"]
+  t.spec_files = begin
+    if ENV["TASK"] 
+      ENV["TASK"].split(',').map { |task| "spec/**/#{task}_spec.rb" }
+    else
+      FileList['spec/**/*_spec.rb']
+    end
+  end
 end
+
+desc 'Default: run spec examples'
+task :default => 'spec'

data/lib/merb-builder/template.rb

@@ -7,14 +7,21 @@ module Merb::Template
     # ==== Parameters
     # path<String>:: Path to the template file.
     # name<~to_s>:: The name of the template method.
+    # locals<Array[Symbol]>:: A list of locals to assign from the args passed into the compiled template.
     # mod<Class, Module>::
     #   The class or module wherein this method should be defined.
-    def self.compile_template(io, name, mod)
+    def self.compile_template(io, name, locals, mod)
       path = File.expand_path(io.path)
       method = mod.is_a?(Module) ? :module_eval : :instance_eval
+      assigns = locals.inject([]) do |a, l|
+        a << "#{l} = _locals[#{l.inspect}];"
+      end.join
       mod.send(method, %{
-        def #{name}
+        def #{name}(_locals={})
           @_engine = 'builder'
+          
+          #{assigns}
+          
           config = (Merb.config[:builder] || {}).inject({}) do |c, (k, v)|
             c[k.to_sym] = v
             c

data/spec/builder_spec.rb

@@ -12,7 +12,7 @@ describe "Builder" do
     c.body.should == @xml.target!
   end
   
-  it "should be able to render partial Builder templates" do
+  it "should be able to render partial Builder templates and use locals" do
     c = dispatch_to(PartialBuilder, :index, :format => "xml")
     @xml.hello "World"
     c.body.should == @xml.target!

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

@@ -1 +1 @@
-xml.hello 'World'
+xml.hello world

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

@@ -1,2 +1,2 @@
 xml.instruct!
-xml << partial(:partial_builder)
+xml << partial(:partial_builder, :world => "World")

data/spec/spec_helper.rb

@@ -1,4 +1,3 @@
-$TESTING=true
 $:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 require "rubygems"
 require "merb-core"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb-builder
 version: !ruby/object:Gem::Version 
-  version: 0.9.7
+  version: 0.9.8
 platform: ruby
 authors: 
 - Jonathan Younger
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-09 00:00:00 +03:00
+date: 2008-10-06 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.7
+        version: 0.9.8
     version: 
 - !ruby/object:Gem::Dependency 
   name: builder