leonardo 1.6.1 → 1.7.0

data/CHANGELOG

@@ -1,8 +1,16 @@
+1.7.0 (October 1th, 2011) Marco Mastrodonato
+* New feature to add a resource management within a namescape. Unlike the original way (rails g leosca admin/resource ...which remains available), the resource is not under the namespace but only its management so you could create one for several kind of users. Try it adding the new option like this example: --leospace=admin
+* Huge code improvements
+
+
+
 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/erb/leosca/leosca_generator.rb

@@ -1,26 +1,22 @@
-require 'rails/generators/erb'
-require 'rails/generators/resource_helpers'
-require File.join(File.dirname(__FILE__), '../../base')
+require 'rails/generators/erb/scaffold/scaffold_generator'
+require File.join(File.dirname(__FILE__), '../../leonardo')
 
 module Erb
   module Generators
-    class LeoscaGenerator < Base
-      include Rails::Generators::ResourceHelpers
+    class LeoscaGenerator <  ::Erb::Generators::ScaffoldGenerator
       include ::Leonardo::Leosca
       include ::Leonardo::Nested
       #puts 'erb:leosca'
 
       source_root File.expand_path('../templates', __FILE__)
-      argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
       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)
-      end
+      class_option :under, :type => :string, :default => "", :banner => "brand/category", :desc => "To nest a resource under another(s)"
+      class_option :leospace, :type => :string, :default => "", :banner => ":admin", :desc => "To nest a resource under namespace(s)"
+      class_option :auth_class, :type => :boolean, :default => 'user', :desc => "Set the authentication class name"
 
+      #override
       def copy_view_files
         available_views.each do |view|
           filenames = filenames_all_formats(view, source_paths)
@@ -36,7 +32,7 @@ module Erb
             end
             filename_source = filename unless search_into_subfolder
 
-            template filename_source, File.join("app/views", controller_file_path, filename)
+            template filename_source, File.join("app/views", base_namespaces, controller_file_path, filename)
           end
         end
       end
@@ -44,20 +40,37 @@ module Erb
       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(/^            /, '')
+          inject_into_file file, :before => "            <!-- Insert above here other #{last_parent} elements -->" 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 -->
+                          <!-- Insert above here other #{singular_table_name} elements -->
                           #{"<% end -%>" if authorization?}
             FILE
           end if File.exists?(file)
+        #elsif leospaced?
+        #  inject_into_file file, :before => "            <!-- Insert above other elements -->" do
+        #    <<-FILE.gsub(/^              /, '')
+        #                  #{"<% if #{options.auth_class}_signed_in? && current_#{options.auth_class}.role?(#{last_namespace.inspect}) -%>" if authorization?}
+        #                  <li class="<%= controller.controller_path == '#{last_namespace}' ? 'active' : '' %>"><a href="<%= #{last_namespace}_index_path %>">#{last_namespace.capitalize}</a></li>
+        #                  <!-- Insert above here other #{last_namespace} elements -->
+        #                  #{"<% end -%>" if authorization?}
+        #    FILE
+        #  end if File.exists?(file)
+        #  inject_into_file file, :before => "            <!-- Insert above other elements -->" do
+        #    <<-FILE.gsub(/^              /, '')
+        #                  #{"<% if can?(:read, #{class_name}) -%>" if authorization?}
+        #                  <li class="<%= controller.controller_path == '#{formatted_namespace_path}#{controller_name}' ? 'active' : '' %>"><a href="<%= #{list_resources_path} %>"><%= t('models.#{plural_table_name}') %></a></li>
+        #                  <!-- Insert above 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
+          inject_into_file file, :before => "            <!-- Insert above other elements -->" 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 -->
+                        <li class="<%= controller.controller_path == '#{formatted_namespace_path}#{controller_name}' ? 'active' : '' %>"><a href="<%= #{list_resources_path} %>"><%= t('models.#{plural_table_name}') %></a></li>
+                        <!-- Insert above here other #{singular_table_name} elements -->
                         #{"<% end -%>" if authorization?}
             FILE
           end if File.exists?(file)
@@ -77,6 +90,7 @@ module Erb
 
     protected
 
+      #Override
       def available_views
         %w(index edit show new _form _list destroy _show)
       end

data/lib/generators/leolay/leolay_generator.rb

@@ -6,7 +6,7 @@ class LeolayGenerator < Rails::Generators::Base
   class_option :second_color, :type => :string, :default => nil, :desc => "Force a secondary color for the stylesheet"
   class_option :authentication, :type => :boolean, :default => true, :desc => "Add code to manage authentication with devise"
   class_option :authorization, :type => :boolean, :default => true, :desc => "Add code to manage authorization with cancan"
-  class_option :user_class, :type => :boolean, :default => 'user', :desc => "Set the user class name"
+  class_option :auth_class, :type => :boolean, :default => 'user', :desc => "Set the authentication class name"
   class_option :formtastic, :type => :boolean, :default => true, :desc => "Copy formtastic files into leosca custom folder (inside project)"
   class_option :jquery_ui, :type => :boolean, :default => true, :desc => "To use jQuery ui improvement"
   class_option :rspec, :type => :boolean, :default => true, :desc => "Include custom rspec generator and custom templates"
@@ -112,7 +112,7 @@ class LeolayGenerator < Rails::Generators::Base
   end
 
   def setup_authentication
-    file = "app/models/#{options.user_class}.rb"
+    file = "app/models/#{options.auth_class}.rb"
     #puts "File #{file} #{File.exists?(file) ? "" : "does not"} exists!"
     return unless options.authentication? and File.exists?(file)
 
@@ -133,6 +133,9 @@ class LeolayGenerator < Rails::Generators::Base
       def role?(role)
         roles.include? role.to_s
       end
+      def admin?
+        self.role? 'admin'
+      end
       FILE
     end
 
@@ -333,12 +336,12 @@ class LeolayGenerator < Rails::Generators::Base
     copy_file file, file
     file = "spec/helpers/application_helpers_spec.rb"
     copy_file file, file
-    file = "lib/templates/rspec/scaffold"
-    directory file, file
-    file = "lib/templates/rspec/scaffold"
-    directory file, file
-    file = "lib/generators/rspec/scaffold"
-    directory file, file
+    #file = "lib/templates/rspec/scaffold"
+    #directory file, file
+    #file = "lib/templates/rspec/scaffold"
+    #directory file, file
+    #file = "lib/generators/rspec/scaffold"
+    #directory file, file
 
   end
 

data/lib/generators/leolay/templates/spec/factories.rb

@@ -1,17 +1,17 @@
 FactoryGirl.define do
   factory :user do
-    email     'test@leonardo.com'
-    password  'abcd1234'
-    roles     ['user']
+    sequence(:email)      {|n| "test#{n}@leonardo.com" }
+    password              'abcd1234'
+    roles                 ['user']
 
     trait :guest do
-      roles ['guest']
+      roles               ['guest']
     end
     trait :manager do
-      roles ['manager']
+      roles               ['manager']
     end
     trait :admin do
-      roles ['admin']
+      roles               ['admin']
     end
 
     factory :user_guest,    :traits => [:guest]

data/lib/generators/{base.rb → leonardo.rb}

@@ -58,18 +58,18 @@ module Leonardo
     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 :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}"
+        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}, :remote => remote) %>"
+      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} %>"
@@ -92,28 +92,15 @@ module Leonardo
         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
 
   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
+    #Add leonardo namespace to class_path
+    #def class_path
+    #  super + base_namespaces
+    #end
 
     #product => products_path
     #product under category => category_products_path(@category)
@@ -124,6 +111,7 @@ module Leonardo
 
     #product under category => category_products_path(category)
     #product under brand/category => brand_category_products_path(@brand, category)
+    #TODO: figure out how to build links for a particular resource in the path
     def list_resources_path_back
       return unless nested?
       "#{underscore_resource_path(:parent_singular_resource_plural)}_path(#{formatted_parent_resources("@").reverse.sub(/@/, "").reverse})"
@@ -180,18 +168,34 @@ module Leonardo
       resources.size > 1 ? "#{delimiter[0..0]}#{str_resources}#{delimiter[1..1]}" : str_resources
     end
 
+    #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 under brand/category => ["brand", "category", "product"] or ["@brand", "@category", "@product"]
-    def resource_path(prefix_parent="", prefix_resource="", resource=nil)
+    def resource_path(prefix_parent="", prefix_resource="", resource=nil, prefix_namespace="")
       if resource
         prefix_parent = "#{resource}."
       else
         resource = singular_table_name
       end
 
+      prefix_namespace = ":" if prefix_namespace.empty? && prefix_parent.any?
+
       if nested?
-        parent_resources(prefix_parent) << "#{prefix_resource}#{resource}"
+        (base_namespaces(prefix_namespace) + parent_resources(prefix_parent)) << "#{prefix_resource}#{resource}"
       else
-        ["#{prefix_resource}#{resource}"]
+        base_namespaces(prefix_namespace) << "#{prefix_resource}#{resource}"
       end
     end
 
@@ -217,6 +221,7 @@ module Leonardo
 
     #product under brand/category => ["brand", "category"]
     def base_parent_resources
+      return [] unless options[:under].present?
       options[:under].split('/').map{|m| m.underscore}
     end
 
@@ -224,6 +229,25 @@ module Leonardo
       options[:under].present?
     end
 
+    ### NAMESPACE ###
+    def leospaced?
+      options[:leospace].present?
+    end
+
+    def base_namespaces(prefix="")
+      return [] unless options[:leospace].present?
+      options[:leospace].split('/').map{|m| "#{prefix}#{m.underscore}"}
+    end
+
+    def last_namespace(prefix="")
+      base_namespaces(prefix).last
+    end
+
+    def formatted_namespace_path(separator='/')
+      return "" unless leospaced?
+      "#{base_namespaces.join(separator)}#{separator}"
+    end
+
     module Test
       protected
       #Add parent(s) param(s) to request

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 "base.rb", "lib/generators/base.rb"
+        copy_file "leonardo.rb", "lib/generators/leonardo.rb"
       end
     end
   end

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

@@ -1,44 +1,28 @@
-require 'rails/generators/rails/resource/resource_generator'
-require File.join(File.dirname(__FILE__), '../../base')
+require 'rails/generators/rails/scaffold/scaffold_generator'
+require File.join(File.dirname(__FILE__), '../../leonardo')
 
 module Rails
   module Generators
-    class LeoscaGenerator < ResourceGenerator #metagenerator
+    class LeoscaGenerator < ::Rails::Generators::ScaffoldGenerator
       include ::Leonardo::Nested
       #puts 'rails:leosca'
 
-      remove_hook_for :resource_controller
-      remove_class_option :actions
-
-      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"
+      class_option :under, :type => :string, :default => "", :banner => "brand/category", :desc => "To nest a resource under another(s)"
+      class_option :leospace, :type => :string, :default => "", :banner => ":admin", :desc => "To nest a resource under namespace(s)"
 
+      remove_hook_for :scaffold_controller
       hook_for :leosca_controller, :required => true
 
-      hook_for :assets do |assets|
-        invoke assets, [controller_name]
-      end
-
-      hook_for :stylesheet_engine do |stylesheet_engine|
-        invoke stylesheet_engine, [controller_name] if options[:stylesheets] && behavior == :invoke
-      end
-
-      #Override resource def
+      #Override
       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 = ""
+        route_config << plural_parent_resources.map{|m| "resources :#{m} do " }.join(" ") if nested?
+        route_config << base_namespaces.map{|m| "namespace :#{m} do " }.join(" ") if leospaced?
+        route_config << regular_class_path.map{|m| "namespace :#{m} do " }.join(" ")
         route_config << "resources :#{file_name.pluralize}"
