splendeo-generators 0.2.1 → 0.3.0

data/README.rdoc

@@ -2,6 +2,13 @@
 
 A collection of useful Rails generator scripts for scaffolding, layout files, authentication, and more.
 
+This is a fork from Ryanb's nifty_generators (http://github.com/ryanb/nifty-generators). It extends it with 
+the following features:
+
+* Everything is translatable in a i18n-compliant way
+* formtastic is used for forms
+* blueprintcss is included by default
+* The scaffold generator supports declarative_authorization and cancan
 
 == Install
 
@@ -41,6 +48,10 @@ There are a few changes to the generated code as well, such as no XML format by
 
 It also offers support for HAML, Shoulda, and RSpec.
 
+i18n + formtastic support make translations much easier.
+
+Finally, blueprintcss is installed by default.
+
 
 <b>I get "undefined method 'title'" error.</b>
 
@@ -88,11 +99,9 @@ Also, make sure you're using Rails 2.1 or greater.
 
 If you are having a problem with Splendeo Generators, first look at the FAQs above. If you still cannot resolve it, please submit an issue here.
 
-http://github.com/ryanb/splendeo-generators/issues
+http://github.com/splendeo/splendeo-generators/issues
 
 
 == Rails 3
 
-Splendeo Generators does not yet officially work with Rails 3, but a fork is available here.
-
-http://github.com/dvyjones/splendeo-generators
+Splendeo Generators does not work with Rails 3.

data/rails_generators/splendeo_authentication/templates/sessions_controller.rb

@@ -8,7 +8,7 @@ class <%= session_plural_class_name %>Controller < ApplicationController
     @<%= session_singular_name %> = <%= session_class_name %>.new(params[:<%= session_singular_name %>])
     if @<%= session_singular_name %>.save
       flash[:notice] = t('flash_notice_logged_in')
-      redirect_to_target_or_default(root_url)
+      redirect_to_target_or_default(root_path)
     else
       flash.now[:error] = t('flash_error_invalid_login')
       render :action => 'new'
@@ -19,7 +19,7 @@ class <%= session_plural_class_name %>Controller < ApplicationController
     @<%= session_singular_name %> = <%= session_class_name %>.find
     @<%= session_singular_name %>.destroy
     flash[:notice] = t('flash_notice_logged_out')
-    redirect_to root_url
+    redirect_to root_path
   end
 <%- else -%>
   def new
@@ -30,7 +30,7 @@ class <%= session_plural_class_name %>Controller < ApplicationController
     if <%= user_singular_name %>
       session[:<%= user_singular_name %>_id] = <%= user_singular_name %>.id
       flash[:notice] = t('flash_notice_logged_in')
-      redirect_to_target_or_default(root_url)
+      redirect_to_target_or_default(root_path)
     else
       flash.now[:error] = t('flash_error_invalid_login')
       render :action => 'new'
@@ -40,7 +40,7 @@ class <%= session_plural_class_name %>Controller < ApplicationController
   def destroy
     session[:<%= user_singular_name %>_id] = nil
     flash[:notice] = t('flash_notice_logged_out')
-    redirect_to root_url
+    redirect_to root_path
   end
 <%- end -%>
 end

data/rails_generators/splendeo_authentication/templates/users_controller.rb

@@ -10,7 +10,7 @@ class <%= user_plural_class_name %>Controller < ApplicationController
       session[:<%= user_singular_name %>_id] = @<%= user_singular_name %>.id
     <%- end -%>
       flash[:notice] = t('flash_notice_signed_up')
-      redirect_to root_url
+      redirect_to root_path
     else
       render :action => 'new'
     end

data/rails_generators/splendeo_authentication/templates/views/erb/login.html.erb

@@ -1,6 +1,6 @@
 <%% title t('log_in_title') %>
 
-<p><%%= t('sign_up_message', :url => signup_path) %></p>
+<p><%%= t('sign_up_message', :link => link_to(t("sign_up_link"), signup_path)) %></p>
 
 <%- if options[:authlogic] -%>
 <%% semantic_form_for @<%= session_singular_name %> do |f| %>

data/rails_generators/splendeo_authentication/templates/views/erb/signup.html.erb

@@ -1,6 +1,6 @@
 <%% title t('sign_up_title') %>
 
