leonardo 1.4.0 → 1.5.0

data/CHANGELOG

@@ -1,3 +1,20 @@
+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
+* Autocheck to exclude pagination from views and controller
+* Fixed the template.rb to generate rspec:install and added :development to group as well as :test. Now if you choose to use rspec, leosca will generate rspec test.
+* Added leolay:install to copy generator under project folder to be able to customize it like leosca:install
+
+
+
 1.4.0 (August 24th, 2011) Marco Mastrodonato
 * New file custom.js to fill with your javascripts and use application.js as manifest file
 * Two new files under vendor/assets folder: vendor.js and vendor.css to use as manifest file

data/README.rdoc

@@ -46,6 +46,7 @@ Will be:
 2. If you have used my template you have an application ready to work:
 run rails s and try it on http://localhost:3000
 if you chose authentication you have to sign in, try with this different profile:
+
  email: admin@AppExample.com, password: abcd1234
  [this profile can do everything]
  or
@@ -84,25 +85,27 @@ Go to lib\generators\rails if you want to customize more.
 
 For more information about usage:
 
-rails g leolay --help
-rails g leosca --help
+ rails g leolay --help
+
+ rails g leosca --help
 
 
 === Example:
 
 leolay:
 
-rails generate leolay
-rails generate leolay --main_color=#c8c8c8
-rails generate leolay layout1 --main_color=rgb(200,150,200) --second-color=yellow
-rails generate leolay layout2 --skip-pagination --skip-authentication --skip-authorization
+ rails generate leolay
+ rails generate leolay --main_color=#c8c8c8
+ rails generate leolay layout1 --main_color=rgb(200,150,200) --second-color=yellow
+ rails generate leolay layout2 --skip-pagination --skip-authentication --skip-authorization
 
 leosca:
 
-rails generate leosca product name:string
-rails generate leosca product name:string --skip-remote       => if you do not want ajax
-rails generate leosca product name:string --skip-seeds
-rails generate leosca product name:string --seeds=60          => if you need more records
+ rails generate leosca product name:string
+ rails generate leosca product name:string --skip-remote       => if you do not want ajax
+ rails generate leosca product name:string --skip-seeds
+ rails generate leosca product name:string --seeds=60          => if you need more records
+
 
 PS: Of course, these options are in addition to those provided by the original scaffold
 

data/lib/generators/base.rb

@@ -0,0 +1,28 @@
+module LeonardoShared
+  def prova
+    puts 'ok'
+  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
+end

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

@@ -64,6 +64,14 @@ module Erb
       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"
@@ -71,6 +79,9 @@ module Erb
       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/_list.erb

@@ -1,4 +1,6 @@
+<%- if pagination? -%>
 <%%= paginate @<%= plural_table_name %>, :remote => remote %>
+<%- end -%>
 <div class="separator"></div>
 
 <table class='user' cellspacing='0'>
@@ -18,7 +20,7 @@
 <%- attributes.each do |attribute| -%>
     <%- case attribute.type
         when :boolean -%>
-    <td><%%= <%= singular_table_name %>.<%= attribute.name %> ? style_image_tag("ico_v.png") : style_image_tag('ico_x.png') %></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><%%= link_to(link_name, <%= singular_table_name %>.<%= attribute.name %> ) %></td>
@@ -27,24 +29,26 @@
     <%- end -%>
 <%- end -%>
     <td><%%= link_to t(:show), <%= singular_table_name %> %></td>
-    <% if authorization? -%>
+    <%- if authorization? -%>
     <%% if can? :update, <%= singular_table_name %> -%>
-    <% end -%>
+    <%- end -%>
     <td><%%= link_to t(:edit), edit_<%= singular_table_name %>_path(<%= singular_table_name %>) %></td>
-    <% if authorization? -%>
+    <%- if authorization? -%>
     <%% end -%>
-    <% end -%>
-    <% if authorization? -%>
+    <%- end -%>
+    <%- if authorization? -%>
     <%% if can? :destroy, <%= singular_table_name %> -%>
-    <% end -%>
+    <%- end -%>
     <td><%%= link_to t(:destroy), <%= singular_table_name %>, <%= key_value :confirm, "t(:sure?)" %>, <%= key_value :method, ":delete" %>, :remote => remote %></td>
-    <% if authorization? -%>
+    <%- if authorization? -%>
     <%% end -%>
-    <% end -%>
+    <%- end -%>
   </tr>
 <%% end %>
   </tbody>
 </table>
 
 <div class="separator"></div>
-<%%= paginate @<%= plural_table_name %>, :remote => remote %>
+<%- if pagination? -%>
+<%%= paginate @<%= plural_table_name %>, :remote => remote %>
+<%- end -%>

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

@@ -1 +1 @@
-$("#tr<%%= @<%= singular_table_name %>.id %>").hide('fast');
+$("#tr<%%= @<%= singular_table_name %>.id %>").hide('fast').text('');

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

@@ -10,7 +10,7 @@
   <%- 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") : style_image_tag('ico_x.png') %></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>

data/lib/generators/leolay/install_generator.rb

@@ -0,0 +1,17 @@
+module Leolay
+  module Generators
+    class InstallGenerator < Rails::Generators::Base
+
+      source_root File.expand_path('../../', __FILE__)
+
+      def copy_all_to_local
+        #directory "leolay", "lib/generators/leolay"
+        copy_file "leolay/leolay_generator.rb", "lib/generators/leolay/leolay_generator.rb"
+        copy_file "leolay/USAGE", "lib/generators/leolay/USAGE"
+        directory "leolay/templates", "lib/generators/leolay/templates"
+        #copy_file "leonardo_shared.rb", "lib/generators/leonardo_shared.rb" unless File.exists? "lib/generators/leonardo_shared.rb"
+      end
+    end
+  end
+end
+

data/lib/generators/leolay/leolay_generator.rb

@@ -288,6 +288,53 @@ class LeolayGenerator < Rails::Generators::Base
     end if options.formtastic?
   end
 
+  def setup_rspec
+    file = "spec/spec_helper.rb"
+    return unless File.exists? file
+    inject_into_file file, :after => "require 'rspec/rails'" do
+    <<-FILE.gsub(/^    /, '')
+
+    require 'capybara/rspec'
+    require 'helpers/application_helpers_spec'
+
+    Capybara.default_wait_time = 5 #default=2
+    FILE
+    end
+
+    gsub_file file, 'config.fixture_path = "#{::Rails.root}/spec/fixtures"', '#config.fixture_path =  "#{::Rails.root}/spec/fixtures"'
+    #inject_into_file file, "#", :before => 'config.fixture_path = "#{::Rails.root}/spec/fixtures"'
+
+    gsub_file file, "config.use_transactional_fixtures = true" do
+    <<-FILE.gsub(/^  /, '')
+  config.use_transactional_fixtures = false
+
+    config.before(:suite) do
+      DatabaseCleaner.strategy = :truncation
+    end
+
+    config.before(:each) do
+      DatabaseCleaner.start
+    end
+
+    config.after(:each) do
+      DatabaseCleaner.clean
+    end
+
+    config.include ApplicationHelpers
+    FILE
+    end
+
+    file = "spec/factories.rb"
+    copy_file file, file
+    file = "spec/support/devise.rb"
+    copy_file file, file
+    file = "spec/helpers/application_helpers_spec.rb"
+    copy_file file, file
+    file = "lib/templates/rspec/scaffold"
+    directory file, file
+
+  end
+
   private
   def style_name
     style.underscore

data/lib/generators/leolay/templates/config/locales/devise.en.yml

@@ -37,6 +37,10 @@ en:
       inactive_signed_up: 'You have signed up successfully. However, we could not sign you in because your account is %{reason}.'
       updated: 'You updated your account successfully.'
       destroyed: 'Bye! Your account was successfully cancelled. We hope to see you again soon.'
+      reasons:
+        inactive: 'inactive'
+        unconfirmed: 'unconfirmed'
+        locked: 'locked'
     unlocks:
       send_instructions: 'You will receive an email with instructions about how to unlock your account in a few minutes.'
       unlocked: 'Your account was successfully unlocked. You are now signed in.'

data/lib/generators/leolay/templates/config/locales/devise.it.yml

@@ -35,6 +35,10 @@ it:
       inactive_signed_up: 'Ti sei registrato, ma non sei collegato perchè il tuo account è %{reason}.'
       updated: "Il tuo account è stato aggiornato."
       destroyed: "Arrivederci! L'account è stato cancellato. Speriamo di rivederti presto."
+      reasons:
+        inactive: "Inattivo"
+        unconfirmed: "Non confermato"
+        locked: "Bloccato"
     unlocks:
       send_instructions: "Riceverai un messaggio email con le istruzioni per sbloccare il tuo account entro qualche minuto."
       unlocked: "Il tuo account è stato correttamente sbloccato. Ora sei collegato."

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

@@ -0,0 +1,181 @@
+require 'spec_helper'
+require 'helpers/application_helpers_spec'
+
+# This spec was generated by rspec-rails when you ran the scaffold generator.
+# It demonstrates how one might use RSpec to specify the controller code that
+# was generated by Rails when you ran the scaffold generator.
+#
+# It assumes that the implementation code is generated by the rails scaffold
+# generator.  If you are using any extension libraries to generate different
+# controller code, this generated spec may or may not pass.
+#
+# It only uses APIs available in rails and/or rspec-rails.  There are a number
+# of tools you can use to make these specs even more expressive, but we're
+# sticking to rails and rspec-rails APIs to keep things simple and stable.
+#
+# Compared to earlier versions of this generator, there is very limited use of
+# stubs and message expectations in this spec.  Stubs are only used when there
+# is no simpler way to get a handle on the object needed for the example.
+# 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
+  include ApplicationHelpers
+
+<% unless options[:singleton] -%>
+  describe "GET index" do
+    it "assigns all <%= table_name.pluralize %> as @<%= table_name.pluralize %>" do
+      login_controller_as(:user)
+      <%= file_name %> = Factory(:<%= file_name %>)
+      get :index
+      assigns(:<%= table_name %>).should eq([<%= file_name %>])
+    end
+  end
+
+<% end -%>
+  describe "GET show" do
+    it "assigns the requested <%= ns_file_name %> as @<%= ns_file_name %>" do
+      login_controller_as(:user)
+      <%= file_name %> = Factory(:<%= file_name %>)
+      get :show, :id => <%= file_name %>.id.to_s
+      assigns(:<%= ns_file_name %>).should eq(<%= file_name %>)
+    end
+  end
+
+  describe "GET new" do
+    it "assigns a new <%= ns_file_name %> as @<%= ns_file_name %>" do
+      login_controller_as(:user)
+      get :new
+      assigns(:<%= ns_file_name %>).should be_a_new(<%= class_name %>)
+    end
+  end
+
+  describe "GET edit" do
+    it "assigns the requested <%= ns_file_name %> as @<%= ns_file_name %>" do
+      login_controller_as(:user)
+      <%= file_name %> = Factory(:<%= file_name %>)
+      get :edit, :id => <%= file_name %>.id.to_s
+      assigns(:<%= ns_file_name %>).should eq(<%= file_name %>)
+    end
+  end
+
+  describe "POST create" do
+    describe "with valid params" do
+      it "creates a new <%= class_name %>" do
+        login_controller_as(:user)
+        expect {
+          post :create, :<%= ns_file_name %> => Factory.attributes_for(:<%= file_name %>)
+        }.to change(<%= class_name %>, :count).by(1)
+      end
+
+      it "assigns a newly created <%= ns_file_name %> as @<%= ns_file_name %>" do
+        login_controller_as(:user)
+        post :create, :<%= ns_file_name %> => Factory.attributes_for(:<%= file_name %>)
+        assigns(:<%= ns_file_name %>).should be_a(<%= class_name %>)
+        assigns(:<%= ns_file_name %>).should be_persisted
+      end
+
+      it "redirects to the created <%= ns_file_name %>" do
+        login_controller_as(:user)
+        post :create, :<%= ns_file_name %> => Factory.attributes_for(:<%= file_name %>)
+        response.should redirect_to(<%= class_name %>.last)
+      end
+    end
+
+    describe "with invalid params" do
+      it "assigns a newly created but unsaved <%= ns_file_name %> as @<%= ns_file_name %>" do
+        login_controller_as(:user)
+        # Trigger the behavior that occurs when invalid params are submitted
+        <%= class_name %>.any_instance.stub(:save).and_return(false)
+        post :create, :<%= ns_file_name %> => {}
+        assigns(:<%= ns_file_name %>).should be_a_new(<%= class_name %>)
+      end
+
+      it "re-renders the 'new' template" do
+        login_controller_as(:user)
+        # Trigger the behavior that occurs when invalid params are submitted
+        <%= class_name %>.any_instance.stub(:save).and_return(false)
+        post :create, :<%= ns_file_name %> => {}
+        response.should render_template("new")
+      end
+    end
+  end
+
+  describe "PUT update" do
+    describe "with valid params" do
+      it "updates the requested <%= ns_file_name %>" do
+        login_controller_as(:user)
+        <%= file_name %> = Factory(:<%= file_name %>)
+        # Assuming there are no other <%= table_name %> in the database, this
+        # specifies that the <%= class_name %> created on the previous line
+        # receives the :update_attributes message with whatever params are
+        # submitted in the request.
+        <%= class_name %>.any_instance.should_receive(:update_attributes).with(<%= params %>)
+        put :update, :id => <%= file_name %>.id, :<%= ns_file_name %> => <%= params %>
+      end
+
+      it "assigns the requested <%= ns_file_name %> as @<%= ns_file_name %>" do
+        login_controller_as(:user)
+        <%= file_name %> = Factory(:<%= file_name %>)
+        put :update, :id => <%= file_name %>.id, :<%= ns_file_name %> => Factory.attributes_for(:<%= file_name %>)
+        assigns(:<%= ns_file_name %>).should eq(<%= file_name %>)
+      end
+
+      it "redirects to the <%= ns_file_name %>" do
+        login_controller_as(:user)
+        <%= file_name %> = Factory(:<%= file_name %>)
+        put :update, :id => <%= file_name %>.id, :<%= ns_file_name %> => Factory.attributes_for(:<%= file_name %>)
+        response.should redirect_to(<%= file_name %>)
+      end
+    end
+
+    describe "with invalid params" do
+      it "assigns the <%= ns_file_name %> as @<%= ns_file_name %>" do
+        login_controller_as(:user)
+        <%= file_name %> = Factory(:<%= file_name %>)
+        # Trigger the behavior that occurs when invalid params are submitted
+        <%= class_name %>.any_instance.stub(:save).and_return(false)
+        put :update, :id => <%= file_name %>.id.to_s, :<%= ns_file_name %> => {}
+        assigns(:<%= ns_file_name %>).should eq(<%= file_name %>)
+      end
+
+      it "re-renders the 'edit' template" do
+        login_controller_as(:user)
+        <%= file_name %> = Factory(:<%= file_name %>)
+        # Trigger the behavior that occurs when invalid params are submitted
+        <%= class_name %>.any_instance.stub(:save).and_return(false)
+        put :update, :id => <%= file_name %>.id.to_s, :<%= ns_file_name %> => {}
+        response.should render_template("edit")
+      end
+    end
+  end
+
+  describe "DELETE destroy" do
+    describe "with authorization" do
+      it "destroys the requested <%= ns_file_name %>" do
+        login_controller_as(:user_manager)
+        <%= file_name %> = Factory(:<%= file_name %>)
+        expect {
+          delete :destroy, :id => <%= file_name %>.id.to_s
+        }.to change(<%= class_name %>, :count).by(-1)
+      end
+
+      it "redirects to the <%= table_name %> list" do
+        login_controller_as(:user_manager)
+        <%= file_name %> = Factory(:<%= file_name %>)
+        delete :destroy, :id => <%= file_name %>.id.to_s
+        response.should redirect_to(<%= index_helper %>_url)
+      end
+    end
+    describe "without authorization" do
+      it "destroys the requested <%= ns_file_name %>" do
+        login_controller_as(:user)
+        <%= file_name %> = Factory(:<%= file_name %>)
+        expect {
+          delete :destroy, :id => <%= file_name %>.id.to_s
+        }.to change(<%= class_name %>, :count).by(0)
+      end
+    end
+  end
+
+end

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

@@ -0,0 +1,18 @@
+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
+  before(:each) do
+    @<%= ns_file_name %> = assign(:<%= ns_file_name %>, Factory(:<%= ns_file_name %>) )
+  end
+
+  it "renders the edit <%= ns_file_name %> form" do
+    render
+
+    rendered.should have_selector("form", :action => <%= index_helper %>_path(@<%= ns_file_name %>), :method => "post") do |form|
+    <% for attribute in output_attributes -%>
+  form.should have_selector("<%= attribute.input_type -%>#<%= ns_file_name %>_<%= attribute.name %>", :name => "<%= ns_file_name %>[<%= attribute.name %>]")
+    <% end -%>
+end
+  end
+end

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

@@ -0,0 +1,41 @@
+require 'spec_helper'
+
+<%
+def value_for_check(attribute)
+  name = ":text"
+  ([] <<
+  case attribute.type
+  when :boolean
+    "\"tr#tr\#{r.id}>td>img.\#{r.#{attribute.name} ? \"ico_true\" : \"ico_false\"}\""
+  else
+    "\"tr#tr\#{r.id}>td\""
+  end <<
+  case attribute.type
+  when :references, :belongs_to
+    "#{name} => (r.#{attribute.name}.try(:name) || r.#{attribute.name}.try(:id))"
+  when :boolean
+    nil
+  else
+    "#{name} => r.#{attribute.name}"
+  end <<
+  ":count => 1"
+  ).compact.join(', ')
+end
+%>
+
+<% output_attributes = attributes.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
+describe "<%= ns_table_name %>/index.html.<%= options[:template_engine] %>" do
+  before(:each) do
+    @records = assign(:<%= table_name %>, FactoryGirl.create_list(:<%= ns_file_name %>, 2) )
+    assign(:<%= ns_file_name %>, Factory(:<%= ns_file_name %>) )
+  end
+
+  it "renders a list of <%= ns_table_name %>" do
+    render
+    @records.each do |r|
+    <% for attribute in output_attributes -%>
+  assert_select <%= value_for_check(attribute) %>
+    <% end -%>
+end
+  end
+end

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