-        route_config << " end" * route_resources.size
+        route_config << " end" * (regular_class_path.size + plural_parent_resources.size + base_namespaces.size)
         route route_config
       end
 

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

@@ -1,13 +1,12 @@
-require 'rails/generators/resource_helpers'
-require File.join(File.dirname(__FILE__), '../../base')
+require 'rails/generators/rails/scaffold_controller/scaffold_controller_generator'
+require File.join(File.dirname(__FILE__), '../../leonardo')
 
 WINDOWS = (RUBY_PLATFORM =~ /dos|win32|cygwin/i) || (RUBY_PLATFORM =~ /(:?mswin|mingw)/)
 CRLF = WINDOWS ? "\r\n" : "\n"
 
 module Rails
   module Generators
-    class LeoscaControllerGenerator < NamedBase
-      include ResourceHelpers
+    class LeoscaControllerGenerator < ::Rails::Generators::ScaffoldControllerGenerator
       include ::Leonardo::Leosca
       include ::Leonardo::Nested
       include ::Leonardo::Nested::Test
@@ -18,25 +17,16 @@ module Rails
       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"
-
-      class_option :orm, :banner => "NAME", :type => :string, :required => true,
-                         :desc => "ORM to generate the controller for"
+      class_option :under, :type => :string, :default => "", :banner => "brand/category", :desc => "To nest a resource under another(s)"
+      class_option :leospace, :type => :string, :default => "", :banner => ":admin", :desc => "To nest a resource under namespace(s)"
 
+      #Override
       def create_controller_files
-        template 'controller.rb', File.join('app/controllers', class_path, "#{controller_file_name}_controller.rb")
+        template 'controller.rb', File.join('app/controllers', class_path, base_namespaces, "#{controller_file_name}_controller.rb")
       end
 
-      hook_for :template_engine, :as => :leosca
-      hook_for :test_framework, :as => :scaffold
-
-      # Invoke the helper using the controller name (pluralized)
-      hook_for :helper, :as => :scaffold do |invoked|
-        invoke invoked, [ controller_name ]
-      end
+      #Override
+      hook_for :template_engine, :test_framework, :as => :leosca
 
       def update_yaml_locales
         #Inject model and attributes name into yaml files for i18n
@@ -142,72 +132,6 @@ module Rails
         file = "spec/spec_helper.rb"
         return unless File.exists? file
 
-        check_attr_to_have, check_attr_to_not_have = get_attr_to_match
-
-        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
-            get #{plural_table_name}_path
-            response.status.should be(200)
-          end
-        FILE
-        gsub_file file, remove, ""
-
-        inject_into_file file, :after => "describe \"GET /#{plural_table_name}\" do" do
-        <<-FILE.gsub(/^      /, '')
-
-          it "displays #{plural_table_name}" do
-            #{singular_table_name} = Factory(:#{singular_table_name})
-            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
-        FILE
-        end
-
-        inject_into_file file, :before => /^end/ do
-          items = []
-          attributes.each do |attribute|
-            items << attribute_to_requests(attribute)
-          end
-          <<-FILE.gsub(/^        /, '')
-
-          describe "POST /#{plural_table_name}" do
-            it "creates a new #{singular_table_name}" do
-              #{singular_table_name} = Factory.build(:#{singular_table_name})
-              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
-              page.should have_content(I18n.t(:created, :model => I18n.t('models.#{singular_table_name}')))
-              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, :before => "  ### Insert below here other your factories ###" do
           items = []

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

@@ -1,24 +1,16 @@
 <% module_namespacing do -%>
-class <%= controller_class_name %>Controller < ApplicationController
+class <%= leospaced? ? (base_namespaces << controller_class_name).join('/').camelize : 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_before
+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
   <% base_parent_resources.each do |parent| -%>
   @<%= parent %> = <%= parent.classify %>.find params[:<%= parent %>_id]
   <% end -%>
 end
-<% end -%>
 
   # GET <%= route_url %>
   # GET <%= route_url %>.json

data/lib/generators/rspec/leointegration/leointegration_generator.rb

@@ -0,0 +1,29 @@
+require 'generators/rspec/integration/integration_generator'
+require 'generators/leonardo' #leonardo base
+
+module Rspec
+  module Generators
+    class LeointegrationGenerator < ::Rspec::Generators::IntegrationGenerator
+      include ::Leonardo::Leosca
+      include ::Leonardo::Nested
+      include ::Leonardo::Nested::Test
+
+      #puts 'Rspec:Generators:LeointegrationGenerator'
+      source_paths << File.expand_path('../templates', __FILE__)
+
+      argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
+
+      class_option :remote, :type => :boolean, :default => true, :desc => "It checks ajax sections"
+      class_option :under, :type => :string, :default => "", :banner => "brand/category", :desc => "Nested resources"
+      class_option :leospace, :type => :string, :default => "", :banner => ":admin", :desc => "To nest a resource under namespace(s)"
+
+      def generate_request_spec
+        return unless options[:request_specs]
+
+        template 'request_spec.rb',
+                 File.join('spec/requests', class_path, base_namespaces, "#{table_name}_spec.rb")
+      end
+
+    end
+  end
+end

data/lib/generators/rspec/leointegration/templates/request_spec.rb

@@ -0,0 +1,52 @@
+require 'spec_helper'
+<%-
+items = []
+attributes.each do |attribute|
+  items << "        #{attribute_to_requests(attribute)}"
+end
+check_attr_to_have, check_attr_to_not_have = get_attr_to_match
+-%>
+
+describe "<%= class_name.pluralize %>" do
+  describe "GET /<%= table_name %>" do
+    it "displays <%= plural_table_name %>" do
+      <%= singular_table_name %> = Factory(:<%= singular_table_name %>)
+      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
+
+    describe "POST /<%= plural_table_name %>" do
+      it "creates a new <%= singular_table_name %>" do
+        <%= singular_table_name %> = Factory.build(:<%= singular_table_name %>)
+        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
+        page.should have_content(I18n.t(:created, :model => I18n.t('models.<%= singular_table_name %>')))
+        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
+  end
+end

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

@@ -0,0 +1,45 @@
+require 'generators/rspec/scaffold/scaffold_generator'
+require 'generators/leonardo' #leonardo base
+
+module Rspec
+  module Generators
+    class LeoscaGenerator < ::Rspec::Generators::ScaffoldGenerator
+      include ::Leonardo::Leosca
+      include ::Leonardo::Nested
+      include ::Leonardo::Nested::Test
+      #puts 'Rspec:Generators:LeoscaGenerator'
+      source_paths << File.expand_path('../templates', __FILE__)
+
+      #Leonardo options
+      class_option :remote, :type => :boolean, :default => true, :desc => "It checks ajax sections"
+      class_option :under, :type => :string, :default => "", :banner => "brand/category", :desc => "Nested resources"
+      class_option :leospace, :type => :string, :default => "", :banner => ":admin", :desc => "To nest a resource under namespace(s)"
+
+      #Override
+      def generate_controller_spec
+        return unless options[:controller_specs]
+
+        template 'controller_spec.rb',
+                 File.join('spec/controllers', base_namespaces, controller_class_path, "#{controller_file_name}_controller_spec.rb")
+      end
+
+      #Override
+      def generate_routing_spec
+        return unless options[:routing_specs]
+
+        template 'routing_spec.rb',
+          File.join('spec/routing', base_namespaces, controller_class_path, "#{controller_file_name}_routing_spec.rb")
+      end
+
+      hook_for :integration_tool, :as => :leointegration
+
+      protected
+
+        #Override
+        def copy_view(view)
+          template "#{view}_spec.rb",
+                   File.join("spec/views", base_namespaces, controller_file_path, "#{view}.html.#{options[:template_engine]}_spec.rb")
+        end
+    end
+  end
+end

data/lib/generators/{leolay/templates/lib/templates/rspec/scaffold → rspec/leosca/templates}/controller_spec.rb

