merb-haml 0.9.5 → 0.9.6

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.5") + PKG_BUILD
+GEM_VERSION = (Merb::MORE_VERSION rescue "0.9.6") + 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.5')
+  s.add_dependency('merb-core', '>= 0.9.6')
   s.add_dependency('haml', '>= 1.8.2')
   s.require_path = 'lib'
   s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,spec}/**/*")
@@ -47,14 +47,14 @@ end
 
 desc "Install the gem"
 task :install => [:package] do
-  sh %{#{sudo} gem install #{install_home} pkg/#{GEM_NAME}-#{GEM_VERSION} --no-update-sources}
+  sh install_command(GEM_NAME, GEM_VERSION)
 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/#{GEM_NAME}-#{GEM_VERSION}.gem --no-rdoc --no-ri}
+    sh jinstall_command(GEM_NAME, GEM_VERSION)
   end
 
 end

data/lib/generators/controller.rb

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

data/lib/generators/layout.rb

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

data/lib/generators/resource_controller.rb

@@ -2,11 +2,11 @@
   
   [: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")
+    Merb::Generators::ResourceControllerGenerator.template "view_#{view}_haml", :orm => orm, :template_engine => :haml do |t|
+      t.source = File.join(File.dirname(__FILE__), "templates/resource_controller/#{orm}/app/views/%file_name%/#{view}.html.haml")
+      t.destination = File.join("app/views", base_path, "#{file_name}/#{view}.html.haml")
     end
 
   end
 
-end
+end

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

@@ -6,7 +6,7 @@
     app/views/<%= file_name %>/edit.html.erb
 = error_messages_for :<%= singular_model %>
 
-- form_for(@<%= singular_model %>, :action => url(:<%= singular_model %>, @<%= singular_model %>)) do
+= form_for(@<%= singular_model %>, :action => url(:<%= singular_model %>, @<%= singular_model %>)) do
 <% for property in properties.select{|p| !p.key?} -%>
   %p
     %b
@@ -15,7 +15,7 @@
     = <%= field_from_type(property.type) %> :<%= property.getter %>
 <% end -%>
   %p
-    = submit_button "Update"
+    = submit "Update"
 
 = link_to 'Show', url(:<%= singular_model %>, @<%= singular_model %>)
 |

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 |f|
 <% for property in properties.select{|p| !p.key?} -%>
   %p
     %b
@@ -15,6 +15,6 @@
 
 <% end -%>
   %p
-    = submit_button "Create"
+    = submit "Create"
 
 = link_to 'Back', url(:<%= plural_model %>)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb-haml
 version: !ruby/object:Gem::Version 
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors: 
 - Yehuda Katz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-21 00:00:00 +03:00
+date: 2008-09-09 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.5
+        version: 0.9.6
     version: 
 - !ruby/object:Gem::Dependency 
   name: haml