bastion 3.2.2 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb88de97c9f4c944ef8dc4bdaa2658887a649946
-  data.tar.gz: eb1a8a31b204a4841e605eba9c887882b5436074
+  metadata.gz: b7c7fe733a22410ca7cf6a17aaed71e8373efeb4
+  data.tar.gz: 2cd0cf452ca0000dd3643c4ed3b6b8603cc23fb1
 SHA512:
-  metadata.gz: 060854ddc47304d5814abe27b1c09e8f6fafba5c03833e44084ce94c8d7e4f7aa034c11ea6e55ce6751c6d6ab4b1808c4ac3e668edde9ae176885f55ac630be4
-  data.tar.gz: 27bd7e7c4f50cacb71b4f3ef0a16f49b15cad9ead497aa475736727abc615fc425b50a3859ba6c09c3a3c5071c5c2f5ad32365c8d61b0d17a0a7ca0d1db18ff8
+  metadata.gz: 44a83fce72d0f3a18c8bcd3f5fbc78c18398fa178ee69023dc2201d7e7d5ee4de7b849a058b889e81a2cf3309be0ab896b1cf8c2f6355206f68a414ed8688598
+  data.tar.gz: de02c1e4d11ee3a8e1553388a6143fc8bf35495f987086de2fb6df3a46dc4eac36b7ab33705ef13ad1b9b310579d7c4d8a8457a433a355ce8e9a0c38dff24219

data/app/assets/javascripts/bastion/bastion.module.js

