keppler 2.0.2 → 2.0.3

data/installer/core/lib/generators/keppler_relation/keppler_relation_generator.rb

@@ -207,7 +207,7 @@ module Rails
 
       # References to add nest button in father_module's listing
       def str_last_button(father)
-        " - if Pundit.policy(current_user, #{father.camelcase}).show?"
+        " - if can?(#{father.camelcase}).show?"
       end
 
       #String of the button to add in father_module's listing

data/installer/core/lib/generators/keppler_scaffold/keppler_scaffold_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails/generators/rails/resource/resource_generator'
 require 'rails/generators/resource_helpers'
 module Rails
@@ -11,7 +13,7 @@ module Rails
       class_option :stylesheet_engine, desc: 'Engine for Stylesheets'
       remove_class_option :resource_route, type: :boolean
 
-      source_root File.expand_path('../templates', __FILE__)
+      source_root File.expand_path('templates', __dir__)
 
       check_class_collision suffix: 'Controller'
 
@@ -31,13 +33,12 @@ module Rails
       )
 
       def add_route
-        unless options[:skip_routes]
-          inject_into_file(
-            'config/routes.rb',
-            "\n #{indent(str_route)}",
-            after: "root to: 'admin#root'"
-          )
-        end
+        return if options[:skip_routes]
+        inject_into_file(
+          'config/routes.rb',
+          "\n #{indent(str_route)}",
+          after: "root to: 'admin#root'"
+        )
       end
 
       def add_option_menu
@@ -48,6 +49,13 @@ module Rails
         )
       end
 
+      def add_option_permissions
+        inject_into_file(
+          'config/permissions.yml',
+          str_permissions,
+          before: 'scripts:'
+        )
+      end
       # def add_access_ability
       #   inject_into_file(
       #     'app/models/ability.rb',
@@ -67,7 +75,7 @@ module Rails
       # end
 
       def add_locales
-        %w(en es).each do |locale|
+        %w[en es].each do |locale|
           add_str_locales(locale, 'singularize')
           add_str_locales(locale, 'pluralize')
           add_str_locales(locale, 'modules')
@@ -76,7 +84,7 @@ module Rails
         end
       end
 
-      # Se usa para configurar la exportación del ActiveRecords a .xls,
+      # Se usa para configurar la exportacion del ActiveRecords a .xls,
       # pero da problemas al borrar el KepplerScaffold
 
       # def add_config_xls
@@ -114,7 +122,8 @@ module Rails
           'policies/policy.rb',
           File.join(
             'app/policies',
-            controller_class_path, "#{controller_file_name.singularize}_policy.rb"
+            controller_class_path,
+            "#{controller_file_name.singularize}_policy.rb"
           )
         )
       end
@@ -122,16 +131,22 @@ module Rails
       def create_views_files
         names
         attachments
-        template_keppler_views('_description.html.haml')
-        template_keppler_views('_index_show.html.haml')
-        template_keppler_views('_listing.html.haml')
-        template_keppler_views('_form.html.haml')
-        template_keppler_views('show.js.haml')
-        template_keppler_views('edit.html.haml')
-        template_keppler_views('new.html.haml')
-        template_keppler_views('show.html.haml')
-        template_keppler_views('index.html.haml')
-        template_keppler_views('reload.js.haml')
+        # template_keppler_views('_description.html.haml')
+        # template_keppler_views('_index_show.html.haml')
+        # template_keppler_views('_listing.html.haml')
+        # template_keppler_views('_form.html.haml')
+        # template_keppler_views('show.js.haml')
+        # template_keppler_views('edit.html.haml')
+        # template_keppler_views('new.html.haml')
+        # template_keppler_views('show.html.haml')
+        # template_keppler_views('index.html.haml')
+        # template_keppler_views('reload.js.haml')
+        %w[
+          _description.html _index_show.html _listing.html _form.html edit.html
+          new.html show.html index.html show.js reload.js
+        ].each do |file_name|
+          template_keppler_views("#{file_name}.haml")
+        end
       end
 
       hook_for :test_framework, as: :scaffold
@@ -141,24 +156,24 @@ module Rails
         invoke invoked, [controller_name]
       end
 
-      def add_position_field
-        file = Dir::entries('db/migrate').sort.last
-        #system "sudo apt-get update"
-        inject_into_file(
-          "db/migrate/#{file}",
-          "t.integer :position\n      ",
-          before: "t.timestamps null: false"
-        )
-      end
+      # def add_position_field
+      #   file = Dir::entries('db/migrate').max
+      #   # system 'sudo apt-get update'
+      #   inject_into_file(
+      #     "db/migrate/#{file}",
+      #     "t.integer :position\n      ",
+      #     before: 't.timestamps'
+      #   )
+      # end
 
       private
 
       def names
-        @names = ['name', 'title', 'first_name', 'full_name']
+        @names = %w[name title first_name full_name]
       end
 
       def attachments
-        @attachments = ['logo', 'brand', 'photo', 'avatar', 'cover', 'image', 'picture', 'banner', 'attachment', 'pic', 'file']
+        @attachments = %w[logo brand photo avatar cover image picture banner attachment pic file]
       end
 
       def add_str_locales(locale, switch)
@@ -170,14 +185,16 @@ module Rails
       end
 
       def str_route
-        "\n  resources :#{controller_file_name} do\n    get '(page/:page)', action: :index, on: :collection, as: ''\n    get '/clone', action: 'clone'\n    post '/import', action: 'import', as: :import\n    \n    get '/download', action: 'download', as: :download\n    post(\n      '/sort',\n      action: :sort,\n      on: :collection,\n    )\n    get(\n      '/reload',\n      action: :reload,\n      on: :collection,\n    )\n    delete(\n      '/destroy_multiple',\n      action: :destroy_multiple,\n      on: :collection,\n      as: :destroy_multiple\n    )
-  end"
+        "\n  resources :#{controller_file_name} do\n    post '/sort', action: :sort, on: :collection\n    get '(page/:page)', action: :index, on: :collection, as: ''\n    get '/clone', action: 'clone'\n    post '/upload', action: 'upload', as: :upload\n    get(\n      '/reload',\n      action: :reload,\n      on: :collection,\n    )\n    delete(\n      '/destroy_multiple',\n      action: :destroy_multiple,\n      on: :collection,\n      as: :destroy_multiple\n    )\n  end"
       end
 
       def str_menu
         "  #{controller_file_name.singularize}:\n    name: #{controller_file_name.humanize.downcase}\n    url_path: /admin/#{controller_file_name}\n    icon: layers\n    current: ['admin/#{controller_file_name}']\n    model: #{controller_file_name.singularize.camelize}\n"
       end
 
+      def str_permissions
+        "#{controller_file_name.pluralize}:\n    name: #{controller_file_name.singularize.camelize}\n    actions: [\n      'index', 'create', 'update',\n      'destroy', 'download', 'upload',\n      'clone'\n    ]\n  "
+      end
       # def str_ability_admin
       #   "\n\n      # - #{controller_file_name.singularize.camelcase} authorize -\n      can :manage, #{controller_file_name.singularize.camelcase}"
       # end
@@ -186,9 +203,9 @@ module Rails
       #   "\n\n      # - #{controller_file_name.singularize.camelcase} authorize -\n      can [:index, :show], #{controller_file_name.singularize.camelcase}"
       # end
 
-      def str_xls
-        "\nif #{controller_file_name.singularize.camelcase}.table_exists?\n  @#{controller_file_name.pluralize} = #{controller_file_name.singularize.camelcase}.all\n  @#{controller_file_name.pluralize}.to_xls(\n    only: %i[#{attributes_names.map { |name| name }.join(' ')}],\n    except: [:id],\n    header: false,\n    prepend: [['Col 0, Row 0', 'Col 1, Row 0'], ['Col 0, Row 1']],\n    column_width: [17, 15, 15, 40, 25, 37]\n  )\n  @#{controller_file_name.pluralize}.to_xls do |column, value|\n    column == :salutation ? t(value) : value\n  end\nend\n"
-      end
+      # def str_xls
+      #   "\nif #{controller_file_name.singularize.camelcase}.table_exists?\n  @#{controller_file_name.pluralize} = #{controller_file_name.singularize.camelcase}.all\n  @#{controller_file_name.pluralize}.to_xls(\n    only: %i[#{attributes_names.map { |name| name }.join(' ')}],\n    except: [:id],\n    header: false,\n    prepend: [['Col 0, Row 0', 'Col 1, Row 0'], ['Col 0, Row 1']],\n    column_width: [17, 15, 15, 40, 25, 37]\n  )\n  @#{controller_file_name.pluralize}.to_xls do |column, value|\n    column == :salutation ? t(value) : value\n  end\nend\n"
+      # end
 
       def str_locales(switch)
         case switch
@@ -197,9 +214,9 @@ module Rails
         when 'pluralize'
           "\n        #{controller_file_name}: #{controller_file_name.humanize.downcase}"
         when 'modules'
-          "\n      admin/#{controller_file_name}: #{controller_file_name.humanize}"
+          "\n      admin/#{controller_file_name.dasherize}: #{controller_file_name.humanize}"
         when 'sidebar-menu'
-          "\n      #{controller_file_name}: #{controller_file_name.humanize}"
+          "\n      #{controller_file_name.dasherize}: #{controller_file_name.humanize}"
         # when 'attributes'
         #   array = ["\n      #{controller_file_name.singularize}:"]
         #   attributes_names.each do |attribute|
@@ -212,7 +229,7 @@ module Rails
       def template_keppler_views(name_file)
         template(
           "views/#{name_file}",
-          File.join("app/views/admin/#{controller_file_name}",  name_file)
+          File.join("app/views/admin/#{controller_file_name}", name_file)
         )
       end
 

data/installer/core/lib/generators/keppler_scaffold/templates/controllers/controller.rb

@@ -5,36 +5,34 @@ require_dependency "<%= namespaced_file_path %>/application_controller"
 module Admin
   # <%= controller_class_name %>Controller
   class <%= controller_class_name %>Controller < AdminController
-    before_action :set_<%= singular_table_name %>, only: [:show, :edit, :update, :destroy]
-    before_action :show_history, only: [:index]
+    before_action :set_<%= singular_table_name %>, only: %i[show edit update destroy]
+    before_action :show_history, only: %i[index]
     before_action :set_attachments
+    before_action :authorization, except: %i[reload]
 
     # GET <%= route_url %>
     def index
       @q = <%= class_name %>.ransack(params[:q])
       <%= plural_table_name %> = @q.result(distinct: true)
-      @objects = <%= plural_table_name %>.page(@current_page).order(position: :desc)
+      @objects = <%= plural_table_name %>.page(@current_page).order(position: :asc)
       @total = <%= plural_table_name %>.size
-      @<%= plural_table_name %> = @objects.order(:position)
+      @<%= plural_table_name %> = <%= class_name %>.all
       if !@objects.first_page? && @objects.size.zero?
         redirect_to <%= plural_table_name %>_path(page: @current_page.to_i.pred, search: @query)
       end
+      format
     end
 
     # GET <%= route_url %>/1
-    def show
-    end
+    def show; end
 
     # GET <%= route_url %>/new
     def new
       @<%= singular_table_name %> = <%= orm_class.build(class_name) %>
-      authorize @<%= singular_table_name %>
     end
 
     # GET <%= route_url %>/1/edit
-    def edit
-      authorize @<%= singular_table_name %>
-    end
+    def edit; end
 
     # POST <%= route_url %>
     def create
@@ -54,7 +52,6 @@ module Admin
       else
         render :edit
       end
-      authorize @<%= singular_table_name %>
     end
 
     def clone
@@ -65,14 +62,12 @@ module Admin
       else
         render :new
       end
-      authorize @<%= singular_table_name %>
     end
 
     # DELETE <%= route_url %>/1
     def destroy
       @<%= orm_instance.destroy %>
       redirect_to admin_<%= index_helper %>_path, notice: actions_messages(@<%= singular_table_name %>)
-      authorize @<%= singular_table_name %>
     end
 
     def destroy_multiple
@@ -81,26 +76,14 @@ module Admin
         admin_<%= index_helper %>_path(page: @current_page, search: @query),
         notice: actions_messages(<%= orm_class.build(class_name) %>)
       )
-      authorize @<%= singular_table_name %>
     end
 
-    def import
-      <%= class_name %>.import(params[:file])
+    def upload
+      <%= class_name %>.upload(params[:file])
       redirect_to(
         admin_<%= index_helper %>_path(page: @current_page, search: @query),
         notice: actions_messages(<%= orm_class.build(class_name) %>)
       )
-      authorize @<%= singular_table_name %>
-    end
-
-    def download
-      @<%= plural_table_name %> = <%= class_name %>.all
-      respond_to do |format|
-        format.html
-        format.xls { send_data(@<%= plural_table_name %>.to_xls) }
-        format.json { render :json => @<%= plural_table_name %> }
-      end
-      authorize @<%= plural_table_name %>
     end
 
     def reload
@@ -111,14 +94,30 @@ module Admin
 
     def sort
       <%= class_name %>.sorter(params[:row])
-      render :index
+      @q = <%= class_name %>.ransack(params[:q])
+      <%= plural_table_name %> = @q.result(distinct: true)
+      @objects = <%= plural_table_name %>.page(@current_page)
     end
 
     private
 
+    def format
+      respond_to do |format|
+        format.html
+        format.csv { send_data @<%= plural_table_name %>.to_csv }
+        format.xls # { send_data @<%= plural_table_name %>.to_xls }
+        format.json { render json: @<%= plural_table_name %> }
+      end
+    end
+
+    def authorization
+      authorize <%= class_name %>
+    end
+
     def set_attachments
-      @attachments = ['logo', 'brand', 'photo', 'avatar', 'cover', 'image',
-                      'picture', 'banner', 'attachment', 'pic', 'file']
+      @attachments = %w[
+        logo brand photo avatar cover image picture banner attachment pic file
+      ]
     end
 
     # Use callbacks to share common setup or constraints between actions.

data/installer/core/lib/generators/keppler_scaffold/templates/models/model.rb

@@ -1,36 +1,30 @@
+# frozen_string_literal: true
+
 # <%= class_name %> Model
 <% module_namespacing do -%>
 class <%= class_name %> < ApplicationRecord
   include ActivityHistory
   include CloneRecord
-  require 'csv'
-  <%- attributes_names.each do |attribute| -%>
-    <%- if @attachments.include?(attribute) -%>
-  mount_uploader :<%=attribute%>, AttachmentUploader
+  include Uploadable
+  include Downloadable
+  include Sortable
+  <%- attributes.each do |attribute| -%>
+    <%- if @attachments.include?(attribute.name) -%>
+  mount_uploader :<%=attribute.name%>, AttachmentUploader
+    <%- end -%>
+    <%- if attribute.reference? -%>
+  belongs_to :<%= attribute.name %>
     <%- end -%>
   <%- end -%>
   acts_as_list
+  acts_as_paranoid
+
   # Fields for the search form in the navbar
   def self.search_field
-    fields = <%= attributes_names.map { |name| name } %>
+    fields = %i[<%= attributes_names.map { |name| name }.join(' ') %>]
     build_query(fields, :or, :cont)
   end
 
-  def self.import(file)
-    CSV.foreach(file.path, headers: true) do |row|
-      begin
-        self.create! row.to_hash
-      rescue => err
-      end
-    end
-  end
-
-  def self.sorter(params)
-    params.each_with_index do |id, idx|
-      self.find(id).update(position: idx.to_i+1)
-    end
-  end
-
   # Funcion para armar el query de ransack
   def self.build_query(fields, operator, conf)
     query = fields.join("_#{operator}_")

data/installer/core/lib/generators/keppler_scaffold/templates/views/_form.html.haml

@@ -2,7 +2,7 @@
   .container
     .row
       .col-lg-2
-        = link_to admin_<%= plural_table_name %>_path, class: "", "data-position" => "bottom", "data-tooltip" => t("keppler.actions.back") do
+        = link_to admin_<%= plural_table_name %>_path, class: '', 'data-position' => 'bottom', 'data-tooltip' => t('keppler.actions.back') do
           .arrow-back.btn.btn-default
             %i.fa.fa-angle-left
             = t('keppler.actions.back')
@@ -13,48 +13,37 @@
           .box-header.with-border
             %h3.box-title= t("keppler.modules.#{action_name.underscore}")
             .box-tools.pull-right
-              %a.btn.btn-box-tool{"data-widget" => "collapse", :type => "button"}
+              %a.btn.btn-box-tool{ 'data-widget' => 'collapse', type: 'button' }
                 %i.fa.fa-minus
           .box-body
             %table.table.table-bordered
               %tbody
                 .form-padding
-                  <%- attributes.each do |attribute| -%>
-                    <%- if @attachments.include?(attribute.name) -%>
-                  .col-xs-12
-                    .upload-image
-                      = f.label :<%= attribute.name %>
-                      .files.form-group.trigger{ class: "#{'files-absolute' unless @<%= singular_table_name %>.<%= attribute.name %>.blank?}" }
-                        #icon-file
-                          +
-                        = f.file_field :<%= attribute.name %>, class: 'photo_upload'
-                      %center#image
-                        = image_tag "#{@<%= singular_table_name %>.<%= attribute.name %>.blank? ? '<%= attribute.name %>.png' : @<%= singular_table_name %>.<%= attribute.name %>}", class: "#{'hidden' if @<%= singular_table_name %>.<%= attribute.name %>.blank?} image_to_upload"
-                    <%- end -%>
-                  <%- end -%>
-                  <%- attributes.each do |attribute| -%>
+                  <%- attributes.each_with_index do |attribute, index| -%>
                   .col-xs-12
-                  <%- unless @attachments.include?(attribute.name) -%>
-                    <%- if attribute.type.to_s == "text" -%>
-                    = f.<%= attribute.reference? ? :association : :input %> :<%= attribute.name %>, input_html: {class: "materialize-textarea"}
-                    <%- elsif attribute.type.to_s == "date" -%>
-                    = f.<%= attribute.reference? ? :association : :input %> :<%= attribute.name %>, as: :string, input_html: {class: "datepicker"}
-                    <%- elsif attribute.type.to_s == "boolean" -%>
-                    -# = f.<%= attribute.reference? ? :association : :input %> :<%= attribute.name %>
-                    .checkbox
-                      %label{ for: "checkbox-#{@<%= singular_table_name %>.id}" }
-                        %span.label-text <%= attribute.name %>
-                        %input{ type:"checkbox", id: "checkbox-#{@<%= singular_table_name %>.id}", 'checklist-model' => 'check', 'checklist-value' => "#{@<%= singular_table_name %>.id}", '@click' => "listDelete(#{@<%= singular_table_name %>.id})"}
-                        %span.cr
-                          %i.cr-icon.glyphicon.glyphicon-ok
-                    <%- elsif attribute.type.to_s == "integer" -%>
-                    = f.<%= attribute.reference? ? :association : :input %> :<%= attribute.name %>, input_html: {min: 0}
+                    <%- if @attachments.include?(attribute.name) -%>
+                    = f.input :<%= attribute.name %>, as: :keppler_file, label: false
+                    <%- elsif attribute.reference? -%>
+                    = f.association :<%= attribute.name %>, include_blank: false
+                    <%- elsif attribute.type.to_s == 'text' -%>
+                    = f.input :<%= attribute.name %>, input_html: { ckeditor: { toolbar: 'mini' } }
+                    <%- elsif %[position deleted_at].include?(attribute.name.to_s) || attribute.type.to_s == 'timestamp' -%>
+                    = f.input :<%= attribute.name %>, as: :hidden
+                    <%- elsif attribute.type.to_s == 'date' -%>
+                    = f.input :<%= attribute.name %>, as: :string, input_html: { class: 'datepicker' }
+                    <%- elsif attribute.type.to_s == 'boolean' -%>
+                    = f.input :<%= attribute.name %>, as: :keppler_boolean
+                    <%- elsif %w[integer float decimal].include?(attribute.type.to_s) -%>
+                    = f.input :<%= attribute.name %>, input_html: { min: 0 }
+                    <%- elsif attribute.type.to_s == 'binary' -%>
+                    = f.input :<%= attribute.name %>, as: :string
+                    <%- elsif attribute.name.to_s == "position" || attribute.name.to_s == "deleted_at" -%>
+                    = f.<%= attribute.reference? ? :association : :input %> :<%= attribute.name %>, as: :hidden
                     <%- else -%>
-                    = f.<%= attribute.reference? ? :association : :input %> :<%= attribute.name %>
+                    = f.input :<%= attribute.name %>
                     <%- end -%>
                   <%- end -%>
-                  <%- end -%>
                   .col-xs-12
                     .pull-right
-                      = f.button :submit, t("keppler.actions.save"), name: '_save', class: "btn-primary"
-                      = f.button :submit, t("keppler.actions.save_and_add_another"), name: '_add_other'
+                      = f.button :submit, t('keppler.actions.save'), name: '_save', class: 'btn-primary'
+                      = f.button :submit, t('keppler.actions.save_and_add_another'), name: '_add_other'