@@ -0,0 +1,19 @@
+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
+  before(:each) do
+    assign(:<%= ns_file_name %>, Factory.build(:<%= ns_file_name %>) )
+  end
+
+
+  it "renders new <%= ns_file_name %> form" do
+    render
+
+    rendered.should have_selector("form", :action => <%= index_helper %>_path, :method => "post") do |form|
+    <% for attribute in output_attributes -%>
+  form.should have_selector("<%= attribute.input_type -%>#<%= ns_file_name %>_<%= attribute.name %>", :name => "<%= ns_file_name %>[<%= attribute.name %>]")
+    <% end -%>
+end
+  end
+end

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

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+<%
+def value_for_check(attribute)
+  case attribute.type
+  when :references, :belongs_to
+    "have_content(@#{ns_file_name}.#{attribute.name}.try(:name) || @#{ns_file_name}.#{attribute.name}.try(:id))"
+  when :boolean
+    "have_css(\"img.\#{@#{ns_file_name}.#{attribute.name} ? \"ico_true\" : \"ico_false\"}\")"
+  else
+    "have_content(@#{ns_file_name}.#{attribute.name})"
+  end
+end
+%>
+
+<% output_attributes = attributes.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
+describe "<%= ns_table_name %>/show.html.<%= options[:template_engine] %>" do
+  before(:each) do
+    @<%= ns_file_name %> = assign(:<%= ns_file_name %>, Factory(:<%= ns_file_name %>) )
+  end
+
+  it "renders attributes" do
+    render
+<% for attribute in output_attributes -%>
+    rendered.should <%= value_for_check(attribute) %>
+<% end -%>
+  end
+end

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

@@ -0,0 +1,23 @@
+FactoryGirl.define do
+  factory :user do
+    email     'test@leonardo.com'
+    password  'abcd1234'
+    roles     ['user']
+
+    trait :guest do
+      roles ['guest']
+    end
+    trait :manager do
+      roles ['manager']
+    end
+    trait :admin do
+      roles ['admin']
+    end
+
+    factory :user_guest,    :traits => [:guest]
+    factory :user_manager,  :traits => [:manager]
+    factory :user_admin,    :traits => [:admin]
+  end
+  ### Leonardo creates here below your factories ###
+  ### Insert below here other your factories ###
+end

data/lib/generators/leolay/templates/spec/helpers/application_helpers_spec.rb

@@ -0,0 +1,13 @@
+module ApplicationHelpers
+  def login_view_as(role=:user)
+    user = Factory(role)
+    fill_in 'user_email', :with => user.email
+    fill_in 'user_password', :with => user.password
+    click_button 'Sign in'
+  end
+  def login_controller_as(role=:user)
+    user = Factory(role)
+    #user.confirm! # or set a confirmed_at inside the factory. Only necessary if you are using the confirmable module
+    sign_in user
+  end
+end

data/lib/generators/leolay/templates/spec/support/devise.rb

@@ -0,0 +1,4 @@
+RSpec.configure do |config|
+  config.include Devise::TestHelpers, :type => :controller
+  config.include Devise::TestHelpers, :type => :view
+end

data/lib/generators/leosca/install_generator.rb

@@ -8,6 +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"
       end
     end
   end

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

@@ -1,4 +1,5 @@
 require 'rails/generators/resource_helpers'
+#require '../../leonardo_shared' #I'd like to share common code but it can't find that module :(
 
 WINDOWS = (RUBY_PLATFORM =~ /dos|win32|cygwin/i) || (RUBY_PLATFORM =~ /(:?mswin|mingw)/)
 CRLF = WINDOWS ? "\r\n" : "\n"
@@ -7,6 +8,7 @@ module Rails
   module Generators
     class LeoscaControllerGenerator < NamedBase
       include ResourceHelpers
+      #include LeonardoShared
       #puts 'rails:leosca_controller'
 
       source_root File.expand_path('../templates', __FILE__)
@@ -66,17 +68,18 @@ module Rails
           inject_into_file file, :after => "    hints:#{CRLF}" do
             content = "      #{file_name}:#{CRLF}"
             attributes.each do |attribute|
+              attr_name = attribute.name.gsub '_', ''
               case attribute.type
               when :integer, :decimal, :float
-                content << "        #{attribute.name}: \"Fill the #{attribute.name} with a#{"n" if attribute.type == :integer} #{attribute.type.to_s} number\"#{CRLF}"
+                content << "        #{attribute.name}: \"Fill the #{attr_name} with a#{"n" if attribute.type == :integer} #{attribute.type.to_s} number\"#{CRLF}"
               when :boolean
-                content << "        #{attribute.name}: \"Select if #{attribute.name} or not\"#{CRLF}"
+                content << "        #{attribute.name}: \"Select if this #{file_name} should be #{attr_name} or not\"#{CRLF}"
               when :string, :text
-                content << "        #{attribute.name}: \"Choose a good #{attribute.name} for this #{file_name}\"#{CRLF}"
+                content << "        #{attribute.name}: \"Choose a good #{attr_name} for this #{file_name}\"#{CRLF}"
               when :date, :datetime, :time
-                content << "        #{attribute.name}: \"Choose a #{attribute.type.to_s} for #{attribute.name}\"#{CRLF}"
+                content << "        #{attribute.name}: \"Choose a #{attribute.type.to_s} for #{attr_name}\"#{CRLF}"
               else
-                content << "        #{attribute.name}: \"Choose a #{attribute.name}\"#{CRLF}"
+                content << "        #{attribute.name}: \"Choose a #{attr_name}\"#{CRLF}"
               end
             end
             content
@@ -125,21 +128,7 @@ module Rails
         append_file file do
           items = []
           attributes.each do |attribute|
-            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")}'"
-              when :datetime                then "'#{Time.now.strftime("%Y-%m-%d %H:%M:%S.000")}'"
-              when :time                    then "'#{Time.now.strftime("%H:%M:%S.000")}'"
-              else                               "'#{attribute.name.capitalize}\#'"
-            end
-            name = case attribute.type
-              when :references, :belongs_to then ":#{attribute.name}_id"
-              else                               ":#{attribute.name}"
-            end
-            items << " #{name} => #{value}"
+            items << attribute_to_hash(attribute)
           end
           row = "{ #{items.join(', ')} }"
 
@@ -153,6 +142,85 @@ module Rails
         end if File.exists?(file)
       end
 
+      def update_specs
+        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_table_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 #{plural_table_name}_path
+            login_view_as(:user_guest)
+            #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
+
+        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_#{singular_table_name}_path
+              login_view_as(:user)
+        #{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
+          FILE
+        end
+
+        file = "spec/factories.rb"
+        inject_into_file file, :after => "### Leonardo creates here below your factories ###" do
+          items = []
+          attributes.each do |attribute|
+            items << attribute_to_factories(attribute)
+          end
+          <<-FILE.gsub(/^        /, '')
+
+          factory :#{singular_table_name} do |#{singular_table_name[0..0]}|
+        #{items.join(CRLF)}
+          end
+          FILE
+        end if File.exists?(file)
+
+      end
+
       protected
       def authorization?
         File.exists? "app/models/ability.rb"
@@ -165,6 +233,70 @@ module Rails
         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

@@ -37,7 +37,7 @@ class <%= controller_class_name %>Controller < ApplicationController
     
     @<%= plural_table_name %> = case request.format
     when 'text/html', 'text/javascript'
-      <%= class_name %>.where(conditions).order(:id).page(params[:page])
+      <%= class_name %>.where(conditions).order(:id)<%= ".page(params[:page])" if pagination? %>
     else
       <%= class_name %>.where(conditions)
     end

data/template.rb

@@ -1,107 +1,119 @@
-#This is a Rails 3.1.x template
-#Written by Marco Mastrodonato  27/07/2011
-#
-# USAGE: rails new yourapp -m template.rb
-
-puts '*' * 40
-puts "* Processing template..."
-puts '*' * 40
-
-use_git = yes?("Do you think to use git ?")
-if use_git
-  git :init
-  file ".gitignore", <<-EOS.gsub(/^    /, '')
-    .DS_Store
-    log/*.log
-    tmp/**/*
-    config/database.yml
-    db/*.sqlite3
-    nbproject/*
-    .idea
-  EOS
-end
-
-gem 'kaminari' if yes?("Pagination ?")
-
-gem 'paperclip' if yes?("Attachment ?")
-
-gem 'fastercsv' if yes?("FasterCSV ?")
-
-gem 'state_machine' if yes?("Do you have to handle states ?")
-
-formtastic = yes?("Formtastic ?")
-if formtastic
-  #gem 'justinfrench-formtastic', :lib => 'formtastic', :source => 'http://gems.github.com'
-  #rake "gems:install" if install_gem
-
-  #A Rails FormBuilder DSL (with some other goodies) to make it far easier to create beautiful, semantically rich, syntactically awesome, readily stylable and wonderfully accessible HTML forms in your Rails applications.
-  gem 'formtastic'
-  gem 'validation_reflection'
-end
-
-if yes?("Add testing framework ?")
-  gem 'rspec-rails', :group => :test
-  gem 'capybara', :group => :test
-  gem 'launchy', :group => :test
-end
-
-model_name = nil
-devise = yes?("Would you like to install Devise?")
-if devise
-  gem 'devise'
-  model_name = ask(" What would you like the user model to be called? [user]")
-  model_name = "user" if model_name.blank?
-end
-
-cancan = yes?("Authorization ?")
-gem 'cancan' if cancan
-
-#home = yes?("Generate controller home ? (raccomanded)")
-home = true
-
-leolay = yes?("Layout ?")
-leolay_main_color = leolay_second_color = nil
-if leolay
-  gem 'leonardo'
-  puts " Enter colors, for example:"
-  puts "   #c8c8c8 or rgb(200,200,200) or gray"
-  leolay_main_color = ask(" Choose main color [blank=default color]:")
-  leolay_second_color = ask(" Choose secondary color [blank=default color]:")
-end
-
-run "bundle install"
-
-generate "formtastic:install" if formtastic
-
-if devise
-  generate("devise:install")
-  generate("devise", model_name)
-  #generate("devise:views") #not use since leolay copies custom views
-end
-
-generate "cancan:ability" if cancan
-
-if leolay
-  generate  "leolay",
-            (leolay_main_color && leolay_main_color.any? ? leolay_main_color : ""),
-            (leolay_second_color && leolay_second_color.any? ? leolay_second_color : ""),
-            (cancan ? "" : "--skip-authorization"),
-            (devise ? "" : "--skip-authentication"),
-	          (formtastic ? "" : "--skip-formtastic")
-end
-
-if home
-  generate "controller", "home", "index"
-  route "root :to => 'home#index'"
-end
-
-File.unlink "public/index.html"
-
-rake "db:create:all"
-rake "db:migrate"
-
-#rake "gems:unpack" if yes?("Unpack to vendor/gems ?")
-
-git :add => ".", :commit => "-m 'initial commit'" if use_git
-
-puts "ENJOY!"
+#########################################################
+# 2011 Marco Mastrodonato(c)
+# This is a Rails 3.1 template to use with leonardo gem
+# https://rubygems.org/gems/leonardo
+# 
+# USAGE: rails new yourappname -m template.rb
+# 
+# -------------------------------------------------------
+# 25-08-2011: Added rspec generation
+#########################################################
+
+puts '*' * 40
+puts "* Processing template..."
+puts '*' * 40
+
+use_git = yes?("Do you think to use git ?")
+if use_git
+  git :init
+  file ".gitignore", <<-EOS.gsub(/^    /, '')
+    .DS_Store
+    log/*.log
+    tmp/**/*
+    config/database.yml
+    db/*.sqlite3
+    nbproject/*
+    .idea
+  EOS
+end
+
+gem 'kaminari' if yes?("Pagination ?")
+
+gem 'paperclip' if yes?("Attachment ?")
+
+gem 'fastercsv' if yes?("FasterCSV ?")
+
+gem 'state_machine' if yes?("Do you have to handle states ?")
+
+formtastic = yes?("Formtastic ?")
+if formtastic
+  #gem 'justinfrench-formtastic', :lib => 'formtastic', :source => 'http://gems.github.com'
+  #rake "gems:install" if install_gem
+
+  #A Rails FormBuilder DSL (with some other goodies) to make it far easier to create beautiful, semantically rich, syntactically awesome, readily stylable and wonderfully accessible HTML forms in your Rails applications.
+  gem 'formtastic'
+  gem 'validation_reflection'
+end
+
+rspec = yes?("Add rspec as testing framework ?")
+if rspec
+  gem 'rspec-rails', :group => [:test, :development]
+  gem 'capybara', :group => :test
+  gem 'launchy', :group => :test
+  gem 'database_cleaner', :group => :test
+  gem 'factory_girl_rails', :group => :test
+end
+
+model_name = nil
+devise = yes?("Would you like to install Devise?")
+if devise
+  gem 'devise'
+  model_name = ask(" What would you like the user model to be called? [user]")
+  model_name = "user" if model_name.blank?
+end
+
+cancan = yes?("Authorization ?")
+gem 'cancan' if cancan
+
+#home = yes?("Generate controller home ? (raccomanded)")
+home = true
+
+leolay = yes?("Layout ?")
+leolay_main_color = leolay_second_color = ""
+if leolay
+  gem 'leonardo'
+  puts " Enter colors, for example:"
+  puts "   #c8c8c8 or rgb(200,200,200) or gray"
+  leolay_main_color = ask(" Choose main color [blank=default color]:")
+  leolay_second_color = ask(" Choose secondary color [blank=default color]:")
+end
+
+run "bundle install"
+
+generate "rspec:install" if rspec
+
+generate "formtastic:install" if formtastic
+
+if devise
+  generate("devise:install")
+  generate("devise", model_name)
+  #generate("devise:views") #not use since leolay copies custom views
+end
+
+generate "cancan:ability" if cancan
+
+if leolay
+  generate  "leolay",
+            "cloudy",
+            ("--main_color=#{leolay_main_color}" if leolay_main_color.any?),
+            ("--second_color=#{leolay_second_color}" if leolay_second_color.any?),
+            (cancan ? "" : "--skip-authorization"),
+            (devise ? "" : "--skip-authentication"),
+            (formtastic ? "" : "--skip-formtastic")
+end
+
+if home
+  generate "controller", "home", "index"
+  route "root :to => 'home#index'"
+end
+
+File.unlink "public/index.html"
+
+rake "db:create:all"
+rake "db:migrate"
+
+#rake "gems:unpack" if yes?("Unpack to vendor/gems ?")
+
+git :add => ".", :commit => "-m 'initial commit'" if use_git
+
+puts "ENJOY!"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: leonardo
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 3
   prerelease: 
   segments: 
   - 1
-  - 4
+  - 5
   - 0
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors: 
 - Marco Mastrodonato
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-24 00:00:00 Z
+date: 2011-08-30 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,6 +27,7 @@ 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
@@ -37,6 +38,7 @@ files:
 - lib/generators/erb/leosca/templates/show.html.erb
 - lib/generators/erb/leosca/templates/_form.html.erb
 - lib/generators/erb/leosca/templates/_list.erb
+- lib/generators/leolay/install_generator.rb
 - lib/generators/leolay/leolay_generator.rb
 - lib/generators/leolay/templates/app/assets/javascripts/custom.js
 - lib/generators/leolay/templates/app/views/devise/confirmations/new.html.erb
@@ -58,7 +60,15 @@ 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/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/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
+- lib/generators/leolay/templates/spec/support/devise.rb
 - lib/generators/leolay/templates/styles/cloudy/images/jquery-ui/Thumbs.db
 - lib/generators/leolay/templates/styles/cloudy/images/jquery-ui/ui-bg_diagonals-thick_18_b81900_40x40.png
 - lib/generators/leolay/templates/styles/cloudy/images/jquery-ui/ui-bg_diagonals-thick_20_666666_40x40.png
@@ -146,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.9
 signing_key: 
 specification_version: 3
 summary: A layout and customized scaffold generator for Rails 3.1