active_leonardo 0.0.2 → 0.0.3

data/CHANGELOG

@@ -1,2 +1,9 @@
+0.0.3 (May 23th, 2012) Marco Mastrodonato
+* Improved cancan integration
+* Localization yaml file cleaned from some previous leonardo stuff
+
+0.0.2 (May 23th, 2012) Marco Mastrodonato
+* Minor changement
+
 0.0.1 (May 23th, 2012) Marco Mastrodonato
 * First release

data/active_template.rb

@@ -44,33 +44,42 @@ gem "active_leonardo"
 
 gem 'state_machine' if yes?("Do you have to handle states ?")
 
-authorization = yes?("Authorization ?")
-gem 'cancan' if authorization
-
 authentication = yes?("Authentication ?")
+model_name = authorization = nil
+if authentication
+  default_model_name = "User"
+  model_name = ask(" Insert model name: [#{default_model_name}] (Other names are not tested yet)")
+  model_name = default_model_name if model_name.empty?
+  
+  authorization = yes?("Authorization ?")
+  gem 'cancan' if authorization
+end
 
-#home = yes?("Generate controller home ? (raccomanded)")
-home = true
+dashboard_root = yes?("Would you use dashboard as root ? (recommended)")
+home = yes?("Ok. Would you create home controller as root ?") unless dashboard_root
 
 if yes?("Bundle install ?")
   dir = ask(" Insert folder name to install locally: [blank=default gems path]")
   run "bundle install #{"--path=#{dir}" unless dir.empty?}"
 end
 
-generate "active_admin:install #{authentication ? "User" : "--skip-users"}"
+generate "active_admin:install #{authentication ? model_name : "--skip-users"}"
 
 if authorization
   generate "cancan:ability"
-  generate "migration", "AddRolesMaskToUsers", "roles_mask:integer"
+  generate "migration", "AddRolesMaskTo#{model_name}", "roles_mask:integer"
 end
 
 generate  "leolay",
             "active", #specify theme
+            "--auth_class=#{model_name}",
             (authorization ? "" : "--skip-authorization"),
-            (authentication ? "" : "--skip-authentication"),
+            (authentication ? "" : "--skip-authentication")
 
 
-if home
+if dashboard_root
+  route "root :to => 'admin/dashboard#index'"
+elsif home
   generate "controller", "home", "index"
   route "root :to => 'home#index'"
 end

data/lib/generators/active_leonardo.rb

@@ -1,15 +1,24 @@
 module ActiveLeonardo
   module Base
     protected
+    def authorization_file
+      "app/models/ability.rb"
+    end
     def authorization?
-      File.exists? "app/models/ability.rb"
+      File.exists? authorization_file
+    end
+    def authentication_file auth_class="User"
+      "app/models/#{auth_class.downcase}.rb"
     end
-    def authentication?
-      return true if File.exists? "app/models/user.rb"
+    def authentication? auth_class="User"
+      return true if File.exists? authentication_file(auth_class)
       File.exists? "config/initializers/devise.rb"
     end
+    def activeadmin_file
+      "config/initializers/active_admin.rb"
+    end
     def activeadmin?
-      File.exists? "config/initializers/active_admin.rb"
+      File.exists? activeadmin_file
     end
     #def formtastic?
     #  return false unless options.formtastic?

data/lib/generators/leolay/leolay_generator.rb

@@ -1,4 +1,8 @@
+require File.join(File.dirname(__FILE__), '../active_leonardo')
+
 class LeolayGenerator < Rails::Generators::Base
+  include ::ActiveLeonardo::Base
+
   source_root File.expand_path('../templates', __FILE__)
   argument :style, :type => :string, :default => "active"
   #class_option :pagination, :type => :boolean, :default => true, :desc => "Include pagination files"
@@ -7,7 +11,7 @@ class LeolayGenerator < Rails::Generators::Base
   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 :activeadmin, :type => :boolean, :default => true, :desc => "Add code to manage activeadmin gem"
-  class_option :auth_class, :type => :boolean, :default => 'User', :desc => "Set the authentication class name"
+  class_option :auth_class, :type => :string, :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"
@@ -125,7 +129,6 @@ class LeolayGenerator < Rails::Generators::Base
           end
           I18n.locale = session[:lang]
         end
-        require "upd_activeadmin"
         FILE
       end
     end
@@ -154,7 +157,7 @@ class LeolayGenerator < Rails::Generators::Base
     #puts "File #{file} #{File.exists?(file) ? "" : "does not"} exists!"
     return unless options.authentication? and File.exists?(file)
 
-    inject_into_class file, User do
+    inject_into_class file, options[:auth_class] do
       <<-FILE.gsub(/^    /, '')
       ROLES = %w[admin manager user guest]
       scope :with_role, lambda { |role| {:conditions => "roles_mask & \#{2**ROLES.index(role.to_s)} > 0 "} }
@@ -174,6 +177,7 @@ class LeolayGenerator < Rails::Generators::Base
       def admin?
         self.role? 'admin'
       end
+      attr_accessible :roles
       FILE
     end
 
@@ -196,13 +200,13 @@ class LeolayGenerator < Rails::Generators::Base
     file = "db/seeds.rb"
     append_file file do
       <<-FILE.gsub(/^      /, '')
-      user=User.new :email => 'admin@#{app_name}.com', :password => 'abcd1234', :password_confirmation => 'abcd1234'
+      user=#{options[:auth_class]}.new :email => 'admin@#{app_name}.com', :password => 'abcd1234', :password_confirmation => 'abcd1234'
       #{"user.roles=['admin']" if options.authorization?}
       user.save
-      user=User.new :email => 'manager@#{app_name}.com', :password => 'abcd1234', :password_confirmation => 'abcd1234'
+      user=#{options[:auth_class]}.new :email => 'manager@#{app_name}.com', :password => 'abcd1234', :password_confirmation => 'abcd1234'
       #{"user.roles=['manager']" if options.authorization?}
       user.save
-      user=User.new :email => 'user@#{app_name}.com', :password => 'abcd1234', :password_confirmation => 'abcd1234'
+      user=#{options[:auth_class]}.new :email => 'user@#{app_name}.com', :password => 'abcd1234', :password_confirmation => 'abcd1234'
       #{"user.roles=['user']" if options.authorization?}
       user.save
       FILE
@@ -338,14 +342,13 @@ class LeolayGenerator < Rails::Generators::Base
 
   def setup_extras
     copy_file "lib/upd_array.rb", "lib/extras/upd_array.rb"
-    template "lib/upd_activeadmin.rb", "lib/extras/upd_activeadmin.rb"
   end
 
   def setup_activeadmin
-    file = "config/initializers/active_admin.rb"
-    return unless options.activeadmin? and File.exists?(file)
+    return unless options.activeadmin? and activeadmin?
+    template "config/initializers/activeadmin_leonardo.rb", "config/initializers/activeadmin_leonardo.rb"
+    copy_file "config/initializers/activeadmin_cancan.rb", "config/initializers/activeadmin_cancan.rb" if options.authorization?
     template "app/admin/users.rb", "app/admin/#{options[:auth_class].downcase.pluralize}.rb"
-    template "app/views/admin/users/_form.html.erb", "app/views/admin/#{options[:auth_class].downcase.pluralize}/_form.html.erb"
 
     file = "app/assets/stylesheets/active_admin.css.scss"
     append_file file do

data/lib/generators/leolay/templates/app/admin/users.rb

@@ -1,10 +1,11 @@
-ActiveAdmin.register <%= options[:auth_class].capitalize %> do
-  menu :if => proc{ can?(:manage, <%= options[:auth_class].capitalize %>) }
-  controller.authorize_resource
+ActiveAdmin.register <%= options[:auth_class] %> do
+  menu :if => proc{ can?(:manage, <%= options[:auth_class] %>) }
 
-  config.sort_order = 'order asc'
+  config.sort_order = 'email_asc'
 
   controller do
