rao-resources_controller 0.0.44.pre → 0.0.48.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fcd34fcb1c9fd9106d0fe2534b6d94c5ada97ede7f23b53a0ea4fbc51300f6ac
-  data.tar.gz: a722dfd5902c76ee2690a4b3107d103def7cb8d423635675fd698aa2c7a13c58
+  metadata.gz: a4ce8af3cd312aa3406286e3d4a28344a89d612ba4e567dc6189f0b0cc15f57e
+  data.tar.gz: dbb59f4181f6b243dad00c5b26265ad88de50f8b97397ac111fcf467c3f39b23
 SHA512:
-  metadata.gz: c93d9671784c6e9a1ac8a3f428bf2db2fb8bdc2aab4fce48b8bbad2d9ca2a0e672f11aac7b2413249042bfd95b88dce71e1bd3198461fca3ee4e4ff92ac92982
-  data.tar.gz: ddbf8be123007bbb2151f358c1e3715f6140840d03e37e79bcf7e29dd20bdc7797a56fb99a567703cc4f45930de4af7888d9043fe96064c2d3f0dbbd211792e0
+  metadata.gz: 6d6d31f19420c6a04f0ac4f8f22171552701d050396085409c69836e3386ab9b64cd78e8dd217cc2c235e6d045b740d42d078cac60f1acb761f04492ce4ca5a8
+  data.tar.gz: ac5fa0ff35c92566a97275e55e6133f5c6ca3263fd4f7e1bc9f4611f0e8912ebddd1fc9b04780fa7d79277d305cddc11b500cf99aa9e49dc69cf18620362aa62

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,7 +46,8 @@ de:
           title: "%{resource_name} erstellen"
         show_actions:
           back: "Zurück"
-          delete: "Löschen"
+          destroy: "Löschen"
+          destroy_confirmation: "Sind Sie sicher?"
           edit: "Bearbeiten"
       batch_actions_concern:
         destroy_many:

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.44.pre
+  version: 0.0.48.pre
 platform: ruby
 authors:
 - Roberto Vasquez Angel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-28 00:00:00.000000000 Z
+date: 2021-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: rao
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: rails-dummy
   requirement: !ruby/object:Gem::Requirement
@@ -160,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
@@ -189,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
@@ -203,14 +203,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.24
 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')