merb-haml 0.9.2 → 0.9.3

data/Rakefile

@@ -3,7 +3,7 @@ require 'rake/gempackagetask'
 
 PLUGIN = "merb-haml"
 NAME = "merb-haml"
-VERSION = "0.9.2"
+VERSION = "0.9.3"
 AUTHOR = "Yehuda Katz"
 EMAIL = "ykatz@engineyard.com"
 HOMEPAGE = "http://merb-plugins.rubyforge.org/merb-haml/"
@@ -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('haml', '>= 1.8.2')  
   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/spec/controllers/haml.rb

@@ -0,0 +1,31 @@
+class HamlController < Merb::Controller
+  self._template_root = File.dirname(__FILE__) / "views"
+  def index
+    render
+  end
+end
+
+class PartialHaml < HamlController
+end
+
+class HamlConfig < HamlController
+end
+
+class PartialIvars < HamlController
+  def index
+    @var1 = "Partial"
+    render
+  end
+end
+
+class CaptureHaml < HamlController
+end
+
+module Merb::ConcatHamlHelper
+  def concatter(&blk)
+    concat("<p>Concat</p>", blk.binding)
+  end
+end
+
+class ConcatHaml < HamlController
+end

data/spec/controllers/views/capture_haml/index.html.haml

@@ -0,0 +1,3 @@
+- x = capture do
+  %p Hello
+= x

data/spec/controllers/views/concat_haml/index.html.haml

@@ -0,0 +1,2 @@
+- concatter do
+  Hello

data/spec/controllers/views/haml_config/index.html.haml

@@ -0,0 +1,2 @@
+#foo
+  %foo

data/spec/controllers/views/haml_controller/index.html.haml

@@ -0,0 +1,2 @@
+#foo
+  %p Hello

data/spec/controllers/views/partial_haml/_partial_haml.html.haml

@@ -0,0 +1 @@
+%p Partial

data/spec/controllers/views/partial_haml/index.html.haml

@@ -0,0 +1,2 @@
+#foo
+  = partial :partial_haml

data/spec/controllers/views/partial_ivars/_partial_haml.html.haml

@@ -0,0 +1 @@
+%p== #{@var1} #{@var2}

data/spec/controllers/views/partial_ivars/index.html.haml

@@ -0,0 +1,3 @@
+#foo
+  - @var2 = "HAML"
+  = partial :partial_haml

data/spec/haml_spec.rb

@@ -0,0 +1,33 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+describe "HAML" do
+  it "should be able to render HAML templates" do
+    c = dispatch_to(HamlController, :index)
+    c.body.should == ::Haml::Engine.new("#foo\n  %p Hello").render
+  end
+
+  it "should be able to render HAML templates" do
+    c = dispatch_to(PartialHaml, :index)
+    c.body.should == ::Haml::Engine.new("#foo\n  %p Partial").render
+  end
+
+  it "should use the haml configuration in Merb::Config" do
+    c = dispatch_to(HamlConfig, :index)
+    c.body.should == ::Haml::Engine.new("#foo\n  %foo", :autoclose => ["foo"]).render
+  end
+  
+  it "should be able to have ivars defined in both the controller and the parent template" do
+    c = dispatch_to(PartialIvars, :index)
+    c.body.should == ::Haml::Engine.new("#foo\n  %p Partial HAML").render    
+  end
+  
+  it "should support capture" do
+    c = dispatch_to(CaptureHaml, :index)
+    c.body.should == "<p>Hello</p>\n"
+  end
+  
+  it "should support concat" do
+    c = dispatch_to(ConcatHaml, :index)
+    c.body.should == "<p>Concat</p>"
+  end
+end

data/spec/spec_helper.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb-haml
 version: !ruby/object:Gem::Version 
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors: 
 - Yehuda Katz
@@ -9,7 +9,7 @@ autorequire: merb-haml
 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: haml
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.8.2
     version: 
 description: Merb plugin that provides HAML support
 email: ykatz@engineyard.com
@@ -40,6 +49,25 @@ files:
 - lib/merb-haml/merbtasks.rb
 - lib/merb-haml/template.rb
 - lib/merb-haml.rb
+- spec/controllers
+- spec/controllers/haml.rb
+- spec/controllers/views
+- spec/controllers/views/capture_haml
+- spec/controllers/views/capture_haml/index.html.haml
+- spec/controllers/views/concat_haml
+- spec/controllers/views/concat_haml/index.html.haml
+- spec/controllers/views/haml_config
+- spec/controllers/views/haml_config/index.html.haml
+- spec/controllers/views/haml_controller
+- spec/controllers/views/haml_controller/index.html.haml
+- spec/controllers/views/partial_haml
+- spec/controllers/views/partial_haml/_partial_haml.html.haml
+- spec/controllers/views/partial_haml/index.html.haml
+- spec/controllers/views/partial_ivars
+- spec/controllers/views/partial_ivars/_partial_haml.html.haml
+- spec/controllers/views/partial_ivars/index.html.haml
+- spec/haml_spec.rb
+- spec/spec_helper.rb
 has_rdoc: true
 homepage: http://merb-plugins.rubyforge.org/merb-haml/
 post_install_message: