merb-haml 1.1.0 → 1.1.1

data/Rakefile

@@ -1,46 +1,9 @@
 require 'rubygems'
 require 'rake'
 
-# Assume a typical dev checkout to fetch the current merb-core version
-require File.expand_path('../../merb-core/lib/merb-core/version', __FILE__)
-
 # Load this library's version information
 require File.expand_path('../lib/merb-haml/version', __FILE__)
 
-begin
-
-  gem 'jeweler', '~> 1.4'
-  require 'jeweler'
-
-  Jeweler::Tasks.new do |gemspec|
-
-    gemspec.version     = Merb::Haml::VERSION.dup
-
-    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'
-
-  end
-
-  Jeweler::GemcutterTasks.new
-
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-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')

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

@@ -6,7 +6,7 @@
     app/views/<%= file_name %>/edit.html.haml
 = error_messages_for @<%= singular_model %>
 
-= form_for(@<%= singular_model %>, :action => url(:<%= singular_model %>, @<%= singular_model %>)) do
+= form_for(@<%= singular_model %>, :action => resource(@<%= singular_model %>)) do
 <% for property in properties.select{|p| !p.key?} -%>
   %p
     %b
@@ -17,6 +17,6 @@
   %p
     = submit "Update"
 
-= link_to 'Show', url(:<%= singular_model %>, @<%= singular_model %>)
+= link_to 'Show', resource(@<%= singular_model %>)
 |
-= link_to 'Back', url(:<%= plural_model %>)
+= link_to 'Back', resource(:<%= plural_model %>)

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

@@ -17,8 +17,8 @@
         =h <%= singular_model %>.<%= property.getter %>
 <% end -%>
       %td
-        = link_to 'Show', url(:<%= singular_model %>, <%= singular_model %>)
+        = link_to 'Show', resource(<%= singular_model %>)
       %td
-        = link_to 'Edit', url(:edit_<%= singular_model %>,  <%= singular_model %>)
+        = link_to 'Edit', resource(<%= singular_model %>, :edit)
 
-= link_to 'New', url(:new_<%= singular_model %>)
+= link_to 'New', resource(:<%= plural_model %>, :new)

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
+= form_for(@<%= singular_model %>, :action => resource(:<%= plural_model %>) ) do
 <% for property in properties.select{|p| !p.key?} -%>
   %p
     %b
@@ -17,4 +17,4 @@
   %p
     = submit "Create"
 
-= link_to 'Back', url(:<%= plural_model %>)
+= link_to 'Back', resource(:<%= plural_model %>)

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

@@ -11,6 +11,6 @@
   =h @<%= singular_model %>.<%= property.getter %>
 <% end -%>
 
-= link_to 'Edit',  url(:edit_<%= singular_model %>,  @<%= singular_model %>)
+= link_to 'Edit',  resource(@<%= singular_model %>, :edit)
 |
-= link_to 'Back', url(:<%= plural_model %>)
+= link_to 'Back', resource(:<%= plural_model %>)

data/lib/merb-haml/version.rb

@@ -1,5 +1,5 @@
 module Merb
   module Haml
-    VERSION = '1.1.0'.freeze
+    VERSION = '1.1.1'.freeze
   end
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: merb-haml
 version: !ruby/object:Gem::Version 
+  hash: 17
   prerelease: false
   segments: 
   - 1
   - 1
-  - 0
-  version: 1.1.0
+  - 1
+  version: 1.1.1
 platform: ruby
 authors: 
 - Yehuda Katz
@@ -14,30 +15,34 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-22 00:00:00 +00:00
+date: 2010-06-15 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: merb-core
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 17
         segments: 
         - 1
         - 1
-        - 0
-        version: 1.1.0
+        - 1
+        version: 1.1.1
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: haml
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 9
         segments: 
         - 2
         - 0
@@ -49,9 +54,11 @@ dependencies:
   name: rspec
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 13
         segments: 
         - 1
         - 2
@@ -66,15 +73,12 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- LICENSE
 - README
+- LICENSE
 - TODO
 files: 
 - Generators
-- LICENSE
-- README
 - Rakefile
-- TODO
 - lib/generators/controller.rb
 - lib/generators/layout.rb
 - lib/generators/resource_controller.rb
@@ -96,10 +100,10 @@ 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/version.rb
+- lib/merb-haml.rb
 - spec/controllers/haml.rb
 - spec/controllers/views/capture_haml/index.html.haml
 - spec/controllers/views/concat_haml/index.html.haml
@@ -112,33 +116,40 @@ files:
 - spec/haml_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
+- README
+- LICENSE
+- TODO
 has_rdoc: true
 homepage: http://merbivore.com/
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Merb plugin that provides support for writing view template with HAML