leonardo 1.6.0 → 1.6.1

data/CHANGELOG

@@ -1,3 +1,8 @@
+1.6.1 (September 20th, 2011) Marco Mastrodonato
+* Improved ajax show title
+* List resource: the link to parent show resource is now ajax (if remote = true)
+* Minor bug fix
+
 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

data/lib/generators/base.rb

@@ -69,7 +69,7 @@ module Leonardo
     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 :references, :belongs_to   then "<%= link_to((#{object}.#{attribute.name}.try(:name) || \"\#{t('models.#{attribute.name}')} \#{#{object}.#{attribute.name}.try(:id)}\"), #{object}.#{attribute.name}, :remote => remote) %>"
       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} %>"
@@ -122,6 +122,13 @@ module Leonardo
       "#{underscore_resource_path(:parent_singular_resource_plural)}_path(#{formatted_parent_resources("@")})"
     end
 
+    #product under category => category_products_path(category)
+    #product under brand/category => brand_category_products_path(@brand, category)
+    def list_resources_path_back
+      return unless nested?
+      "#{underscore_resource_path(:parent_singular_resource_plural)}_path(#{formatted_parent_resources("@").reverse.sub(/@/, "").reverse})"
+    end
+
     #product => "product"
     #product under category => "[@category, product]"
     #product under brand/category => "[@brand, @category, product]"

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

@@ -69,7 +69,7 @@ module Erb
         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>
+              <td><%= link_to t('models.#{plural_table_name}'), #{list_resources_path_back} %></td>
 
           FILE
         end if File.exists?(file)

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

@@ -4,7 +4,7 @@
 
 <%% 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? %> %>
+<%% remote = @remote %>
 <%%= form_for <%= show_resource_path("@") %>, :remote => remote, :html => { :method => :get, :id => "form_search" } do |f| %>
 <div class="filter-container">
   <%- attributes.each do |attribute| -%>

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

@@ -4,5 +4,5 @@
                         {:value  => t(:show), :active => true}
 )%>
 
-<%%= render 'show' %>
+<%%= render 'show', :remote => @remote %>
 

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

@@ -2,6 +2,6 @@ var $dialog = $('<div></div>')
     .html("<%%= escape_javascript(render('show'))%>")
     .dialog({
         autoOpen: false,
-        title: '<%%= "#{t(:show)}"%>'
+        title: '<%%= "#{t('models.<%= singular_table_name %>')} #{@<%= singular_table_name %>.try(:name) || @<%= singular_table_name %>.try(:id)}"%>'
     });
 $dialog.dialog('open');

data/lib/generators/rails/leosca_controller/templates/controller.rb

@@ -2,7 +2,15 @@
 class <%= controller_class_name %>Controller < ApplicationController
   <%= "before_filter :authenticate_user!#{CRLF}" if authentication? -%>
   <%= "load_and_authorize_resource#{CRLF}" if authorization? -%>
-  <%= "before_filter :load_parents#{CRLF}" if nested? -%>
+  <%#= "before_filter :load_parents#{CRLF}" if nested? -%>
+  before_filter :load_before
+
+  def load_before
+    @remote = <%= options.remote? %>
+    <% base_parent_resources.each do |parent| -%>
+    @<%= parent %> = <%= parent.classify %>.find params[:<%= parent %>_id]
+    <% end -%>
+  end
 
 <% if nested? -%>
   def load_parents
@@ -19,11 +27,11 @@ end
     conditions_fields = []
     conditions_values = []
 
-    <%- attributes.each do |attribute| -%>
-    <% if nested? && (attribute.type == :references || attribute.type == :belongs_to) -%>
-conditions_fields << "#{<%= class_name %>.table_name}.<%= base_parent_resources.last %>_id = ?"
-    conditions_values << @<%= base_parent_resources.last %>.id
-    <%- end -%>
+    <%- base_parent_resources.each do |parent| -%>
+      <%- if attributes.map(&:name).include? parent -%>
+    conditions_fields << "#{<%= class_name %>.table_name}.<%= parent %>_id = ?"
+    conditions_values << @<%= parent %>.id
+      <%- end -%>
     <%- end -%>
 
     if params[:<%= singular_table_name %>]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: leonardo
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 1
   - 6
-  - 0
-  version: 1.6.0
+  - 1
+  version: 1.6.1
 platform: ruby
 authors: 
 - Marco Mastrodonato
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-16 00:00:00 Z
+date: 2011-09-20 00:00:00 Z
 dependencies: []
 
 description: A generator for creating Rails 3.1 applications ready to go. It generates the layout, the style, the internationalization and manage external gems for authentication, authorization and other. It also provides a customized scaffold to generates cool sites ajax ready in few minutes. If you find a bug please report to m.mastrodonato@gmail.com