rao-resources_controller 0.0.42.pre → 0.0.47.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 225265f8be85ba6e2675e209908e36bc57e9dd1ccc1cfcd26c160f0cb55cd810
-  data.tar.gz: 687cd0d960e38566ff3adcfe4ddebd840d7839f96cbea947a9d440c5c103803d
+  metadata.gz: 2371783ce441bfb7c74932bdff959429ebb65d251cde9ca97cc08af007a4a2e1
+  data.tar.gz: e2c107624566431ebe89eaa98e4233d3cdf43a77db53fa1ef99cf0bb6086990a
 SHA512:
-  metadata.gz: 1f9c2cae5e41e3b96fa11da8d7ddaec198fb4afaa291e7da05a74286ee0fa6731cfac1dd3b4c1004f9cbe061bd0d91bed0d7286ceee782672ca0bc7c642a6511
-  data.tar.gz: f10056f3297ce576e18a71525966d1804e126cbf04f0b2b1dcb0f7f7e0b5c3f404d12272e7a038f4f4ceb472648d514b9b7117afc0be611587bfcea984a3518e
+  metadata.gz: 3d76366e6030fd7f2e634a28b777d571af999ccde43dac26a63fb3269038d2c8d2cd90a1037809d6ddf00f9a2699ff5dbd6e1f17620206a5739b7d9bffaf3efd
+  data.tar.gz: c19cb5464ccba957c86c525bbda7bfcaa713fcd28a420a3968176e7e95e3e90f7c23b1efd6ab6bce5ad1c8a7362e275ca6ccfacd8ccffee63e2dfee4d5ea650c

data/app/concerns/rao/resources_controller/aasm_concern.rb

@@ -0,0 +1,30 @@
+module Rao
+  module ResourcesController
+    module AasmConcern
+      extend ActiveSupport::Concern
+
+      included do
+        before_action :load_resource_for_trigger_event, only: [:trigger_event]
+      end
+
+      def trigger_event
+        if @resource.aasm(permitted_params_for_trigger_event[:machine_name].to_sym).fire!(permitted_params_for_trigger_event[:event_name].to_sym)
+          flash[:notice] = t('rao.resources_controller.aasm_concern.trigger_event.success', state: @resource.aasm(permitted_params_for_trigger_event[:machine_name].to_sym).current_state, event: permitted_params_for_trigger_event[:event_name])
+        else
+          flash[:notice] = t('rao.resources_controller.aasm_concern.trigger_event.failure', state: @resource.aasm(permitted_params_for_trigger_event[:machine_name].to_sym).current_state, event: permitted_params_for_trigger_event[:event_name])
+        end
+        redirect_back(fallback_location: root_path)
+      end
+
+      private
+
+      def permitted_params_for_trigger_event
+        params.permit!
+      end
+
+      def load_resource_for_trigger_event
+        load_resource
+      end
+    end
+  end
+end

data/app/concerns/rao/resources_controller/batch_actions_concern.rb

@@ -9,9 +9,13 @@ module Rao
   module ResourcesController::BatchActionsConcern
     def destroy_many
       @collection = load_collection_scope.where(id: params[:ids])
+      count = @collection.count
       @collection.destroy_all
 
-      respond_with @collection, location: after_destroy_many_location, notice: t('.success', count: @collection.count)
+      default_message = t('.success', inflections.merge(count: count))
+      respond_with @collection,
+        location: after_destroy_many_location,
+        notice: t('rao.resources_controller.batch_actions_concern.destroy_many.success', inflections.merge(count: count, default: default_message))
     end
 
     private

data/app/views/rao/resources_controller/base/_form_buttons.html.haml

@@ -0,0 +1,5 @@
+= form.button :submit, class: 'btn btn-success' do
+  = fa_icon :check
+  = t('.submit', model_name: form.object.model_name.human)
+= link_to(((action_name == 'new' || form.object.new_record?) ? collection_path : resource_path(form.object)), class: 'btn btn-link') do
+  = t('.cancel')

data/app/views/rao/resources_controller/base/{_form_errors.haml → _form_errors.html.haml}

@@ -1,5 +1,5 @@
 - if resource.errors.any?
-  = bootstrap_alert(context: :danger, class: 'error-explanation') do
+  .alert.alert-danger.error-explanation
     .error-heading= t('errors.template.header', count: resource.errors.count, model: resource.class.model_name.human)
     %ul
       - resource.errors.full_messages.each do |msg|

data/app/views/rao/resources_controller/base/_show_actions.html.haml

@@ -0,0 +1,11 @@
+.btn-group
+  = link_to(edit_resource_path(resource), class: 'btn btn-secondary') do
+    %i.fas.fa-edit
+    = t('.edit')
+
+  = link_to(resource_path(resource), class: 'btn btn-danger', method: :delete, data: { confirm: t('.destroy_confirmation') }) do
+    %i.fas.fa-trash
+    = t('.destroy')
+
+= link_to(collection_path, class: 'btn btn-link') do
+  = t('.back')

data/app/views/rao/resources_controller/base/_table_actions.html.haml

@@ -0,0 +1,12 @@
+= table.column :actions, title: '' do |resource|
+  - capture_haml do
+    .btn-group
+      = link_to(resource_path(resource), class: 'btn btn-sm btn-primary') do
+        %i.fas.fa-eye
+        = t('.show')
+      = link_to(edit_resource_path(resource), class: 'btn btn-sm btn-secondary') do
+        %i.fas.fa-edit
+        = t('.edit')
+      = link_to(resource_path(resource), class: 'btn btn-sm btn-danger', method: :delete, data: { confirm: t('.destroy_confirmation') }) do
+        %i.fas.fa-trash
+        = t('.destroy')

data/app/views/rao/resources_controller/base/{edit.haml → edit.html.haml}

@@ -1,6 +1,6 @@
 %h1= t('.title', inflections)
 
-= bootstrap_form_for(@resource, url: resource_path(@resource)) do |f|
+= simple_form_for(@resource, url: resource_path(@resource)) do |f|
   = render 'form_errors',  resource: f.object
   = render 'form',         form: f
   = render 'form_buttons', form: f

data/app/views/rao/resources_controller/base/{index.haml → index.html.haml}

@@ -2,8 +2,8 @@
   %span
     = resource_class.model_name.human(count: :other)
   .pull-right
-    = bootstrap_button(to: new_resource_path, context: :success) do
-      = fa_icon(:plus)
+    = link_to(new_resource_path, class: 'btn btn-success') do
+      %i.fas.fa-plus
       = t('.new')
 
 = render 'before_index_table', collection: @collection

data/app/views/rao/resources_controller/base/{new.haml → new.html.haml}

@@ -1,6 +1,6 @@
 %h1= t('.title', inflections)
 
-= bootstrap_form_for(@resource, url: collection_path) do |f|
+= simple_form_for(@resource, url: collection_path) do |f|
   = render 'form_errors',  resource: f.object
   = render 'form',         form: f
   = render 'form_buttons', form: f

data/app/views/rao/resources_controller/base/{show.haml → show.html.haml}

@@ -1,4 +1,4 @@
-%h1= @resource.try_all(:human, :title, :name, :to_s)
+%h1= Rao::ResourcesController::Configuration.label_for_resource_proc.call(@resource)
 
 = render 'before_show_table', resource: @resource
 

data/config/locales/de.yml

@@ -32,6 +32,9 @@ de:
         alert: "%{resource_name} konnte nicht ausgeführt werden. Es traten folgende Fehler auf: %{errors}"
   rao:
     resources_controller:
+      aasm_concern:
+        trigger_event:
+          success: "Der Vorgang %{event} war erfolgreich. Der neue Status ist %{state}."
       base:
         form_buttons:
           cancel: "Abbrechen"
@@ -43,5 +46,9 @@ de:
           title: "%{resource_name} erstellen"
         show_actions:
           back: "Zurück"
-          delete: "Löschen"
-          edit: "Bearbeiten"
+          destroy: "Löschen"
+          destroy_confirmation: "Sind Sie sicher?"
+          edit: "Bearbeiten"
+      batch_actions_concern:
+        destroy_many:
+          success: "%{count} %{collection_name} wurden gelöscht."

data/config/locales/en.yml

@@ -32,6 +32,9 @@ en:
         alert: "%{resource_name} could not be executed. Errors: %{errors}"
   rao:
     resources_controller:
+      aasm_concern:
+        trigger_event:
+          success: "The event %{event} completed successfully. The new state is %{state}."
       base:
         form_buttons:
           cancel: "Cancel"
@@ -43,5 +46,9 @@ en:
           title: "New %{resource_name}"
         show_actions:
           back: "Back"
-          delete: "Delete"
-          edit: "Edit"
+          destroy: "Delete"
+          destroy_confirmation: "Are you sure?"
+          edit: "Edit"
+      batch_actions_concern:
+        destroy_many:
+          success: "Deleted %{count} %{collection_name}."

data/lib/generators/rao/resources_controller/templates/initializer.rb

@@ -12,4 +12,20 @@ Rao::ResourcesController.configure do |config|
   # default: config.pagination_per_page_default = 25
   #
   config.pagination_per_page_default = 25
+
+  # Configures how a label will be created for resources.
+  #
+  # default: config.label_for_resource_proc = lambda do |resource|
+  #            [:human, :title, :name, :to_s].each do |method_name|
+  #              next unless resource.respond_to?(method_name)
+  #              return resource.send(method_name)
+  #            end
+  #          end
+  #
+  config.label_for_resource_proc = lambda do |resource|
+    [:human, :title, :name, :to_s].each do |method_name|
+      next unless resource.respond_to?(method_name)
+      return resource.send(method_name)
+    end
+  end
 end

data/lib/rao/resources_controller.rb

@@ -2,6 +2,9 @@ require "rao/resources_controller/configuration"
 require "rao/resources_controller/version"
 require "rao/resources_controller/engine"
 
+require "rao/resources_controller/routing/acts_as_list_concern"
+require "rao/resources_controller/routing/acts_as_published_concern"
+
 module Rao
   module ResourcesController
     extend Configuration

data/lib/rao/resources_controller/configuration.rb

@@ -5,8 +5,22 @@ module Rao
         yield self
       end
 
-      mattr_accessor(:resources_controller_base_class_name) { "::ApplicationController" }
-      mattr_accessor(:pagination_per_page_default) { 25 }
+      mattr_accessor(:resources_controller_base_class_name) do
+        "::ApplicationController"
+      end
+
+      mattr_accessor(:pagination_per_page_default) do
+        25
+      end
+
+      mattr_accessor(:label_for_resource_proc) do
+        lambda do |resource|
+          [:human, :title, :name, :to_s].each do |method_name|
+            next unless resource.respond_to?(method_name)
+            return resource.send(method_name)
+          end
+        end
+      end
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rao-resources_controller
 version: !ruby/object:Gem::Version
-  version: 0.0.42.pre
+  version: 0.0.47.pre
 platform: ruby
 authors:
 - Roberto Vasquez Angel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-20 00:00:00.000000000 Z
+date: 2020-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -147,6 +147,7 @@ files:
 - README.md
 - Rakefile
 - app/concerns/rao/controller/autosubmit_concern.rb
+- app/concerns/rao/resources_controller/aasm_concern.rb
 - app/concerns/rao/resources_controller/acts_as_list_concern.rb
 - app/concerns/rao/resources_controller/acts_as_published_concern.rb
 - app/concerns/rao/resources_controller/awesome_nested_set_concern.rb
@@ -159,26 +160,24 @@ files:
 - app/concerns/rao/resources_controller/resources_concern.rb
 - app/concerns/rao/resources_controller/rest_actions_concern.rb
 - app/concerns/rao/resources_controller/rest_resource_urls_concern.rb
-- app/concerns/rao/resources_controller/routing/acts_as_list_concern.rb
-- app/concerns/rao/resources_controller/routing/acts_as_published_concern.rb
 - app/concerns/rao/resources_controller/sorting_concern.rb
 - app/concerns/rao/resources_controller/will_paginate_concern.rb
 - app/controllers/rao/resources_controller/base.rb
