leonardo 1.5.0 → 1.6.0

data/lib/generators/leolay/templates/lib/templates/rspec/scaffold/routing_spec.rb

@@ -0,0 +1,37 @@
+require "spec_helper"
+
+describe <%= controller_class_name %>Controller do
+  describe "routing" do
+
+<% unless options[:singleton] -%>
+    it "routes to #index" do
+      get("/<%= plural_parent_resources.join('/1/') %><%= "/1/" if nested? %><%= ns_table_name %>").should route_to("<%= ns_table_name %>#index"<%= nested_params_http_request("1") %>)
+    end
+
+<% end -%>
+    it "routes to #new" do
+      get("/<%= plural_parent_resources.join('/1/') %><%= "/1/" if nested? %><%= ns_table_name %>/new").should route_to("<%= ns_table_name %>#new"<%= nested_params_http_request("1") %>)
+    end
+
+    it "routes to #show" do
+      get("/<%= plural_parent_resources.join('/1/') %><%= "/1/" if nested? %><%= ns_table_name %>/1").should route_to("<%= ns_table_name %>#show", :id => "1"<%= nested_params_http_request("1") %>)
+    end
+
+    it "routes to #edit" do
+      get("/<%= plural_parent_resources.join('/1/') %><%= "/1/" if nested? %><%= ns_table_name %>/1/edit").should route_to("<%= ns_table_name %>#edit", :id => "1"<%= nested_params_http_request("1") %>)
+    end
+
+    it "routes to #create" do
+      post("/<%= plural_parent_resources.join('/1/') %><%= "/1/" if nested? %><%= ns_table_name %>").should route_to("<%= ns_table_name %>#create"<%= nested_params_http_request("1") %>)
+    end
+
+    it "routes to #update" do
+      put("/<%= plural_parent_resources.join('/1/') %><%= "/1/" if nested? %><%= ns_table_name %>/1").should route_to("<%= ns_table_name %>#update", :id => "1"<%= nested_params_http_request("1") %>)
+    end
+
+    it "routes to #destroy" do
+      delete("/<%= plural_parent_resources.join('/1/') %><%= "/1/" if nested? %><%= ns_table_name %>/1").should route_to("<%= ns_table_name %>#destroy", :id => "1"<%= nested_params_http_request("1") %>)
+    end
+
+  end
+end

data/lib/generators/leolay/templates/lib/templates/rspec/scaffold/show_spec.rb

@@ -17,6 +17,9 @@ end
 describe "<%= ns_table_name %>/show.html.<%= options[:template_engine] %>" do
   before(:each) do
     @<%= ns_file_name %> = assign(:<%= ns_file_name %>, Factory(:<%= ns_file_name %>) )
+    <%- base_parent_resources.each do |parent| -%>
+    @<%= parent %> = assign(:<%= parent %>, @<%= ns_file_name %>.<%= parent %>)
+    <%- end -%>
   end
 
   it "renders attributes" do

data/lib/generators/leolay/templates/{vendor/assets/stylesheets → styles/cloudy/stylesheets/vendor}/jquery-ui/jquery-ui-1.8.16.redcarpet.css

@@ -59,26 +59,26 @@
 .ui-widget { font-family: Trebuchet MS, Tahoma, Verdana, Arial, sans-serif; font-size: 1.1em; }
 .ui-widget .ui-widget { font-size: 1em; }
 .ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Trebuchet MS, Tahoma, Verdana, Arial, sans-serif; font-size: 1em; }
-.ui-widget-content { border: 1px solid #dddddd; background: #eeeeee url(styles/cloudy/jquery-ui/ui-bg_highlight-soft_100_eeeeee_1x100.png) 50% top repeat-x; color: #333333; }
+.ui-widget-content { border: 1px solid #dddddd; background: #eeeeee url(../styles/cloudy/jquery-ui/ui-bg_highlight-soft_100_eeeeee_1x100.png) 50% top repeat-x; color: #333333; }
 .ui-widget-content a { color: #333333; }
-.ui-widget-header { border: 1px solid #990000; background: #cc0000 url(styles/cloudy/jquery-ui/ui-bg_gloss-wave_35_f6a828_500x100.png) 50% 50% repeat-x; color: #ffffff; font-weight: bold; }
+.ui-widget-header { border: 1px solid #990000; background: #cc0000 url(../styles/cloudy/jquery-ui/ui-bg_gloss-wave_35_f6a828_500x100.png) 50% 50% repeat-x; color: #ffffff; font-weight: bold; }
 .ui-widget-header a { color: #ffffff; }
 
 /* Interaction states
 ----------------------------------*/
-.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #cccccc; background: #f6f6f6 url(styles/cloudy/jquery-ui/ui-bg_glass_100_f6f6f6_1x400.png) 50% 50% repeat-x; font-weight: bold; color: #1c94c4; }
+.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #cccccc; background: #f6f6f6 url(../styles/cloudy/jquery-ui/ui-bg_glass_100_f6f6f6_1x400.png) 50% 50% repeat-x; font-weight: bold; color: #1c94c4; }
 .ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #1c94c4; text-decoration: none; }
-.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #ff0000; background: #fdf5ce url(styles/cloudy/jquery-ui/ui-bg_glass_100_fdf5ce_1x400.png) 50% 50% repeat-x; font-weight: bold; color: #990000; }
+.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #ff0000; background: #fdf5ce url(../styles/cloudy/jquery-ui/ui-bg_glass_100_fdf5ce_1x400.png) 50% 50% repeat-x; font-weight: bold; color: #990000; }
 .ui-state-hover a, .ui-state-hover a:hover { color: #990000; text-decoration: none; }
-.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #ff0000; background: #ffffff url(styles/cloudy/jquery-ui/ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x; font-weight: bold; color: #990000; }
+.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #ff0000; background: #ffffff url(../styles/cloudy/jquery-ui/ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x; font-weight: bold; color: #990000; }
 .ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #990000; text-decoration: none; }
 .ui-widget :active { outline: none; }
 
 /* Interaction Cues
 ----------------------------------*/
-.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight  {border: 1px solid #ff0000; background: #ff0000 url(styles/cloudy/jquery-ui/ui-bg_highlight-soft_75_ffe45c_1x100.png) 50% top repeat-x; color: #363636; }
+.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight  {border: 1px solid #ff0000; background: #ff0000 url(../styles/cloudy/jquery-ui/ui-bg_highlight-soft_75_ffe45c_1x100.png) 50% top repeat-x; color: #363636; }
 .ui-state-highlight a, .ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a { color: #363636; }
-.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #cd0a0a; background: #b81900 url(styles/cloudy/jquery-ui/ui-bg_diagonals-thick_18_b81900_40x40.png) 50% 50% repeat; color: #ffffff; }
+.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #cd0a0a; background: #b81900 url(../styles/cloudy/jquery-ui/ui-bg_diagonals-thick_18_b81900_40x40.png) 50% 50% repeat; color: #ffffff; }
 .ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { color: #ffffff; }
 .ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { color: #ffffff; }
 .ui-priority-primary, .ui-widget-content .ui-priority-primary, .ui-widget-header .ui-priority-primary { font-weight: bold; }
@@ -89,14 +89,14 @@
 ----------------------------------*/
 
 /* states and images */
-.ui-icon { width: 16px; height: 16px; background-image: url(styles/cloudy/jquery-ui/ui-icons_222222_256x240.png); }
-.ui-widget-content .ui-icon {background-image: url(styles/cloudy/jquery-ui/ui-icons_222222_256x240.png); }
-.ui-widget-header .ui-icon {background-image: url(styles/cloudy/jquery-ui/ui-icons_ffffff_256x240.png); }
-.ui-state-default .ui-icon { background-image: url(styles/cloudy/jquery-ui/ui-icons_ef8c08_256x240.png); }
-.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(styles/cloudy/jquery-ui/ui-icons_ef8c08_256x240.png); }
-.ui-state-active .ui-icon {background-image: url(styles/cloudy/jquery-ui/ui-icons_ef8c08_256x240.png); }
-.ui-state-highlight .ui-icon {background-image: url(styles/cloudy/jquery-ui/ui-icons_228ef1_256x240.png); }
-.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(styles/cloudy/jquery-ui/ui-icons_ffd27a_256x240.png); }
+.ui-icon { width: 16px; height: 16px; background-image: url(../styles/cloudy/jquery-ui/ui-icons_222222_256x240.png); }
+.ui-widget-content .ui-icon {background-image: url(../styles/cloudy/jquery-ui/ui-icons_222222_256x240.png); }
+.ui-widget-header .ui-icon {background-image: url(../styles/cloudy/jquery-ui/ui-icons_ffffff_256x240.png); }
+.ui-state-default .ui-icon { background-image: url(../styles/cloudy/jquery-ui/ui-icons_ef8c08_256x240.png); }
+.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(../styles/cloudy/jquery-ui/ui-icons_ef8c08_256x240.png); }
+.ui-state-active .ui-icon {background-image: url(../styles/cloudy/jquery-ui/ui-icons_ef8c08_256x240.png); }
+.ui-state-highlight .ui-icon {background-image: url(../styles/cloudy/jquery-ui/ui-icons_228ef1_256x240.png); }
+.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(../styles/cloudy/jquery-ui/ui-icons_ffd27a_256x240.png); }
 
 /* positioning */
 .ui-icon-carat-1-n { background-position: 0 0; }
@@ -286,8 +286,8 @@
 .ui-corner-all, .ui-corner-bottom, .ui-corner-right, .ui-corner-br { -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; -khtml-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; }
 
 /* Overlays */
-.ui-widget-overlay { background: #666666 url(styles/cloudy/jquery-ui/ui-bg_diagonals-thick_20_666666_40x40.png) 50% 50% repeat; opacity: .50;filter:Alpha(Opacity=50); }
-.ui-widget-shadow { margin: -5px 0 0 -5px; padding: 5px; background: #000000 url(styles/cloudy/jquery-ui/ui-bg_flat_10_000000_40x100.png) 50% 50% repeat-x; opacity: .20;filter:Alpha(Opacity=20); -moz-border-radius: 5px; -khtml-border-radius: 5px; -webkit-border-radius: 5px; border-radius: 5px; }/*
+.ui-widget-overlay { background: #666666 url(../styles/cloudy/jquery-ui/ui-bg_diagonals-thick_20_666666_40x40.png) 50% 50% repeat; opacity: .50;filter:Alpha(Opacity=50); }
+.ui-widget-shadow { margin: -5px 0 0 -5px; padding: 5px; background: #000000 url(../styles/cloudy/jquery-ui/ui-bg_flat_10_000000_40x100.png) 50% 50% repeat-x; opacity: .20;filter:Alpha(Opacity=20); -moz-border-radius: 5px; -khtml-border-radius: 5px; -webkit-border-radius: 5px; border-radius: 5px; }/*
  * jQuery UI Resizable 1.8.16
  *
  * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)

data/lib/generators/leolay/templates/vendor/assets/javascripts/jquery-ui/jquery.ui.datepicker-de.js

@@ -14,7 +14,7 @@ jQuery(function($){
 		dayNamesShort: ['So','Mo','Di','Mi','Do','Fr','Sa'],
 		dayNamesMin: ['So','Mo','Di','Mi','Do','Fr','Sa'],
 		weekHeader: 'Wo',
-		dateFormat: 'dd.mm.yy',
+		dateFormat: 'dd-mm-yy',
 		firstDay: 1,
 		isRTL: false,
 		showMonthAfterYear: false,

data/lib/generators/leolay/templates/vendor/assets/javascripts/jquery-ui/jquery.ui.datepicker-en.js

@@ -14,7 +14,7 @@ jQuery(function($){
 		dayNamesShort: ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'],
 		dayNamesMin: ['Su','Mo','Tu','We','Th','Fr','Sa'],
 		weekHeader: 'Wk',
-		dateFormat: 'dd/mm/yy',
+		dateFormat: 'dd-mm-yy',
 		firstDay: 1,
 		isRTL: false,
 		showMonthAfterYear: false,

data/lib/generators/leolay/templates/vendor/assets/javascripts/jquery-ui/jquery.ui.datepicker-it.js

@@ -14,7 +14,7 @@ jQuery(function($){
 		dayNamesShort: ['Dom','Lun','Mar','Mer','Gio','Ven','Sab'],
 		dayNamesMin: ['Do','Lu','Ma','Me','Gi','Ve','Sa'],
 		weekHeader: 'Sm',
-		dateFormat: 'dd/mm/yy',
+		dateFormat: 'dd-mm-yy',
 		firstDay: 1,
 		isRTL: false,
 		showMonthAfterYear: false,

data/lib/generators/leosca/install_generator.rb

@@ -8,7 +8,7 @@ module Leosca
         directory "erb/leosca", "lib/generators/erb/leosca" if options.erb?
         directory "rails/leosca", "lib/generators/rails/leosca"
         directory "rails/leosca_controller", "lib/generators/rails/leosca_controller"
-        #copy_file "leonardo_shared.rb", "lib/generators/leonardo_shared.rb"
+        copy_file "base.rb", "lib/generators/base.rb"
       end
     end
   end

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

@@ -1,8 +1,10 @@
 require 'rails/generators/rails/resource/resource_generator'
+require File.join(File.dirname(__FILE__), '../../base')
 
 module Rails
   module Generators
     class LeoscaGenerator < ResourceGenerator #metagenerator
+      include ::Leonardo::Nested
       #puts 'rails:leosca'
 
       remove_hook_for :resource_controller
@@ -10,6 +12,7 @@ module Rails
 
       class_option :stylesheets, :type => :boolean, :default => false, :desc => "Generate Stylesheets"
       class_option :stylesheet_engine, :desc => "Engine for Stylesheets"
+      class_option :under, :type => :string, :default => "", :banner => "brand/category", :desc => "Choose namespace(s) if resource must be nested"
 
       hook_for :leosca_controller, :required => true
 
@@ -21,6 +24,24 @@ module Rails
         invoke stylesheet_engine, [controller_name] if options[:stylesheets] && behavior == :invoke
       end
 
+      #Override resource def
+      def add_resource_route
+        return if options[:actions].present?
+
+        if options[:under].present?
+          route_resources = plural_parent_resources
+          route_map = "resources"
+        else
+          route_resources = regular_class_path
+          route_map = "namespace"
+        end
+
+        route_config =  route_resources.collect{|m| "#{route_map} :#{m} do " }.join(" ")
+        route_config << "resources :#{file_name.pluralize}"
+        route_config << " end" * route_resources.size
+        route route_config
+      end
+
     end
   end
 end

data/lib/generators/rails/leosca_controller/leosca_controller_generator.rb

@@ -1,5 +1,5 @@
 require 'rails/generators/resource_helpers'
-#require '../../leonardo_shared' #I'd like to share common code but it can't find that module :(
+require File.join(File.dirname(__FILE__), '../../base')
 
 WINDOWS = (RUBY_PLATFORM =~ /dos|win32|cygwin/i) || (RUBY_PLATFORM =~ /(:?mswin|mingw)/)
 CRLF = WINDOWS ? "\r\n" : "\n"
@@ -8,14 +8,17 @@ module Rails
   module Generators
     class LeoscaControllerGenerator < NamedBase
       include ResourceHelpers
-      #include LeonardoShared
+      include ::Leonardo::Leosca
+      include ::Leonardo::Nested
+      include ::Leonardo::Nested::Test
       #puts 'rails:leosca_controller'
 
       source_root File.expand_path('../templates', __FILE__)
       argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
-      class_option :seeds, :type => :boolean, :default => true, :description => "Create seeds to run with rake db:seed"
-      class_option :seeds_elements, :type => :string, :default => "30", :description => "Choose seeds elements", :banner => "NUMBER OF ARRAY ELEMENTS"
-      class_option :remote, :type => :boolean, :default => true, :description => "Enable ajax. You can also do later set remote to true into index view."
+      class_option :seeds, :type => :boolean, :default => true, :desc => "Create seeds to run with rake db:seed"
+      class_option :seeds_elements, :type => :string, :default => "30", :desc => "Choose seeds elements", :banner => "NUMBER"
+      class_option :remote, :type => :boolean, :default => true, :desc => "Enable ajax. You can also do later set remote to true into index view."
+      class_option :under, :type => :string, :default => "", :banner => "brand/category", :desc => "Nested resources"
 
 
       check_class_collision :suffix => "Controller"
@@ -48,17 +51,21 @@ module Rails
           inject_into_file file, :after => "#Attributes zone - do not remove#{CRLF}" do
             content = "      #{file_name}:#{CRLF}"
             attributes.each do |attribute|
-              content << "        #{attribute.name}: \"#{camel_case attribute.name}\"#{CRLF}"
+              content << "        #{attribute.name}: \"#{attribute.name.humanize}\"#{CRLF}"
             end
             content << "        op_new: \"New #{singular_table_name}\"#{CRLF}"
             content << "        op_edit: \"Editing #{singular_table_name}\"#{CRLF}"
-            content << "        op_index: \"Listing #{plural_table_name}\"#{CRLF}"
+            if nested?
+              content << "        op_index: \"Listing #{plural_table_name} belongings to %{parent} %{name}\"#{CRLF}"
+            else
+              content << "        op_index: \"Listing #{plural_table_name}\"#{CRLF}"
+            end
             content
           end
 
           #Model name
           inject_into_file file, :after => "models: &models#{CRLF}" do
-            <<-FILE.gsub(/^    /, '')
+            <<-FILE.gsub(/^      /, '')
             #{file_name}: "#{file_name.capitalize}"
             #{controller_name}: "#{controller_name.capitalize}"
             FILE
@@ -68,7 +75,7 @@ module Rails
           inject_into_file file, :after => "    hints:#{CRLF}" do
             content = "      #{file_name}:#{CRLF}"
             attributes.each do |attribute|
-              attr_name = attribute.name.gsub '_', ''
+              attr_name = attribute.name.humanize
               case attribute.type
               when :integer, :decimal, :float
                 content << "        #{attribute.name}: \"Fill the #{attr_name} with a#{"n" if attribute.type == :integer} #{attribute.type.to_s} number\"#{CRLF}"
@@ -76,7 +83,7 @@ module Rails
                 content << "        #{attribute.name}: \"Select if this #{file_name} should be #{attr_name} or not\"#{CRLF}"
               when :string, :text
                 content << "        #{attribute.name}: \"Choose a good #{attr_name} for this #{file_name}\"#{CRLF}"
-              when :date, :datetime, :time
+              when :date, :datetime, :time, :timestamp
                 content << "        #{attribute.name}: \"Choose a #{attribute.type.to_s} for #{attr_name}\"#{CRLF}"
               else
                 content << "        #{attribute.name}: \"Choose a #{attr_name}\"#{CRLF}"
@@ -88,17 +95,6 @@ module Rails
         end
       end
 
-      def update_layout_html
-        file = "app/views/layouts/_#{CONFIG[:default_style]}.html.erb"
-        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="<%= #{controller_name}_path %>"><%= t('models.#{controller_name}') %></a></li>
-                      #{"<% end -%>" if authorization?}
-          FILE
-        end if File.exists?(file)
-      end
-
       def update_ability_model
         file = "app/models/ability.rb"
         return unless File.exists?(file)
@@ -148,7 +144,7 @@ module Rails
 
         check_attr_to_have, check_attr_to_not_have = get_attr_to_match
 
-        file = "spec/requests/#{plural_table_name}_spec.rb"
+        file = "spec/requests/#{plural_path_file_name}_spec.rb"
         remove = <<-FILE.gsub(/^      /, '')
           it "works! (now write some real specs)" do
             # Run the generator again with the --webrat flag if you want to use webrat methods/matchers
@@ -163,23 +159,12 @@ module Rails
 
           it "displays #{plural_table_name}" do
             #{singular_table_name} = Factory(:#{singular_table_name})
-            visit #{plural_table_name}_path
-            login_view_as(:user_guest)
+            visit #{list_resources_path_test}
+            #{"login_view_as(:user_guest)" if authentication?}
             #save_and_open_page #uncomment to debug
             page.should #{check_attr_to_have}
             assert page.find("#tr\#{#{singular_table_name}.id}").visible?
           end
-          it "checks ajax", :js => true do
-            #{singular_table_name} = Factory(:#{singular_table_name})
-            visit #{plural_table_name}_path
-            login_view_as(:user_manager)
-            page.should #{check_attr_to_have}
-            click_link "Destroy"
-            page.driver.browser.switch_to.alert.accept
-            #save_and_open_page #uncomment to debug
-            page.should #{check_attr_to_not_have}
-            assert !find("#tr\#{#{singular_table_name}.id}").visible?
-          end
         FILE
         end
 
@@ -193,8 +178,8 @@ module Rails
           describe "POST /#{plural_table_name}" do
             it "creates a new #{singular_table_name}" do
               #{singular_table_name} = Factory.build(:#{singular_table_name})
-              visit new_#{singular_table_name}_path
-              login_view_as(:user)
+              visit #{new_resource_path_test}
+              #{"login_view_as(:user_admin)" if authentication?}
         #{items.join(CRLF)}
               click_button "Create \#{I18n.t('models.#{singular_table_name}')}"
               #save_and_open_page #uncomment to debug
@@ -202,11 +187,29 @@ module Rails
               page.should #{check_attr_to_have}
             end
           end
+
+          describe "Check ajax /#{plural_table_name}" do
+            it "checks links on list page", :js => true do
+              #{singular_table_name} = Factory(:#{singular_table_name})
+              visit #{list_resources_path_test}
+              #{"login_view_as(:user_manager)" if authentication?}            #authentication
+              page.find("div#list").should #{check_attr_to_have}
+              click_link I18n.t(:show)
+              page.find("div.ui-dialog").should #{check_attr_to_have}         #checks if dialog is appeared
+              click_link "close"                                              #close dialog
+              !page.find("div.ui-dialog").visible?                            #checks if dialog has been closed
+              click_link I18n.t(:destroy)                                     #check ajax destroy
+              page.driver.browser.switch_to.alert.accept                      #confirms destroy
+              #save_and_open_page                                             #uncomment to debug
+              page.find("div#list").should #{check_attr_to_not_have}          #checks if content has been removed
+              !page.find("#tr\#{#{singular_table_name}.id}").visible?         #checks if row has been hidden
+            end
+          end
           FILE
         end
 
         file = "spec/factories.rb"
-        inject_into_file file, :after => "### Leonardo creates here below your factories ###" do
+        inject_into_file file, :before => "  ### Insert below here other your factories ###" do
           items = []
           attributes.each do |attribute|
             items << attribute_to_factories(attribute)
@@ -221,82 +224,6 @@ module Rails
 
       end
 
-      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"
-      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                    then "#{Time.now.strftime("%H:%M:%S.000")}".inspect
-          else                               "#{attribute.name.titleize}\#".inspect
-        end
-        " #{name} => #{value}"
-      end
-      def attribute_to_factories(attribute)
-        name = case attribute.type
-        when :references, :belongs_to   then  "#{singular_table_name[0..0]}.association                   "
-        when :boolean, :datetime, :time then  "#{singular_table_name[0..0]}.#{attribute.name}             "
-        else                                  "#{singular_table_name[0..0]}.sequence(:#{attribute.name})  "
-        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                    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         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 get_attr_to_match
-        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
-        return  "have_xpath('//table/tbody/tr')",
-                "have_no_xpath('//table/tbody/tr')"
-      end
-
     end
   end
 end

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

@@ -1,38 +1,59 @@
 <% module_namespacing do -%>
 class <%= controller_class_name %>Controller < ApplicationController
-  <%= "before_filter :authenticate_user!" if authentication? %>
-  <%= "load_and_authorize_resource" if authorization? %>
+  <%= "before_filter :authenticate_user!#{CRLF}" if authentication? -%>
+  <%= "load_and_authorize_resource#{CRLF}" if authorization? -%>
+  <%= "before_filter :load_parents#{CRLF}" if nested? -%>
+
+<% if nested? -%>
+  def load_parents
+  <% base_parent_resources.each do |parent| -%>
+  @<%= parent %> = <%= parent.classify %>.find params[:<%= parent %>_id]
+  <% end -%>
+end
+<% end -%>
 
   # GET <%= route_url %>
   # GET <%= route_url %>.json
   def index
     @<%= singular_table_name %> = <%= orm_class.build(class_name) %>
-    conditions = nil
+    conditions_fields = []
+    conditions_values = []
 
-    if params[:<%= singular_table_name %>]
-      request.format = :csv if params[:commit] == 'Csv'
-      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 -%>
+    <%- end -%>
 
+    if params[:<%= singular_table_name %>]
       <%- attributes.each do |attribute| -%>
-      if params[:<%= singular_table_name %>][:<%= attribute.name %>] && params[:<%= singular_table_name %>][:<%= attribute.name %>].length>0
-        <%- conditions_operator_sign = case attribute.type
-          when :string, :text then "LIKE"
-          else "="
-        end -%>
-        <%- conditions_operator_value = case attribute.type
-           when :string, :text then "%"
-           else ""
-        end -%>
-        conditions_fields << "#{<%= class_name %>.table_name}.<%= attribute.name %> <%= conditions_operator_sign %> ?"
-        conditions_values << "<%= conditions_operator_value %>#{params[:<%= singular_table_name %>][:<%= attribute.name %>]}<%= conditions_operator_value %>"
-        @<%= singular_table_name %>.<%= attribute.name %> = params[:<%= singular_table_name %>][:<%= attribute.name %>]
+      <%- attr_name = case attribute.type
+                 when :references, :belongs_to then "#{attribute.name}_id"
+                 else attribute.name
+              end -%>
+      <%- conditions_operator_sign = case attribute.type
+        when :string, :text then "LIKE"
+        else "="
+      end -%>
+      <%- conditions_operator_value = case attribute.type
+         when :string, :text then "%"
+         else ""
+      end -%>
+      <% unless nested? && (attribute.type == :references || attribute.type == :belongs_to) -%>
+
+      if params[:<%= singular_table_name %>][:<%= attr_name %>] && params[:<%= singular_table_name %>][:<%= attr_name %>].length>0
+        conditions_fields << "#{<%= class_name %>.table_name}.<%= attr_name %> <%= conditions_operator_sign %> ?"
+        conditions_values << "<%= conditions_operator_value %>#{params[:<%= singular_table_name %>][:<%= attr_name %>]}<%= conditions_operator_value %>"
+        @<%= singular_table_name %>.<%= attr_name %> = params[:<%= singular_table_name %>][:<%= attr_name %>]
       end
       <%- end -%>
+      <%- end -%>
 
-      conditions = conditions_fields.join(' and ').to_a + conditions_values
     end
 
+    conditions = conditions_fields.join(' and ').to_a + conditions_values
+
     request.format = :csv if params[:commit] == 'Csv'
     
     @<%= plural_table_name %> = case request.format
@@ -65,6 +86,7 @@ class <%= controller_class_name %>Controller < ApplicationController
     respond_to do |format|
       format.html # show.html.erb
       format.json { render <%= key_value :json, "@#{singular_table_name}" %> }
+      format.js
     end
   end
 
@@ -72,6 +94,9 @@ class <%= controller_class_name %>Controller < ApplicationController
   # GET <%= route_url %>/new.json
   def new
     @<%= singular_table_name %> = <%= orm_class.build(class_name) %>
+    <%- if nested? -%>
+    @<%= singular_table_name %>.<%= last_parent %>_id = @<%= last_parent %>.id
+    <%- end -%>
 
     respond_to do |format|
       format.html # new.html.erb
@@ -88,10 +113,13 @@ class <%= controller_class_name %>Controller < ApplicationController
   # POST <%= route_url %>.json
   def create
     @<%= singular_table_name %> = <%= orm_class.build(class_name, "params[:#{singular_table_name}]") %>
+    <%- if nested? -%>
+    @<%= singular_table_name %>.<%= last_parent %>_id ||= @<%= last_parent %>.id
+    <%- end -%>
 
     respond_to do |format|
       if @<%= orm_instance.save %>
-        format.html { redirect_to @<%= singular_table_name %>, <%= key_value :notice, "I18n.t(:created, :model => I18n.t('models.#{singular_table_name}'))" %> }
+        format.html { redirect_to <%= show_resource_path("@") %>, <%= key_value :notice, "I18n.t(:created, :model => I18n.t('models.#{singular_table_name}'))" %> }
         format.json { render <%= key_value :json, "@#{singular_table_name}" %>, <%= key_value :status, ':created' %>, <%= key_value :location, "@#{singular_table_name}" %> }
       else
         format.html { render <%= key_value :action, '"new"' %> }
@@ -107,7 +135,7 @@ class <%= controller_class_name %>Controller < ApplicationController
 
     respond_to do |format|
       if @<%= orm_instance.update_attributes("params[:#{singular_table_name}]") %>
-        format.html { redirect_to @<%= singular_table_name %>, <%= key_value :notice, "I18n.t(:updated, :model => I18n.t('models.#{singular_table_name}'))" %> }
+        format.html { redirect_to <%= show_resource_path("@") %>, <%= key_value :notice, "I18n.t(:updated, :model => I18n.t('models.#{singular_table_name}'))" %> }
         format.json { head :ok }
       else
         format.html { render <%= key_value :action, '"edit"' %> }
@@ -123,7 +151,7 @@ class <%= controller_class_name %>Controller < ApplicationController
     @<%= orm_instance.destroy %>
 
     respond_to do |format|
-      format.html { redirect_to <%= index_helper %>_url }
+      format.html { redirect_to <%= list_resources_path %> }
       format.json { head :ok }
       format.js
     end

data/template.rb

@@ -27,7 +27,8 @@ if use_git
   EOS
 end
 
-gem 'kaminari' if yes?("Pagination ?")
+pagination = yes?("Pagination ?")
+gem 'kaminari' if pagination
 
 gem 'paperclip' if yes?("Attachment ?")
 
@@ -80,6 +81,8 @@ end
 
 run "bundle install"
 
+generate "kaminari:config" if pagination
+
 generate "rspec:install" if rspec
 
 generate "formtastic:install" if formtastic