itsf_backend 1.1.7 → 1.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0be05c7a7fd7f6d0fb8391a79bd47350b7d9ea00
-  data.tar.gz: 2ecc683d46c48fae5c150dd93a42d6a0c5d7a9b8
+  metadata.gz: 7b421756702587ef74370ab1010ab5535623d270
+  data.tar.gz: 94d3ee99c2857d4abf02c76d9a1d116100aaf498
 SHA512:
-  metadata.gz: fb484cf8858f22721a11804340796539a09189bfb7d8acaf5595c14e7aa108b56087d9ccd08192215517c6abc0f4d9cc9305efe78156c7fc8bbfc63d58bb88d8
-  data.tar.gz: dd9deebdf4828fcb22be500b5caeaa027027d8cf35b3088076cf4194f31da6c8a6505a4c369a59f84ef3de6f85cc022d2f785af446bf8ca8417f57bb2bd03b81
+  metadata.gz: 8a0af1ca63b6d8ca0885b5f72a1f3010764042468a3e0a6063a7fe15f245a4597e2e917781e60ce0cb956beeffe31e8ae03808a7db408fcd5b4dd2cd22ee3f8d
+  data.tar.gz: 537f2e9615e687a3f5160263d49cd9f03ad3b765a988d989e98e5d0422e2da259a1e4140f412f6c376df99202cc61eb83eaac980c609becb6319779c7899b8d5

data/app/controllers/concerns/controller/pundit_authorization_failure_handling_concern.rb

@@ -0,0 +1,21 @@
+module Controller
+  module PunditAuthorizationFailureHandlingConcern
+    extend ActiveSupport::Concern
+
+    included do
+      rescue_from Pundit::NotAuthorizedError, with: :not_authorized
+    end
+
+    private
+
+    def not_authorized(exception)
+      resource_name   = exception.record.respond_to?(:model_name) ? exception.record.model_name.human : exception.record
+      collection_name = exception.record.respond_to?(:model_name) ? exception.record.model_name.human(count: :other) : exception.record
+      flash[:error] = I18n.t("pundit.not_authorized.#{action_name}", collection_name: collection_name,resource_name: resource_name)
+      respond_to do |format|
+        format.html { redirect_to main_app.root_path }
+        format.json { render json: { error: 'not authorized' }, status: 403 }
+      end
+    end
+  end
+end

data/app/controllers/concerns/controller/rest_actions_concern_with_pundit.rb

@@ -7,6 +7,7 @@ module Controller
       responders :flash
     end
 
+    
     def index
       if Itsf::Backend.features?(:ransack)
         @q = collection_scope_with_search_scopes(collection_scope).ransack(params[:q])
@@ -19,7 +20,7 @@ module Controller
     end
 
     def new
-      @resource = resource_class.new
+      @resource = initialize_resource
       authorize_action
       respond_with @resource
     end
@@ -57,6 +58,7 @@ module Controller
       respond_with @resource, location: after_destroy_location
     end
 
+
     private
 
     def after_create_location
@@ -93,6 +95,10 @@ module Controller
       resource_class
     end
 
+    def initialize_resource
+      resource_class.new
+    end
+
     def load_resource
       resource_class.find(params[:id])
     end

data/app/controllers/itsf/backend/dashboard_controller.rb

@@ -8,6 +8,7 @@ module Itsf::Backend
     if Itsf::Backend.features?(:pundit)
       include Pundit
       prepend Controller::PunditNamespacedAuthorizeConcern
+      include Controller::PunditAuthorizationFailureHandlingConcern
       helper_method :engine_policy
 
       after_action :verify_authorized

data/app/controllers/itsf/backend/home_controller.rb

@@ -6,6 +6,7 @@ module Itsf::Backend
     if Itsf::Backend.features?(:pundit)
       include Pundit
       prepend Controller::PunditNamespacedAuthorizeConcern
+      include Controller::PunditAuthorizationFailureHandlingConcern
       helper_method :engine_policy
     end
 

data/app/controllers/itsf/backend/resource/base_controller.rb

@@ -7,6 +7,7 @@ module Itsf::Backend
       include Controller::RestActionsConcernWithPundit
       include Pundit
       prepend Controller::PunditNamespacedAuthorizeConcern
+      include Controller::PunditAuthorizationFailureHandlingConcern
       helper_method :engine_policy
     else
       include Controller::RestActionsConcern

data/app/controllers/itsf/backend/service/base_controller.rb

@@ -6,6 +6,7 @@ module Itsf::Backend
     if Itsf::Backend.features?(:pundit)
       include Pundit
       include Controller::PunditNamespacedAuthorizeConcern 
+      include Controller::PunditAuthorizationFailureHandlingConcern
     end
 
     include Controller::ServiceInflectionsConcern

data/app/views/itsf/backend/resource/base/_form_buttons.haml

@@ -0,0 +1,3 @@
+= form.button :submit, class: 'btn btn-success'
+= form.button :submit_and_continue_with_edit, class: 'btn btn-success'
+= form.button :submit_and_continue_with_new, class: 'btn btn-success'

data/app/views/itsf/backend/resource/base/_table_actions.html.haml

@@ -2,14 +2,20 @@
   - id_base = "link-to-#{controller.class.name.underscore.gsub('_controller', '').gsub(/[\/_]/, '-')}-#{resource.to_param}"
   .btn-group
     - if !Itsf::Backend.features?(:pundit) || policy(resource).show?
-      = link_to(resource_path(resource), id: "#{id_base}-show", class: 'btn btn-xs btn-responsive btn-default') do
-        %span.glyphicon.glyphicon-eye-open
-        %span.btn-text= t('.show')
+      - begin
+        = link_to(resource_path(resource), id: "#{id_base}-show", class: 'btn btn-xs btn-responsive btn-default') do
+          %span.glyphicon.glyphicon-eye-open
+          %span.btn-text= t('.show')
+      - rescue ActionController::UrlGenerationError
     - if !Itsf::Backend.features?(:pundit) || policy(resource).edit?
-      = link_to(edit_resource_path(resource), id: "#{id_base}-edit", class: 'btn btn-xs btn-responsive btn-default') do
-        %span.glyphicon.glyphicon-pencil
-        %span.btn-text= t('.edit')
+      - begin
+        = link_to(edit_resource_path(resource), id: "#{id_base}-edit", class: 'btn btn-xs btn-responsive btn-default') do
+          %span.glyphicon.glyphicon-pencil
+          %span.btn-text= t('.edit')
+      - rescue ActionController::UrlGenerationError
     - if !Itsf::Backend.features?(:pundit) || policy(resource).destroy?
-      = link_to(resource_path(resource), id: "#{id_base}-destroy", class: 'btn btn-xs btn-responsive btn-danger', method: :delete, data: { confirm: I18n.t('.confirmations.delete') }) do
-        %span.glyphicon.glyphicon-fire
-        %span.btn-text= t('.destroy')
+      - begin
+        = link_to(resource_path(resource), id: "#{id_base}-destroy", class: 'btn btn-xs btn-responsive btn-danger', method: :delete, data: { confirm: I18n.t('.confirmations.delete') }) do
+          %span.glyphicon.glyphicon-fire
+          %span.btn-text= t('.destroy')
+      - rescue ActionController::UrlGenerationError

data/app/views/itsf/backend/resource/base/edit.html.haml

@@ -5,9 +5,7 @@
     = simple_form_for(@resource, url: resource_path(@resource)) do |f|
       = render partial: 'form_errors', locals: { resource: f.object }
       = render 'form', form: f
-      = f.button :submit, class: 'btn btn-success'
-      = f.button :submit_and_continue_with_edit, class: 'btn btn-success'
-      = f.button :submit_and_continue_with_new, class: 'btn btn-success'
+      = render 'form_buttons', form: f
 
 .well.well-sm
   = link_to resource_path(@resource), class: 'btn btn-primary btn-responsive' do

data/app/views/itsf/backend/resource/base/new.html.haml

@@ -5,9 +5,7 @@
     = simple_form_for(@resource, url: collection_path) do |f|
       = render partial: 'form_errors', locals: { resource: f.object }
       = render 'form', form: f
-      = f.button :submit, class: 'btn btn-success'
-      = f.button :submit_and_continue_with_edit, class: 'btn btn-success'
-      = f.button :submit_and_continue_with_new, class: 'btn btn-success'
+      = render 'form_buttons', form: f
   %div.panel-footer
 
 .well.well-sm

data/lib/generators/itsf/backend/install/templates/initializer.rb

@@ -17,12 +17,18 @@ Itsf::Backend.configure do |config|
   #
   config.home_base_controller = 'BackendController'
 
-  # Set the base controller for resouce controllers
+  # Set the base controller for resource controllers
   #
   # Default: config.resource_base_controller = 'BackendController'
   #
   config.resource_base_controller = 'BackendController'
 
+  # Set the base controller for service controllers
+  #
+  # Default: config.service_base_controller = 'BackendController'
+  #
+  config.service_base_controller = 'BackendController'
+
   # Register backend engines here. They will be  added to the backend menu
   #
   # Example: config.backend_engines = %w( MyEngine::Engine ).map(&:constantize)

data/lib/itsf/backend/version.rb

@@ -1,5 +1,5 @@
 module Itsf
   module Backend
-    VERSION = '1.1.7'
+    VERSION = '1.1.8'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itsf_backend
 version: !ruby/object:Gem::Version
-  version: 1.1.7
+  version: 1.1.8
 platform: ruby
 authors:
 - Roberto Vasquez Angel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-17 00:00:00.000000000 Z
+date: 2016-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -498,6 +498,7 @@ files:
 - app/controllers/concerns/controller/acts_as_list_concern.rb
 - app/controllers/concerns/controller/acts_as_published_concern.rb
 - app/controllers/concerns/controller/pagination_concern.rb
+- app/controllers/concerns/controller/pundit_authorization_failure_handling_concern.rb
 - app/controllers/concerns/controller/pundit_namespaced_authorize_concern.rb
 - app/controllers/concerns/controller/ransack_concern.rb
 - app/controllers/concerns/controller/rest_actions_concern_with_pundit.rb
@@ -539,6 +540,7 @@ files:
 - app/views/itsf/backend/home/index.html.haml
 - app/views/itsf/backend/i18n/_navigation.html.haml
 - app/views/itsf/backend/resource/base/_form.html.haml
+- app/views/itsf/backend/resource/base/_form_buttons.haml
 - app/views/itsf/backend/resource/base/_form_errors.html.haml
 - app/views/itsf/backend/resource/base/_head_extras.html.haml
 - app/views/itsf/backend/resource/base/_index_extras.html.haml