csmosx-haml_scaffold 1.1.0 → 1.1.1

data/History.txt

@@ -1,3 +1,9 @@
+=== 1.1.1 / 2009-08-11
+
+* Updated controller & views to use resource_controller gem
+* Removed requirement of old version of will_paginate
+* Deleted creation of stylesheets/sass folder and application.sass
+
 === 1.1.0 / 2009-07-30
 
 * 3 major enhancements

data/Manifest.txt

@@ -11,7 +11,6 @@ generators/haml_scaffold/templates/functional_test.rb.erb
 generators/haml_scaffold/templates/helper.rb.erb
 generators/haml_scaffold/templates/helper_test.rb.erb
 generators/haml_scaffold/templates/layout.html.haml.erb
-generators/haml_scaffold/templates/stylesheet.sass
 generators/haml_scaffold/templates/view_edit.html.haml.erb
 generators/haml_scaffold/templates/view_index.html.haml.erb
 generators/haml_scaffold/templates/view_new.html.haml.erb

data/README.rdoc

@@ -1,3 +1,11 @@
+= Haml Scaffold ( csmosx fork )
+
+=== Changes in this fork
+
+* Updated controller & views to use {resource_controller}[http://github.com/csmosx/resource_controller/tree/master] gem
+* removed requirement of old version of will_paginate
+* deleted creation of stylesheets/sass folder and application.sass
+
 = Haml Scaffold
 
 A collection of hacks to the Rails scaffold generator, to make it output
@@ -79,4 +87,4 @@ Also, don't forget to Hamlize your Rails app:
 {Norman Clarke}[mailto:norman@njclarke.com]
 
 This work is derived from code in {Ruby on Rails}[http://rubyonrails.org/] and
-is released under its same license, the MIT License.
+is released under its same license, the MIT License.

data/Rakefile

@@ -9,7 +9,6 @@ $hoe = Hoe.new("haml_scaffold", HamlScaffold::Version::STRING) do |p|
   p.description = "Rails scaffolding with Haml rather than ERB, and various other improvements."
   p.url = 'http://haml-scaffold.rubyforge.org/'
   p.extra_deps << ['haml', '>= 2.0.6']
-  #p.extra_deps << ['will_paginate', '>= 2.2.2']
   p.extra_deps << ['mocha', '>= 0.9.0']
   p.extra_dev_deps << ['newgem', ">= #{::Newgem::VERSION}"]
   p.remote_rdoc_dir = "/"

data/generators/haml_scaffold/templates/_form.html.haml.erb

@@ -1,10 +1,9 @@
-- form_for(<%= singular_name %>) do |f|
-  = f.error_messages
+= f.error_messages
 <% for attribute in attributes -%>
-  %p
-    = f.label :<%= attribute.name %>
-    %br
-    = f.<%= attribute.field_type %> :<%= attribute.name %>
+%p
+  = f.label :<%= attribute.name %>
+  %br
+  = f.<%= attribute.field_type %> :<%= attribute.name %>
 <% end -%>
-  %p
-    = f.submit "Submit"
+%p
+  = f.submit "Submit"

data/generators/haml_scaffold/templates/_object.html.haml.erb

@@ -5,6 +5,6 @@
       %strong <%= attribute.column.human_name %>:
       =h <%= singular_name %>.<%= attribute.name %>
 <% end -%>
-    = link_to 'Show', <%= singular_name %>
-    = link_to 'Edit', edit_<%= singular_name %>_path(<%= singular_name %>)
-    = link_to 'Destroy', <%= singular_name %>, :confirm => 'Are you sure?', :method => :delete
+    = link_to 'Show', object_path(object)
+    = link_to 'Edit', edit_object_path(object)
+    = link_to 'Destroy', object_path(object), :confirm => 'Are you sure?', :method => :delete

data/generators/haml_scaffold/templates/controller.rb.erb

@@ -1,80 +1,9 @@
-class <%= controller_class_name %>Controller < ApplicationController
-
-  before_filter :find_<%= file_name %>
-
-  <%= file_name.pluralize.upcase %>_PER_PAGE = 20
-
-  def create
-    @<%= file_name %> = <%= class_name %>.new(params[:<%= file_name %>])
-    respond_to do |format|
-      if @<%= file_name %>.save
-        flash[:notice] = '<%= class_name %> was successfully created.'
-        format.html { redirect_to @<%= file_name %> }
-        format.xml  { render :xml => @<%= file_name %>, :status => :created, :location => @<%= file_name %> }
-      else
-        format.html { render :action => "new" }
-        format.xml  { render :xml => @<%= file_name %>.errors, :status => :unprocessable_entity }
-      end
-    end
-  end
-
-  def destroy
-    respond_to do |format|
-      if @<%= file_name %>.destroy
-        flash[:notice] = '<%= class_name %> was successfully destroyed.'        
-        format.html { redirect_to <%= file_name.pluralize %>_path }
-        format.xml  { head :ok }
-      else
-        flash[:error] = '<%= class_name %> could not be destroyed.'
-        format.html { redirect_to @<%= file_name %> }
-        format.xml  { head :unprocessable_entity }
-      end
-    end
-  end
-
-  def index
-    @<%= table_name %> = <%= class_name %>.paginate(:page => params[:page], :per_page => <%= file_name.pluralize.upcase %>_PER_PAGE)
-    respond_to do |format|
-      format.html
-      format.xml  { render :xml => @<%= table_name %> }
-    end
-  end
-
-  def edit
-  end
-
-  def new
-    @<%= file_name %> = <%= class_name %>.new
-    respond_to do |format|
-      format.html
-      format.xml  { render :xml => @<%= file_name %> }
-    end
-  end
-
-  def show
-    respond_to do |format|
-      format.html
-      format.xml  { render :xml => @<%= file_name %> }
-    end
-  end
-
-  def update
-    respond_to do |format|
-      if @<%= file_name %>.update_attributes(params[:<%= file_name %>])
-        flash[:notice] = '<%= class_name %> was successfully updated.'
-        format.html { redirect_to @<%= file_name %> }
-        format.xml  { head :ok }
-      else
-        format.html { render :action => "edit" }
-        format.xml  { render :xml => @<%= file_name %>.errors, :status => :unprocessable_entity }
-      end
-    end
-  end
+class <%= controller_class_name %>Controller < ResourceController::Base
 
   private
 
-  def find_<%= file_name %>
-    @<%= file_name %> = <%= class_name %>.find(params[:id]) if params[:id]
+  def collection
+    @collection ||= end_of_association_chain.paginate(:page => params[:page])
   end
 
-end
+end

data/generators/haml_scaffold/templates/view_edit.html.haml.erb

@@ -1,6 +1,7 @@
-%h2 Editing <%= singular_name %>
-= render :partial => "form", :locals => {:<%= singular_name %> => @<%= singular_name %>}
+%h2 Editing <%= singular_name.classify %>
+- form_for(@object, :url => object_path) do |f|
+  = render :partial => 'form', :locals => {:f => f}
 %ul
-  %li= link_to 'Show', @<%= singular_name %>
-  %li= link_to 'Back', <%= plural_name %>_path
-  %li= link_to 'Destroy', @<%= singular_name %>, :confirm => 'Are you sure?', :method => :delete  
+  %li= link_to 'Show', object_path(@object)
+  %li= link_to 'Back', object_path
+  %li= link_to 'Destroy', @object, :confirm => 'Are you sure?', :method => :delete

data/generators/haml_scaffold/templates/view_index.html.haml.erb

@@ -1,8 +1,8 @@
-%h2 Listing <%= plural_name %>
-- if !@<%= plural_name %>.empty?
+%h2 Listing <%= controller_class_name %>
+- unless @<%= plural_name %>.empty?
   .<%= plural_name %>
     = render :partial => "<%= singular_name %>", :collection => @<%= plural_name %>
   = will_paginate(@<%= plural_name %>)
 - else
-  %p There are no <%= plural_name %> to show yet.
-= link_to 'New <%= singular_name %>', new_<%= singular_name %>_path
+  %p There are no <%= controller_class_name %> to show yet.
+= link_to 'New <%= singular_name.classify %>', new_object_path

data/generators/haml_scaffold/templates/view_new.html.haml.erb

@@ -1,4 +1,5 @@
-%h2 New <%= singular_name %>
-= render :partial => "form", :locals => {:<%= singular_name %> => @<%= singular_name %>}
+%h2 New <%= singular_name.classify %>
+- form_for(@object, :url => collection_path) do |f|
+  = render :partial => 'form', :locals => {:f => f}
 %ul
-  %li= link_to 'Back', <%= plural_name %>_path
+  %li= link_to 'Back', collection_path

data/generators/haml_scaffold/templates/view_show.html.haml.erb

@@ -7,5 +7,5 @@
       =h @<%= singular_name %>.<%= attribute.name %>
 <% end -%>
 %ul
-  %li= link_to 'Edit', edit_<%= singular_name %>_path(@<%= singular_name %>)
-  %li= link_to 'Back', <%= plural_name %>_path
+  %li= link_to 'Edit', edit_object_path
+  %li= link_to 'Back', collection_path

data/lib/haml_scaffold/version.rb

@@ -2,7 +2,7 @@ module HamlScaffold
   class Version
     MAJOR  = 1
     MINOR  = 1
-    TINY   = 0
+    TINY   = 1
     STRING = "#{MAJOR}.#{MINOR}.#{TINY}"
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: csmosx-haml_scaffold
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors: 
 - Norman Clarke
@@ -77,7 +77,6 @@ files:
 - generators/haml_scaffold/templates/helper.rb.erb
 - generators/haml_scaffold/templates/helper_test.rb.erb
 - generators/haml_scaffold/templates/layout.html.haml.erb
-- generators/haml_scaffold/templates/stylesheet.sass
 - generators/haml_scaffold/templates/view_edit.html.haml.erb
 - generators/haml_scaffold/templates/view_index.html.haml.erb
 - generators/haml_scaffold/templates/view_new.html.haml.erb

data/generators/haml_scaffold/templates/stylesheet.sass

@@ -1,11 +0,0 @@
-body
-  :text-align center
-
-h1
-  :border-bottom 1px #000 solid
-  :padding-bottom 5px
-
-#wrapper
-  :width 800px
-  :text-align left
-  :margin auto