petergate 1.5.2 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4bc623aff4e968f13e93888f5de948b843cb511d
-  data.tar.gz: c36afe33348380bdd7d2390b94d345f7a53a56ea
+  metadata.gz: 7366ce69bda79a5c0b5072f2f7413684239650d8
+  data.tar.gz: 87805e112d8097aae45ddb19c11537f1aab07d24
 SHA512:
-  metadata.gz: 075913d5d41b9565357c12c55ac16ee5664d8ee434cdf362ace283db8c3e1bc38a7ad84c1c67c71cf067b6e6fd16a467ec313d52d351b4f5249606e53e3c580d
-  data.tar.gz: 7624aebda00c0237c2f25fd8b4d2e4cc6729150a45d36dc88cd6a0da34f9da0e2e8fc28da359635015ba345a205fdab88c8e3895a8e2871ed1ee73c35cfe39c6
+  metadata.gz: 5879d63794e172de154b8562e6bea4f4303a0b02c8a3f4b5adf682d8412aedf0d32fd46abcabc3f600ad0bc050b827031661f9cd659e1a0650da057e18fd3b61
+  data.tar.gz: bd050cc3a0b0fc0b5fdd21e6430f9c4d9f54414299e58bb75d649c0a4be973b6afaa968ca24937df99d1027dfcf894e059e0496bc08addd967de5bc54789e366

data/lib/petergate/active_record/base.rb

@@ -19,10 +19,9 @@ module Petergate
           end
 
           instance_eval do
-            const_set('ROLES', (roles + [:user]).uniq)
+            const_set('ROLES', (roles + [:user]).uniq) unless defined?(User::ROLES)
           end
 
-
           class_eval do
             def available_roles
               self.class::ROLES
@@ -41,9 +40,16 @@ module Petergate
                                  v.first
                                end
               end
+            end
 
-              def roles
-                Array(self[:roles].to_sym) | [:user]
+            def roles
+              case self[:roles].class.to_s
+              when "String", "Symbol"
+                [self[:roles].to_sym, :user]
+              when "Array"
+                super
+              else
+                [:user]
               end
             end
 

data/lib/petergate/version.rb

@@ -1,3 +1,3 @@
 module Petergate
-  VERSION = "1.5.2"
+  VERSION = "1.5.3"
 end

metadata

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