petergate 1.2.1 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b892f7fb8bd9dede52439d388ad0960785eda65
-  data.tar.gz: 64e30d9978358748a8755419b5b06521fe856c05
+  metadata.gz: 8195676a80d896b9c03096811dfe1a2f0ba103d9
+  data.tar.gz: 22dde73f57a394c67bc6b44f83c930b44a56203c
 SHA512:
-  metadata.gz: 00262c0fdb48c9b50dd12814be378b6342d71001e71d6ed0022d33640e10d53e1d675db7ef59c45deeeec0ada3393b53072d963a23d460197b0e28c4f90093ba
-  data.tar.gz: 76b3390ab9851e4791a8de4bedee17b3323e85b13813ac5bfc11838dd23c44c01472ef44fa152f4ff00c4a2d8cf0e5455e1a69891f9eb69d45e4ed4f6ac308cb
+  metadata.gz: 5c37088d9935b4baf5428babd3621bfbe185bc34103795a13c1616f3aac6228c8013f11dd938624dcf7d08c7848be52be529e0653a7c38dae911c180a0bf5cb5
+  data.tar.gz: 6c44f18ade5b9101605bd8f2ab53a2505718aa23a10f2d0a27f7fc7aef8136b75992c6bddbde771d31efbd50681f405beddca98df6267c9ac298d61c31e96e24

data/lib/petergate/action_controller/base.rb

@@ -53,7 +53,7 @@ module Petergate
         base.before_filter do 
           unless logged_in?(:admin)
             message= defined?(check_access) ? check_access : true
-            if message.is_a?(String) || message == false
+            if message.is_a?(String) || message.nil?
               if user_signed_in?
                 forbidden! message
               else
@@ -71,25 +71,26 @@ 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
         # Allows Array's of keys for he same hash.
-        rules.inject({}){|h, (k, v)| k.class == Array ? h.merge(Hash[k.map{|kk| [kk, v]}]) : h.merge(k => v) }
+        rules = rules.inject({}){|h, (k, v)| k.class == Array ? h.merge(Hash[k.map{|kk| [kk, v]}]) : h.merge(k => v) }
       end
 
       def permissions(rules = {all: [:index, :show], customer: [], wiring: []})
+        message = rules.delete(:message)
         rules = parse_permission_rules(rules)
         allowances = [rules[:all]]
         current_user.roles.each do |role|
           allowances << rules[role]
         end if logged_in?(:user)
-        allowances.flatten.compact.include?(params[:action].to_sym)
+        allowances.flatten.compact.include?(params[:action].to_sym) || message
       end
 
       def logged_in?(*roles)
@@ -101,7 +102,7 @@ module Petergate
           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 || 'Permission Denied'
+            redirect_to destination, notice: (msg || 'Permission Denied')
           end
         end
       end

data/lib/petergate/version.rb

@@ -1,3 +1,3 @@
 module Petergate
-  VERSION = "1.2.1"
+  VERSION = "1.2.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: petergate
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.5
 platform: ruby
 authors:
 - Isaac Sloan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-22 00:00:00.000000000 Z
+date: 2016-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler