size() to length, updated config, fixed hasRole

Author: benmarch

gruntfile.js

@@ -58,7 +58,8 @@ module.exports = function (grunt) {
                     '<%= config.app %>/ast/*.js',
 
                     '<%= config.app %>/SpelExpressionParser.js',
-                    '<%= config.app %>/SpelExpressionEvaluator.js'
+                    '<%= config.app %>/SpelExpressionEvaluator.js',
+                    '<%= config.app %>/StandardContext.js'
                 ],
                 dest: '<%= config.dist %>/spel2js.js'
             }

src/StandardContext.js

@@ -8,11 +8,22 @@
         context.principal = principal || {};
 
         context.hasRole = function (role) {
-            if (!context.authentication && !context.authentication.authorities) {
+            var hasRole = false;
+
+            if (!role) {
+                return false;
+            }
+            if (!context.authentication && !Array.isArray(context.authentication.authorities)) {
                 return false;
             }
 
-            return !!~context.authentication.authorities.indexOf(role);
+            context.authentication.authorities.forEach(function (grantedAuthority) {
+                if (grantedAuthority.authority.toLowerCase() === role.toLowerCase()) {
+                    hasRole = true;
+                }
+            });
+
+            return hasRole;
         };
 
         context.hasPermission = function (/*variable arguments*/) {
@@ -21,7 +32,9 @@
             if (args.length === 1) {
                 return context.hasRole(args[0]);
             }
-        }
+        };
+
+        return context;
     }
 
     exports.StandardContext = {

src/ast/MethodReference.js

@@ -52,6 +52,11 @@
                 return context[methodName.charAt(3).toLowerCase() + methodName.substring(4)] = compiledArgs[0];
             }
 
+            //size() -> length
+            if (methodName === 'size' && args.length === 0) {
+                return context.length;
+            }
+
             method = maybeHandleNullSafeNavigation(context[methodName]);
             if (method) {
                 return method.apply(context, compiledArgs);

src/ast/PropertyReference.js

@@ -21,15 +21,21 @@
                 }
             }
 
-            //handle safe navigation
             if (context[propertyName] === undefined) {
+                //handle safe navigation
                 if (nullSafeNavigation) {
                     return null;
                 }
 
+                //handle conversion of Java properties to JavaScript properties
+                //this might cause problems, I'll look into alternatives
+                if (propertyName === 'size') {
+                    return context.length;
+                }
+
                 throw {
                     name: 'NullPointerException',
-                    message: 'Property ' + propertyName + ' does not exist.'
+                    message: 'Property \'' + propertyName + '\' does not exist.'
                 };
             }
 

test/karma.conf.js

@@ -95,6 +95,7 @@ module.exports = function (config) {
 
             'src/SpelExpressionParser.js',
             'src/SpelExpressionEvaluator.js',
+            '<%= config.app %>/StandardContext.js',
 
             'test/spec/**/*.spec.js'
         ]