leonardo 1.3.1 → 1.4.0

data/CHANGELOG

@@ -1,3 +1,18 @@
+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
+* Now you can skip formtastic also with leosca generator (leolay already could) and though if it is installed.
+* jQuery ui (1.8.16) support with a custom ligthness theme to combine with leonardo default style
+* Filter fields labels on index views now have id linked to own text field.
+* Remove underscore from fields labels on yaml i18n files.
+* Fields labels on _form partial now use i18n tags. Who used formastic didn't need it.
+* Now date use a text fields with calendar class for jquery ui calendar, if you chose it
+* The three users created by leolay (admin, manager and user) have now a new password: abcd1234
+* Association now generate a link to related object showing its name || id. These changes are in the _list and show which now use a table => will be changed with a tableless layout
+* Minor improvement
+
+
+
 1.3.1 (August 22th, 2011) Marco Mastrodonato
 * Fixed csv name (to enable csv data export you have to set remote = false)
 * Fixed seeds creation when references fields are used

data/README.rdoc

@@ -1,14 +1,16 @@
 = Leolay Generators
 
 A layout and customized scaffold generator for Rails 3.1
-Generate a layout using the ERGO Insurance Group\'s style, you can customize it or add your own. It also provides a customized scaffold to generates cool sites ajax ready.
+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
 
 
 == Install
 
   gem install leonardo
 
-
+  or
+  
+  rails new NewApp -m http://cloud.github.com/downloads/marcomd/Leonardo/template.rb
 
 
 == Usage
@@ -19,16 +21,19 @@ To run the generator, go to your rails project directory and call it using rails
 rails g leolay or rails destroy leolay
 rails g leosca or rails destroy leosca
 
-PS:  Ergosca destroy do not remove variables parts like the attributes inserted into i18n yaml
+PS:  leosca destroy do not remove variables parts like the attributes inserted into i18n yaml
+
 PPS: You can run it more times and right like scaffold, is smart and won't generate tons of identical code
 
 === Step by step
 
 1. Firstly, create layout and initialize your project:
-rails new AppExample -m template.rb
-(You could find a template into gem root folder)
+rails new AppExample -m http://cloud.github.com/downloads/marcomd/Leonardo/template.rb
+(You can also find a template into gem root folder)
 
-there will be only a conflict on locales/en.yml which you can force
+Answer y for the gem you need.
+After the question will start generations.
+There will be a conflict on locales/en.yml which you must force if it is the first generation.
 
 Will be:
 * Created an application layout with a nice and dynamic stylesheet based on sass
@@ -36,43 +41,45 @@ Will be:
 * Customized application.rb to exclude javascript and stylesheet for every resource you will create
 * Customized application controller to manage i18n and others stuff like authentication, authorization ecc [optionals]
 * Created customized partials for pagination with kaminari [optional]
+* Added jQuery-ui with a custom ligthness layout
 
 2. If you have used my template you have an application ready to work:
-run rails s and try it on localhost:3000
-if you choosed authentication you have to sign in, try with this different profile:
- email: admin@AppExample.com, password: AppExample
+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
- email: manager@AppExample.com, password: AppExample
+ email: manager@AppExample.com, password: abcd1234
  [can read, create and update]
  or
- email: user@AppExample.com, password: AppExample
+ email: user@AppExample.com, password: abcd1234
  [can read, create, update and destroy]
 
-Profile exists only if you choosed authorization as well.
-That are default and ready to be customized to suit your needs.
+Profile exists only if you chose authorization as well.
 
 3. Create your resource:
 rails g leosca product name:string description:text active:boolean items:integer price:decimal
 
-This will act as a normal scaffold more new stuff:
+This will act as a normal scaffold and has more new features:
 * will be invoked new leosca_controller which is a customized scaffold_controller
-* customized views with new layout and ajax ready [set remote to true into index]
-* attributes will be insert into i18n files for fast translation
+* customized views with new layout and ajax ready (only destroy atm)
+* attributes will be insert into i18n files for a fast translation
 * seeds will be created for you to populate new table
+* ...and other stuff
 
-4. Apply on db
+4. Apply to db
 rake db:migrate
 rake db:seed
 
-READY!
-
+That's all!
+The new application is ready to be customized and to suit your needs.
 
-You could also customize it, copy under your project folder running:
+You could also customize templates: both views and controller.
+To copy under your project folder run:
 rails g leosca:install
 
-Then go to lib\generators\erb to change erb views like you would do with original scaffold
-go to lib\generators\rails if you want to customize more.
+Then go to lib\generators\erb to edit erb views like you would do with original scaffold.
+Go to lib\generators\rails if you want to customize more.
 
 
 For more information about usage:
@@ -102,7 +109,13 @@ PS: Of course, these options are in addition to those provided by the original s
 
 === Available layout
 
- * ergo [default]
+ * cloudy [default]
+
+
+== Tutorial
+
+http://mastrodonato.info/index.php/2011/08/leonardo-generatore-di-applicazioni-rails-3-1/
+
 
 
 == Found a bug?
@@ -113,3 +126,7 @@ If you are having a problem please submit an issue at m.mastrodonato@gmail.com
 == Rails 2 and Rails 3.0.x
 
 This Generators does not work with versions earlier 3.1
+
+
+
+

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

@@ -11,6 +11,7 @@ module Erb
       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"
 
       def create_root_folder
         empty_directory File.join("app/views", controller_file_path)
@@ -63,11 +64,13 @@ module Erb
       def authorization?
         File.exists? "app/models/ability.rb"
       end
-
       def formtastic?
+        return false unless options.formtastic?
         File.exists? "config/initializers/formtastic.rb"
       end
-
+      def jquery_ui?
+        File.exists? "vendor/assets/javascripts/jquery-ui"
+      end
     end
   end
 end

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

@@ -13,7 +13,7 @@
 
 <% attributes.each do |attribute| -%>
   <div class="field">
-    <%%= f.label :<%= attribute.name %> %><br />
+    <%%= f.label :<%= attribute.name %>, t('attributes.<%= singular_table_name %>.<%= attribute.name %>') %><br />
     <%%= f.<%= attribute.field_type %> :<%= attribute.name %> %>
   </div>
 <% end -%>

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

@@ -17,8 +17,11 @@
   <tr id="tr<%%= <%= singular_table_name %>.id %>" class="<%%= cycle("odd", "even")%>">
 <%- attributes.each do |attribute| -%>
     <%- case attribute.type
-    when :boolean -%>
+        when :boolean -%>
     <td><%%= <%= singular_table_name %>.<%= attribute.name %> ? style_image_tag("ico_v.png") : style_image_tag('ico_x.png') %></td>
+    <%- when :references, :belongs_to -%>
+    <%% link_name = <%= singular_table_name %>.<%= attribute.name %>.try(:name) || <%= singular_table_name %>.<%= attribute.name %>.try(:id) %>
+    <td><%%= link_to(link_name, <%= singular_table_name %>.<%= attribute.name %> ) %></td>
     <%-	else -%>
     <td><%%= <%= singular_table_name %>.<%= attribute.name %> %></td>
     <%- end -%>

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

@@ -1,8 +1,13 @@
 <%%= semantic_form_for(@<%= singular_table_name %>) do |f| %>
     <%%= f.inputs do %>
-    <% attributes.each do |attribute| -%>
-        <%%= f.input :<%= attribute.name %> %>
-    <% end -%>
+    <%- attributes.each do |attribute| -%>
+        <%- case attribute.type
+            when :date -%>
+            <%%= f.input :<%= attribute.name %>, :as => :string, :input_html => { :class => 'calendar', :maxlength => 10 } %>
+        <%-	else -%>
+            <%%= f.input :<%= attribute.name %> %>
+        <%- end -%>
+    <%- end -%>
     <%% end %>
     <%%= f.buttons do %>
       <%%= f.commit_button :button_html => { :class => "button large" } %>

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

@@ -9,7 +9,7 @@
 <div class="filter-container">
   <%- attributes.each do |attribute| -%>
   <div class="filter-field">
-    <b><%%= f.label t('attributes.<%= singular_table_name %>.<%= attribute.name %>') %></b><br />
+    <b><%%= f.label :<%= attribute.name %>, t('attributes.<%= singular_table_name %>.<%= attribute.name %>') %></b><br />
     <%- case attribute.type -%>
     <%-	when :boolean -%>
         <%%= radio_button("<%= singular_table_name %>", "<%= attribute.name %>", "1", {:checked => (@<%= singular_table_name %>.<%= attribute.name %>)}) %><%%= label_tag "<%= singular_table_name %>_<%= attribute.name %>_1", t(:yes) %><br />
@@ -17,6 +17,8 @@
         <%%= radio_button("<%= singular_table_name %>", "<%= attribute.name %>", "") %><%%= label_tag "<%= singular_table_name %>_<%= attribute.name %>_", t(:all) %>
     <%-	when :text -%>
         <%%= f.text_field :<%= attribute.name %> %>
+    <%-	when :date -%>
+        <%%= f.text_field :<%= attribute.name %><%=", :class => \"calendar\"" if jquery_ui?%> %>
     <%-	else -%>
         <%%= f.<%= attribute.field_type %> :<%= attribute.name %> %>
     <%- end -%>

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

@@ -4,10 +4,22 @@
                         {:value => link_to(t(:show), @<%= singular_table_name %>), :active => true}
 )%>
 
+<table>
 <% attributes.each do |attribute| -%>
-<p>
-  <b><%%= t('attributes.<%= singular_table_name %>.<%= attribute.name %>') %>:</b>
-  <%%= @<%= singular_table_name %>.<%= attribute.name %> %>
-</p>
-
+<tr>
+  <%- case attribute.type
+      when :boolean -%>
+    <td><b><%%= t('attributes.<%= singular_table_name %>.<%= attribute.name %>') %>:</b></td>
+    <td><%%= @<%= singular_table_name %>.<%= attribute.name %> ? style_image_tag("ico_v.png") : style_image_tag('ico_x.png') %></td>
+  <%- when :references, :belongs_to -%>
+    <%% link_name = @<%= singular_table_name %>.<%= attribute.name %>.try(:name) || @<%= singular_table_name %>.<%= attribute.name %>.try(:id) %>
+    <td><b><%%= t('attributes.<%= singular_table_name %>.<%= attribute.name %>') %>:</b></td>
+    <td><%%= link_to(link_name, @<%= singular_table_name %>.<%= attribute.name %> ) %></td>
+  <%- else -%>
+    <td><b><%%= t('attributes.<%= singular_table_name %>.<%= attribute.name %>') %>:</b></td>
+    <td><%%= @<%= singular_table_name %>.<%= attribute.name %> %></td>
+  <%- end -%>
+</tr>
 <% end -%>
+</table>
+

data/lib/generators/leolay/leolay_generator.rb

@@ -8,45 +8,64 @@ class LeolayGenerator < Rails::Generators::Base
   class_option :authorization, :type => :boolean, :default => true, :description => "Add code to manage authorization with cancan"
   class_option :user_class, :type => :boolean, :default => 'user', :description => "Set the user class name"
   class_option :formtastic, :type => :boolean, :default => true, :description => "Copy formtastic files into leosca custom folder (inside project)"
+  class_option :jquery_ui, :type => :boolean, :default => true, :description => "To use jQuery ui improvement"
 
 
   def generate_layout
     template "config.rb", "config/initializers/config.rb"
 
-    template "styles/#{style_name}/stylesheet.sass",
-             "app/assets/stylesheets/#{style_name}.sass"
+    template "styles/#{style_name}/stylesheet.sass", "app/assets/stylesheets/#{style_name}.sass"
 
     copy_file "layout_helper.rb", "app/helpers/layout_helper.rb"
 
     copy_file "styles/#{style_name}/views/layout/application.html.erb", "app/views/layouts/application.html.erb", :force => true
     template "styles/#{style_name}/views/layout/_layout.html.erb", "app/views/layouts/_#{style_name}.html.erb"
-              #{:authentication => options.authentication?,
-              #:authorization => options.authorization?}
     copy_file "styles/#{style_name}/views/layout/_message.html.erb", "app/views/application/_message.html.erb"
     copy_file "styles/#{style_name}/views/layout/_session.html.erb", "app/views/application/_session.html.erb" if options.authentication?
 