+    load_resource :except => :index
+    authorize_resource
     def update
       unless params[:<%= options[:auth_class].downcase %>]['password'] && params[:<%= options[:auth_class].downcase %>]['password'].size > 0
         params[:<%= options[:auth_class].downcase %>].delete 'password'
@@ -18,26 +19,36 @@ ActiveAdmin.register <%= options[:auth_class].capitalize %> do
 
   index do
     id_column
-    #column :name
     column :email
-    #column :login_ldap
-    #column :gruppo, :sortable => :gruppo_id
+    #column :group, :sortable => :group_id
+    column :roles do |user|
+      user.roles.join ", "
+    end
     column :current_sign_in_at
     column :current_sign_in_ip
-    #column :created_at
+    column :created_at
     default_actions
   end
 
-  form :partial => "form"
+  form do |f|
+    input_roles = "<li>" <<
+        f.label(:roles) <<
+        <%= options[:auth_class] %>::ROLES.map{|role| check_box_tag("<%= options[:auth_class].downcase %>[roles][]", role, f.object.roles.include?(role)) << ' ' << role.humanize.html_safe }.join(" ") <<
+        hidden_field_tag("<%= options[:auth_class].downcase %>[roles][]") <<
+        "</li>"
+    f.inputs "Account" do
+      f.input :email
+      f.input :password
+      f.input(:password_confirmation) <<
+          input_roles.html_safe
+    end
+    f.buttons
+  end
 
   show do
     attributes_table do
-      #row :gruppo do |<%= options[:auth_class].downcase %>|
-      #  <%= options[:auth_class].downcase %>.gruppo ? <%= options[:auth_class].downcase %>.gruppo.try(:name) : "Unknown"
-      #end
-      #row :name
       row :email
-      #row :login_ldap
+      #row :group
       row :current_sign_in_at
       row :last_sign_in_at
       row :sign_in_count
@@ -48,14 +59,12 @@ ActiveAdmin.register <%= options[:auth_class].capitalize %> do
       row :created_at
       row :updated_at
     end
-
   end
 
   csv do
     column :email
     #column("Name") { |<%= options[:auth_class].downcase %>| <%= options[:auth_class].downcase %>.name }
     #column("Group") { |<%= options[:auth_class].downcase %>| <%= options[:auth_class].downcase %>.group.try(:name) }
-    #column :login_ldap
     column(I18n.t('attributes.<%= options[:auth_class].downcase %>.roles')) { |<%= options[:auth_class].downcase %>| <%= options[:auth_class].downcase %>.roles.join ", " }
     column(I18n.t('attributes.created_at')) { |<%= options[:auth_class].downcase %>| <%= options[:auth_class].downcase %>.created_at.strftime("%d/%m/%Y") }
     column(I18n.t('attributes.<%= options[:auth_class].downcase %>.last_sign_in_at')) { |<%= options[:auth_class].downcase %>| <%= options[:auth_class].downcase %>.last_sign_in_at.strftime("%d/%m/%Y") if <%= options[:auth_class].downcase %>.last_sign_in_at }

data/lib/generators/leolay/templates/config/initializers/activeadmin_cancan.rb

@@ -0,0 +1,114 @@
+
+module ActiveAdmin
+  module Views
+    #Integrate cancan in default_actions
+    #\lib\active_admin\views\index_as_table.rb
+    class IndexAsTable
+      class IndexTableFor
+        # Adds links to View, Edit and Delete
+        def default_actions(options = {})
+          options = {
+              :name => "",
+              :auth => nil
+          }.merge(options)
+          column options[:name] do |resource|
+            links = ''.html_safe
+            if controller.action_methods.include?('show') && (options[:auth] ? can?(:read, resource) : true)
+              links += link_to I18n.t('active_admin.view'), resource_path(resource), :class => "member_link view_link"
+            end
+            if controller.action_methods.include?('edit') && (options[:auth] ? can?(:update, resource) : true)
+              links += link_to I18n.t('active_admin.edit'), edit_resource_path(resource), :class => "member_link edit_link"
+            end
+            if controller.action_methods.include?('destroy') && (options[:auth] ? can?(:update, resource) : true)
+              links += link_to I18n.t('active_admin.delete'), resource_path(resource), :method => :delete, :confirm => I18n.t('active_admin.delete_confirmation'), :class => "member_link delete_link"
+            end
+            links
+          end
+        end
+      end
+    end
+  end
+
+  module ViewHelpers
+    # lib/active_admin/view_helpers/auto_link_helper.rb
+    def auto_link(resource, link_content = nil)
+      content = link_content || display_name(resource)
+      if can?(:read, resource) && registration = active_admin_resource_for(resource.class)
+        begin
+          content = link_to(content, send(registration.route_instance_path, resource))
+        rescue
+        end
+      end
+      content
+    end
+  end
+
+  class Resource
+    module ActionItems
+      private
+
+      # Adds the default action items to each resource
+      def add_default_action_items
+        # New Link on all actions except :new and :show
+        add_action_item :except => [:new, :show] do
+          if controller.action_methods.include?('new') && can?(:create, active_admin_config.resource_class)
+            link_to(I18n.t('active_admin.new_model', :model => active_admin_config.resource_name), new_resource_path)
+          end
+        end
+
+        # Edit link on show
+        add_action_item :only => :show do
+          if controller.action_methods.include?('edit') && can?(:edit, resource)
+            link_to(I18n.t('active_admin.edit_model', :model => active_admin_config.resource_name), edit_resource_path(resource))
+          end
+        end
+
+        # Destroy link on show
+        add_action_item :only => :show do
+          if controller.action_methods.include?("destroy") && can?(:destroy, resource)
+            link_to(I18n.t('active_admin.delete_model', :model => active_admin_config.resource_name),
+              resource_path(resource),
+              :method => :delete, :confirm => I18n.t('active_admin.delete_confirmation'))
+          end
+        end
+      end
+    end
+
+    # lib/active_admin/resource/menu.rb
+    module Menu
+      # The :if block is evaluated by TabbedNavigation#display_item?
+      def default_menu_options
+        klass = resource_class # avoid variable capture
+        super.merge(:if => proc{ can? :read, klass })
+      end
+    end
+  end
+
+  class ResourceController
+    # lib/active_admin/resource_controller/collection.rb
+
+    # The following doesn't work (see https://github.com/ryanb/cancan/pull/683):
+    #
+    # load_and_authorize_resource
+    # skip_load_resource :only => :index
+    #
+    # If you don't skip loading on #index you will get the exception:
+    #
+    # "Collection is not a paginated scope. Set collection.page(params[:page]).per(10) before calling :paginated_collection."
+    #
+    # Add to your activeadmin file:
+    #
+    # controller.load_resource :except => :index
+    # controller.authorize_resource
+
+    # https://github.com/gregbell/active_admin/wiki/Enforce-CanCan-constraints
+    # https://github.com/ryanb/cancan/blob/master/lib/cancan/controller_resource.rb#L80
+    module Collection
+      module BaseCollection
+        def scoped_collection
+          end_of_association_chain.accessible_by(current_ability)
+        end
+      end
+    end
+  end
+end

data/lib/generators/leolay/templates/config/initializers/activeadmin_leonardo.rb

@@ -0,0 +1,30 @@
+module ActiveAdmin
+  module Views
+    module Pages
+      #Custom footer
+      #\lib\active_admin\views\pages\base.rb
+      class Base < Arbre::HTML::Document
+        private
+        def build_footer
+          div :id => "footer" do
+            para "#{CONFIG[:application][:name]} #{Rails.env} #{CONFIG[:application][:version]} <%= Time.now.year %>.".html_safe
+          end
+        end
+
+      end
+    end
+
+    #Avoid xml and json from download
+    #\lib\active_admin\views\components\paginated_collection.rb
+    #class PaginatedCollection
+    #  def build_download_format_links(formats = [:csv])
+    #    links = formats.collect do |format|
+    #      link_to format.to_s.upcase, { :format => format}.merge(request.query_parameters.except(:commit, :format))
+    #    end
+    #    div :class => "download_links" do
+		 #     text_node [I18n.t('active_admin.download'), links].flatten.join("&nbsp;").html_safe
+    #    end
+    #  end
+    #end
+  end
+end

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

@@ -0,0 +1,57 @@
+
+
+it:
+  errors:
+    messages:
+      expired: "è scaduto ed è necessario richiederne uno nuovo"
+      not_found: "non trovato"
+      already_confirmed: "è già stato confermato, riprova a collegarti"
+      not_locked: "non era bloccato"
+      not_saved:
+        one: "un errore ha impedito il salvataggio di %{resource}:"
+        other: "%{count} errori hanno impedito il salvataggio di %{resource}:"
+
+  devise:
+    failure:
+      already_authenticated: "Sei già autenticato"
+      unauthenticated: "Devi accedere o registrarti per continuare."
+      unconfirmed: "Devi confermare il tuo account per continuare."
+      locked: "Il tuo account è bloccato."
+      invalid: "Indirizzo email o password non validi."
+      invalid_token: "Codice di autenticazione non valido."
+      timeout: "Sessione scaduta, accedere nuovamente per continuare."
+      inactive: "Il tuo account non è stato ancora attivato."
+    sessions:
+      signed_in: "Accesso effettuato con successo."
+      signed_out: "Sei uscito correttamente."
+    passwords:
+      send_instructions: "Riceverai un messaggio email con le istruzioni per reimpostare la tua password entro qualche minuto."
+      updated: "La tua password è stata cambiata. Ora sei collegato."
+      updated_not_active: "La tua password è stata cambiata."
+      send_paranoid_instructions: "Se il tuo indirizzo e-mail esiste nel nostro database, riceverai un link per il recupero della password."
+    confirmations:
+      send_instructions: "Riceverai un messaggio email con le istruzioni per confermare il tuo account entro qualche minuto."
+      send_paranoid_instructions: "Se il tuo indirizzo e-mail esiste nel nostro database, fra pochi minuti riceverai un link con le istruzioni per confermare il tuo account."
+      confirmed: "Il tuo account è stato correttamente confermato. Ora sei collegato."
+    registrations:
+      signed_up: "Iscrizione correttamente eseguita."
+      signed_up_but_unconfirmed: "Un messaggio con il link di conferma è stato inviato al tuo indirizzo email. Dovresti cliccare su quel link per attivare il tuo account."
+      signed_up_but_inactive: "Ti sei registrato con successo. Tuttavia, non è stato possibile effettuare il login perché il tuo account non è ancora stato attivato."
+      signed_up_but_locked: "Ti sei registrato con successo. Tuttavia, non è stato possibile effettuare il login perché il tuo account è bloccato."
+      updated: "Il tuo account è stato aggiornato."
+      update_needs_confirmation: "È stato aggiornato il tuo account con successo, ma abbiamo bisogno di verificare il tuo nuovo indirizzo email. Controlla la tua email e clicca sul link per confermare il nuovo indirizzo email."
+      destroyed: "Arrivederci! L'account è stato cancellato. Speriamo di rivederti presto."
+    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."
+      send_paranoid_instructions: "Se il tuo indirizzo e-mail esiste nel nostro database, fra pochi minuti riceverai un link con le istruzioni per sbloccare il tuo account."
+    omniauth_callbacks:
+      success: "Sei stato autorizzato dall'account di %{kind}."
+      failure: "Non siamo riusciti ad autoruzzarti da %{kind} perchè '%{reason}'."
+    mailer:
+      confirmation_instructions:
+        subject: "Istruzioni per la conferma"
+      reset_password_instructions:
+        subject: "Istruzioni per reimpostare la password"
+      unlock_instructions:
+        subject: "Istruzioni per sbloccare l'account"

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

@@ -20,7 +20,7 @@ module Rails
       #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 => "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"
+      class_option :auth_class, :type => :string, :default => 'User', :desc => "Set the authentication class name"
       class_option :activeadmin, :type => :boolean, :default => true, :desc => "Add code to manage activeadmin gem"
 
       #Override