-- app/views/rao/resources_controller/base/_after_show_table.haml
-- app/views/rao/resources_controller/base/_before_index_table.haml
-- app/views/rao/resources_controller/base/_before_show_table.haml
-- app/views/rao/resources_controller/base/_form.haml
-- app/views/rao/resources_controller/base/_form_buttons.haml
-- app/views/rao/resources_controller/base/_form_errors.haml
-- app/views/rao/resources_controller/base/_pagination.haml
-- app/views/rao/resources_controller/base/_show.haml
-- app/views/rao/resources_controller/base/_show_actions.haml
-- app/views/rao/resources_controller/base/_table.haml
-- app/views/rao/resources_controller/base/_table_actions.haml
-- app/views/rao/resources_controller/base/edit.haml
-- app/views/rao/resources_controller/base/index.haml
-- app/views/rao/resources_controller/base/new.haml
-- app/views/rao/resources_controller/base/show.haml
+- app/views/rao/resources_controller/base/_after_show_table.html.haml
+- app/views/rao/resources_controller/base/_before_index_table.html.haml
+- app/views/rao/resources_controller/base/_before_show_table.html.haml
+- app/views/rao/resources_controller/base/_form.html.haml
+- app/views/rao/resources_controller/base/_form_buttons.html.haml
+- app/views/rao/resources_controller/base/_form_errors.html.haml
+- app/views/rao/resources_controller/base/_pagination.html.haml
+- app/views/rao/resources_controller/base/_show.html.haml
+- app/views/rao/resources_controller/base/_show_actions.html.haml
+- app/views/rao/resources_controller/base/_table.html.haml
+- app/views/rao/resources_controller/base/_table_actions.html.haml
+- app/views/rao/resources_controller/base/edit.html.haml
+- app/views/rao/resources_controller/base/index.html.haml
+- app/views/rao/resources_controller/base/new.html.haml
+- app/views/rao/resources_controller/base/show.html.haml
 - config/initializers/include_routing_concerns.rb
 - config/locales/de.yml
 - config/locales/en.yml
@@ -188,6 +187,8 @@ files:
 - lib/rao/resources_controller.rb
 - lib/rao/resources_controller/configuration.rb
 - lib/rao/resources_controller/engine.rb
+- lib/rao/resources_controller/routing/acts_as_list_concern.rb
+- lib/rao/resources_controller/routing/acts_as_published_concern.rb
 - lib/rao/resources_controller/version.rb
 - lib/tasks/rao-resources_controller_tasks.rake
 homepage: https://github.com/rails-add_ons
@@ -209,7 +210,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.1.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Resources Controllers for Ruby on Rails.

data/app/views/rao/resources_controller/base/_form_buttons.haml

@@ -1,5 +0,0 @@
-= form.button :submit, class: 'btn btn-success' do
-  = fa_icon :check
-  = t('.submit', model_name: form.object.model_name.human)
-= bootstrap_button(to: ((action_name == 'new' || form.object.new_record?) ? collection_path : resource_path(form.object)), context: :link) do
-  = t('.cancel')

data/app/views/rao/resources_controller/base/_show_actions.haml

@@ -1,11 +0,0 @@
-= bootstrap_button_group do
-  = bootstrap_button(to: edit_resource_path(resource), context: :secondary) do
-    = fa_icon(:pencil)
-    = t('.edit')
-
-  = bootstrap_button(to: resource_path(resource), context: :danger, method: :delete, data: { confirm: 'Are you sure?' }) do
-    = fa_icon :trash
-    = t('.destroy')
-
-= bootstrap_button(to: collection_path, context: :link) do
-  = t('.back')

data/app/views/rao/resources_controller/base/_table_actions.haml

@@ -1,12 +0,0 @@
-= table.column :actions do |resource|
-  - capture_haml do
-    = bootstrap_button_group do
-      = bootstrap_button(to: resource_path(resource), context: :primary, size: :small) do
-        = fa_icon :eye
-        = t('.show')
-      = bootstrap_button(to: edit_resource_path(resource), context: :secondary, size: :small) do
-        = fa_icon :pencil
-        = t('.edit')
-      = bootstrap_button(to: resource_path(resource), context: :danger, size: :small, method: :delete, data: { confirm: 'Are you sure?' }) do
-        = fa_icon :trash
-        = t('.destroy')