leonardo 1.5.0 → 1.6.0

data/CHANGELOG

@@ -1,11 +1,17 @@
+1.6.0 (September 16th, 2011) Marco Mastrodonato
+* Nested resource: use new option rails g leosca product --under=category field:type
+* Improved views data format
+* Added ajax mode for show view managed by jquery-ui dialog
+* Updated specs for namespaced resource and other improvements
+* Several little improvements
+
+
+
 1.5.0 (September 6th, 2011) Marco Mastrodonato
 * Added Rspec support with requests to check ajax => All green if you use formtastic views (associations with select)
 * New template
 * Little improvements
 
-Next release:
-* Nested resource
-* Code improvements
 
 
 1.4.1 (August 25th, 2011) Marco Mastrodonato

data/lib/generators/base.rb

@@ -1,28 +1,266 @@
-module LeonardoShared
-  def prova
-    puts 'ok'
-  end
+module Leonardo
+  module Leosca
 
-  protected
-  def authorization?
-    File.exists? "app/models/ability.rb"
-  end
-  def authentication?
-    return true if File.exists? "app/models/user.rb"
-    File.exists? "config/initializers/devise.rb"
-  end
-  def camel_case(str)
-    return str if str !~ /_/ && str =~ /[A-Z]+.*/
-    str.split('_').map { |i| i.capitalize }.join
-  end
-  def formtastic?
-    return false unless options.formtastic?
-    File.exists? "config/initializers/formtastic.rb"
+    protected
+    def authorization?
+      File.exists? "app/models/ability.rb"
+    end
+    def authentication?
+      return true if File.exists? "app/models/user.rb"
+      File.exists? "config/initializers/devise.rb"
+    end
+    def formtastic?
+      return false unless options.formtastic?
+      File.exists? "config/initializers/formtastic.rb"
+    end
+    def jquery_ui?
+      File.exists? "vendor/assets/javascripts/jquery-ui"
+    end
+    def pagination?
+      File.exists? "config/initializers/kaminari_config.rb"
+    end
+    def attribute_to_hash(attribute)
+      name = case attribute.type
+        when :references, :belongs_to then ":#{attribute.name}_id"
+        else                               ":#{attribute.name}"
+      end
+      value = case attribute.type
+        when :boolean                 then "true"
+        when :integer                 then "#"
+        when :float, :decimal         then "#.46"
+        when :references, :belongs_to then "#"
+        when :date                    then "#{Time.now.strftime("%Y-%m-%d 00:00:00.000")}".inspect
+        when :datetime                then "#{Time.now.strftime("%Y-%m-%d %H:%M:%S.000")}".inspect
+        when :time, :timestamp        then "#{Time.now.strftime("%H:%M:%S.000")}".inspect
+        else                               "#{attribute.name.titleize}\#".inspect
+      end
+      " #{name} => #{value}"
+    end
+    def attribute_to_factories(attribute)
+      str_space = " " * (20-attribute.name.size).abs
+      name = case attribute.type
+      when :references, :belongs_to   then "#{singular_table_name[0..0]}.association        #{str_space}"
+      when :boolean, :datetime, :time, :timestamp
+                                      then "#{singular_table_name[0..0]}.#{attribute.name}           #{str_space}"
+      else                                 "#{singular_table_name[0..0]}.sequence(:#{attribute.name})#{str_space}"
+      end
+      value = case attribute.type
+        when :boolean                 then "true"
+        when :integer                 then "{|n| n }"
+        when :float, :decimal         then "{|n| n }"
+        when :references, :belongs_to then ":#{attribute.name}"
+        when :date                    then "{|n| n.month.ago }"
+        when :datetime                then "#{Time.now.strftime("%Y-%m-%d %H:%M:%S.000")}".inspect
+        when :time, :timestamp        then "#{Time.now.strftime("%H:%M:%S.000")}".inspect
+        else                               "{|n| \"#{attribute.name.titleize}\#{n}\" }"
+      end
+      "    #{name} #{value}"
+    end
+    def attribute_to_requests(attribute)
+      case attribute.type
+        when :boolean                 then "      check '#{singular_table_name}_#{attribute.name}' if #{singular_table_name}.#{attribute.name}"
+        when :references, :belongs_to then "      select #{singular_table_name}.#{attribute.name}.name, :from => '#{singular_table_name}_#{attribute.name}_id'"
+        when :datetime, :time, :timestamp
+                                      then ""
+        when :date                    then "      fill_in '#{singular_table_name}_#{attribute.name}', :with => #{singular_table_name}.#{attribute.name}.strftime('%d-%m-%Y')"
+        else                               "      fill_in '#{singular_table_name}_#{attribute.name}', :with => #{singular_table_name}.#{attribute.name}"
+      end
+    end
+    def attribute_to_erb(attribute, object)
+      case attribute.type
+      when :boolean                   then "<%= #{object}.#{attribute.name} ? style_image_tag(\"ico_v.png\", :class => \"ico_true\") : style_image_tag(\"ico_x.png\", :class => \"ico_false\") %>"
+      when :references, :belongs_to   then "<%= link_to((#{object}.#{attribute.name}.try(:name) || \"\#{t('models.#{attribute.name}')} \#{#{object}.#{attribute.name}.try(:id)}\"), #{object}.#{attribute.name}) %>"
+      when :integer                   then "<%= number_with_delimiter #{object}.#{attribute.name} %>"
+      when :decimal                   then "<%= number_to_currency #{object}.#{attribute.name} %>"
+      when :float                     then "<%= number_with_precision #{object}.#{attribute.name} %>"
+      when :date                      then "<%= #{object}.#{attribute.name}.strftime('%d-%m-%Y') if #{object}.#{attribute.name} %>"
+      when :datetime                  then "<%= #{object}.#{attribute.name}.strftime('%d-%m-%Y %H:%M:%S') if #{object}.#{attribute.name} %>"
+      when :time, :timestamp          then "<%= #{object}.#{attribute.name}.strftime('%H:%M:%S') if #{object}.#{attribute.name} %>"
+      else                                 "<%= #{object}.#{attribute.name} %>"
+      end
+    end
+    def get_attr_to_match(view=:list)
+      attributes.each do |attribute|
+        return  "have_content(#{singular_table_name}.#{attribute.name})",
+                "have_no_content(#{singular_table_name}.#{attribute.name})" if attribute.type==:string
+      end
+      #If there are not string attributes
+      case view
+      when :list
+        return  "have_xpath('//table/tbody/tr')", "have_no_xpath('//table/tbody/tr')"
+      when :show
+        return  "have_xpath('//table/tbody/tr')", "have_no_xpath('//table/tbody/tr')"
+      end
+    end
+    def plural_path_file_name
+      (class_path + [plural_table_name]).join('/')
+    end
   end
-  def jquery_ui?
-    File.exists? "vendor/assets/javascripts/jquery-ui"
-  end
-  def pagination?
-    File.exists? "config/initializers/kaminari_config.rb"
+
+  module Nested
+    protected
+
+    #product under brand/category => "brand_category_product"
+    def underscore_resource_path(names=:all_singular)
+      case names
+      when :all_singular
+        resource_path.join('_')
+      when :all_plural
+        #who needs?
+      when :parent_singular_resource_plural
+        resource_path.join('_').pluralize
+      else
+        "#{names.to_s}_not_supported"
+      end
+
+    end
+
+    #product => products_path
+    #product under category => category_products_path(@category)
+    #product under brand/category => brand_category_products_path(@brand, @category)
+    def list_resources_path
+      "#{underscore_resource_path(:parent_singular_resource_plural)}_path(#{formatted_parent_resources("@")})"
+    end
+
+    #product => "product"
+    #product under category => "[@category, product]"
+    #product under brand/category => "[@brand, @category, product]"
+    def destroy_resource_path(prefix_resource="")
+      formatted_resource_path("@", prefix_resource, "[]")
+    end
+
+    #product => "product"
+    #product under category => "[@category, product]"
+    #product under brand/category => "[@brand, @category, product]"
+    def show_resource_path(prefix_resource="")
+      formatted_resource_path("@", prefix_resource, "[]")
+    end
+
+    #product => "@product"
+    #product under category => "[@category, @product]"
+    #product under brand/category => "[@brand, @category, @product]"
+    def form_resource_path
+      formatted_resource_path("@", "@", "[]")
+    end
+
+    #product => new_product_path
+    #product under category => new_category_product_path(@category)
+    #product under brand/category => new_brand_category_product_path(@brand, @category)
+    def new_resource_path
+      "new_#{underscore_resource_path}_path(#{formatted_parent_resources("@")})"
+    end
+
+    #product => edit_product_path(@product)
+    #product under category => edit_category_product_path(@category, @product)
+    #product under brand/category => edit_brand_category_product_path(@brand, @category, @product)
+    def edit_resource_path(prefix_resource="")
+      "edit_#{underscore_resource_path}_path(#{formatted_resource_path("@", prefix_resource)})"
+    end
+
+    #product under brand/category => "[brand, category, product]" or "[@brand, @category, @product]" or "@brand, @category, @product" or [product.brand, product.category, product]
+    def formatted_resource_path(prefix_parent="", prefix_resource="", delimiter="", resource=nil)
+      formatted_resource_base resource_path(prefix_parent, prefix_resource, resource), delimiter
+    end
+
+    #product under brand/category => "[brand, category]" or "[@brand, @category]" or "@brand, @category" or product.brand, product.category
+    def formatted_parent_resources(prefix_parent="", delimiter="", resource=nil)
+      prefix_parent = "#{resource}." if resource
+      formatted_resource_base parent_resources(prefix_parent), delimiter
+    end
+
+    def formatted_resource_base(resources, delimiter="")
+      str_resources = resources.join(', ')
+      resources.size > 1 ? "#{delimiter[0..0]}#{str_resources}#{delimiter[1..1]}" : str_resources
+    end
+
+    #product under brand/category => ["brand", "category", "product"] or ["@brand", "@category", "@product"]
+    def resource_path(prefix_parent="", prefix_resource="", resource=nil)
+      if resource
+        prefix_parent = "#{resource}."
+      else
+        resource = singular_table_name
+      end
+
+      if nested?
+        parent_resources(prefix_parent) << "#{prefix_resource}#{resource}"
+      else
+        ["#{prefix_resource}#{resource}"]
+      end
+    end
+
+    #product under brand/category => "categories"
+    def plural_last_parent
+      plural_parent_resources.last
+    end
+
+    #product under brand/category => ["brands", "categories"] or ["@brands", "@categories"]
+    def plural_parent_resources(prefix_parent="")
+      base_parent_resources.map{|m| "#{prefix_parent}#{m.pluralize}"}
+    end
+
+    #product under brand/category => ["brand", "category"] or ["@brand", "@category"]
+    def parent_resources(prefix_parent="")
+      base_parent_resources.map{|m| "#{prefix_parent}#{m}"}
+    end
+
+    #product under brand/category => "category"
+    def last_parent
+      base_parent_resources.last
+    end
+
+    #product under brand/category => ["brand", "category"]
+    def base_parent_resources
+      options[:under].split('/').map{|m| m.underscore}
+    end
+
+    def nested?
+      options[:under].present?
+    end
+
+    module Test
+      protected
+      #Add parent(s) param(s) to request
+      #get :index for a product under category => get :index, :category_id => product.category_id.to_s
+      def nested_params_http_request(value=nil)
+        return unless nested?
+        ", " << base_parent_resources.map{|m| ":#{m}_id => #{value ? value.to_s.inspect : "#{file_name}.#{m}_id.to_s"}"}.join(', ')
+      end
+
+      #Create new parent(s) and add it to request
+      #get :index for a product under category => get :index, :category_id => Factory(:category).id.to_s
+      def nested_params_http_request_new_parent
+        return unless nested?
+        ", " << base_parent_resources.map{|m| ":#{m}_id => Factory(:#{m}).id.to_s"}.join(', ')
+      end
+
+      #product => products_path
+      #product under category => category_products_path(product.category)
+      #product under brand/category => brand_category_products_path(product.brand, product.category)
+      def list_resources_path_test(resource=nil, prefix_parent=nil)
+        unless prefix_parent
+          resource = resource || singular_table_name
+          prefix_parent = "#{resource}."
+        end
+        "#{underscore_resource_path(:parent_singular_resource_plural)}_path(#{formatted_parent_resources(prefix_parent, "", resource)})"
+      end
+
+      #product => "product"
+      #product under category => "[category, product]" or "[product.category, product]"
+      #product under brand/category => "[brand, category, product]" or "[product.brand, product.category, product]"
+      def show_resource_path_test(resource=nil, prefix_parent=nil, prefix_resource="")
+        resource = resource || singular_table_name
+        prefix_parent = prefix_parent || "#{resource}."
+        formatted_resource_path(prefix_parent, prefix_resource, "[]", resource)
+      end
+
+      #product => new_product_path
+      #product under category => new_category_product_path(product.category)
+      #product under brand/category => new_brand_category_product_path(product.brand, product.category)
+      def new_resource_path_test(resource=nil, prefix_parent=nil)
+        resource = resource || singular_table_name
+        prefix_parent = prefix_parent || "#{resource}."
+        "new_#{underscore_resource_path}_path(#{formatted_parent_resources(prefix_parent, "",resource)})"
+      end
+    end
   end
 end

data/lib/generators/erb/leosca/leosca_generator.rb

@@ -1,10 +1,13 @@
 require 'rails/generators/erb'
 require 'rails/generators/resource_helpers'
+require File.join(File.dirname(__FILE__), '../../base')
 
 module Erb
   module Generators
     class LeoscaGenerator < Base
       include Rails::Generators::ResourceHelpers
+      include ::Leonardo::Leosca
+      include ::Leonardo::Nested
       #puts 'erb:leosca'
 
       source_root File.expand_path('../templates', __FILE__)
@@ -12,6 +15,7 @@ module Erb
       class_option :authorization, :type => :boolean, :default => true, :description => "Add code to manage authorization with cancan"
       class_option :remote, :type => :boolean, :default => true, :description => "Enable ajax. You can also do later set remote to true into index view."
       class_option :formtastic, :type => :boolean, :default => true, :description => "Create forms to manage with formtastic gem"
+      class_option :under, :type => :string, :default => "", :banner => "brand/category"
 
       def create_root_folder
         empty_directory File.join("app/views", controller_file_path)
@@ -35,13 +39,46 @@ module Erb
             template filename_source, File.join("app/views", controller_file_path, filename)
           end
         end
+      end
+
+      def update_layout_html
+        file = "app/views/layouts/_#{CONFIG[:default_style]}.html.erb"
+        if nested?
+          inject_into_file file, :after => "<!-- Insert below here other #{last_parent} elements -->#{CRLF}" do
+            <<-FILE.gsub(/^            /, '')
+                          #{"<% if can?(:read, #{class_name}) && controller.controller_path == '#{controller_name}' -%>" if authorization?}
+                          <li class="active"><%= t('models.#{plural_table_name}') %></li>
+                          <!-- Insert below here other #{singular_table_name} elements -->
+                          #{"<% end -%>" if authorization?}
+            FILE
+          end if File.exists?(file)
+        else
+          inject_into_file file, :after => "<!-- Insert below other elements -->#{CRLF}" do
+            <<-FILE.gsub(/^            /, '')
+                        #{"<% if can?(:read, #{class_name}) -%>" if authorization?}
+                        <li class="<%= controller.controller_path == '#{controller_name}' ? 'active' : '' %>"><a href="<%= #{plural_table_name}_path %>"><%= t('models.#{plural_table_name}') %></a></li>
+                        <!-- Insert below here other #{singular_table_name} elements -->
+                        #{"<% end -%>" if authorization?}
+            FILE
+          end if File.exists?(file)
+        end
+      end
+
+      def update_parent_views
+        return unless nested?
+        file = "app/views/#{plural_last_parent}/_list.erb"
+        inject_into_file file, :before => "<!-- Manage section, do not remove this tag -->" do
+          <<-FILE.gsub(/^          /, '')
+              <td><%= link_to t('models.#{plural_table_name}'), #{underscore_resource_path :parent_singular_resource_plural}_path(#{last_parent}) %></td>
 
+          FILE
+        end if File.exists?(file)
       end
 
     protected
 
       def available_views
-        %w(index edit show new _form _list destroy)
+        %w(index edit show new _form _list destroy _show)
       end
 
       def filenames_all_formats(name, paths=[], formats=[:html, :js, nil])
@@ -61,27 +98,6 @@ module Erb
         [name, format, parser].compact.join(".")
       end
 
-      def authorization?
-        File.exists? "app/models/ability.rb"
-      end
-      def authentication?
-        return true if File.exists? "app/models/user.rb"
-        File.exists? "config/initializers/devise.rb"
-      end
-      def camel_case(str)
-        return str if str !~ /_/ && str =~ /[A-Z]+.*/
-        str.split('_').map { |i| i.capitalize }.join
-      end
-      def formtastic?
-        return false unless options.formtastic?
-        File.exists? "config/initializers/formtastic.rb"
-      end
-      def jquery_ui?
-        File.exists? "vendor/assets/javascripts/jquery-ui"
-      end
-      def pagination?
-        File.exists? "config/initializers/kaminari_config.rb"
-      end
     end
   end
 end

data/lib/generators/erb/leosca/templates/_form.html.erb

@@ -1,4 +1,4 @@
-<%%= form_for(@<%= singular_table_name %>) do |f| %>
+<%%= form_for(<%= form_resource_path %>) do |f| %>
   <%% if @<%= singular_table_name %>.errors.any? %>
     <div id="error_explanation">
       <h2><%%= pluralize(@<%= singular_table_name %>.errors.count, "error") %> prohibited this <%= singular_table_name %> from being saved:</h2>
@@ -11,12 +11,23 @@
     </div>
   <%% end %>
 
-<% attributes.each do |attribute| -%>
+<%- attributes.each do |attribute| -%>
   <div class="field">
     <%%= f.label :<%= attribute.name %>, t('attributes.<%= singular_table_name %>.<%= attribute.name %>') %><br />
+    <%- case attribute.type
+        when :references, :belongs_to  -%>
+    <%% if @<%= singular_table_name %>.new_record? -%>
+        <%%= f.collection_select :<%= attribute.name %>_id, <%= attribute.name.classify %>.all, :id, :name, :prompt => true if can?(:manage, <%=class_name %>) %>
+    <%% else -%>
+        <%%= f.collection_select :<%= attribute.name %>_id, <%= attribute.name.classify %>.all, :id, :name, :prompt => true %>
+    <%% end -%>
+    <%-	when :date -%>
+    <%%= f.<%= attribute.field_type %> :<%= attribute.name %> <%=", :class => \"calendar\"" if jquery_ui?%> %>
+    <%-	else -%>
     <%%= f.<%= attribute.field_type %> :<%= attribute.name %> %>
+    <%- end -%>
   </div>
-<% end -%>
+<%- end -%>
   <div class="actions">
     <%%= f.submit :class => 'button large' %>
   </div>

data/lib/generators/erb/leosca/templates/_list.erb

@@ -1,6 +1,6 @@
-<%- if pagination? -%>
+<%- if pagination? %>
 <%%= paginate @<%= plural_table_name %>, :remote => remote %>
-<%- end -%>
+<%- end %>
 <div class="separator"></div>
 
 <table class='user' cellspacing='0'>
@@ -15,36 +15,29 @@
   </tr>
   </thead>
   <tbody>
-<%% @<%= plural_table_name %>.each do |<%= singular_table_name %>| %>
+<%% @<%= plural_table_name %>.each do |<%= singular_table_name %>| -%>
   <tr id="tr<%%= <%= singular_table_name %>.id %>" class="<%%= cycle("odd", "even")%>">
 <%- attributes.each do |attribute| -%>
-    <%- case attribute.type
-        when :boolean -%>
-    <td><%%= <%= singular_table_name %>.<%= attribute.name %> ? style_image_tag("ico_v.png", :class => "ico_true") : style_image_tag("ico_x.png", :class => "ico_false") %></td>
-    <%- when :references, :belongs_to -%>
-    <%% link_name = <%= singular_table_name %>.<%= attribute.name %>.try(:name) || <%= singular_table_name %>.<%= attribute.name %>.try(:id) %>
-    <td><%%= link_to(link_name, <%= singular_table_name %>.<%= attribute.name %> ) %></td>
-    <%-	else -%>
-    <td><%%= <%= singular_table_name %>.<%= attribute.name %> %></td>
-    <%- end -%>
+    <td><%= attribute_to_erb(attribute, singular_table_name) -%></td>
 <%- end -%>
-    <td><%%= link_to t(:show), <%= singular_table_name %> %></td>
+    <!-- Manage section, do not remove this tag -->
+    <td><%%= link_to t(:show), <%= show_resource_path %><%= ", :remote => remote" if jquery_ui? %> %></td>
     <%- if authorization? -%>
-    <%% if can? :update, <%= singular_table_name %> -%>
+    <%%- if can? :update, <%= singular_table_name %> -%>
     <%- end -%>
-    <td><%%= link_to t(:edit), edit_<%= singular_table_name %>_path(<%= singular_table_name %>) %></td>
+    <td><%%= link_to t(:edit), <%= edit_resource_path %> %></td>
     <%- if authorization? -%>
-    <%% end -%>
+    <%%- end -%>
     <%- end -%>
     <%- if authorization? -%>
-    <%% if can? :destroy, <%= singular_table_name %> -%>
+    <%%- if can? :destroy, <%= singular_table_name %> -%>
     <%- end -%>
-    <td><%%= link_to t(:destroy), <%= singular_table_name %>, <%= key_value :confirm, "t(:sure?)" %>, <%= key_value :method, ":delete" %>, :remote => remote %></td>
+    <td><%%= link_to t(:destroy), <%= destroy_resource_path %>, <%= key_value :confirm, "t(:sure?)" %>, <%= key_value :method, ":delete" %>, :remote => remote %></td>
     <%- if authorization? -%>
-    <%% end -%>
+    <%%- end -%>
     <%- end -%>
   </tr>
-<%% end %>
+<%% end -%>
   </tbody>
 </table>
 

data/lib/generators/erb/leosca/templates/_show.erb

@@ -0,0 +1,9 @@
+<table>
+<%- attributes.each do |attribute| -%>
+
+<tr>
+    <td><b><%%= t('attributes.<%= singular_table_name %>.<%= attribute.name %>') %>:</b></td>
+    <td><%= attribute_to_erb(attribute, "@#{singular_table_name}") %></td>
+</tr>
+<%- end -%>
+</table>

data/lib/generators/erb/leosca/templates/edit.html.erb

@@ -1,11 +1,9 @@
-<%% secondary_navigation({:value => link_to(t(:list), <%= plural_table_name %>_path)},
-                        ({:value => link_to(t(:add), new_<%= singular_table_name %>_path)}<%= " if can?(:create, @#{singular_table_name})" if authorization? %>),
+<%% secondary_navigation({:value => link_to(t(:list), <%= list_resources_path %>)},
+                        ({:value => link_to(t(:add), <%= new_resource_path %>)}<%= " if can?(:create, @#{singular_table_name})" if authorization? %>),
                         {:value => t(:edit), :active => true},
-                        {:value => link_to(t(:show), @<%= singular_table_name %>)}
+                        {:value => link_to(t(:show), <%= show_resource_path("@") %>)}
 ) %>
 
 <%% title t('attributes.<%= singular_table_name %>.op_edit') %>
 
 <%%= render 'form' %>
-<!--<%%#= link_to t(:show), @<%= singular_table_name %> %> |-->
-<!--<%%#= link_to t(:back), <%= index_helper %>_path %>-->

data/lib/generators/erb/leosca/templates/formtastic/_form.html.erb

@@ -1,11 +1,17 @@
-<%%= semantic_form_for(@<%= singular_table_name %>) do |f| %>
+<%%= semantic_form_for(<%= form_resource_path %>) do |f| %>
     <%%= f.inputs do %>
     <%- attributes.each do |attribute| -%>
         <%- case attribute.type
-            when :date -%>
-            <%%= f.input :<%= attribute.name %>, :as => :string, :input_html => { :class => 'calendar', :maxlength => 10 } %>
-        <%-	else -%>
+            when :references, :belongs_to  -%>
+        <%% if @<%= singular_table_name %>.new_record? -%>
+            <%%= f.input :<%= attribute.name %> if can?(:manage, <%=class_name %>) %>
+        <%% else -%>
             <%%= f.input :<%= attribute.name %> %>
+        <%% end -%>
+        <%-	when :date -%>
+        <%%= f.input :<%= attribute.name %>, :as => :string, :input_html => { :class => 'calendar', :maxlength => 10 } %>
+        <%-	else -%>
+        <%%= f.input :<%= attribute.name %> %>
         <%- end -%>
     <%- end -%>
     <%% end %>

data/lib/generators/erb/leosca/templates/index.html.erb

@@ -1,16 +1,28 @@
 <%% secondary_navigation({:value => t(:list), :active => true},
-                        ({:value => link_to(t(:add), new_<%= singular_table_name %>_path)}<%= " if can?(:create, @#{singular_table_name})" if authorization? %>)
+                        ({:value => link_to(t(:add), <%= new_resource_path %> )}<%= " if can?(:create, @#{singular_table_name})" if authorization? %>)
 ) %>
 
-<%% title t('attributes.<%= singular_table_name %>.op_index') %>
+<%% title t('attributes.<%= singular_table_name %>.op_index'<%= ", {:parent => \"#{last_parent}\", :name => @#{last_parent}.try(:name) || @#{last_parent}.try(:id)}" if nested? -%>) %>
 
 <%% remote = <%= options.remote? %> %>
-<%%= form_for :<%= singular_table_name %>, :remote => remote, :html => { :method => :get, :id => "form_search" } do |f| %>
+<%%= form_for <%= show_resource_path("@") %>, :remote => remote, :html => { :method => :get, :id => "form_search" } do |f| %>
 <div class="filter-container">
   <%- attributes.each do |attribute| -%>
   <div class="filter-field">
+    <%- case attribute.type -%>
+    <%-	when :references, :belongs_to -%>
+        <%- unless nested? -%>
+    <b><%%= f.label :<%= attribute.name %>, t('attributes.<%= singular_table_name %>.<%= attribute.name %>') %></b><br />
+        <%- end -%>
+    <%- else -%>
     <b><%%= f.label :<%= attribute.name %>, t('attributes.<%= singular_table_name %>.<%= attribute.name %>') %></b><br />
+    <%- end -%>
+
     <%- case attribute.type -%>
+    <%-	when :references, :belongs_to -%>
+        <%- unless nested? -%>
+        <%%= f.collection_select :<%= attribute.name %>_id, <%= attribute.name.classify %>.all, :id, :name, :prompt => true %>
+        <%- end -%>
     <%-	when :boolean -%>
         <%%= radio_button("<%= singular_table_name %>", "<%= attribute.name %>", "1", {:checked => (@<%= singular_table_name %>.<%= attribute.name %>)}) %><%%= label_tag "<%= singular_table_name %>_<%= attribute.name %>_1", t(:yes) %><br />
         <%%= radio_button("<%= singular_table_name %>", "<%= attribute.name %>", "0", {:checked => (!@<%= singular_table_name %>.<%= attribute.name %>)}) %><%%= label_tag "<%= singular_table_name %>_<%= attribute.name %>_0", t(:no) %><br />
@@ -22,7 +34,6 @@
     <%-	else -%>
         <%%= f.<%= attribute.field_type %> :<%= attribute.name %> %>
     <%- end -%>
-
   </div>
   <%- end -%>
   <div style="clear:both;">

data/lib/generators/erb/leosca/templates/new.html.erb

@@ -1,4 +1,4 @@
-<%% secondary_navigation({:value => link_to(t(:list), <%= plural_table_name %>_path)},
+<%% secondary_navigation({:value => link_to(t(:list), <%= list_resources_path %>)},
                         {:value => t(:add), :active => true})
 %>
 

data/lib/generators/erb/leosca/templates/show.html.erb

@@ -1,25 +1,8 @@
-<%% secondary_navigation({:value => link_to(t(:list),<%= plural_table_name %>_path)},
-                        ({:value => link_to(t(:add), new_<%= singular_table_name %>_path)}<%= " if can?(:create, @#{singular_table_name})" if authorization? %>),
-                        ({:value => link_to(t(:edit), edit_<%= singular_table_name %>_path(@<%= singular_table_name %>))}<%= " if can?(:update, @#{singular_table_name})" if authorization? %>),
-                        {:value => link_to(t(:show), @<%= singular_table_name %>), :active => true}
+<%% secondary_navigation({:value => link_to(t(:list), <%= list_resources_path %>)},
+                        ({:value => link_to(t(:add), <%= new_resource_path %>)}<%= " if can?(:create, @#{singular_table_name})" if authorization? %>),
+                        ({:value => link_to(t(:edit), <%= edit_resource_path("@") %>)}<%= " if can?(:update, @#{singular_table_name})" if authorization? %>),
+                        {:value  => t(:show), :active => true}
 )%>
 
-<table>
-<% attributes.each do |attribute| -%>
-<tr>
-  <%- case attribute.type
-      when :boolean -%>
-    <td><b><%%= t('attributes.<%= singular_table_name %>.<%= attribute.name %>') %>:</b></td>
-    <td><%%= @<%= singular_table_name %>.<%= attribute.name %> ? style_image_tag("ico_v.png", :class => "ico_true") : style_image_tag("ico_x.png", :class => "ico_false") %></td>
-  <%- when :references, :belongs_to -%>
-    <%% link_name = @<%= singular_table_name %>.<%= attribute.name %>.try(:name) || @<%= singular_table_name %>.<%= attribute.name %>.try(:id) %>
-    <td><b><%%= t('attributes.<%= singular_table_name %>.<%= attribute.name %>') %>:</b></td>
-    <td><%%= link_to(link_name, @<%= singular_table_name %>.<%= attribute.name %> ) %></td>
-  <%- else -%>
-    <td><b><%%= t('attributes.<%= singular_table_name %>.<%= attribute.name %>') %>:</b></td>
-    <td><%%= @<%= singular_table_name %>.<%= attribute.name %> %></td>
-  <%- end -%>
-</tr>
-<% end -%>
-</table>
+<%%= render 'show' %>
 

data/lib/generators/erb/leosca/templates/show.js.erb

@@ -0,0 +1,7 @@
+var $dialog = $('<div></div>')
+    .html("<%%= escape_javascript(render('show'))%>")
+    .dialog({
+        autoOpen: false,
+        title: '<%%= "#{t(:show)}"%>'
+    });
+$dialog.dialog('open');

data/lib/generators/leolay/USAGE

@@ -5,7 +5,7 @@ Rails version supported:
     3.1
 
 Available layout:
-    ergo [default]
+    cloudy [default]
 
 Example:
     rails generate leolay