@@ -46,15 +46,11 @@ module Rails
             attributes.each do |attribute|
               content << "        #{attribute.name}: \"#{attribute.name.humanize}\"#{CRLF}"
             end
-            content << "        op_new: \"New #{singular_table_name}\"#{CRLF}"
-            content << "        op_edit: \"Editing #{singular_table_name}\"#{CRLF}"
-            content << "        op_edit_multiple: \"Editing #{plural_table_name}\"#{CRLF}"
-            content << "        op_copy: \"Creating new #{plural_table_name}\"#{CRLF}"
-            #if nested?
-            #  content << "        op_index: \"Listing #{plural_table_name} belongings to %{parent} %{name}\"#{CRLF}"
-            #else
-              content << "        op_index: \"Listing #{plural_table_name}\"#{CRLF}"
-            #end
+            #content << "        op_new: \"New #{singular_table_name}\"#{CRLF}"
+            #content << "        op_edit: \"Editing #{singular_table_name}\"#{CRLF}"
+            #content << "        op_edit_multiple: \"Editing #{plural_table_name}\"#{CRLF}"
+            #content << "        op_copy: \"Creating new #{plural_table_name}\"#{CRLF}"
+            #content << "        op_index: \"Listing #{plural_table_name}\"#{CRLF}"
             content
           end
 
@@ -91,9 +87,8 @@ module Rails
       end
 
       def update_ability_model
-        file = "app/models/ability.rb"
-        return unless File.exists?(file)
-        inject_into_file file, :before => "  end\nend" do
+        return unless authorization?
+        inject_into_file authorization_file, :before => "  end\nend" do
           <<-FILE.gsub(/^      /, '')
           #can :read, #{class_name} if #{options[:auth_class].downcase}.new_record? #Guest
           can :read, #{class_name} if #{options[:auth_class].downcase}.role? :guest #Registered guest
@@ -145,15 +140,10 @@ module Rails
           <<-FILE.gsub(/^          /, '')
 
             menu :if => proc{ can?(:read, #{class_name}) }
-            controller.authorize_resource
 
             controller do
-              # don't show prohibited actions on the index page
-              def action_methods
-                actions_abilities = {'show' => :read, 'new' => :create, 'edit' => :update, 'destroy' => :destroy}
-                prohibited_methods = actions_abilities.keys.select{|m| !can? actions_abilities[m], #{class_name}}
-                super - prohibited_methods
-              end
+              load_resource :except => :index
+              authorize_resource
             end
           FILE
         end if authorization? && File.exists?(file)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_leonardo
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Marco Mastrodonato
@@ -15,12 +15,28 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-23 00:00:00 Z
+date: 2012-08-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: activeadmin
+  name: rails
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 3
+        - 1
+        - 0
+        version: 3.1.0
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: activeadmin
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -32,7 +48,23 @@ dependencies:
         - 0
         version: 0.4.0
   type: :runtime
-  version_requirements: *id001
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: cancan
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 1
+        - 5
+        - 0
+        version: 1.5.0
+  type: :runtime
+  version_requirements: *id003
 description: This generator help you to create new Rails applications to combine with active admin gem. It generates application structure to easily get the internationalization and authorization.
 email: 
 - m.mastrodonato@gmail.com
@@ -50,12 +82,13 @@ files:
 - lib/generators/leolay/templates/app/admin/users.rb
 - lib/generators/leolay/templates/app/assets/javascripts/custom.js
 - lib/generators/leolay/templates/app/helpers/layout_helper.rb
-- lib/generators/leolay/templates/app/views/admin/users/_form.html.erb
+- lib/generators/leolay/templates/config/initializers/activeadmin_cancan.rb
+- lib/generators/leolay/templates/config/initializers/activeadmin_leonardo.rb
+- lib/generators/leolay/templates/config/locales/devise.it.yml
 - lib/generators/leolay/templates/config/locales/en.yml
 - lib/generators/leolay/templates/config/locales/it.yml
 - lib/generators/leolay/templates/config.rb
 - lib/generators/leolay/templates/lib/development_mail_interceptor.rb
-- lib/generators/leolay/templates/lib/upd_activeadmin.rb
 - lib/generators/leolay/templates/lib/upd_array.rb
 - lib/generators/leolay/templates/styles/active/images/logo.png
 - lib/generators/leolay/templates/styles/active/images/style/ico_v.png

data/lib/generators/leolay/templates/app/views/admin/users/_form.html.erb

@@ -1,21 +0,0 @@
-<%%= semantic_form_for [:admin, @<%= options[:auth_class].downcase %>] do |f| %>
-    <%%= f.inputs do %>
-        <%%#= f.input :group %>
-        <%%= f.input :email, :input_html => { :maxlength => 100 } %>
-        <%%= f.input :password %>
-        <%%= f.input :password_confirmation %>
-        <li>
-          <%%= f.label :roles %>
-          <%% for role in <%= options[:auth_class].downcase.classify %>::ROLES %>
-            <%%= check_box_tag "<%= options[:auth_class].downcase %>[roles][]", role, @<%= options[:auth_class].downcase %>.roles.include?(role) %>
-            <%%= h role.humanize %>
-          <%% end %>
-          <%%= hidden_field_tag "<%= options[:auth_class].downcase %>[roles][]"%>
-        </li>
-    <%% end %>
-    <%%#= f.inputs "Optional informations" do %>
-        <%%#= f.input :name %>
-        <%%#= f.input :login_ldap %>
-    <%%# end %>
-    <%%= f.buttons :commit %>
-<%% end %>

data/lib/generators/leolay/templates/lib/upd_activeadmin.rb

@@ -1,65 +0,0 @@
-
-module ActiveAdmin
-  module Views
-    module Pages
-
-      #Custom footer
-      #\lib\active_admin\views\pages\base.rb
-      class Base < Arbre::HTML::Document
-        private
-        def build_footer
-          div :id => "footer" do
-            para "#{CONFIG[:application][:name]} #{Rails.env} #{CONFIG[:application][:version]} <%= Time.now.year %>.".html_safe
-          end
-        end
-
-      end
-    end
-
-    #Avoid xml and json from download
-    #\lib\active_admin\views\components\paginated_collection.rb
-    #class PaginatedCollection
-    #  def build_download_format_links(formats = [:csv])
-    #    links = formats.collect do |format|
-    #      link_to format.to_s.upcase, { :format => format}.merge(request.query_parameters.except(:commit, :format))
-    #    end
-    #    div :class => "download_links" do
-		 #     text_node [I18n.t('active_admin.download'), links].flatten.join("&nbsp;").html_safe
-    #    end
-    #  end
-    #end
-
-  end
-
-  #class Resource
-  #  module ActionItems
-  #    private
-  #
-  #    # Adds the default action items to each resource
-  #    def add_default_action_items
-  #      # New Link on all actions except :new and :show
-  #      add_action_item :except => [:new, :show] do
-  #        if controller.action_methods.include?('new') && can?(:create, eval(active_admin_config.resource_name.classify))
-  #          link_to(I18n.t('active_admin.new_model', :model => active_admin_config.resource_name), new_resource_path)
-  #        end
-  #      end
-  #
-  #      # Edit link on show
-  #      add_action_item :only => :show do
-  #        if controller.action_methods.include?('edit') && can?(:edit, resource)
-  #          link_to(I18n.t('active_admin.edit_model', :model => active_admin_config.resource_name), edit_resource_path(resource))
-  #        end
-  #      end
-  #
-  #      # Destroy link on show
-  #      add_action_item :only => :show do
-  #        if controller.action_methods.include?("destroy") && can?(:destroy, resource)
-  #          link_to(I18n.t('active_admin.delete_model', :model => active_admin_config.resource_name),
-  #            resource_path(resource),
-  #            :method => :delete, :confirm => I18n.t('active_admin.delete_confirmation'))
-  #        end
-  #      end
-  #    end
-  #  end
-  #end
-end