petergate 1.1.8 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e874f558d2dba4491ce0df91cd9dd14d97169abd
-  data.tar.gz: 5068a8370ec69a9797af8ccb27b3001a2ecd21a7
+  metadata.gz: 8fa3c73c0f112d28500fcbcb241a152643853a5e
+  data.tar.gz: c93c7d0652127f3ae3542e9bc7b09e6445fef36d
 SHA512:
-  metadata.gz: b26024de4dd6f9a8f5dd223c576be77001bb717a3193dcd17c558d7e4cba65efa5b0160883b192c1ec9f863beb8c943ac91a30dd95332e96c3827328111b1d3d
-  data.tar.gz: 10b62d0f11bdc6696152e5092f0be7ff562eca0f21a8000bc44a56e38895d75353d298209561d07d99854d31fade1ed314a62df21eac8307ba95388ca7ac6747
+  metadata.gz: 477ec56213cfb10f13be43082c361b7453d1ad5f4d7da5b77324f537a3a40bbdb1f69d52a6114b48c5a63cee8db6a679ee0f3e2d658d98b020337b21b8b4d308
+  data.tar.gz: 9697d0099f63d92e3548a575602cf0179b7dfc74505b2ae06729262f54fff7cd71c222e0e7b744df99d727902c4975e767e44e17f3b2d25a7943f2f7a29b2622

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

data/lib/petergate/active_record/base.rb

@@ -6,14 +6,20 @@ module Petergate
       end
 
       module ClassMethods
-        def petergate(options = {roles: [:admin]})
-          serialize :roles
-          after_initialize do
-            self[:roles] ||= []
+        def petergate(roles: [:admin], multiple: true)
+          if multiple
+            serialize :roles
+            after_initialize do
+              self[:roles] ||= [:user]
+            end
+          else
+            after_initialize do
+              self[:roles] ||= :user 
+            end
           end
 
           instance_eval do
-            const_set('ROLES', options[:roles])
+            const_set('ROLES', (roles + [:user]).uniq)
           end
 
 
@@ -22,12 +28,23 @@ module Petergate
               self.class::ROLES
             end
 
-            def roles=(v)
-              self[:roles] = Array(v).map(&:to_sym).to_a.select{|r| r.size > 0 && available_roles.include?(r)}
-            end
-
-            def roles
-              self[:roles] + [:user]
+            if multiple
+              def roles=(v)
+                self[:roles] = (Array(v).map(&:to_sym).select{|r| r.size > 0 && available_roles.include?(r)} + [:user]).uniq
+              end
+            else
+              def roles=(v)
+                self[:roles] = case v.class.to_s
+                               when "String", "Symbol"
+                                 v
+                               when "Array"
+                                 v.first
+                               end
+              end
+
+              def roles
+                Array(self[:roles].to_sym)
+              end
             end
 
             def role

data/lib/petergate/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: petergate
 version: !ruby/object:Gem::Version
-  version: 1.1.8
+  version: 1.2.0
 platform: ruby
 authors:
 - Isaac Sloan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-13 00:00:00.000000000 Z
+date: 2015-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler