merb-haml 0.9.8 → 0.9.9

data/Generators

@@ -0,0 +1,4 @@
+scope 'merb-gen' do
+  dir = File.join(File.dirname(__FILE__), 'lib', 'generators/')
+  Merb.add_generators dir + 'controller', dir + 'layout', dir + 'resource_controller'
+end

data/Rakefile

@@ -4,6 +4,8 @@ require "extlib"
 require 'merb-core/tasks/merb_rake_helper'
 require "spec/rake/spectask"
 
+require File.join(File.dirname(__FILE__), "../merb-core/lib/merb-core/version.rb")
+
 ##############################################################################
 # Package && release
 ##############################################################################
@@ -17,7 +19,7 @@ GEM_EMAIL  = "ykatz@engineyard.com"
 
 GEM_NAME    = "merb-haml"
 PKG_BUILD   = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
-GEM_VERSION = (Merb::MORE_VERSION rescue "0.9.8") + PKG_BUILD
+GEM_VERSION = Merb::VERSION + PKG_BUILD
 
 RELEASE_NAME    = "REL #{GEM_VERSION}"
 
@@ -35,10 +37,10 @@ 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.8')
-  s.add_dependency('haml', '>= 1.8.2')
+  s.add_dependency('merb-core', "= #{Merb::VERSION}")
+  s.add_dependency('haml', '>= 2.0.3')
   s.require_path = 'lib'
-  s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,spec}/**/*")
+  s.files = %w(LICENSE README Rakefile TODO Generators) + Dir.glob("{lib}/**/*")
 end
 
 Rake::GemPackageTask.new(spec) do |pkg|
@@ -75,4 +77,4 @@ Spec::Rake::SpecTask.new('spec') do |t|
 end
 
 desc 'Default: run spec examples'
-task :default => 'spec'
+task :default => 'spec'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb-haml
 version: !ruby/object:Gem::Version 
-  version: 0.9.8
+  version: 0.9.9
 platform: ruby
 authors: 
 - Yehuda Katz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-06 00:00:00 +03:00
+date: 2008-10-13 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -18,9 +18,9 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.8
+        version: 0.9.9
     version: 
 - !ruby/object:Gem::Dependency 
   name: haml
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.8.2
+        version: 2.0.3
     version: 
 description: Merb plugin that provides HAML support
 email: ykatz@engineyard.com
@@ -47,6 +47,7 @@ files:
 - README
 - Rakefile
 - TODO
+- Generators
 - lib/generators
 - lib/generators/controller.rb
 - lib/generators/layout.rb
@@ -99,25 +100,6 @@ 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://merbivore.com
 post_install_message: 

data/spec/controllers/haml.rb

@@ -1,31 +0,0 @@
-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

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

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

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

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

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

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

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

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

@@ -1 +0,0 @@
-%p= text

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

@@ -1,2 +0,0 @@
-#foo
-  = partial :partial_haml, :text => "Partial"

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

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

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

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

data/spec/haml_spec.rb

@@ -1,33 +0,0 @@
-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 with locals" 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::Plugins.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

@@ -1,14 +0,0 @@
-$:.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