-<p><%%= t('log_in_message', :url => login_path) %></p>
+<p><%%= t('log_in_message', :link => link_to(t("log_in_link"), login_path)) %></p>
 
 <%% semantic_form_for @<%= user_singular_name %> do |f| %>
   <%%= f.error_message_on :base %>

data/rails_generators/splendeo_authentication/templates/views/haml/login.html.haml

@@ -1,6 +1,6 @@
 - title t('log_in_title')
 
-%p== t('sign_up_message', :url => signup_path)
+%p= t('sign_up_message', :link => link_to(t("sign_up_link"), signup_path))
 
 <%- if options[:authlogic] -%>
 - semantic_form_for @<%= session_singular_name %> do |f|

data/rails_generators/splendeo_authentication/templates/views/haml/signup.html.haml

@@ -1,6 +1,6 @@
 - title t('sign_up_title')
 
-%p=t('log_in_message', :url => login_path)
+%p= t('log_in_message', :link => link_to(t("log_in_link"), login_path))
 
 - semantic_form_for @<%= user_singular_name %> do |f|
   = f.error_message_on :base

data/rails_generators/splendeo_layout/USAGE

@@ -3,23 +3,65 @@ Description:
   helper which will give some structure to a starting Rails app.
   
   The generator takes one argument which will be the name of the
-	layout and stylesheet files. If no argument is passed then it defaults
-	to "application".
+  layout and stylesheet files. If no argument is passed then it defaults
+  to "application".
   
   The helper module includes some methods which can be called in any
   template or partial to set variables to be used in the layout, such as
   page title and javascript/stylesheet includes.
+  
+  Includes formtastic & blueprint stylesheets by default. Blueprint plugins
+  are available but commented out by default.
+  
+  Includes a sample English locale for easy i18n. Note that if you are 
+  translating to other languages, you may need to complete it with text for
+  translating rails' internal messages. Get the files you need from
+  
+  http://github.com/svenfuchs/rails-i18n/tree/master/rails/locale
+  
+  and then add the parts contained on en.yml.
+  
+  The helper includes a --skip-locale option that deactivates the generation
+  of the locale file.
+  
+  The helper admits a --haml option that generates haml and sass files.
+  On this case it will also generate a haml plugin initialization file.
+
 
 Examples:
     script/generate splendeo_layout
 
-        Layout:     app/views/layouts/application.html.erb
-        Stylesheet: public/stylesheets/application.css
-        Helper:     app/helpers/layout_helper.rb
+        Layout:       app/views/layouts/application.html.erb
+        Stylesheets:  public/stylesheets/application.css
+                      public/stylesheets/blueprint/*
+                      public/stylesheets/formtastic.css
+                      public/stylesheets/formtastic_changes.css
+        Helper:       app/helpers/layout_helper.rb
+        Initializers: config/initializers/formtastic.rb
+        Locale:       config/locales/en.yml
 
 
     script/generate splendeo_layout admin
 
-        Layout:     app/views/layouts/admin.html.erb
-        Stylesheet: public/stylesheets/admin.css
-        Helper:     app/helpers/layout_helper.rb
+        Layout:       app/views/layouts/admin.html.erb
+        Stylesheets:  public/stylesheets/admin.css
+                      public/stylesheets/blueprint/*
+                      public/stylesheets/formtastic.css
+                      public/stylesheets/formtastic_changes.css
+        Helper:       app/helpers/layout_helper.rb
+        Initializers: config/initializers/formtastic.rb
+        Locale:       config/locales/en.yml
+
+
+    script/generate splendeo_layout --haml
+
+        Layout:       app/views/layouts/application.html.haml
+        Stylesheets:  public/stylesheets/sass/application.sass
+                      public/stylesheets/sass/blueprint/*
+                      public/stylesheets/sass/formtastic.sass
+                      public/stylesheets/sass/formtastic_changes.sass
+        Helper:       app/helpers/layout_helper.rb
+        Initializers: config/initializers/formtastic.rb
+        Locale:       config/locales/en.yml
+        Plugin:       vendor/plugins/haml/init.rb
+

data/rails_generators/splendeo_layout/splendeo_layout_generator.rb

@@ -38,11 +38,10 @@ class SplendeoLayoutGenerator < Rails::Generator::Base
 
         m.template "layout.html.haml", "app/views/layouts/#{file_name}.html.haml"
         m.file     "sass/stylesheet.sass",  "public/stylesheets/sass/#{file_name}.sass"
-        
-        unless options[:skip_formtastic]
-          m.file 'sass/formtastic.sass', 'public/stylesheets/sass/formtastic.sass'
-          m.file 'sass/formtastic_changes.sass', 'public/stylesheets/sass/formtastic_changes.sass'
-        end
+
+        m.file 'sass/formtastic.sass', 'public/stylesheets/sass/formtastic.sass'
+        m.file 'sass/formtastic_changes.sass', 'public/stylesheets/sass/formtastic_changes.sass'
+
       else
 
         m.directory 'public/stylesheets/blueprint'
@@ -63,10 +62,8 @@ class SplendeoLayoutGenerator < Rails::Generator::Base
         m.template "layout.html.erb", "app/views/layouts/#{file_name}.html.erb"
         m.file     "css/stylesheet.css",  "public/stylesheets/#{file_name}.css"
 
-        unless options[:skip_formtastic]
-          m.file 'css/formtastic.css', 'public/stylesheets/formtastic.css'
-          m.file 'css/formtastic_changes.css', 'public/stylesheets/formtastic_changes.css'
-        end
+        m.file 'css/formtastic.css', 'public/stylesheets/formtastic.css'
+        m.file 'css/formtastic_changes.css', 'public/stylesheets/formtastic_changes.css'
       end
       m.file "helper.rb", "app/helpers/layout_helper.rb"
     end
@@ -83,7 +80,6 @@ class SplendeoLayoutGenerator < Rails::Generator::Base
       opt.separator 'Options:'
       opt.on("--haml", "Generate HAML for view, and SASS for stylesheet.") { |v| options[:haml] = v }
       opt.on("--skip-locale", "Skips the generation of a locale file") { |v| options[:skip_locale] = true }
-      opt.on("--skip-formtastic", "Skips the generation formtastic-related files") { |v| options[:skip_formtastic] = true }
     end
 
     def banner

data/rails_generators/splendeo_layout/templates/config/locales/en.yml

@@ -21,10 +21,12 @@ en:
 
   # Authentication
   log_in_button: "Log In"
-  log_in_message: "Already have an account? <a href='{{url}}>Log in!</a>"
+  log_in_message: "Already have an account? {{link}}"
+  log_in_link: "Log in!"
   log_in_title: "Log In"
   sign_up_button: "Sign Up"
-  sign_up_message: "Don't have an account? <a href='{{url}}'>Sign up!</a>"
+  sign_up_message: "Don't have an account? {{link}}"
+  sign_up_link: "Sign up!"
   sign_up_title: "Sign Up"
   login_label: "Login"
   password_label: "Password"

data/rails_generators/splendeo_layout/templates/helper.rb

@@ -7,15 +7,15 @@ module LayoutHelper
     @content_for_title = page_title.to_s
     @show_title = show_title
   end
-  
+
   def show_title?
     @show_title
   end
-  
+
   def stylesheet(*args)
     content_for(:head) { stylesheet_link_tag(*args) }
   end
-  
+
   def javascript(*args)
     content_for(:head) { javascript_include_tag(*args) }
   end

data/rails_generators/splendeo_scaffold/USAGE

@@ -4,6 +4,8 @@ Description:
     resource-oriented application. Tests or specs are also generated depending
     on if you have a "spec" directory or not.
     
+    Haml, declarative_authorization and cancan are also supported on this generator.
+    
     IMPORTANT: This generator uses the "title" helper method which is generated
     by the splendeo_layout generator. You may want to run that generator first.
 
@@ -30,6 +32,16 @@ Usage:
     Adding an "!" in the mix of arguments will invert the passed controller
     actions. This will include all 7 controller actitons except the ones
     mentioned. This option doesn't affect model attributes.
+    
+    The --haml option generates haml views instead of erb.
+    
+    The --declarative option will use declarative_authorization on the controller, 
+    model & views. This option will be activated automatically if there's a file
+    named config/authorization_rules.
+    The --cancan option will do the same but using cancan. This option will be 
+    activated automatically if declarative authorization isn't active and there's a
+    file named models/ability.rb
+    Use --skip-authorization if you want to generate without authorization.
 
 Examples:
     script/generate splendeo_scaffold post
@@ -37,15 +49,28 @@ Examples:
         Will create a controller called "posts" it will contain all seven
         CRUD actions along with the views. A model will NOT be created,
         instead it will look for an existing model and use those attributes.
-    
+
     script/generate splendeo_scaffold post name:string content:text index new edit
         
         Will create a Post model and migration file with the name and content
         attributes. It will also create a controller with index, new, create,
         edit, and update actions. Notice the create and update actions are
         added automatically with new and edit.
-    
+
     script/generate splendeo_scaffold post ! show new
         
         Creates a posts controller (no model) with index, edit, update, and
         destroy actions.
+        
+    script/generate splendeo_scaffold post name:string content:text --declarative
+
+        Will create a model and migration file, and controller called "posts".
+        Declarative authorization will be used to authorize the model, controller and
+        view links.
+
+    script/generate splendeo_scaffold post --haml
+
+        Will create the controller with all 7 views. It will try to look for an existing
+        model. Views will be generated using haml instead of erb.
+    
+        

data/rails_generators/splendeo_scaffold/splendeo_scaffold_generator.rb

@@ -109,10 +109,14 @@ class SplendeoScaffoldGenerator < Rails::Generator::Base
     names.all? { |n| action? n.to_s }
   end
   
-  def actions_with_find
+  def member_actions
     %w[ show edit update destroy ].select{|a| action?(a)}
   end
   
+  def new_actions
+    %w[ new create ].select{|a| action?(a)}
+  end
+  
   def singular_name
     name.underscore
   end
@@ -135,6 +139,30 @@ class SplendeoScaffoldGenerator < Rails::Generator::Base
     end.join("  \n").strip
   end
   
+  def tabify(text, ident)
+    tab_string = '  ' * ident
+    return tab_string + text.rstrip.gsub("\n", "\n#{tab_string}") + "\n"
+  end
+  
+  def link(action, options={})
+    if action? action
+      @action = action
+
+      instance_variable = options[:instance_variable].nil? ? true : options[:instance_variable]
+      @tag= options[:tag]
+      ident = options[:ident].nil? ? 0 : options[:ident]
+
+      if(@tag.present?)
+        text = read_template("views/#{view_language}/_tagged_link.html.#{view_language}")
+      else
+        text = read_template("views/#{view_language}/_link.html.#{view_language}")
+      end
+      text = text.gsub("@#{singular_name}", singular_name) if instance_variable == false
+
+      return tabify(text, ident)
+    end
+  end
+  
   def render_form
     if form_partial?
       if options[:haml]
@@ -189,6 +217,29 @@ class SplendeoScaffoldGenerator < Rails::Generator::Base
     test_framework == :rspec
   end
   
+  def declarative?
+    authorization_framework == :declarative_authorization
+  end
+  
+  def cancan?
+    authorization_framework == :cancan
+  end
+  
+  def authorized?
+    af = authorization_framework
+    return (af==:cancan or af==:declarative_authorization)
+  end
+  
+  def authorized_verb
+    return 'permitted_to?' if declarative?
+    return 'can?' if cancan?
+  end
+  
+  def authorization_context
+    return ":#{plural_name}" if [:index,:new].include? @action
+    return "@#{singular_name}"
+  end
+  
 protected
   
   def view_language
@@ -199,6 +250,19 @@ protected
     options[:test_framework] ||= default_test_framework
   end
   
+  def authorization_framework
+    return nil if options[:skip_authorization]
+    options[:authorization_framework] ||= default_authorization_framework
+    return options[:authorization_framework]
+  end
+  
+  def default_authorization_framework
+    return nil if options[:skip_authorization]
+    return :declarative_authorization if(File.exist?(destination_path("config/authorization_rules.rb")))
+    return :cancan if(File.exist?(destination_path("models/ability.rb")))
+    return nil
+  end
+  
   def default_test_framework
     File.exist?(destination_path("spec")) ? :rspec : :testunit
   end
@@ -210,6 +274,11 @@ protected
     opt.on("--skip-migration", "Don't generate migration file for model.") { |v| options[:skip_migration] = v }
     opt.on("--skip-timestamps", "Don't add timestamps to migration file.") { |v| options[:skip_timestamps] = v }
     opt.on("--skip-controller", "Don't generate controller, helper, or views.") { |v| options[:skip_controller] = v }
+
+    opt.on("--skip-authorization", "Don't generate authorization controls") { |v| options[:skip_authorization] = v }
+    opt.on("--declarative", "Include basic declarative authorization commands on models and controllers.") {|v| options[:authorization_framework] = :declarative_authorization}
+    opt.on("--cancan", "Include basic declarative authorization commands on models and controllers.") {|v| options[:authorization_framework] = :cancan}
+
     opt.on("--invert", "Generate all controller actions except these mentioned.") { |v| options[:invert] = v }
     opt.on("--haml", "Generate HAML views instead of ERB.") { |v| options[:haml] = v }
     opt.on("--testunit", "Use test/unit for test files.") { options[:test_framework] = :testunit }

data/rails_generators/splendeo_scaffold/templates/actions/create.rb

@@ -1,5 +1,4 @@
   def create
-    @<%= singular_name %> = <%= class_name %>.new(params[:<%= singular_name %>])
     if @<%= singular_name %>.save
       flash[:notice] = t('flash_notice_successfully_created', :model => <%=class_name%>.human_name)
       redirect_to <%= item_path('url') %>

data/rails_generators/splendeo_scaffold/templates/actions/new.rb

@@ -1,3 +1,2 @@
   def new
-    @<%= singular_name %> = <%= class_name %>.new
   end

data/rails_generators/splendeo_scaffold/templates/controller.rb

@@ -1,17 +1,34 @@
 class <%= plural_class_name %>Controller < ApplicationController
 
-<%- if actions_with_find.length > 0 -%>
-  before_filter :find_<%= singular_name %>, :only => [ <%= actions_with_find.collect{|a| ":#{a}"}.join(', ') %> ]
+<%- if declarative? -%>
+  filter_resource_access
+<%- elsif cancan? -%>
+  load_and_authorize_resource
+<%- else -%>
+  <%- if member_actions.length > 0 -%>
+  before_filter :load_<%= singular_name %>, :only => [ <%= member_actions.collect{|a| ":#{a}"}.join(', ') %> ]
+  <%- end -%>
+  <%- if new_actions.length > 0 -%>
+  before_filter :new_<%= singular_name %>_from_params, :only => [ <%= new_actions.collect{|a| ":#{a}"}.join(', ') %> ]
+  <%- end -%>
 <%- end -%>
 
   <%= controller_methods :actions %>
 
-<%- if actions_with_find.length > 0 -%>
-  protected
+protected
 
-  def find_<%= singular_name %>
+<%- unless authorized? -%>
+
+  <%- if new_actions.length > 0 -%>
+  def new_<%= singular_name %>_from_params
+    @<%= singular_name %> = <%= class_name %>.new(params[:<%= singular_name %>])
+  end
+  <%- end -%>
+
+  <%- if member_actions.length > 0 -%>
+  def load_<%= singular_name %>
     @<%= singular_name %> = <%= class_name %>.find(params[:id])
-  rescue ActiveRecord::RecordNotFound => msg
+    rescue ActiveRecord::RecordNotFound => msg
     flash[:error] = msg
     <%- if action?(:index) -%>
       redirect_to :action => :index
@@ -19,5 +36,7 @@ class <%= plural_class_name %>Controller < ApplicationController
       redirect_to root_path
     <%- end -%>
   end
+  <%- end -%>
+
 <%- end -%>
 end

data/rails_generators/splendeo_scaffold/templates/model.rb

@@ -1,3 +1,6 @@
 class <%= class_name %> < ActiveRecord::Base
   attr_accessible <%= attributes.map { |a| ":#{a.name}" }.join(", ") %>
+<%- if declarative? -%>
+  using_access_control
+<%- end -%>
 end

data/rails_generators/splendeo_scaffold/templates/views/erb/_link.html.erb

@@ -0,0 +1,7 @@
+<%- if authorized? -%>
+<%% if <%= authorized_verb %> :<%= @action %>, <%= authorization_context %> %>
+  <%= read_template "views/erb/_link_#{@action}.html.erb" -%>
+<%% end %>
+<%- else -%>
+<%= read_template "views/erb/_link_#{@action}.html.erb" -%>
+<%- end -%>

data/rails_generators/splendeo_scaffold/templates/views/erb/_link_destroy.html.erb

@@ -0,0 +1 @@
+<%%= link_to t("destroy_link"), @<%= singular_name %>, :confirm => t('destroy_confirmation'), :method => :delete %>

data/rails_generators/splendeo_scaffold/templates/views/erb/_link_edit.html.erb

@@ -0,0 +1 @@
+<%%= link_to t("edit_link"), edit_<%= singular_name %>_path(@<%= singular_name %>) %>

data/rails_generators/splendeo_scaffold/templates/views/erb/_link_index.html.erb

@@ -0,0 +1 @@
+<%%= link_to t("back_to_list_link"), <%= plural_name %>_path %>

data/rails_generators/splendeo_scaffold/templates/views/erb/_link_new.html.erb

@@ -0,0 +1 @@
+<%%= link_to t("new_link", :model => <%= class_name %>.human_name), new_<%= singular_name %>_path %>

data/rails_generators/splendeo_scaffold/templates/views/erb/_link_show.html.erb

@@ -0,0 +1 @@
+<%%= link_to t("show_link"), @<%= singular_name %> %>

data/rails_generators/splendeo_scaffold/templates/views/erb/_tagged_link.html.erb

@@ -0,0 +1,12 @@
+<%- if authorized? -%>
+<%% if <%= authorized_verb %> :<%= @action %>, <%= authorization_context %> %>
+  <<%= @tag %>>
+    <%= read_template "views/erb/_link_#{@action}.html.erb" -%>
+  </<%= @tag %>>
+<%% end %>
+<%- else -%>
+<<%= @tag %>>
+  <%= read_template "views/erb/_link_#{@action}.html.erb" -%>
+</<%= @tag %>>
+<%- end -%>
+

data/rails_generators/splendeo_scaffold/templates/views/erb/edit.html.erb

@@ -4,11 +4,7 @@
 
 <%- if actions? :show, :index -%>
 <p>
-<%- if action? :show -%>
-  <%%= link_to t("show_link"), @<%= singular_name %> %> |
-<%- end -%>
-<%- if action? :index -%>
-  <%%= link_to t("view_all_link"), <%= plural_name %>_path %>
-<%- end -%>
+<%= link :show, :ident => 1 -%>
+<%= link :index, :ident => 1 -%>
 </p>
 <%- end -%>

data/rails_generators/splendeo_scaffold/templates/views/erb/index.html.erb

@@ -11,19 +11,11 @@
     <%- for attribute in attributes -%>
       <td><%%=h <%= singular_name %>.<%= attribute.name %> %></td>
     <%- end -%>
-    <%- if action? :show -%>
-      <td><%%= link_to t("show_link"), <%= singular_name %> %></td>
-    <%- end -%>
-    <%- if action? :edit -%>
-      <td><%%= link_to t("edit_link"), edit_<%= singular_name %>_path(<%= singular_name %>) %></td>
-    <%- end -%>
-    <%- if action? :destroy -%>
-      <td><%%= link_to t("destroy_link"), <%= singular_name %>, :confirm => t('destroy_confirmation'), :method => :delete %></td>
-    <%- end -%>
+<%= link :show, :ident => 3, :tag => :td, :instance_variable => false -%>
+<%= link :edit, :ident => 3, :tag => :td, :instance_variable => false -%>
+<%= link :destroy, :ident => 3, :tag => :td, :instance_variable => false -%>
     </tr>
   <%% end %>
 </table>
 
-<%- if action? :new -%>
-<p><%%= link_to t("new_link", :model => <%= class_name %>.human_name), new_<%= singular_name %>_path %></p>
-<%- end -%>
+<%= link :new, :tag => :p -%>

data/rails_generators/splendeo_scaffold/templates/views/erb/new.html.erb

@@ -2,6 +2,4 @@
 
 <%= render_form %>
 
-<%- if action? :index -%>
-<p><%%= link_to t("back_to_list_link"), <%= plural_name %>_path %></p>
-<%- end -%>
+<%= link :index, :tag => :p -%>

data/rails_generators/splendeo_scaffold/templates/views/erb/show.html.erb

@@ -8,13 +8,7 @@
 <%- end -%>
 
 <p>
-<%- if action? :edit -%>
-  <%%= link_to t('edit_link'), edit_<%= singular_name %>_path(@<%= singular_name %>) %> |
-<%- end -%>
-<%- if action? :destroy -%>
-  <%%= link_to t('destroy_link'), @<%= singular_name %>, :confirm => t('destroy_confirmation'), :method => :delete %> |
-<%- end -%>
-<%- if action? :index -%>
-  <%%= link_to t("view_all_link"), <%= plural_name %>_path %>
-<%- end -%>
+<%= link :edit, :ident => 1 -%>
+<%= link :destroy, :ident => 1 -%>
+<%= link :index, :ident => 1 -%>
 </p>

data/rails_generators/splendeo_scaffold/templates/views/haml/_link.html.haml

@@ -0,0 +1,6 @@
+<%- if authorized? -%>
+- if <%= authorized_verb %> :<%= @action %>, <%= authorization_context %>
+  <%= read_template "views/haml/_link_#{@action}.html.haml" -%>
+<%- else -%>
+<%= read_template "views/haml/_link_#{@action}.html.haml" -%>
+<%- end -%>

data/rails_generators/splendeo_scaffold/templates/views/haml/_link_destroy.html.haml

@@ -0,0 +1 @@
+= link_to t("destroy_link"), @<%= singular_name %>, :confirm => t('destroy_confirmation'), :method => :delete

data/rails_generators/splendeo_scaffold/templates/views/haml/_link_edit.html.haml

@@ -0,0 +1 @@
+= link_to t("edit_link"), edit_<%= singular_name %>_path(@<%= singular_name %>)

data/rails_generators/splendeo_scaffold/templates/views/haml/_link_index.html.haml

@@ -0,0 +1 @@
+= link_to t("back_to_list_link"), <%= plural_name %>_path

data/rails_generators/splendeo_scaffold/templates/views/haml/_link_new.html.haml

@@ -0,0 +1 @@
+= link_to t("new_link", :model => <%= class_name %>.human_name), new_<%= singular_name %>_path

data/rails_generators/splendeo_scaffold/templates/views/haml/_link_show.html.haml

@@ -0,0 +1 @@
+= link_to t("show_link"), @<%= singular_name %>

data/rails_generators/splendeo_scaffold/templates/views/haml/_tagged_link.html.haml

@@ -0,0 +1,9 @@
+<%- if authorized? -%>
+- if <%= authorized_verb %> :<%= @action %>, <%= authorization_context %>
+  %<%= @tag %>
+    <%= read_template "views/haml/_link_#{@action}.html.haml" -%>
+<%- else -%>
+%<%= @tag %>
+  <%= read_template "views/haml/_link_#{@action}.html.haml" -%>
+<%- end -%>
+

data/rails_generators/splendeo_scaffold/templates/views/haml/edit.html.haml

@@ -4,11 +4,6 @@
 
 <%- if actions? :show, :index -%>
 %p
-  <%- if action? :show -%>
-  = link_to t("show_link"), <%= singular_name %>_path(@<%= singular_name %>)
-  |
-  <%- end -%>
-  <%- if action? :index -%>
-  = link_to t("view_all_link"), <%= plural_name %>_path
-  <%- end -%>
+<%= link :show , :ident => 1 -%>
+<%= link :index, :ident => 1 -%>
 <%- end -%>

data/rails_generators/splendeo_scaffold/templates/views/haml/index.html.haml

@@ -10,16 +10,10 @@
       <%- for attribute in attributes -%>
       %td= h <%= singular_name %>.<%= attribute.name %>
       <%- end -%>
-      <%- if action? :show -%>
-      %td= link_to t('show_link'), <%= singular_name %>
-      <%- end -%>
-      <%- if action? :edit -%>
-      %td= link_to t('edit_link'), edit_<%= singular_name %>_path(<%= singular_name %>)
-      <%- end -%>
-      <%- if action? :destroy -%>
-      %td= link_to t('destroy_link'), <%= singular_name %>, :confirm => t('destroy_confirmation'), :method => :delete
-      <%- end -%>
+<%= link :show, :ident => 3, :tag => :td, :instance_variable => false -%>
+<%= link :edit, :ident => 3, :tag => :td, :instance_variable => false -%>
+<%= link :destroy, :ident => 3, :tag => :td, :instance_variable => false -%>
 
 <%- if actions? :new -%>
-%p= link_to t("new_link", :model => <%= class_name %>.human_name), new_<%= singular_name %>_path
+<%= link :new, :tag => :p -%>
 <%- end -%>

data/rails_generators/splendeo_scaffold/templates/views/haml/new.html.haml

@@ -2,6 +2,4 @@
 
 <%= render_form %>
 
-<%- if action? :index -%>
-%p= link_to t("back_to_list_link"), <%= plural_name %>_path
-<%- end -%>
+<%= link :index, :tag => :p -%>

data/rails_generators/splendeo_scaffold/templates/views/haml/show.html.haml

@@ -8,14 +8,6 @@
 <%- end -%>
 
 %p
-  <%- if action? :edit -%>
-  = link_to t('edit_link'), edit_<%= singular_name %>_path(@<%= singular_name %>)
-  |
-  <%- end -%>
-  <%- if action? :destroy -%>
-  = link_to t('destroy_link'), @<%= singular_name %>, :confirm => t('destroy_confirmation'), :method => :delete
-  |
-  <%- end -%>
-  <%- if action? :index -%>
-  = link_to t('view_all_link'), <%= plural_name %>_path
-  <%- end -%>
+<%= link :edit, :ident => 1 %>
+<%= link :destroy, :ident => 1 %>
+<%= link :index, :ident => 1 %>

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 1
-  version: 0.2.1
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Ryan Bates
@@ -16,11 +16,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-16 00:00:00 +01:00
+date: 2010-04-07 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
-description: A fork of ryanb's nifty-generators, with i18n and blueprint.
+description: ryanb's nifty-generators + i18n, blueprint, formtastic, declarative_authorization and cancan.
 email: egarcia@splendeo.es
 executables: []
 
@@ -38,15 +38,29 @@ files:
 - test/test_splendeo_authentication_generator.rb
 - test/test_splendeo_layout_generator.rb
 - rails_generators/splendeo_scaffold/templates/model.rb
+- rails_generators/splendeo_scaffold/templates/views/haml/_link_new.html.haml
+- rails_generators/splendeo_scaffold/templates/views/haml/_link_destroy.html.haml
+- rails_generators/splendeo_scaffold/templates/views/haml/_link_edit.html.haml
+- rails_generators/splendeo_scaffold/templates/views/haml/_tagged_link.html.haml
+- rails_generators/splendeo_scaffold/templates/views/haml/_link_index.html.haml
+- rails_generators/splendeo_scaffold/templates/views/haml/_link_show.html.haml
 - rails_generators/splendeo_scaffold/templates/views/haml/show.html.haml
 - rails_generators/splendeo_scaffold/templates/views/haml/_form.html.haml
 - rails_generators/splendeo_scaffold/templates/views/haml/index.html.haml
+- rails_generators/splendeo_scaffold/templates/views/haml/_link.html.haml
 - rails_generators/splendeo_scaffold/templates/views/haml/edit.html.haml
 - rails_generators/splendeo_scaffold/templates/views/haml/new.html.haml
 - rails_generators/splendeo_scaffold/templates/views/erb/_form.html.erb
+- rails_generators/splendeo_scaffold/templates/views/erb/_tagged_link.html.erb
+- rails_generators/splendeo_scaffold/templates/views/erb/_link_edit.html.erb
 - rails_generators/splendeo_scaffold/templates/views/erb/edit.html.erb
+- rails_generators/splendeo_scaffold/templates/views/erb/_link_index.html.erb
+- rails_generators/splendeo_scaffold/templates/views/erb/_link_destroy.html.erb
 - rails_generators/splendeo_scaffold/templates/views/erb/show.html.erb
+- rails_generators/splendeo_scaffold/templates/views/erb/_link_new.html.erb
+- rails_generators/splendeo_scaffold/templates/views/erb/_link.html.erb
 - rails_generators/splendeo_scaffold/templates/views/erb/index.html.erb
+- rails_generators/splendeo_scaffold/templates/views/erb/_link_show.html.erb
 - rails_generators/splendeo_scaffold/templates/views/erb/new.html.erb
 - rails_generators/splendeo_scaffold/templates/helper.rb
 - rails_generators/splendeo_scaffold/templates/controller.rb