petergate 1.3.0 → 1.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8be82833c7259e85ee80f35a935c7762a80bb9d2
-  data.tar.gz: f45cce812bbdc12d63a317a1759e5fd013c73add
+  metadata.gz: 1321402dd89f897c7b4fd9c32b5a6a375e6cccc8
+  data.tar.gz: 8b2bfc9840321e2e42ddf04ce2323bf103e3d686
 SHA512:
-  metadata.gz: b18da7bf7fc915bc1b67e3f7602c58a6e45cddfc3b1f53753036839f08ca3ec9546ead0ad5166c3c0a02f442df98dabd57f72daa1930a552a196db046871736f
-  data.tar.gz: ad2529c9ed5c8b84b50874fcd2e0d2d3b8de58d7675239fd1e693d92e463f97516958b63cdaf1f55ad63e552f3b83ad79fca18a3e5567076b041d40f57f1284c
+  metadata.gz: d72761ff90b4e08ef1678048aa608c505e17fc9ec365e112f3b64aa5072d35285219a0d4b7e730edeeb9fdff9785027c45a291eba7785a33eb8f284e46cd6ee0
+  data.tar.gz: 6ea6888d1818f492d2ab243edc5bfa45ecd88af3aa17cdff88208a99f4b3c565ddda239ba772b90137af8326c65f162b122b21c2bf5e43936b5a328d0c176314

data/lib/petergate/action_controller/base.rb

@@ -34,11 +34,12 @@ module Petergate
             end
 
             def controller_message
-              @_controller_message
+              @_controller_message || "Permission Denied"
             end
 
             def inherited(subclass)
               subclass.instance_variable_set("@_controller_rules", instance_variable_get("@_controller_rules"))
+              subclass.instance_variable_set("@_controller_message", instance_variable_get("@_controller_message"))
             end
           end
 
@@ -76,11 +77,11 @@ module Petergate
                              v == :all ? self.class.all_actions : raise("No action for: #{v}")
                            when "Hash"
                              v[:except].present? ? self.class.except_actions(v[:except]) : raise("Invalid values for except: #{v.values}")
-                           when "Array"
-                             v
-                           else
-                             raise("No action for: #{v}")
-                           end
+                             when "Array"
+                               v
+                             else
+                               raise("No action for: #{v}")
+                             end
 
           h.merge({k => special_values})
         end
@@ -101,12 +102,16 @@ module Petergate
         current_user && (roles & current_user.roles).any?
       end
 
+      def custom_message
+        defined?(self.class.controller_message) ? self.class.controller_message : 'Permission Denied'
+      end
+
       def forbidden!(msg = nil)
         respond_to do |format|
           format.any(:js, :json, :xml) { render nothing: true, status: :forbidden }
           format.html do
             destination = current_user.present? ? request.referrer || after_sign_in_path_for(current_user) : root_path
-            redirect_to destination, notice: (msg || self.class.controller_message || 'Permission Denied')
+            redirect_to destination, notice: (msg || custom_message)
           end
         end
       end

data/lib/petergate/version.rb

@@ -1,3 +1,3 @@
 module Petergate
-  VERSION = "1.3.0"
+  VERSION = "1.3.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: petergate
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.5
 platform: ruby
 authors:
 - Isaac Sloan