@@ -59,6 +59,8 @@ angular.module('Bastion').config(
 
         $urlRouterProvider.otherwise(function ($injector, $location) {
             var $window = $injector.get('$window'),
+                $state = $injector.get('$state'),
+                parentState = $location.path().split('/')[1].replace('_', '-'),
                 url = $location.absUrl();
 
             // ensure we don't double encode +s
@@ -67,10 +69,15 @@ angular.module('Bastion').config(
             // Remove the old browser path if present
             url = url.replace(oldBrowserBastionPath, '');
 
-            $window.location.href = url;
+            if ($state.get(parentState)) {
+                $window.location.href = '/404';
+            } else {
+                $window.location.href = url;
+            }
+            return $location.path();
         });
 
-        $locationProvider.html5Mode(true);
+        $locationProvider.html5Mode({enabled: true, requireBase: false});
 
         $provide.factory('PrefixInterceptor', ['$q', '$templateCache', function ($q, $templateCache) {
             return {
@@ -185,7 +192,7 @@ angular.module('Bastion').run(['$rootScope', '$state', '$stateParams', 'gettextC
         );
 
         // Prevent angular from handling org/location switcher URLs
-        orgSwitcherRegex = new RegExp("/(organizations|locations)/(.+/)*(select|clear)");
+        orgSwitcherRegex = new RegExp("/(organizations|locations)");
         $rootScope.$on('$locationChangeStart', function (event, newUrl) {
             if (newUrl.match(orgSwitcherRegex)) {
                 event.preventDefault();

data/app/assets/javascripts/bastion/components/components.module.js

@@ -9,6 +9,6 @@
      *   Cross application re-usable components
      */
     angular
-        .module('Bastion.components', ['ngAnimate']);
+        .module('Bastion.components', []);
 
 })();

data/app/assets/javascripts/bastion/components/views/autocomplete-scoped-search.html

@@ -6,5 +6,5 @@
   <i class='ui-autocomplete-completed'>
     {{ match.model.completed }}
   </i>
-  {{ match.model.part }}
-</a>
+  {{ match.model.label }}
+</a>

data/app/assets/javascripts/bastion/layouts/panel.html

@@ -0,0 +1,5 @@
+<div class="loading-mask loading-mask-panel fa-3x" ng-show="panel.loading">
+  <i class="fa fa-spinner fa-spin"></i>
+  {{ "Loading..." | translate }}
+</div>
+<span ng-hide="panel.loading" data-block="panel"></span>

data/bower.json

@@ -5,12 +5,12 @@
   "dependencies": {
     "json3": "~3.2.4",
     "es5-shim": "~2.0.8",
-    "angular": "=1.2.9",
+    "angular": "=1.5.5",
     "angular-bootstrap": "0.10.0",
-    "angular": "=1.2.9",
-    "angular-sanitize": "=1.2.9",
-    "angular-resource": "=1.2.9",
-    "angular-route": "=1.2.9",
+    "angular": "=1.5.5",
+    "angular-sanitize": "=1.5.5",
+    "angular-resource": "=1.5.5",
+    "angular-route": "=1.5.5",
     "angular-gettext": "=1.0.0",
     "angular-ui-router": "=0.2.10",
     "angular-blocks": "~>0.1.8",
@@ -18,16 +18,16 @@
     "underscore": "=1.5.2",
     "ngInfiniteScroll": "1.2.1",
     "ngUpload": "~0.5.5",
-    "angular-animate": "=1.2.0",
+    "angular-animate": "=1.5.5",
     "angular-uuid4": "0.1.0"
   },
   "devDependencies": {
     "jquery": "=1.9.1",
-    "angular-mocks": "=1.2.9",
-    "angular-scenario": "=1.2.9"
+    "angular-mocks": "=1.5.5",
+    "angular-scenario": "=1.5.5"
   },
   "resolutions": {
-    "angular": "1.2.9",
+    "angular": "1.5.5",
     "jquery": "=1.9.1"
   },
   "exportsOverride": {

data/lib/bastion/version.rb

@@ -1,3 +1,3 @@
 module Bastion
-  VERSION = "3.2.2"
+  VERSION = "3.3.0"
 end

data/package.json

@@ -2,22 +2,23 @@
   "name": "bastion",
   "version": "0.1.0",
   "dependencies": {
+    "eslint": "~0.14.1",
+    "eslint-plugin-angular": "0.0.3",
+    "generator-bastion": "~0.1.2",
     "grunt": "~0.4.5",
+    "grunt-angular-gettext": "~0.2.15",
     "grunt-bower-task": "~0.3.4",
-    "require-dir": "~0.1.0",
-    "karma": "~0.12.23",
-    "grunt-karma": "~0.9.0",
-    "karma-jasmine": "~0.1.5",
-    "karma-phantomjs-launcher": "~0.1.4",
-    "karma-ng-html2js-preprocessor": "~0.1.0",
-    "karma-coverage": "~0.2.6",
-    "grunt-htmlhint": "~0.4.1",
     "grunt-concurrent": "~1.0.0",
-    "generator-bastion": "~0.1.2",
-    "grunt-angular-gettext": "~0.2.15",
     "grunt-eslint": "~6.0.0",
-    "eslint": "~0.14.1",
-    "eslint-plugin-angular": "0.0.3"
+    "grunt-htmlhint": "~0.4.1",
+    "grunt-karma": "^1.0.0",
+    "jasmine-core": "^2.4.1",
+    "karma": "^0.13.22",
+    "karma-coverage": "^1.0.0",
+    "karma-jasmine": "^1.0.2",
+    "karma-ng-html2js-preprocessor": "^1.0.0",
+    "karma-phantomjs-launcher": "^1.0.0",
+    "require-dir": "~0.1.0"
   },
   "engines": {
     "node": ">=0.8.0"

data/test/components/bst-bookmark.directive.test.js

@@ -77,7 +77,7 @@ describe('Directive: bstBookmark', function() {
     });
 
     it("should set bookmarks on the scope", function () {
-        spyOn(BstBookmark, 'queryPaged').andCallThrough();
+        spyOn(BstBookmark, 'queryPaged').and.callThrough();
         compileDirective();
         expect(BstBookmark.queryPaged).toHaveBeenCalled();
         expect(elementScope.bookmarks).toEqual(['bookmark']);
@@ -112,7 +112,7 @@ describe('Directive: bstBookmark', function() {
                 controller: scope.controllerName
             };
 
-            spyOn(BstBookmark, 'create').andCallThrough();
+            spyOn(BstBookmark, 'create').and.callThrough();
             spyOn(BstBookmark, 'queryPaged');
         });
 

data/test/components/bst-dropdown.directive.test.js

@@ -52,7 +52,7 @@ describe('Directive: bstDropdown', function() {
 
         beforeEach(function() {
             target = angular.element(element.find('li')[1]);
-            spyOn(elementScope, 'setHover').andCallThrough();
+            spyOn(elementScope, 'setHover').and.callThrough();
         });
 
         it("by setting the item to active on mouse in", function() {
@@ -75,7 +75,7 @@ describe('Directive: bstDropdown', function() {
 
         beforeEach(function() {
             target = angular.element(element.find('li')[2]);
-            spyOn(elementScope, 'setHover').andCallThrough();
+            spyOn(elementScope, 'setHover').and.callThrough();
         });
 
         it("by setting the item to active on mouse in", function() {

data/test/components/bst-edit.directive.test.js

@@ -44,8 +44,7 @@ describe('Directive: bstEdit', function() {
     }));
 
     describe('bstEdit controller', function() {
-        var element,
-            editController;
+        var editController;
 
         beforeEach(inject(function($controller) {
             editController = $controller('BstEditController', {$scope: scope});
@@ -205,9 +204,9 @@ describe('Directive: bstEdit', function() {
 
         it("should display an input with type of number on editable click", function() {
             editableElement = angular.element(
-                '<span bst-edit-number="item.name"></span>');
+                '<span bst-edit-number="number"></span>');
 
-            scope.item = testItem;
+            scope.number = 3;
 
             compile(editableElement)(scope);
             scope.$digest();
@@ -222,9 +221,9 @@ describe('Directive: bstEdit', function() {
 
         it("should display an input with type of number on editable click with min and max", function() {
             editableElement = angular.element(
-                '<span bst-edit-number="item.name" min=123 max=456></span>');
+                '<span bst-edit-number="number" min=123 max=456></span>');
 
-            scope.item = testItem;
+            scope.number = 123;
 
             compile(editableElement)(scope);
             scope.$digest();

data/test/components/bst-menu.directive.test.js

@@ -58,7 +58,7 @@ describe('Directive: bstMenu', function() {
 
         beforeEach(function() {
             target = angular.element(element.find('li')[2]);
-            spyOn(elementScope, 'handleHover').andCallThrough();
+            spyOn(elementScope, 'handleHover').and.callThrough();
         });
 
         it("by setting the item to active on mouse in", function() {

data/test/components/bst-modal.directive.test.js

@@ -49,13 +49,13 @@ describe('Directive: bstModal', function() {
                    '</span>';
 
         element = angular.element(html);
-        spyOn($templateCache, 'put').andCallThrough();
+        spyOn($templateCache, 'put').and.callThrough();
 
         compile(element)(scope);
         scope.$digest();
 
         elementScope = element.scope();
-        modalId = $templateCache.put.mostRecentCall.args[0];
+        modalId = $templateCache.put.calls.mostRecent().args[0];
     });
 
     it("uses angular-blocks to extend a modal template", function () {
@@ -68,7 +68,7 @@ describe('Directive: bstModal', function() {
     });
 
     it("allows the opening of a modal dialog via bootstrap ui", function() {
-        spyOn($modal, 'open').andCallThrough();
+        spyOn($modal, 'open').and.callThrough();
 
         elementScope.openModal();
 

data/test/components/nutupane.factory.test.js

@@ -54,7 +54,7 @@ describe('Factory: Nutupane', function() {
         it("providing a method to fetch records for the table", function() {
             var expected = nutupane.table.rows.concat(expectedResult);
 
-            spyOn(Resource, 'queryPaged').andCallThrough();
+            spyOn(Resource, 'queryPaged').and.callThrough();
             nutupane.query();
 
             expect(Resource.queryPaged).toHaveBeenCalled();
@@ -65,7 +65,7 @@ describe('Factory: Nutupane', function() {
         });
 
         it("providing a method to refresh the table", function() {
-            spyOn(Resource, 'queryPaged').andCallThrough();
+            spyOn(Resource, 'queryPaged').and.callThrough();
             nutupane.refresh();
 
             expect(Resource.queryPaged).toHaveBeenCalled();
@@ -243,7 +243,7 @@ describe('Factory: Nutupane', function() {
         it("autocompletes using the original resource if possible", function() {
             var data;
             Resource.autocomplete = function() {return ["foo"]};
-            spyOn(Resource, 'autocomplete').andCallThrough();
+            spyOn(Resource, 'autocomplete').and.callThrough();
 
             data = nutupane.table.autocomplete();
             expect(Resource.autocomplete).toHaveBeenCalled();
@@ -253,7 +253,7 @@ describe('Factory: Nutupane', function() {
         it("autocompletes using fetchAutocomplete if resource doesn't support autocomplete", function() {
             var data;
             nutupane.table.fetchAutocomplete = function() {return ['bar']};
-            spyOn(nutupane.table, 'fetchAutocomplete').andCallThrough();
+            spyOn(nutupane.table, 'fetchAutocomplete').and.callThrough();
 
             data = nutupane.table.autocomplete();
             expect(nutupane.table.fetchAutocomplete).toHaveBeenCalled();

data/test/i18n/translate.service.test.js

@@ -10,7 +10,7 @@ describe('Service: translate', function() {
 
     it('passes through to the gettextCatalog.getString', function() {
         var string = 'lalala';
-        spyOn(gettextCatalog, 'getString').andReturn(string);
+        spyOn(gettextCatalog, 'getString').and.returnValue(string);
         expect(translate(string)).toBe(string);
         expect(gettextCatalog.getString).toHaveBeenCalledWith(string);
     });

data/test/utils/urlencode.filter.test.js

@@ -1,4 +1,6 @@
 describe('Filter:urlencode', function() {
+    var urlencodeFilter;
+
     beforeEach(module('Bastion.utils'));
 
     beforeEach(inject(function($filter) {