petergate 1.6.5 → 1.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d20c92ae2ae79dfbb8f1c9d834cc6de6e708036
-  data.tar.gz: 722b9be598ba7734931ec5c7bb3011527a926879
+  metadata.gz: 92093289b85646356446c4fcaff0d86c28f3142f
+  data.tar.gz: 8a48aebdd93d07ab8e452e7ddd60758c0692f4ac
 SHA512:
-  metadata.gz: c8fc4379359203634b97750673bd21d3f88dbeff336a44b2c39b68a427a477faff622379aaff828c445d8a46db596781ffe90e872a26369948a8eab50250cffa
-  data.tar.gz: 3a0bf6453f83ec508a009d6a5c757bd24b1481e4cee23dbee62b90ec65a360f1cf1aff0ed86543b2a3e3b74c0b5d925055795e40f7509a2273f3c034f272302e
+  metadata.gz: 61da71bb4c55f95776c2495fa5f2a7776fa66db45b566ee0e401ec0673f3d2f9bf19680708d7fe999baa51cd56bd303002170f679f107562721c7c1d888ee799
+  data.tar.gz: fc9f0361a82da2a106730e65d02e31ebd334f2d354326e61bfc7a7d8931a91103fc0a21b7113907ccc040b11082a27a9e27929355d232feb25327d2891eecbe6

data/lib/petergate/action_controller/base.rb

@@ -41,6 +41,19 @@ module Petergate
               subclass.instance_variable_set("@_controller_rules", instance_variable_get("@_controller_rules"))
               subclass.instance_variable_set("@_controller_message", instance_variable_get("@_controller_message"))
             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
+                end
+              end
+            end
           end
 
           class_eval do
@@ -56,18 +69,6 @@ module Petergate
       def self.included(base)
         base.extend(ClassMethods)
         base.helper_method :logged_in?, :forbidden!
-        base.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
-            end
-          end
-        end
       end
 
       def parse_permission_rules(rules)

data/lib/petergate/version.rb

@@ -1,3 +1,3 @@
 module Petergate
-  VERSION = "1.6.5"
+  VERSION = "1.6.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: petergate
 version: !ruby/object:Gem::Version
-  version: 1.6.5
+  version: 1.6.6
 platform: ruby
 authors:
 - Isaac Sloan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-04 00:00:00.000000000 Z
+date: 2016-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler