merb-builder 0.9.3 → 0.9.4

data/Rakefile

@@ -1,29 +1,42 @@
 require 'rubygems'
 require 'rake/gempackagetask'
+require "extlib"
+require 'merb-core/tasks/merb_rake_helper'
 
-PLUGIN = "merb-builder"
-NAME = "merb-builder"
-VERSION = "0.9.3"
-AUTHOR = "Jonathan Younger"
-EMAIL = "jonathan@daikini.com"
-HOMEPAGE = "http://merb-plugins.rubyforge.org/merb-builder/"
-SUMMARY = "Merb plugin that provides Builder support"
+##############################################################################
+# Package && release
+##############################################################################
+RUBY_FORGE_PROJECT  = "merb"
+PROJECT_URL         = "http://merbivore.com"
+PROJECT_SUMMARY     = "Merb plugin that provides Builder support"
+PROJECT_DESCRIPTION = PROJECT_SUMMARY
+
+GEM_AUTHOR = "Jonathan Younger"
+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.4") + PKG_BUILD
+
+RELEASE_NAME    = "REL #{GEM_VERSION}"
+
+require "extlib/tasks/release"
 
 spec = Gem::Specification.new do |s|
-  s.name = NAME
-  s.version = VERSION
+  s.rubyforge_project = RUBY_FORGE_PROJECT
+  s.name = GEM_NAME
+  s.version = GEM_VERSION
   s.platform = Gem::Platform::RUBY
   s.has_rdoc = true
   s.extra_rdoc_files = ["README", "LICENSE", 'TODO']
-  s.summary = SUMMARY
-  s.description = s.summary
-  s.author = AUTHOR
-  s.email = EMAIL
-  s.homepage = HOMEPAGE
-  s.add_dependency('merb-core', '>= 0.9.3')
+  s.summary = PROJECT_SUMMARY
+  s.description = PROJECT_DESCRIPTION
+  s.author = GEM_AUTHOR
+  s.email = GEM_EMAIL
+  s.homepage = PROJECT_URL
+  s.add_dependency('merb-core', '>= 0.9.4')
   s.add_dependency('builder', '>= 2.0.0')
   s.require_path = 'lib'
-  s.autorequire = PLUGIN
   s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,spec}/**/*")
 end
 
@@ -31,17 +44,16 @@ Rake::GemPackageTask.new(spec) do |pkg|
   pkg.gem_spec = spec
 end
 
-install_home = ENV['GEM_HOME'] ? "-i #{ENV['GEM_HOME']}" : ""
-
+desc "Install the gem"
 task :install => [:package] do
-  sh %{sudo gem install #{install_home} pkg/#{NAME}-#{VERSION} --no-update-sources}
+  sh %{#{sudo} gem install #{install_home} pkg/#{GEM_NAME}-#{GEM_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 #{install_home} pkg/#{NAME}-#{Merb::VERSION}.gem --no-rdoc --no-ri}
+    sh %{#{sudo} jruby -S gem install #{install_home} pkg/#{GEM_NAME}-#{GEM_VERSION}.gem --no-rdoc --no-ri}
   end
-  
+
 end

data/lib/merb-builder/template.rb

@@ -9,8 +9,8 @@ module Merb::Template
     # name<~to_s>:: The name of the template method.
     # mod<Class, Module>::
     #   The class or module wherein this method should be defined.
-    def self.compile_template(path, name, mod)
-      path = File.expand_path(path)
+    def self.compile_template(io, name, mod)
+      path = File.expand_path(io.path)
       method = mod.is_a?(Module) ? :module_eval : :instance_eval
       mod.send(method, %{
         def #{name}
@@ -20,7 +20,7 @@ module Merb::Template
             c
           end
           xml = ::Builder::XmlMarkup.new(config)
-          self.instance_eval %{#{File.read(path)}}
+          self.instance_eval %{#{io.read}}
           xml.target!
         end
       })

metadata

@@ -1,28 +1,30 @@
 --- !ruby/object:Gem::Specification 
 name: merb-builder
 version: !ruby/object:Gem::Version 
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors: 
 - Jonathan Younger
-autorequire: merb-builder
+autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2008-05-04 00:00:00 -05:00
+date: 2008-08-13 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: merb-core
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.3
+        version: 0.9.4
     version: 
 - !ruby/object:Gem::Dependency 
   name: builder
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -68,7 +70,7 @@ files:
 - spec/controllers/views/partial_ivars/index.xml.builder
 - spec/spec_helper.rb
 has_rdoc: true
-homepage: http://merb-plugins.rubyforge.org/merb-builder/
+homepage: http://merbivore.com
 post_install_message: 
 rdoc_options: []
 
@@ -88,8 +90,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: 
-rubygems_version: 1.0.1
+rubyforge_project: merb
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: Merb plugin that provides Builder support