imagine_cms 3.0.3 → 3.0.4

data/app/helpers/cms_application_helper.rb

@@ -37,36 +37,30 @@ module CmsApplicationHelper
     end
     
     @user = User.find(session[:user_id]) rescue nil
-    session[:user_is_superuser] = @user.is_superuser rescue nil
+    session[:user_is_superuser] = @user.is_superuser? rescue nil
     
     @user
   end
   
   # Takes a symbol/string or array of symbols/strings and returns true if user has all
   # of the named permissions.
-  #
-  # Result is stored in the session to speed up future checks.
   def user_has_permissions?(*permission_set)
     return false if !(@user ||= authenticate_user)
     
-    if !permission_set.is_a? Array
-      permission_set = [ permission_set ]
-    end
+    permission_set = [ permission_set ] unless permission_set.is_a?(Array)
     
     if session[:user_is_superuser]
-      for perm in permission_set
-        perm = perm.to_s
-        session[('user_can_' + perm).to_sym] ||= true
-      end
+      permission_set.each { |perm| session["user_can_#{perm}".to_sym] = true }
       return true
     end
     
-    for perm in permission_set
-      perm = perm.to_s
-      session[('user_can_' + perm).to_sym] = @user.send('can_' + perm)
-      # logger.debug "user_can_#{perm} = #{@user.send('can_' + perm)}"
-      return session[('user_can_' + perm).to_sym]
+    has_permissions = true
+    permission_set.each do |perm|
+      session["user_can_#{perm}".to_sym] = (@user.send("can_#{perm}").to_i == 1)
+      has_permissions = has_permissions && session["user_can_#{perm}".to_sym]
     end
+    
+    has_permissions
   end
   alias :user_has_permission? :user_has_permissions?
   

data/lib/imagine_cms/version.rb

@@ -1,3 +1,3 @@
 module ImagineCms
-  VERSION = "3.0.3"
+  VERSION = "3.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: imagine_cms
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-11 00:00:00.000000000 Z
+date: 2013-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails