keppler 2.0.2 → 2.0.3

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

@@ -1,6 +1,6 @@
 .tab-content
   %h6.actions
-    - if Pundit.policy(current_user, <%= singular_table_name.camelcase %>).update?
+    - if can?(<%= singular_table_name.camelcase %>).update?
       = link_to edit_admin_<%= singular_table_name %>_path(@<%= singular_table_name %>), title: t("keppler.actions.edit"), class: 'pull-left' do
         %i.icon-pencil
         %span= t('keppler.actions.edit')
@@ -9,16 +9,17 @@
   %h3.control-sidebar-heading
     = t("keppler.modules.#{controller_path.underscore}")
   %ul.timeline
-    - @<%= singular_table_name %>.as_json(only: <%= attributes.map{|attr| attr.name} %>).each do |attribute, value|
-      %li.list-row
-        .timeline-item
-          %h6.timeline-header.no-border
-            %small
-              %strong.display-value= t("activerecord.attributes.#{attribute}")
-              - if @attachments.include?(attribute)
-                .display-label= image_tag value
-              - else
-                %p.display-label= value
+    - @<%= singular_table_name %>.as_json(except: %[id position created_at updated_at deleted_at]).each do |attribute, value|
+      -unless attribute.eql?('position') || attribute.eql?('deleted_at')
+        %li.list-row
+          .timeline-item
+            %h6.timeline-header.no-border
+              %small
+                %strong.display-value= t("activerecord.attributes.#{attribute}")
+                - if @attachments.include?(attribute)
+                  .display-label= image_tag value.url if value.url
+                - else
+                  %p.display-label= value.blank? ? '-----------' : value
 :coffee
   $('#close-index-show').click ->
     $('#index-show').css 'right', -$('#index-show').outerWidth()

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

@@ -1,7 +1,7 @@
 - objects.each do |<%= singular_table_name %>|
   %tr{ id: "row-#{<%= singular_table_name %>.id}" }
     %td.item-check{ style: 'width: 10%' }
-      - if Pundit.policy(current_user, <%= singular_table_name.camelcase %>).destroy_multiple?
+      - if can?(<%= singular_table_name.camelcase %>).destroy_multiple?
         .checkbox
           %label{ for: "checkbox-#{<%= singular_table_name %>.id}" }
             %input{ type:"checkbox", id: "checkbox-#{<%= singular_table_name %>.id}", 'checklist-model' => 'check', 'checklist-value' => "#{<%= singular_table_name %>.id}", '@click' => "listDelete(#{<%= singular_table_name %>.id})"}
@@ -12,12 +12,12 @@
     %td
       = link_to admin_<%= singular_table_name %>_path(<%= singular_table_name %>, search: @query), remote: true, class: 'show-row' do
         %span
-          = image_tag <%= singular_table_name %>.<%= attribute.name %>
+          = image_tag <%= singular_table_name %>.<%= attribute.name %>.url unless <%= singular_table_name %>.<%= attribute.name %>.url.blank?
       <%- end -%>
     <%- end -%>
     <%- attributes.each_with_index do |attribute, index| -%>
       <%- if index < 6 -%>
-        <%- unless attribute.type.to_s == 'text' -%>
+        <%- unless attribute.type.to_s.eql?('text') || attribute.name.eql?('position') || attribute.name.eql?('deleted_at') -%>
           <%- unless @attachments.include?(attribute.name) -%>
             <%- if index < 2 -%>
     %td.hidden-xs
@@ -38,22 +38,22 @@
       %a.action-btn.pull-right{:id => "menu-#{<%= singular_table_name %>.id}", "aria-expanded" => "false", "aria-haspopup" => "true", "data-toggle" => "dropdown"}
         %i.icon-options-vertical
       %ul.actions.dropdown-menu{"aria-labelledby" => "menu-#{<%= singular_table_name %>.id}" }
-        - if Pundit.policy(current_user, <%= singular_table_name.camelcase %>).show?
+        - if can?(<%= singular_table_name.camelcase %>).index?
           %li
             = link_to admin_<%= singular_table_name %>_path(<%= singular_table_name %>), class: 'new-menu', title: t('keppler.actions.show') do
               %i.icon-eye
               = t('keppler.actions.show')
-        - if Pundit.policy(current_user, <%= singular_table_name.camelcase %>).update?
+        - if can?(<%= singular_table_name.camelcase %>).update?
           %li
             = link_to edit_admin_<%= singular_table_name %>_path(<%= singular_table_name %>), class: 'new-menu', title: t('keppler.actions.edit') do
               %i.icon-pencil
               = t('keppler.actions.edit')
-        - if Pundit.policy(current_user, <%= singular_table_name.camelcase %>).clone?
+        - if can?(<%= singular_table_name.camelcase %>).clone?
           %li
             = link_to admin_<%= singular_table_name %>_clone_path(<%= singular_table_name %>), class: 'new-menu', title: t('keppler.actions.clone') do
               %i.icon-docs
               = t('keppler.actions.clone')
-        - if Pundit.policy(current_user, <%= singular_table_name.camelcase %>).destroy?
+        - if can?(<%= singular_table_name.camelcase %>).destroy?
           %li
             = link_to admin_<%= singular_table_name %>_path(<%= singular_table_name %>), class: 'new-menu', title: t('keppler.actions.delete'), method: :delete, data: { confirm: t("keppler.messages.data_confirm") } do
               %i.icon-trash

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

@@ -1,4 +1,4 @@
-#index-container{ :controller => "<%= plural_table_name %>" }
+#index-container{ controller: '<%= plural_table_name %>' }
   .container
     .row
       .listing.col-lg-12.col-xs-12
@@ -7,18 +7,18 @@
             = t("keppler.modules.#{controller_path.underscore}")
           = entries(@total, @objects)
           .toolbar
-            - if Pundit.policy(current_user, <%= singular_table_name.camelcase %>).download?
+            - if can?(<%= singular_table_name.camelcase %>).download?
               .toolbar-item
-                = link_to admin_<%= singular_table_name %>_download_path(<%= singular_table_name.camelcase %>, :format => :xls), class: "tool-btn", title: t('keppler.actions.download_records') do
+                = link_to admin_<%= plural_table_name %>_path(format: :csv), class: 'tool-btn', title: t('keppler.actions.download_records') do
                   %i.icon-cloud-download
-            - if Pundit.policy(current_user, <%= singular_table_name.camelcase %>).import?
+            - if can?(<%= singular_table_name.camelcase %>).upload?
               .toolbar-item
-                = link_to "", class: "tool-btn", title: t('keppler.actions.upload_records'), id: "<%= singular_table_name %>" do
+                = link_to '#', id: 'upload', class: 'tool-btn', title: t('keppler.actions.upload_records') do
                   %i.icon-cloud-upload
             .toolbar-item
-              = link_to reload_admin_<%= plural_table_name %>_path, class: "tool-btn", remote: true do
+              = link_to reload_admin_<%= plural_table_name %>_path, class: 'tool-btn', remote: true do
                 %i.icon-reload
-            - if Pundit.policy(current_user, <%= singular_table_name.camelcase %>).destroy_multiple?
+            - if can?(<%= singular_table_name.camelcase %>).destroy_multiple?
               .toolbar-item
                 .checkbox
                   %label{ for: 'checkbox-all' }
@@ -26,26 +26,24 @@
                     %span.cr
                       %i.cr-icon.glyphicon.glyphicon-ok
             .toolbar-item
-              %a.tool-btn{"data-confirm" => "¿Estás seguro?", "data-method" => "delete", "v-bind:href" => "link", :rel => "nofollow", ":class" => "{disabled: !checks}" }
+              %a.tool-btn{'data-confirm' => '¿Estás seguro?', 'data-method' => 'delete', 'v-bind:href' => 'link', rel: 'nofollow', ':class' => '{disabled: !checks}' }
                 %i.icon-trash
           .hide
-            = form_tag admin_<%= singular_table_name %>_import_path(@objects), id: "import_form_<%= plural_table_name %>", multipart: true, method: :post do
-              = file_field_tag :file, id: "import_file_<%= singular_table_name %>"
+            = form_tag admin_<%= singular_table_name %>_upload_path(@objects), id: 'upload_form', multipart: true, method: :post do
+              = file_field_tag :file, id: 'upload_file'
           %ol.breadcrumb
             %li
               %a{ href: '#' }
                 %i.icon-directions
                 = t("keppler.modules.#{action_name.underscore}")
-
         .box.slice-box
           .box-body.no-padding
-
             %table.table
               %thead
                 - if @objects.size.zero?
                   %tr
                     %th{style: 'text-align: center;'}
-                      %h6= t('keppler.messages.not_found_records', model:  t("keppler.models.pluralize.<%= plural_table_name %>"))
+                      %h6= t('keppler.messages.not_found_records', model:  t('keppler.models.pluralize.<%= plural_table_name %>'))
                 - else
                   %tr
                     %th
@@ -56,7 +54,7 @@
                     <%- end -%>
                     <%- attributes.each_with_index do |attribute, index| -%>
                       <%- if index < 6 -%>
-                        <%- unless attribute.type.to_s == 'text' -%>
+                        <%- unless attribute.type.to_s == 'text' || attribute.name.eql?('position') || attribute.name.eql?('deleted_at') -%>
                           <%- unless @attachments.include?(attribute.name) -%>
                             <%- if index < 2 -%>
                     %th.hidden-xs= t('activerecord.attributes.<%= attribute.name %>')
@@ -69,29 +67,15 @@
                     <%- end -%>
                     %th.center Menu
                     %th
-              %tbody#objects-container{ "data-update-url" => "#{sort_admin_<%= plural_table_name %>_path}" }
+              %tbody#objects-container{ 'data-update-url' => "#{sort_admin_<%= plural_table_name %>_path}" }
                 = render 'admin/layouts/listing_preloader'
-                = render 'listing', objects: @<%= plural_table_name %>
+                = render 'listing', objects: @objects
         %center#paginator-module
           = paginate @objects, window: 1
   %aside.control-sidebar
-    = render "description"
+    = render 'description'
   %aside#index-show.control-sidebar
 
   .mixed-btn
-    - if Pundit.policy(current_user, <%= singular_table_name.camelcase %>).create?
-      = link_to new_admin_<%= singular_table_name %>_path, class: "btn-float" do
-        +
-
-:javascript
-  $(document).ready(function(){
-    $('#<%= singular_table_name %>').click(function() {
-      $('#import_file_<%= singular_table_name %>').click()
-      $('#import_file_<%= singular_table_name %>').change(function() {
-        $('.waiting').css('display', 'block')
-        $('#import_form_<%= singular_table_name %>').submit()
-      })
-    });
-
-    renderImg();
-  });
+    - if can?(<%= singular_table_name.camelcase %>).create?
+      = link_to '+', new_admin_<%= singular_table_name %>_path, class: 'btn-float'

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

@@ -1,7 +1,7 @@
 .container
   .row
-    .col-lg-2
-      = link_to admin_<%= plural_table_name %>_path, class: "", "data-position" => "bottom", "data-tooltip" => t("keppler.actions.back") do
+    .col-md-2
+      = link_to admin_<%= plural_table_name %>_path, 'data-position' => 'bottom', 'data-tooltip' => t('keppler.actions.back') do
         .arrow-back.btn.btn-default
           %i.fa.fa-angle-left
           = t('keppler.actions.back')
@@ -9,57 +9,56 @@
   .show-section
     .row
       <%- if attributes.select{|attribute| @attachments.include?(attribute.name)}.size <= 0 -%>
-      .col-lg-12
+      .col-md-12
         .box.slice-box
           .box-header.with-border
-            %h3.box-title= t("keppler.modules.#{controller_path.underscore}")
+            %h3.box-title= t("keppler.modules.#{controller_name.underscore}")
             .box-tools.pull-right
-              - if Pundit.policy(current_user, <%= singular_table_name.camelcase %>).update?
-                = link_to edit_admin_<%= singular_table_name %>_path(@<%= singular_table_name %>), class: "btn btn-box-tool", title: "#{t('keppler.actions.edit') }" do
+              - if can?(<%= singular_table_name.camelcase %>).update?
+                = link_to edit_admin_<%= singular_table_name %>_path(@<%= singular_table_name %>), class: 'btn btn-box-tool', title: t('keppler.actions.edit') do
                   %i.icon-pencil
-              - if Pundit.policy(current_user, <%= singular_table_name.camelcase %>).destroy?
-                = link_to admin_<%= singular_table_name %>_path(@<%= singular_table_name %>), class: "btn btn-box-tool", title: "#{t('keppler.actions.delete')}", method: :delete, data: { confirm: t("keppler.messages.data_confirm") } do
+              - if can?(<%= singular_table_name.camelcase %>).destroy?
+                = link_to admin_<%= singular_table_name %>_path(@<%= singular_table_name %>), class: 'btn btn-box-tool', title: t('keppler.actions.delete'), method: :delete, data: { confirm: t('keppler.messages.data_confirm') } do
                   %i.icon-trash
           .box-body.box-body-no-padding
             %table.table.table-striped
               %tbody
-                - @<%= singular_table_name %>.as_json(only: <%= attributes.map{|attr| attr.name} %>).each do |attribute, value|
+                - @<%= singular_table_name %>.as_json(except: %i[id position created_at updated_at deleted_at]).each do |attribute, value|
                   %tr.list-row
                     %th.display-label= t("activerecord.attributes.#{attribute}")
                     %td.display-value.fs-body-1.tc-black-2
                       - if @attachments.include?(attribute)
-                        = image_tag value
+                        = image_tag value.url unless value.url.blank?
                       - else
-                        = value
+                        = value.blank? ? '-----------' : value
       <%- else -%>
-      <%- @attr = attributes.map{|attr| attr.name}.select{|attr| @attachments.include?(attr)} %>
-      .col-lg-5
-        - @<%= singular_table_name %>.as_json(only: <%= @attr %>).each do |attribute, value|
+      <%- @attr = attributes.select{|attr| @attachments.include?(attr.name)} %>
+      .col-sm-5
+        - @<%= singular_table_name %>.as_json(only: %w[<%= @attr.map(&:name).join(' ') %>]).each do |attribute, value|
           .box.slice-box
             .box-header.with-border
               %h3.box-title= attribute.capitalize
               .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.box-body-no-padding
-              = image_tag value, class: 'img-show'
-      .col-lg-7
+              = image_tag value.url, class: 'img-show' unless value.url.blank?
+      .col-sm-7
         .box.slice-box
           .box-header.with-border
-            %h3.box-title= t("keppler.modules.#{controller_path.underscore}")
+            %h3.box-title= t("keppler.modules.#{controller_name.underscore}")
             .box-tools.pull-right
-              = link_to edit_admin_<%= singular_table_name %>_path(@<%= singular_table_name %>), class: "btn btn-box-tool", title: "#{t('keppler.actions.edit') }" do
+              = link_to edit_admin_<%= singular_table_name %>_path(@<%= singular_table_name %>), class: 'btn btn-box-tool', title: t('keppler.actions.edit') do
                 %i.icon-pencil
-              = link_to admin_<%= singular_table_name %>_path(@<%= singular_table_name %>), class: "btn btn-box-tool", title: "#{t('keppler.actions.delete')}", method: :delete, data: { confirm: t("keppler.messages.data_confirm") } do
+              = link_to admin_<%= singular_table_name %>_path(@<%= singular_table_name %>), class: 'btn btn-box-tool', title: t('keppler.actions.delete'), method: :delete, data: { confirm: t('keppler.messages.data_confirm') } do
                 %i.icon-trash
-              %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.box-body-no-padding
             %table.table.table-striped
               %tbody
-                - @<%= singular_table_name %>.as_json(only: <%= attributes.map{|attr| attr.name}.select{|attr| !@attachments.include?(attr)} %>).each do |attribute, value|
+                - @<%= singular_table_name %>.as_json(except: %i[id position created_at updated_at deleted_at]).each do |attribute, value|
                   %tr.list-row
                     %th.display-label= t("activerecord.attributes.#{attribute}")
-                    %td.display-value.fs-body-1.tc-black-2
-                      = value
+                    %td.display-value.fs-body-1.tc-black-2.text-overflow= value.blank? ? '-----------' : value
       <%- end -%>

data/installer/core/plugins/keppler_ga_dashboard/config/permissions.yml

@@ -0,0 +1,4 @@
+modules:
+  dashboard:
+    name: dashboard
+    actions: [ 'index' ]

data/installer/core/plugins/keppler_ga_dashboard/keppler_ga_dashboard.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.email       = ["contacto@slicegroup.xyz"]
   s.homepage    = "https://www.slicegroup.xyz"
   s.summary     = "Summary of KepplerGaDashboard"
-  s.description = "Engine integrado con google analytics que proporciona un dashboard agradable presentando algunas métricas sobre las visitas."
+  s.description = ""
   s.license     = "MIT"
 
   s.files = Dir["{app,config,db,lib}/**/*", "MIT-LICENSE", "Rakefile", "README.rdoc"]

data/installer/core/test/controllers/roles_controller_test.rb

@@ -0,0 +1,48 @@
+require 'test_helper'
+
+class RolesControllerTest < ActionDispatch::IntegrationTest
+  setup do
+    @role = roles(:one)
+  end
+
+  test "should get index" do
+    get roles_url
+    assert_response :success
+  end
+
+  test "should get new" do
+    get new_role_url
+    assert_response :success
+  end
+
+  test "should create role" do
+    assert_difference('Role.count') do
+      post roles_url, params: { role: { name: @role.name } }
+    end
+
+    assert_redirected_to role_url(Role.last)
+  end
+
+  test "should show role" do
+    get role_url(@role)
+    assert_response :success
+  end
+
+  test "should get edit" do
+    get edit_role_url(@role)
+    assert_response :success
+  end
+
+  test "should update role" do
+    patch role_url(@role), params: { role: { name: @role.name } }
+    assert_redirected_to role_url(@role)
+  end
+
+  test "should destroy role" do
+    assert_difference('Role.count', -1) do
+      delete role_url(@role)
+    end
+
+    assert_redirected_to roles_url
+  end
+end

data/installer/core/test/fixtures/permissions.yml

@@ -0,0 +1,9 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+one:
+  modules: 
+  role: one
+
+two:
+  modules: 
+  role: two

data/installer/core/test/models/permission_test.rb

@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class PermissionTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end

data/installer/core/test/system/roles_test.rb

@@ -0,0 +1,43 @@
+require "application_system_test_case"
+
+class RolesTest < ApplicationSystemTestCase
+  setup do
+    @role = roles(:one)
+  end
+
+  test "visiting the index" do
+    visit roles_url
+    assert_selector "h1", text: "Roles"
+  end
+
+  test "creating a Role" do
+    visit roles_url
+    click_on "New Role"
+
+    fill_in "Name", with: @role.name
+    click_on "Create Role"
+
+    assert_text "Role was successfully created"
+    click_on "Back"
+  end
+
+  test "updating a Role" do
+    visit roles_url
+    click_on "Edit", match: :first
+
+    fill_in "Name", with: @role.name
+    click_on "Update Role"
+
+    assert_text "Role was successfully updated"
+    click_on "Back"
+  end
+
+  test "destroying a Role" do
+    visit roles_url
+    page.accept_confirm do
+      click_on "Destroy", match: :first
+    end
+
+    assert_text "Role was successfully destroyed"
+  end
+end

data/installer/plugins/concerns/commons.rb

@@ -0,0 +1,47 @@
+module KepplerPoll
+  module Concerns
+    # Concern con la configuracion de parametros de los formulario
+    module Commons
+      extend ActiveSupport::Concern
+
+      included do
+        before_action :set_attachments
+        before_action :paginator_params
+        before_action :set_setting
+      end
+
+      private
+
+      def set_attachments
+        @attachments = %w[logo brand photo avatar cover image
+                          picture banner attachment pic file]
+      end
+
+      def paginator_params
+        @search_field = model.search_field if listing?
+        @query = params[:search] unless params[:search].blank?
+        @current_page = params[:page] unless params[:page].blank?
+      end
+
+      def set_setting
+        @setting = Setting.first
+      end
+
+      def module_name
+        self.class.to_s.split('::').first.constantize
+      end
+
+      # Get submit key to redirect, only [:create, :update]
+      def redirect(object, commit)
+        if commit.key?('_save')
+          redirect_to([:admin, :ckn, object], notice: actions_messages(object))
+        elsif commit.key?('_add_other')
+          redirect_to(
+            send("new_admin_#{underscore(object)}_path"),
+            notice: actions_messages(object)
+          )
+        end
+      end
+    end
+  end
+end