petergate 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8fa3c73c0f112d28500fcbcb241a152643853a5e
-  data.tar.gz: c93c7d0652127f3ae3542e9bc7b09e6445fef36d
+  metadata.gz: 9b892f7fb8bd9dede52439d388ad0960785eda65
+  data.tar.gz: 64e30d9978358748a8755419b5b06521fe856c05
 SHA512:
-  metadata.gz: 477ec56213cfb10f13be43082c361b7453d1ad5f4d7da5b77324f537a3a40bbdb1f69d52a6114b48c5a63cee8db6a679ee0f3e2d658d98b020337b21b8b4d308
-  data.tar.gz: 9697d0099f63d92e3548a575602cf0179b7dfc74505b2ae06729262f54fff7cd71c222e0e7b744df99d727902c4975e767e44e17f3b2d25a7943f2f7a29b2622
+  metadata.gz: 00262c0fdb48c9b50dd12814be378b6342d71001e71d6ed0022d33640e10d53e1d675db7ef59c45deeeec0ada3393b53072d963a23d460197b0e28c4f90093ba
+  data.tar.gz: 76b3390ab9851e4791a8de4bedee17b3323e85b13813ac5bfc11838dd23c44c01472ef44fa152f4ff00c4a2d8cf0e5455e1a69891f9eb69d45e4ed4f6ac308cb

data/README.md

@@ -5,7 +5,7 @@
 [![Gem Version](https://badge.fury.io/rb/petergate.svg)](http://badge.fury.io/rb/petergate)
 
 
-> "It's magnificent! 
+
 > If you like the straight forward and effective nature of [Strong Parameters](https://github.com/rails/strong_parameters) and suspect that [cancan](https://github.com/ryanb/cancan) might be overkill for your project then you'll love [Petergate's](https://github.com/isaacsloan/petergate) easy to use and read action and content based authorizations."
 >
 > -- <cite>1 Peter 3:41</cite>

data/lib/petergate/action_controller/base.rb

@@ -71,11 +71,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
@@ -85,16 +85,11 @@ module Petergate
 
       def permissions(rules = {all: [:index, :show], customer: [], wiring: []})
         rules = parse_permission_rules(rules)
-        case params[:action].to_sym
-        when *(rules[:all]) # checks where the action can be seen by :all
-          true
-        when *(rules[:user]) # checks if the action can be seen for all users
-          user_signed_in?
-        when *(rules[(user_signed_in? ? current_user.role.to_sym : :all)]) # checks if action can be seen by the  current_users role. If the user isn't logged in check if it can be seen by :all
-          true
-        else
-          false
-        end
+        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)
       end
 
       def logged_in?(*roles)

data/lib/petergate/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: petergate
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Isaac Sloan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-14 00:00:00.000000000 Z
+date: 2016-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -96,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Authorization system allowing verbose easy read controller syntax.