merb-haml 1.0.15 → 1.1.0.pre

data/Rakefile

@@ -1,74 +1,65 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "..", "rake_helpers"))
-
-##############################################################################
-# Package && release
-##############################################################################
-RUBY_FORGE_PROJECT  = "merb"
-PROJECT_URL         = "http://merbivore.com"
-PROJECT_SUMMARY     = "Merb plugin that provides HAML support"
-PROJECT_DESCRIPTION = PROJECT_SUMMARY
-
-GEM_AUTHOR = "Yehuda Katz"
-GEM_EMAIL  = "ykatz@engineyard.com"
-
-GEM_NAME    = "merb-haml"
-PKG_BUILD   = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
-GEM_VERSION = Merb::VERSION + PKG_BUILD
-
-RELEASE_NAME    = "REL #{GEM_VERSION}"
-
-require "extlib/tasks/release"
-
-spec = Gem::Specification.new do |s|
-  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 = PROJECT_SUMMARY
-  s.description = PROJECT_DESCRIPTION
-  s.author = GEM_AUTHOR
-  s.email = GEM_EMAIL
-  s.homepage = PROJECT_URL
-  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 Generators) + Dir.glob("{lib}/**/*")
-end
+require 'rubygems'
+require 'rake'
 
-Rake::GemPackageTask.new(spec) do |pkg|
-  pkg.gem_spec = spec
-end
+# Assume a typical dev checkout to fetch the current merb-core version
+require File.expand_path('../../merb-core/lib/merb-core/version', __FILE__)
 
-desc "Install the gem"
-task :install do
-  Merb::RakeHelper.install(GEM_NAME, :version => GEM_VERSION)
-end
+# Load this library's version information
+require File.expand_path('../lib/merb-haml/version', __FILE__)
 
-desc "Uninstall the gem"
-task :uninstall do
-  Merb::RakeHelper.uninstall(GEM_NAME, :version => GEM_VERSION)
-end
+begin
+
+  gem 'jeweler', '~> 1.4'
+  require 'jeweler'
+
+  Jeweler::Tasks.new do |gemspec|
+
+    gemspec.version     = Merb::Haml::VERSION
+
+    gemspec.name        = "merb-haml"
+    gemspec.description = "Merb plugin for HAML support"
+    gemspec.summary     = "Merb plugin that provides support for writing view template with HAML"
+
+    gemspec.authors     = [ "Yehuda Katz" ]
+    gemspec.email       = "ykatz@engineyard.com"
+    gemspec.homepage    = "http://merbivore.com/"
+
+    gemspec.files       = %w(Generators LICENSE Rakefile README TODO) + Dir['{lib,spec}/**/*']
+
+    # Runtime dependencies
+    gemspec.add_dependency 'merb-core', "~> #{Merb::VERSION}"
+    gemspec.add_dependency 'haml',      '>= 2.0.3'
+
+    # Development dependencies
+    gemspec.add_development_dependency 'rspec', '>= 1.2.9'
 
-desc "Create a gemspec file"
-task :gemspec do
-  File.open("#{GEM_NAME}.gemspec", "w") do |file|
-    file.puts spec.to_ruby
   end
+
+  Jeweler::GemcutterTasks.new
+
+rescue LoadError
+  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 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
+require 'spec/rake/spectask'
+Spec::Rake::SpecTask.new(:spec) do |spec|
+  spec.spec_opts << '--options' << 'spec/spec.opts' if File.exists?('spec/spec.opts')
+  spec.libs << 'lib' << 'spec'
+  spec.spec_files = FileList['spec/**/*_spec.rb']
 end
 
-desc 'Default: run spec examples'
-task :default => 'spec'
+Spec::Rake::SpecTask.new(:rcov) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.pattern = 'spec/**/*_spec.rb'
+  spec.rcov = true
+end
+
+task :default => :spec
+
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rdoc|
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "test_gem #{Merb::Haml::VERSION}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end

data/lib/generators/templates/resource_controller/datamapper/app/views/%file_name%/edit.html.haml

@@ -3,7 +3,7 @@
 %p
   Edit this file in
   %tt
-    app/views/<%= file_name %>/edit.html.erb
+    app/views/<%= file_name %>/edit.html.haml
 = error_messages_for @<%= singular_model %>
 
 = form_for(@<%= singular_model %>, :action => url(:<%= singular_model %>, @<%= singular_model %>)) do

data/lib/generators/templates/resource_controller/datamapper/app/views/%file_name%/index.html.haml

@@ -3,7 +3,7 @@
 %p
   Edit this file in
   %tt
-    app/views/<%= file_name %>/index.html.erb
+    app/views/<%= file_name %>/index.html.haml
 %table
   %tr
 <% for property in properties.reject{|p| p.lazy?} -%>

data/lib/generators/templates/resource_controller/datamapper/app/views/%file_name%/new.html.haml

@@ -2,7 +2,7 @@
 
 %p 
   Edit this file in 
-  %tt app/views/<%= file_name %>/new.html.erb
+  %tt app/views/<%= file_name %>/new.html.haml
 
 = error_messages_for @<%= singular_model %>
 

data/lib/generators/templates/resource_controller/datamapper/app/views/%file_name%/show.html.haml

@@ -3,7 +3,7 @@
 %p
   Edit this file in
   %tt
-    app/views/<%= file_name %>/show.html.erb
+    app/views/<%= file_name %>/show.html.haml
 <% for property in properties -%>
 %p
   %b

data/lib/merb-haml.rb

@@ -8,7 +8,19 @@ if defined?(Merb)
 
   Merb::BootLoader.after_app_loads do
     
-    if File.directory?(Merb::Plugins.config[:sass][:template_location] || Merb.dir_for(:stylesheet) / "sass")
+    template_locations = []
+    template_locations << Merb.dir_for(:stylesheet) / "sass"
+    
+    # extract template locations list from sass config
+    config_location = Merb::Plugins.config[:sass][:template_location]
+    if config_location.is_a? Hash
+      template_locations += config_location.keys
+    elsif config_location
+      template_locations << config_location.to_s
+    end
+    
+    # setup sass if any template paths match
+    if template_locations.any?{|location| File.directory?(location) }
       require "sass"
       if Merb::Config[:sass]
         Merb.logger.info("Please define your sass settings in Merb::Plugins.config[:sass] not Merb::Config")
@@ -20,13 +32,6 @@ if defined?(Merb)
     
   end
   
-  # Hack because Haml uses symbolize_keys
-  class Hash
-    def symbolize_keys!
-      self
-    end
-  end
-  
   generators = File.join(File.dirname(__FILE__), 'generators')
   Merb.add_generators generators / "resource_controller"
   Merb.add_generators generators / "controller"

data/lib/merb-haml/merbtasks.rb

@@ -1,7 +1,6 @@
 namespace :haml do
   desc "Compiles all sass files into CSS"
   task :compile_sass do
-    gem 'haml'
     require 'sass'
     puts "*** Updating stylesheets"
     Sass::Plugin.options = Merb::Config[:sass] if Merb::Config[:sass]

data/lib/merb-haml/version.rb

@@ -0,0 +1,5 @@
+module Merb
+  module Haml
+    VERSION = '1.1.0.pre'.freeze
+  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= text

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

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

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 '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.opts

@@ -0,0 +1,2 @@
+--format specdoc
+--colour

data/spec/spec_helper.rb

@@ -0,0 +1,23 @@
+require "rubygems"
+
+# Use current merb-core sources if running from a typical dev checkout.
+lib = File.expand_path('../../../merb-core/lib', __FILE__)
+$LOAD_PATH.unshift(lib) if File.directory?(lib)
+require 'merb-core'
+
+# The lib under test
+require "merb-haml"
+
+# Satisfies Autotest and anyone else not using the Rake tasks
+require 'spec'
+
+# Shared spec files
+require "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: 1.0.15
+  version: 1.1.0.pre
 platform: ruby
 authors: 
 - Yehuda Katz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-04 00:00:00 +00:00
+date: 2010-02-20 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.0.15
+        version: 1.1.0.pre
     version: 
 - !ruby/object:Gem::Dependency 
   name: haml
@@ -32,22 +32,32 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 2.0.3
     version: 
-description: Merb plugin that provides HAML support
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.2.9
+    version: 
+description: Merb plugin for HAML support
 email: ykatz@engineyard.com
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
-- README
 - LICENSE
+- README
 - TODO
 files: 
+- Generators
 - LICENSE
 - README
 - Rakefile
 - TODO
-- Generators
 - lib/generators/controller.rb
 - lib/generators/layout.rb
 - lib/generators/resource_controller.rb
@@ -69,16 +79,29 @@ files:
 - lib/generators/templates/resource_controller/sequel/app/views/%file_name%/index.html.haml
 - lib/generators/templates/resource_controller/sequel/app/views/%file_name%/new.html.haml
 - lib/generators/templates/resource_controller/sequel/app/views/%file_name%/show.html.haml
+- lib/merb-haml.rb
 - lib/merb-haml/merbtasks.rb
 - lib/merb-haml/template.rb
-- lib/merb-haml.rb
+- lib/merb-haml/version.rb
+- spec/controllers/haml.rb
+- spec/controllers/views/capture_haml/index.html.haml
+- spec/controllers/views/concat_haml/index.html.haml
+- spec/controllers/views/haml_config/index.html.haml
+- spec/controllers/views/haml_controller/index.html.haml
+- spec/controllers/views/partial_haml/_partial_haml.html.haml
+- spec/controllers/views/partial_haml/index.html.haml
+- spec/controllers/views/partial_ivars/_partial_haml.html.haml
+- spec/controllers/views/partial_ivars/index.html.haml
+- spec/haml_spec.rb
+- spec/spec.opts
+- spec/spec_helper.rb
 has_rdoc: true
-homepage: http://merbivore.com
+homepage: http://merbivore.com/
 licenses: []
 
 post_install_message: 
-rdoc_options: []
-
+rdoc_options: 
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -89,16 +112,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      version: "0"
+      version: 1.3.1
   version: 
 requirements: []
 
-rubyforge_project: merb
+rubyforge_project: 
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: Merb plugin that provides HAML support
+summary: Merb plugin that provides support for writing view template with HAML
 test_files: []