@@ -18,7 +18,7 @@ require 'spec_helper'
 # Message expectations are only used when there is no simpler way to specify
 # that an instance is receiving a specific message.
 
-describe <%= controller_class_name %>Controller do
+describe <%= leospaced? ? (base_namespaces << controller_class_name).join('/').camelize : controller_class_name %>Controller do
 
 <% unless options[:singleton] -%>
   describe "GET index" do

data/lib/generators/{leolay/templates/lib/templates/rspec/scaffold → rspec/leosca/templates}/edit_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 <% output_attributes = attributes.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
-describe "<%= ns_table_name %>/edit.html.<%= options[:template_engine] %>" do
+describe "<%= formatted_namespace_path %><%= ns_table_name %>/edit.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| -%>

data/lib/generators/{leolay/templates/lib/templates/rspec/scaffold → rspec/leosca/templates}/index_spec.rb

@@ -15,6 +15,12 @@ def value_for_check(attribute)
     "#{name} => (r.#{attribute.name}.try(:name) || r.#{attribute.name}.try(:id))"
   when :boolean
     nil
+  when :decimal
+    "#{name} => number_to_currency(r.#{attribute.name})"
+  when :integer
+    "#{name} => number_with_delimiter(r.#{attribute.name})"
+  when :float
+    "#{name} => number_with_precision(r.#{attribute.name})"
   else
     "#{name} => r.#{attribute.name}"
   end
@@ -23,7 +29,7 @@ end
 %>
 
 <% output_attributes = attributes.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
-describe "<%= ns_table_name %>/index.html.<%= options[:template_engine] %>" do
+describe "<%= formatted_namespace_path %><%= ns_table_name %>/index.html.<%= options[:template_engine] %>" do
   before(:each) do
     <%- parents = []; str_parents_create = str_parents_where = "" -%>
     <%- base_parent_resources.each do |parent| -%>

data/lib/generators/{leolay/templates/lib/templates/rspec/scaffold → rspec/leosca/templates}/new_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 <% output_attributes = attributes.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
-describe "<%= ns_table_name %>/new.html.<%= options[:template_engine] %>" do
+describe "<%= formatted_namespace_path %><%= ns_table_name %>/new.html.<%= options[:template_engine] %>" do
   before(:each) do
     <%= "#{ns_file_name} = " if nested? %>assign(:<%= ns_file_name %>, Factory.build(:<%= ns_file_name %>) )
     <%- base_parent_resources.each do |parent| -%>

data/lib/generators/rspec/leosca/templates/routing_spec.rb

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

data/lib/generators/{leolay/templates/lib/templates/rspec/scaffold → rspec/leosca/templates}/show_spec.rb

@@ -14,7 +14,7 @@ end
 %>
 
 <% output_attributes = attributes.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
-describe "<%= ns_table_name %>/show.html.<%= options[:template_engine] %>" do
+describe "<%= formatted_namespace_path %><%= 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| -%>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: leonardo
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 1
-  - 6
-  - 1
-  version: 1.6.1
+  - 7
+  - 0
+  version: 1.7.0
 platform: ruby
 authors: 
 - Marco Mastrodonato
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-20 00:00:00 Z
+date: 2011-09-28 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
@@ -27,7 +27,6 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/generators/base.rb
 - lib/generators/erb/leosca/leosca_generator.rb
 - lib/generators/erb/leosca/templates/destroy.js.erb
 - lib/generators/erb/leosca/templates/edit.html.erb
@@ -62,13 +61,6 @@ files:
 - lib/generators/leolay/templates/config/locales/kaminari.it.yml
 - lib/generators/leolay/templates/config.rb
 - lib/generators/leolay/templates/layout_helper.rb
-- lib/generators/leolay/templates/lib/generators/rspec/scaffold/scaffold_generator.rb
-- lib/generators/leolay/templates/lib/templates/rspec/scaffold/controller_spec.rb
-- lib/generators/leolay/templates/lib/templates/rspec/scaffold/edit_spec.rb
-- lib/generators/leolay/templates/lib/templates/rspec/scaffold/index_spec.rb
-- lib/generators/leolay/templates/lib/templates/rspec/scaffold/new_spec.rb
-- lib/generators/leolay/templates/lib/templates/rspec/scaffold/routing_spec.rb
-- lib/generators/leolay/templates/lib/templates/rspec/scaffold/show_spec.rb
 - lib/generators/leolay/templates/lib/utility.rb
 - lib/generators/leolay/templates/spec/factories.rb
 - lib/generators/leolay/templates/spec/helpers/application_helpers_spec.rb
@@ -119,6 +111,7 @@ files:
 - lib/generators/leolay/templates/vendor/assets/stylesheets/formtastic/formtastic_changes.css
 - lib/generators/leolay/templates/vendor/assets/stylesheets/vendor.css
 - lib/generators/leolay/USAGE
+- lib/generators/leonardo.rb
 - lib/generators/leosca/install_generator.rb
 - lib/generators/leosca/USAGE
 - lib/generators/rails/leosca/leosca_generator.rb
@@ -127,6 +120,15 @@ files:
 - lib/generators/rails/leosca_controller/leosca_controller_generator.rb
 - lib/generators/rails/leosca_controller/templates/controller.rb
 - lib/generators/rails/leosca_controller/USAGE
+- lib/generators/rspec/leointegration/leointegration_generator.rb
+- lib/generators/rspec/leointegration/templates/request_spec.rb
+- lib/generators/rspec/leosca/leosca_generator.rb
+- lib/generators/rspec/leosca/templates/controller_spec.rb
+- lib/generators/rspec/leosca/templates/edit_spec.rb
+- lib/generators/rspec/leosca/templates/index_spec.rb
+- lib/generators/rspec/leosca/templates/new_spec.rb
+- lib/generators/rspec/leosca/templates/routing_spec.rb
+- lib/generators/rspec/leosca/templates/show_spec.rb
 - LICENSE
 - README.rdoc
 - CHANGELOG

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

@@ -1,173 +0,0 @@
-require 'generators/rspec'
-require 'rails/generators/resource_helpers'
-require 'generators/base' #leonardo base
-
-puts "*" * 22
-puts "Custom rspec generator"
-puts "*" * 22
-
-module Rspec
-  module Generators
-    class ScaffoldGenerator < Base
-      include Rails::Generators::ResourceHelpers
-      include ::Leonardo::Leosca
-      include ::Leonardo::Nested
-      include ::Leonardo::Nested::Test
-      source_paths << File.expand_path("../../helper/templates", __FILE__)
-      argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
-
-      class_option :orm, :desc => "ORM used to generate the controller"
-      class_option :template_engine, :desc => "Template engine to generate view files"
-      class_option :singleton, :type => :boolean, :desc => "Supply to create a singleton controller"
-
-      class_option :controller_specs, :type => :boolean, :default => true,  :desc => "Generate controller specs"
-      class_option :view_specs,       :type => :boolean, :default => true,  :desc => "Generate view specs"
-      #Leonardo includes custom views to support capybara
-      #class_option :webrat,           :type => :boolean, :default => false, :desc => "Use webrat methods/matchers"
-      #class_option :webrat_matchers,  :type => :boolean, :default => false, :desc => "Use webrat methods/matchers (deprecated - use --webrat)"
-      class_option :helper_specs,     :type => :boolean, :default => true,  :desc => "Generate helper specs"
-      class_option :routing_specs,    :type => :boolean, :default => true,  :desc => "Generate routing specs"
-
-      #Leonardo options
-      class_option :remote, :type => :boolean, :default => true, :desc => "It checks ajax sections"
-      class_option :under, :type => :string, :default => "", :banner => "brand/category", :desc => "Nested resources"
-
-      def generate_controller_spec
-        return unless options[:controller_specs]
-
-        template 'controller_spec.rb',
-                 File.join('spec/controllers', controller_class_path, "#{controller_file_name}_controller_spec.rb")
-      end
-
-      def generate_view_specs
-        return unless options[:view_specs]
-
-        copy_view :edit
-        copy_view :index unless options[:singleton]
-        copy_view :new
-        copy_view :show
-      end
-
-      # Invoke the helper using the controller name (pluralized)
-      hook_for :helper, :as => :scaffold do |invoked|
-        invoke invoked, [ controller_name ]
-      end
-
-      def generate_routing_spec
-        return unless options[:routing_specs]
-
-        template 'routing_spec.rb',
-          File.join('spec/routing', controller_class_path, "#{controller_file_name}_routing_spec.rb")
-      end
-
-      hook_for :integration_tool, :as => :integration
-
-      protected
-
-        def webrat?
-          RSpec.deprecate("--webrat-matchers", "--webrat") if options[:webrat_matchers]
-          options[:webrat] || options[:webrat_matchers]
-        end
-
-        def copy_view(view)
-          template "#{view}_spec.rb",
-                   File.join("spec/views", controller_file_path, "#{view}.html.#{options[:template_engine]}_spec.rb")
-        end
-
-        def params
-          "{'these' => 'params'}"
-        end
-
-        # support for namespaced-resources
-        def ns_file_name
-          if ARGV[0].match(/(\w+)\/(\w+)/)
-            "#{$1.underscore}_#{$2.singularize.underscore}"
-          else
-            file_name
-          end
-        end
-
-        # support for namespaced-resources
-        def ns_table_name
-          if ARGV[0].match(/(\w+)\/(\w+)/)
-            "#{$1.underscore}/#{$2.tableize}"
-          else
-            table_name
-          end
-        end
-
-        # Returns the name of the mock. For example, if the file name is user,
-        # it returns mock_user.
-        #
-        # If a hash is given, it uses the hash key as the ORM method and the
-        # value as response. So, for ActiveRecord and file name "User":
-        #
-        #   mock_file_name(:save => true)
-        #   #=> mock_user(:save => true)
-        #
-        # If another ORM is being used and another method instead of save is
-        # called, it will be the one used.
-        #
-        def mock_file_name(hash=nil)
-          if hash
-            method, and_return = hash.to_a.first
-            method = orm_instance.send(method).split('.').last.gsub(/\(.*?\)/, '')
-            "mock_#{ns_file_name}(:#{method} => #{and_return})"
-          else
-            "mock_#{ns_file_name}"
-          end
-        end
-
-        # Receives the ORM chain and convert to expects. For ActiveRecord:
-        #
-        #   should! orm_class.find(User, "37")
-        #   #=> User.should_receive(:find).with(37)
-        #
-        # For Datamapper:
-        #
-        #   should! orm_class.find(User, "37")
-        #   #=> User.should_receive(:get).with(37)
-        #
-        def should_receive(chain)
-          stub_or_should_chain(:should_receive, chain)
-        end
-
-        # Receives the ORM chain and convert to stub. For ActiveRecord:
-        #
-        #   stub orm_class.find(User, "37")
-        #   #=> User.stub(:find).with(37)
-        #
-        # For Datamapper:
-        #
-        #   stub orm_class.find(User, "37")
-        #   #=> User.stub(:get).with(37)
-        #
-        def stub(chain)
-          stub_or_should_chain(:stub, chain)
-        end
-
-        def stub_or_should_chain(mode, chain)
-          receiver, method = chain.split(".")
-          method.gsub!(/\((.*?)\)/, '')
-
-          response = "#{receiver}.#{mode}(:#{method})"
-          response << ".with(#{$1})" unless $1.blank?
-          response
-        end
-
-        def value_for(attribute)
-          case attribute.type
-          when :string
-            "#{attribute.name.titleize}".inspect
-          else
-            attribute.default.inspect
-          end
-        end
-
-        def banner
-          self.class.banner
-        end
-
-    end
-  end
-end

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

@@ -1,37 +0,0 @@
-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