petergate 1.6.7 → 1.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad2ca3aedcf715c1b73a506449725242a0be4d3e
-  data.tar.gz: b0cabc242f2cd1e80bda78162633356aa0a7216b
+  metadata.gz: 266c473c940d039ad1098a27bd8a4ae3920b130d
+  data.tar.gz: 08c543814c39ca17f9436bfeb2ef369b6b2f5284
 SHA512:
-  metadata.gz: b672cd4a53dae9a55e3cb4cde2f9f3ce0e06084553af450c67bbb963c6855baad5bba8639a3c16115ef2f8afa5ce5f54648b959920af519ef0c3c33b202efa01
-  data.tar.gz: 93876867cbf3d0e0fa16b0a6d1451ebd1acd10d518190734f35d15b6be8dec68df3ad9502621cdfb1c5b98d35ac168f1af92488361d7f49b4b1a8e2602f3f3f9
+  metadata.gz: f8b185bf7b5d2315bab81d230ed46b33bb440171d2080974b755a69f223bab325bc07b777f586184fc25318144384fd0a2d070b43ec2430048801cf2d9208d16
+  data.tar.gz: d16bc5c3607cc1d4480b4fbc254eaede8fcaf13f29718fb68464b0036665fa7d89a7c277ad15d59bdede8c4fdfeebd8d9fc1295f3988a7be43507931842aba42

data/lib/petergate/action_controller/base.rb

@@ -43,20 +43,14 @@ module Petergate
             end
           end
 
-          class_eval do
-            def check_access
-              permissions(self.class.controller_rules)
-            end
-
-            before_action do 
-              unless logged_in?(:root_admin)
-                message= defined?(check_access) ? check_access : true
-                if message == false || message.is_a?(String)
-                  if current_user || @user
-                    forbidden! message
-                  else
-                    unauthorized!
-                  end
+          before_action do 
+            unless logged_in?(:root_admin)
+              message = permissions(self.class.controller_rules)
+              if message == false || message.is_a?(String)
+                if current_user || @user
+                  forbidden! message
+                else
+                  unauthorized!
                 end
               end
             end
@@ -68,7 +62,7 @@ module Petergate
 
       def self.included(base)
         base.extend(ClassMethods)
-        base.helper_method :logged_in?, :forbidden!
+        base.helper_method :logged_in?, :forbidden!, :unauthorized!
       end
 
       def parse_permission_rules(rules)
@@ -78,11 +72,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

data/lib/petergate/version.rb

@@ -1,3 +1,3 @@
 module Petergate
-  VERSION = "1.6.7"
+  VERSION = "1.6.8"
 end

metadata

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