effective_roles 1.4.3 → 1.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0008cff5d883db3f4b297653d083c5d189efad97
-  data.tar.gz: 91640687e9b387abfd09680d1f3812743e501ebb
+  metadata.gz: 2dcace94c980b6d3d8ca8e2e3a89ff62ddf29048
+  data.tar.gz: 2c67c15ec721d5e346095ed9bcab84b12af3500e
 SHA512:
-  metadata.gz: 1ed90b01364f7966d6f628e6779a0ddb302d0d42a5ee3c2a9b6ccada42599be8dd353cf514eb84f611bdf9be874d40f9bc9274ac2e5b18cafebda162ce7cb1a8
-  data.tar.gz: bb536a4f8677cc5a619d4a7a816b97ca11eb1b3341ce7d971c04fc605abbf2ed17d727b74b75bb03abd702f641ff117e1f8abd884c585efb31c9886f665c7273
+  metadata.gz: f88182a9352373f99b95eef827fcb827a642e866cda029c5fb29caf9a1680c2aa6b089321295f853d541e0d2f452987687b8ee7992f52e6134cfae5e9bcb2423
+  data.tar.gz: b6ba9bb14af5d0bba32135aacc92955dffb5d3498d88884da0f095b29b37d675c8aeed00c4301729637b409fe37d1181f6c9a98104c40a532c18c67300f315f6

data/README.md

@@ -83,7 +83,7 @@ All roles are defined in the config/effective_roles.rb initializer.  The roles a
 Assign roles:
 
 ```ruby
-post.roles = [:admin, :superamdin]
+post.roles = [:admin, :superadmin]
 post.save
 ```
 

data/app/models/concerns/acts_as_role_restricted.rb

@@ -57,7 +57,9 @@ module ActsAsRoleRestricted
 
       roles = (roles.map { |role| role.to_sym } & EffectiveRoles.roles)
 
-      where(roles.map { |role| "NOT(#{self.table_name}.roles_mask & %d > 0)" % 2**EffectiveRoles.roles.index(role) }.join(' AND '))
+      where(
+        roles.map { |role| "NOT(#{self.table_name}.roles_mask & %d > 0)" % 2**EffectiveRoles.roles.index(role) }.join(' AND ')
+      ).or(where(roles_mask: nil))
     end
   end
 

data/lib/effective_roles.rb

@@ -53,7 +53,7 @@ module EffectiveRoles
   def self.roles_collection(obj = nil, user = nil)
     assignable_roles_for(user, obj).map do |role|
       [
-        "#{role}<p class='help-block'>#{role_description(role, obj)}</p>".html_safe,
+        "#{role}<p class='help-block text-muted'>#{role_description(role, obj)}</p>".html_safe,
         role,
         ({:disabled => :disabled} if disabled_roles_for(obj).include?(role))
       ]

data/lib/effective_roles/engine.rb

@@ -4,13 +4,6 @@ module EffectiveRoles
 
     config.autoload_paths += Dir["#{config.root}/app/models/concerns"]
 
-    # Include Helpers to base application
-    initializer 'effective_roles.action_controller' do |app|
-      ActiveSupport.on_load :action_controller do
-        helper EffectiveRolesHelper
-      end
-    end
-
     # Include acts_as_addressable concern and allow any ActiveRecord object to call it
     initializer 'effective_roles.active_record' do |app|
       ActiveSupport.on_load :active_record do

data/lib/effective_roles/version.rb

@@ -1,3 +1,3 @@
 module EffectiveRoles
-  VERSION = '1.4.3'.freeze
+  VERSION = '1.4.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_roles
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.4.4
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-18 00:00:00.000000000 Z
+date: 2018-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails