merb-haml 0.9.7 → 0.9.8

data/LICENSE

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

data/Rakefile

@@ -17,7 +17,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.7") + PKG_BUILD
+GEM_VERSION = (Merb::MORE_VERSION rescue "0.9.8") + PKG_BUILD
 
 RELEASE_NAME    = "REL #{GEM_VERSION}"
 
@@ -35,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('haml', '>= 1.8.2')
   s.require_path = 'lib'
   s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,spec}/**/*")
@@ -46,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/generators/templates/resource_controller/datamapper/app/views/%file_name%/new.html.haml

@@ -6,7 +6,7 @@
 
 = error_messages_for :<%= singular_model %>
 
-= form_for(@<%= singular_model %>, :action => url(:<%= plural_model %>) ) do |f|
+= form_for(@<%= singular_model %>, :action => url(:<%= plural_model %>) ) do
 <% for property in properties.select{|p| !p.key?} -%>
   %p
     %b

data/lib/merb-haml.rb

@@ -3,12 +3,21 @@ if defined?(Merb::Plugins)
   require "haml"
   require "merb-haml/template"
   Merb::Plugins.add_rakefiles(File.join(File.dirname(__FILE__) / "merb-haml" / "merbtasks"))
+  
+  Merb::Plugins.config[:sass] ||= {}
 
   Merb::BootLoader.after_app_loads do
-    if File.directory?(Merb.dir_for(:stylesheet) / "sass")
+    
+    if File.directory?(Merb::Plugins.config[:sass][:template_location] || Merb.dir_for(:stylesheet) / "sass")
       require "sass/plugin" 
-      Sass::Plugin.options = Merb::Config[:sass] if Merb::Config[:sass]
+      if Merb::Config[:sass]
+        Merb.logger.info("Please define your sass settings in Merb::Plugins.config[:sass] not Merb::Config")
+        Sass::Plugin.options = Merb::Config[:sass]
+      else
+        Sass::Plugin.options = Merb::Plugins.config[:sass]
+      end
     end
+    
   end
   
   # Hack because Haml uses symbolize_keys
@@ -22,5 +31,4 @@ if defined?(Merb::Plugins)
   Merb.add_generators generators / "resource_controller"
   Merb.add_generators generators / "controller"
   Merb.add_generators generators / "layout"
-  
-end
+end

data/lib/merb-haml/template.rb

@@ -7,16 +7,17 @@ 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)
       config = (Merb::Plugins.config[:haml] || {}).inject({}) do |c, (k, v)|
         c[k.to_sym] = v
         c
       end.merge :filename => path
       template = ::Haml::Engine.new(io.read, config)
-      template.def_method(mod, name)
+      template.def_method(mod, name, *locals)
       name
     end
   

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

@@ -1 +1 @@
-%p Partial
+%p= text

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

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

data/spec/haml_spec.rb

@@ -6,7 +6,7 @@ describe "HAML" do
     c.body.should == ::Haml::Engine.new("#foo\n  %p Hello").render
   end
 
-  it "should be able to render HAML templates" do
+  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

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-haml
 version: !ruby/object:Gem::Version 
-  version: 0.9.7
+  version: 0.9.8
 platform: ruby
 authors: 
 - Yehuda Katz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-12 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: haml