merb-haml 0.9.3 → 0.9.4

data/Rakefile

@@ -1,29 +1,43 @@
 require 'rubygems'
 require 'rake/gempackagetask'
+require "extlib"
+require 'merb-core/tasks/merb_rake_helper'
+require "spec/rake/spectask"
 
-PLUGIN = "merb-haml"
-NAME = "merb-haml"
-VERSION = "0.9.3"
-AUTHOR = "Yehuda Katz"
-EMAIL = "ykatz@engineyard.com"
-HOMEPAGE = "http://merb-plugins.rubyforge.org/merb-haml/"
-SUMMARY = "Merb plugin that provides HAML support"
+##############################################################################
+# 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::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.add_dependency('haml', '>= 1.8.2')  
+  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('haml', '>= 1.8.2')
   s.require_path = 'lib'
-  s.autorequire = PLUGIN
   s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,spec}/**/*")
 end
 
@@ -31,17 +45,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/generators/controller.rb

@@ -0,0 +1,4 @@
+Merb::Generators::ControllerGenerator.template :index_haml, :template_engine => :haml do
+  source(File.dirname(__FILE__), 'templates/controller/app/views/%file_name%/index.html.haml')
+  destination("app/views", base_path, "#{file_name}/index.html.haml")
+end

data/lib/generators/layout.rb

@@ -0,0 +1,4 @@
+Merb::Generators::LayoutGenerator.template :layout_haml, :template_engine => :haml do
+  source(File.dirname(__FILE__), 'templates/layout/app/views/layout/%file_name%.html.haml')
+  destination("app/views/layout/#{file_name}.html.haml")
+end

data/lib/generators/resource_controller.rb

@@ -0,0 +1,12 @@
+[:activerecord, :datamapper, :sequel, :none].each do |orm|
+  
+  [:show, :index, :edit, :new].each do |view|
+  
+    Merb::Generators::ResourceControllerGenerator.template "view_#{view}_haml", :orm => orm, :template_engine => :haml do
+      source(File.dirname(__FILE__), "templates/resource_controller/#{orm}/app/views/%file_name%/#{view}.html.haml")
+      destination("app/views", base_path, "#{file_name}/#{view}.html.haml")
+    end
+
+  end
+
+end

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

@@ -0,0 +1 @@
+You're in index of the <%= class_name %> controller.

data/lib/generators/templates/layout/app/views/layout/%file_name%.html.haml

@@ -0,0 +1,9 @@
+!!! Strict
+%html{ html_attrs("en_us") }
+  %head
+    %title
+      Fresh Merb App
+    %meta{ :content => "text/html; charset=utf-8", "http-equiv" => "content-type" }/
+    %link{ :href => "/stylesheets/master.css", :rel => "stylesheet", :media => "screen", :type => "text/css", :charset => "utf-8" }/
+  %body
+    = catch_content :for_layout

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

@@ -0,0 +1,5 @@
+%h1 <%= class_name %> controller, edit action
+
+%p
+  Edit this file in
+  %tt app/views/<%= file_name %>/edit.html.haml

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

@@ -0,0 +1,5 @@
+%h1 <%= class_name %> controller, index action
+
+%p
+  Edit this file in
+  %tt app/views/<%= file_name %>/index.html.haml

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

@@ -0,0 +1,5 @@
+%h1 <%= class_name %> controller, new action
+
+%p
+  Edit this file in
+  %tt app/views/<%= file_name %>/new.html.haml

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

@@ -0,0 +1,5 @@
+%h1 <%= class_name %> controller, show action
+
+%p
+  Edit this file in
+  %tt app/views/<%= file_name %>/show.html.haml

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

@@ -0,0 +1,22 @@
+%h1
+  <%= class_name %> controller, edit action
+%p
+  Edit this file in
+  %tt
+    app/views/<%= file_name %>/edit.html.erb
+= error_messages_for :<%= singular_model %>
+
+- form_for(@<%= singular_model %>, :action => url(:<%= singular_model %>, @<%= singular_model %>)) do
+<% for property in properties.select{|p| !p.key?} -%>
+  %p
+    %b
+      <%= DataMapper::Inflection.humanize(property.field) %>
+    %br/
+    = <%= field_from_type(property.type) %> :<%= property.getter %>
+<% end -%>
+  %p
+    = submit_button "Update"
+
+= link_to 'Show', url(:<%= singular_model %>, @<%= singular_model %>)
+|
+= link_to 'Back', url(:<%= plural_model %>)

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

@@ -0,0 +1,26 @@
+%h1
+  <%= class_name %> controller, index action
+%p
+  Edit this file in
+  %tt
+    app/views/<%= file_name %>/index.html.erb
+%table
+  %tr
+<% for property in properties.reject{|p| p.lazy?} -%>
+    %th
+      <%= DataMapper::Inflection.humanize(property.field) %>
+<% end -%>
+  - for <%= singular_model %> in @<%= plural_model %>
+    %tr
+<% for property in properties.reject{|p| p.lazy?} -%>
+      %td
+        =h <%= singular_model %>.<%= property.getter %>
+<% end -%>
+      %td
+        = link_to 'Show', url(:<%= singular_model %>, <%= singular_model %>)
+      %td
+        = link_to 'Edit', url(:edit_<%= singular_model %>,  <%= singular_model %>)
+      %td
+        = delete_button :<%= singular_model %>, <%= singular_model %>
+
+= link_to 'New', url(:new_<%= singular_model %>)

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

@@ -0,0 +1,20 @@
+%h1 <%= class_name %> controller, new action
+
+%p 
+  Edit this file in 
+  %tt app/views/<%= file_name %>/new.html.erb
+
+= error_messages_for :<%= singular_model %>
+
+- form_for(@<%= singular_model %>, :action => url(:<%= plural_model %>) ) do |f|
+<% for property in properties.select{|p| !p.key?} -%>
+  %p
+    %b
+      <%= DataMapper::Inflection.humanize(property.field) %></b>
+    = <%= field_from_type(property.type) %> :<%= property.getter %>
+
+<% end -%>
+  %p
+    = submit_button "Create"
+
+= link_to 'Back', url(:<%= plural_model %>)

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

@@ -0,0 +1,16 @@
+%h1
+  <%= class_name %> controller, show action
+%p
+  Edit this file in
+  %tt
+    app/views/<%= file_name %>/show.html.erb
+<% for property in properties -%>
+%p
+  %b
+    <%= DataMapper::Inflection.humanize(property.field) %>:
+  =h @<%= singular_model %>.<%= property.getter %>
+<% end -%>
+
+= link_to 'Edit',  url(:edit_<%= singular_model %>,  @<%= singular_model %>)
+|
+= link_to 'Back', url(:<%= plural_model %>)

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

@@ -0,0 +1,5 @@
+%h1 <%= class_name %> controller, edit action
+
+%p
+  Edit this file in
+  %tt app/views/<%= file_name %>/edit.html.haml

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

@@ -0,0 +1,5 @@
+%h1 <%= class_name %> controller, index action
+
+%p
+  Edit this file in
+  %tt app/views/<%= file_name %>/index.html.haml

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

@@ -0,0 +1,5 @@
+%h1 <%= class_name %> controller, new action
+
+%p
+  Edit this file in
+  %tt app/views/<%= file_name %>/new.html.haml

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

@@ -0,0 +1,5 @@
+%h1 <%= class_name %> controller, show action
+
+%p
+  Edit this file in
+  %tt app/views/<%= file_name %>/show.html.haml

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

@@ -0,0 +1,5 @@
+%h1 <%= class_name %> controller, edit action
+
+%p
+  Edit this file in
+  %tt app/views/<%= file_name %>/edit.html.haml

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

@@ -0,0 +1,5 @@
+%h1 <%= class_name %> controller, index action
+
+%p
+  Edit this file in
+  %tt app/views/<%= file_name %>/index.html.haml

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

@@ -0,0 +1,5 @@
+%h1 <%= class_name %> controller, new action
+
+%p
+  Edit this file in
+  %tt app/views/<%= file_name %>/new.html.haml

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

@@ -0,0 +1,5 @@
+%h1 <%= class_name %> controller, show action
+
+%p
+  Edit this file in
+  %tt app/views/<%= file_name %>/show.html.haml

data/lib/merb-haml.rb

@@ -17,4 +17,10 @@ if defined?(Merb::Plugins)
       self
     end
   end
+  
+  generators = File.join(File.dirname(__FILE__), 'generators')
+  Merb.add_generators generators / "resource_controller"
+  Merb.add_generators generators / "controller"
+  Merb.add_generators generators / "layout"
+  
 end

data/lib/merb-haml/template.rb

@@ -9,13 +9,13 @@ 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)
-      config = (Merb::Config[:haml] || {}).inject({}) do |c, (k, v)|
+    def self.compile_template(io, name, 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(File.read(path), config)
+      template = ::Haml::Engine.new(io.read, config)
       template.def_method(mod, name)
       name
     end

data/spec/haml_spec.rb

@@ -11,7 +11,7 @@ describe "HAML" do
     c.body.should == ::Haml::Engine.new("#foo\n  %p Partial").render
   end
 
-  it "should use the haml configuration in Merb::Config" do
+  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

metadata

@@ -1,28 +1,30 @@
 --- !ruby/object:Gem::Specification 
 name: merb-haml
 version: !ruby/object:Gem::Version 
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors: 
 - Yehuda Katz
-autorequire: merb-haml
+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: haml
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -45,6 +47,54 @@ files:
 - README
 - Rakefile
 - TODO
+- lib/generators
+- lib/generators/controller.rb
+- lib/generators/layout.rb
+- lib/generators/resource_controller.rb
+- lib/generators/templates
+- lib/generators/templates/controller
+- lib/generators/templates/controller/app
+- lib/generators/templates/controller/app/views
+- lib/generators/templates/controller/app/views/%file_name%
+- lib/generators/templates/controller/app/views/%file_name%/index.html.haml
+- lib/generators/templates/layout
+- lib/generators/templates/layout/app
+- lib/generators/templates/layout/app/views
+- lib/generators/templates/layout/app/views/layout
+- lib/generators/templates/layout/app/views/layout/%file_name%.html.haml
+- lib/generators/templates/resource_controller
+- lib/generators/templates/resource_controller/activerecord
+- lib/generators/templates/resource_controller/activerecord/app
+- lib/generators/templates/resource_controller/activerecord/app/views
+- lib/generators/templates/resource_controller/activerecord/app/views/%file_name%
+- lib/generators/templates/resource_controller/activerecord/app/views/%file_name%/edit.html.haml
+- lib/generators/templates/resource_controller/activerecord/app/views/%file_name%/index.html.haml
+- lib/generators/templates/resource_controller/activerecord/app/views/%file_name%/new.html.haml
+- lib/generators/templates/resource_controller/activerecord/app/views/%file_name%/show.html.haml
+- lib/generators/templates/resource_controller/datamapper
+- lib/generators/templates/resource_controller/datamapper/app
+- lib/generators/templates/resource_controller/datamapper/app/views
+- lib/generators/templates/resource_controller/datamapper/app/views/%file_name%
+- lib/generators/templates/resource_controller/datamapper/app/views/%file_name%/edit.html.haml
+- lib/generators/templates/resource_controller/datamapper/app/views/%file_name%/index.html.haml
+- lib/generators/templates/resource_controller/datamapper/app/views/%file_name%/new.html.haml
+- lib/generators/templates/resource_controller/datamapper/app/views/%file_name%/show.html.haml
+- lib/generators/templates/resource_controller/none
+- lib/generators/templates/resource_controller/none/app
+- lib/generators/templates/resource_controller/none/app/views
+- lib/generators/templates/resource_controller/none/app/views/%file_name%
+- lib/generators/templates/resource_controller/none/app/views/%file_name%/edit.html.haml
+- lib/generators/templates/resource_controller/none/app/views/%file_name%/index.html.haml
+- lib/generators/templates/resource_controller/none/app/views/%file_name%/new.html.haml
+- lib/generators/templates/resource_controller/none/app/views/%file_name%/show.html.haml
+- lib/generators/templates/resource_controller/sequel
+- lib/generators/templates/resource_controller/sequel/app
+- lib/generators/templates/resource_controller/sequel/app/views
+- lib/generators/templates/resource_controller/sequel/app/views/%file_name%
+- lib/generators/templates/resource_controller/sequel/app/views/%file_name%/edit.html.haml
+- 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
 - lib/merb-haml/merbtasks.rb
 - lib/merb-haml/template.rb
@@ -69,7 +119,7 @@ files:
 - spec/haml_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
-homepage: http://merb-plugins.rubyforge.org/merb-haml/
+homepage: http://merbivore.com
 post_install_message: 
 rdoc_options: []
 
@@ -89,8 +139,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 HAML support