-    copy_file "config/locales/en.yml", "config/locales/en.yml"
-    copy_file "config/locales/it.yml", "config/locales/it.yml"
+    locale_path = "config/locales"
+    source_paths.each do |source_path|
+      files = Dir["#{source_path}/#{locale_path}/??.yml"]
+      files.each do |f|
+        copy_file f, "#{locale_path}/#{File.basename(f)}"
+      end
+      break if files.any?
+    end
 
     copy_file "lib/utility.rb", "lib/extras/utility.rb"
 
     if options.pagination?
-      copy_file "config/locales/kaminari.en.yml", "config/locales/kaminari.en.yml"
-      copy_file "config/locales/kaminari.it.yml", "config/locales/kaminari.it.yml"
+      source_paths.each do |source_path|
+        files = Dir["#{source_path}/#{locale_path}/kaminari.??.yml"]
+        files.each do |f|
+          copy_file f, "#{locale_path}/#{File.basename(f)}"
+        end
+        break if files.any?
+      end
 
-      copy_file "styles/#{style_name}/views/kaminari/_next_page.html.erb", "app/views/kaminari/_next_page.html.erb"
-      copy_file "styles/#{style_name}/views/kaminari/_page.html.erb", "app/views/kaminari/_page.html.erb"
-      copy_file "styles/#{style_name}/views/kaminari/_paginator.html.erb", "app/views/kaminari/_paginator.html.erb"
-      copy_file "styles/#{style_name}/views/kaminari/_prev_page.html.erb", "app/views/kaminari/_prev_page.html.erb"
+      #copy_file "styles/#{style_name}/views/kaminari/_next_page.html.erb", "app/views/kaminari/_next_page.html.erb"
+      #copy_file "styles/#{style_name}/views/kaminari/_page.html.erb", "app/views/kaminari/_page.html.erb"
+      #copy_file "styles/#{style_name}/views/kaminari/_paginator.html.erb", "app/views/kaminari/_paginator.html.erb"
+      #copy_file "styles/#{style_name}/views/kaminari/_prev_page.html.erb", "app/views/kaminari/_prev_page.html.erb"
+      directory "styles/#{style_name}/views/kaminari", "app/views/kaminari"
 
-      copy_file "styles/#{style_name}/images/kaminari/nav.png", "app/assets/images/styles/#{style_name}/kaminari/nav.png"
+
+      #copy_file "styles/#{style_name}/images/kaminari/nav.png", "app/assets/images/styles/#{style_name}/kaminari/nav.png"
+      directory "styles/#{style_name}/images/kaminari", "app/assets/images/styles/#{style_name}/kaminari"
     end
 
     directory "styles/#{style_name}/images/style", "app/assets/images/styles/#{style_name}"
 
+    directory "styles/#{style_name}/images/jquery-ui", "app/assets/images/styles/#{style_name}/jquery-ui" if options.jquery_ui?
+
     if options.authentication?
-      copy_file "config/locales/devise.en.yml", "config/locales/devise.en.yml"
-      copy_file "config/locales/devise.it.yml", "config/locales/devise.it.yml"
+      source_paths.each do |source_path|
+        files = Dir["#{source_path}/#{locale_path}/devise.??.yml"]
+        files.each do |f|
+          copy_file f, "#{locale_path}/#{File.basename(f)}"
+        end
+        break if files.any?
+      end
       directory "app/views/devise", "app/views/devise"
     end
   end
@@ -135,19 +154,19 @@ class LeolayGenerator < Rails::Generators::Base
   def create_admin_migration
     file = "db/migrate/*_create_admin.rb"
     return unless options.authentication? and Dir[file].empty?
-    file = file.sub('*', Time.now.strftime("%Y%m%d%H9999"))
+    file = file.sub('*', Time.now.strftime("%Y%m%d%H%M99"))
     create_file file do
       <<-FILE.gsub(/^      /, '')
       class CreateAdmin < ActiveRecord::Migration
         def self.up
           add_column :users, :roles_mask, :integer
-          user=User.new :email => 'admin@#{app_name}.com', :password => '#{app_name}', :password_confirmation => '#{app_name}'
+          user=User.new :email => 'admin@#{app_name}.com', :password => 'abcd1234', :password_confirmation => 'abcd1234'
           user.roles=['admin']
           user.save
-          user=User.new :email => 'manager@#{app_name}.com', :password => '#{app_name}', :password_confirmation => '#{app_name}'
+          user=User.new :email => 'manager@#{app_name}.com', :password => 'abcd1234', :password_confirmation => 'abcd1234'
           user.roles=['manager']
           user.save
-          user=User.new :email => 'user@#{app_name}.com', :password => '#{app_name}', :password_confirmation => '#{app_name}'
+          user=User.new :email => 'user@#{app_name}.com', :password => 'abcd1234', :password_confirmation => 'abcd1234'
           user.roles=['user']
           user.save
         end
@@ -160,20 +179,20 @@ class LeolayGenerator < Rails::Generators::Base
       end
       FILE
     end
+
   end
 
   def setup_formtastic
     return unless options.formtastic?
 
-    file = "app/assets/stylesheets/formtastic.css"
-    copy_file file, file
-    file = "app/assets/stylesheets/formtastic_changes.css"
+    path = "vendor/assets/stylesheets/formtastic"
+    file = "#{path}/formtastic.css"
+    copy_file file, file unless File.exists?(file)
+    file = "#{path}/formtastic_changes.css"
     copy_file file, file
 
-    #New version include custom partial _form
-    #file_source = "lib/templates/erb/scaffold/_form.html.erb"
-    #file_destination = "lib/templates/erb/leosca/_form.html.erb"
-    #copy_file file_source, file_destination if File.exists?(file_source) and not File.exists?(file_destination)
+    path = "vendor/assets/stylesheets/jquery-ui"
+    directory path, path
 
     file = "config/initializers/formtastic.rb"
     inject_into_file file, :after => "# Formtastic::SemanticFormBuilder.i18n_lookups_by_default = false" do
@@ -184,6 +203,91 @@ class LeolayGenerator < Rails::Generators::Base
     end if File.exists?(file)
   end
 
+  def setup_javascript
+    app_path = "app/assets/javascripts"
+    vendor_path = "vendor/assets/javascripts"
+
+    file = "#{app_path}/custom.js"
+    copy_file file, file
+
+    file = "#{vendor_path}/vendor.js"
+    copy_file file, file
+
+    file = "#{app_path}/application.js"
+    append_file file do
+      <<-FILE.gsub(/^      /, '')
+
+      //= require vendor
+      FILE
+    end
+
+    if options.jquery_ui?
+      file = "#{app_path}/custom.js"
+      append_file file do
+        <<-FILE.gsub(/^        /, '')
+
+        $(function (){
+          $('.calendar').datepicker();
+        });
+        FILE
+      end
+
+      file = "#{app_path}/application.js"
+      inject_into_file file, :after => "//= require jquery_ujs" do
+        <<-FILE.gsub(/^        /, '')
+
+        //= require jquery-ui
+        FILE
+      end
+
+      #files = Dir["#{vendor_path}/jquery-ui/jquery.ui.datepicker-??.js"]
+      #files.each do |f|
+      #  copy_file f, f
+      #end
+      directory "#{vendor_path}/jquery-ui", "#{vendor_path}/jquery-ui"
+
+      file = "#{vendor_path}/vendor.js"
+      append_file file do
+        <<-FILE.gsub(/^        /, '')
+
+        //= require_tree ./jquery-ui
+        FILE
+      end
+
+    end
+  end
+
+  def setup_stylesheets
+    app_path = "app/assets/stylesheets"
+    vendor_path = "vendor/assets/stylesheets"
+
+    file = "#{vendor_path}/vendor.css"
+    copy_file file, file
+
+    if options.jquery_ui?
+      file = "#{app_path}/application.css"
+      inject_into_file file, :before => "*/" do
+        <<-FILE.gsub(/^        /, '')
+         *= require vendor
+        FILE
+      end
+
+      file = "#{vendor_path}/vendor.css"
+      inject_into_file file, :before => "*/" do
+        <<-FILE.gsub(/^        /, '')
+         *= require_tree ./jquery-ui
+        FILE
+      end
+    end
+
+    file = "#{vendor_path}/vendor.css"
+    inject_into_file file, :before => "*/" do
+      <<-FILE.gsub(/^      /, '')
+       *= require_tree ./formtastic
+      FILE
+    end if options.formtastic?
+  end
+
   private
   def style_name
     style.underscore
@@ -192,4 +296,5 @@ class LeolayGenerator < Rails::Generators::Base
   def app_name
     File.basename(Dir.pwd)
   end
+
 end