bastion 0.1.14 → 0.2.0

data/bower.json

@@ -16,10 +16,11 @@
     "angular-blocks": "~>0.1.8",
     "underscore": "=1.5.2",
     "ngUpload": "~0.5.5",
-    "bootstrap": "~3.0.1",
-    "font-awesome": "~3.2.1",
+    "bootstrap": "~3.1.1",
+    "font-awesome": "4.2.0",
     "angular-animate": "=1.2.0",
-    "angular-uuid4": "0.1.0"
+    "angular-uuid4": "0.1.0",
+    "patternfly": "1.1.3"
   },
   "devDependencies": {
     "jquery": "=1.9.1",
@@ -32,58 +33,62 @@
   },
   "exportsOverride": {
     "json3": {
-      "javascripts/bastion": "lib/json3.js"
+      "javascripts/bastion/json3": "lib/json3.js"
     },
     "es5-shim": {
-      "javascripts/bastion": "es5-shim.js"
+      "javascripts/bastion/es5-shim": "es5-shim.js"
     },
     "angular": {
-      "javascripts/bastion": "angular.js"
+      "javascripts/bastion/angular": "angular.js"
     },
     "angular-sanitize": {
-      "javascripts/bastion": "angular-sanitize.js"
+      "javascripts/bastion/angular-sanitize": "angular-sanitize.js"
     },
     "angular-resource": {
-      "javascripts/bastion": "angular-resource.js"
+      "javascripts/bastion/angular-resource": "angular-resource.js"
     },
     "angular-route": {
-      "javascripts/bastion": "angular-route.js"
+      "javascripts/bastion/angular-route": "angular-route.js"
     },
     "angular-gettext": {
-      "javascripts/bastion": "dist/angular-gettext.js"
+      "javascripts/bastion/angular-gettext": "dist/angular-gettext.js"
     },
     "angular-blocks": {
-      "javascripts/bastion": "src/angular-blocks.js"
+      "javascripts/bastion/angular-blocks": "src/angular-blocks.js"
     },
     "angular-bootstrap": {
-      "javascripts/bastion": [
+      "javascripts/bastion/angular-bootstrap": [
         "ui-bootstrap.js",
         "ui-bootstrap-tpls.js"
       ]
     },
     "angular-animate": {
-      "javascripts/bastion": "angular-animate.js"
+      "javascripts/bastion/angular-animate": "angular-animate.js"
     },
     "angular-ui-router": {
-      "javascripts/bastion": "release/angular-ui-router.js"
+      "javascripts/bastion/angular-ui-router": "release/angular-ui-router.js"
     },
     "angular-uuid4": {
-      "javascripts/bastion": "angular-uuid4.js"
+      "javascripts/bastion/angular-uuid4": "angular-uuid4.js"
     },
     "underscore": {
-      "javascripts/bastion": "underscore.js"
+      "javascripts/bastion/underscore": "underscore.js"
     },
     "ngUpload": {
-      "javascripts/bastion": "ng-upload.js"
+      "javascripts/bastion/ngUpload": "ng-upload.js"
     },
     "bootstrap": {
-      "stylesheets/bastion": "less/*.less",
-      "fonts/bastion": "dist/fonts/*"
+      "stylesheets/bastion/bootstrap/less": "less/*.less",
+      "fonts/bastion/bootstrap": "dist/fonts/*"
     },
     "font-awesome": {
       "stylesheets/bastion/font-awesome/less": "less/*.less",
       "stylesheets/bastion/font-awesome/scss": "scss/*.scss",
-      "fonts/bastion": "font/*"
+      "fonts/bastion/font-awesome/": "font/*"
+    },
+    "patternfly": {
+      "fonts/bastion/patternfly/": "dist/fonts",
+      "stylesheets/bastion/patternfly": "less/*.less"
     }
   }
 }

data/grunt/bower.js

@@ -3,16 +3,12 @@ module.exports = {
         options: {
             targetDir: 'vendor/assets',
             copy: true,
-            layout: function (type, component) {
+            layout: function (type) {
                 // We provide a bit of customization here by allowing
                 // explicit path declarations if the component is included
                 // in the type. This is handy for sub-nesting within folders
                 // for a component. Fallback is 'byType'.
-                if (type.indexOf(component) !== -1) {
-                    return require('path').join(type);
-                } else {
-                    return require('path').join(type, component);
-                }
+                return require('path').join(type);
             },
             clearBowerDir: true
         }

data/lib/bastion/version.rb

@@ -1,3 +1,3 @@
 module Bastion
-  VERSION = "0.1.14"
+  VERSION = "0.2.0"
 end

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

@@ -25,16 +25,7 @@ describe('Directive: bstAlert', function() {
     }));
 
     beforeEach(function() {
-        element = angular.element('<div bst-alert ' +
-            'success-messages="successMessages" ' +
-            'info-messages="infoMessages" ' +
-            'warning-messages="warningMessages" ' +
-            'error-messages="errorMessages"></div>');
-
-        scope.successMessages = [];
-        scope.infoMessages = [];
-        scope.warningMessages = [];
-        scope.errorMessages = [];
+        element = angular.element('<div bst-alert="info"></div>');
 
         compile(element)(scope);
         scope.$digest();
@@ -42,43 +33,20 @@ describe('Directive: bstAlert', function() {
         elementScope = element.isolateScope();
     });
 
-    it("should display success alerts", function() {
+    it("should display an alert", function() {
         scope.successMessages = ['hello'];
         scope.$digest();
 
-        expect(elementScope.alerts['success'].length).toBe(1);
-        expect(elementScope.alerts['success'][0]).toBe('hello');
+        expect(element.find('.alert').length).toBe(1);
     });
 
-    it("should display info alerts", function() {
-        scope.infoMessages = ['hello'];
-        scope.$digest();
-
-        expect(elementScope.alerts['info'].length).toBe(1);
-        expect(elementScope.alerts['info'][0]).toBe('hello');
-    });
+    it("should display a close icon if a close function is provided", function () {
+        element = angular.element('<div bst-alert="info" close="close()"></div>');
 
-    it("should display warning alerts", function() {
-        scope.warningMessages = ['hello'];
-        scope.$digest();
-
-        expect(elementScope.alerts['warning'].length).toBe(1);
-        expect(elementScope.alerts['warning'][0]).toBe('hello');
-    });
-
-    it("should display success alerts", function() {
-        scope.errorMessages = ['hello'];
+        compile(element)(scope);
         scope.$digest();
+        elementScope = element.isolateScope();
 
-        expect(elementScope.alerts['danger'].length).toBe(1);
-        expect(elementScope.alerts['danger'][0]).toBe('hello');
-    });
-
-    it("provides a way to close alerts", function() {
-        elementScope.alerts = {success: ['yo!', 'hello'], danger: ['foo']};
-        elementScope.closeAlert('success', 1);
-        expect(elementScope.alerts['success'].length).toBe(1);
-        expect(elementScope.alerts['danger'].length).toBe(1);
+        expect(elementScope.closeable).toBe(true);
     });
-
 });

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

@@ -0,0 +1,84 @@
+/**
+ * Copyright 2014 Red Hat, Inc.
+ *
+ * This software is licensed to you under the GNU General Public
+ * License as published by the Free Software Foundation; either version
+ * 2 of the License (GPLv2) or (at your option) any later version.
+ * There is NO WARRANTY for this software, express or implied,
+ * including the implied warranties of MERCHANTABILITY,
+ * NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
+ * have received a copy of GPLv2 along with this software; if not, see
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+ */
+
+describe('Directive: bstAlerts', function() {
+    var scope,
+        compile,
+        element,
+        elementScope;
+
+    beforeEach(module('Bastion.components', 'components/views/bst-alerts.html', 'components/views/bst-alert.html'));
+
+    beforeEach(inject(function(_$compile_, _$rootScope_) {
+        compile = _$compile_;
+        scope = _$rootScope_;
+    }));
+
+    beforeEach(function() {
+        element = angular.element('<div bst-alerts ' +
+            'success-messages="successMessages" ' +
+            'info-messages="infoMessages" ' +
+            'warning-messages="warningMessages" ' +
+            'error-messages="errorMessages"></div>');
+
+        scope.successMessages = [];
+        scope.infoMessages = [];
+        scope.warningMessages = [];
+        scope.errorMessages = [];
+
+        compile(element)(scope);
+        scope.$digest();
+
+        elementScope = element.isolateScope();
+    });
+
+    it("should display success alerts", function() {
+        scope.successMessages = ['hello'];
+        scope.$digest();
+
+        expect(elementScope.alerts['success'].length).toBe(1);
+        expect(elementScope.alerts['success'][0]).toBe('hello');
+    });
+
+    it("should display info alerts", function() {
+        scope.infoMessages = ['hello'];
+        scope.$digest();
+
+        expect(elementScope.alerts['info'].length).toBe(1);
+        expect(elementScope.alerts['info'][0]).toBe('hello');
+    });
+
+    it("should display warning alerts", function() {
+        scope.warningMessages = ['hello'];
+        scope.$digest();
+
+        expect(elementScope.alerts['warning'].length).toBe(1);
+        expect(elementScope.alerts['warning'][0]).toBe('hello');
+    });
+
+    it("should display success alerts", function() {
+        scope.errorMessages = ['hello'];
+        scope.$digest();
+
+        expect(elementScope.alerts['danger'].length).toBe(1);
+        expect(elementScope.alerts['danger'][0]).toBe('hello');
+    });
+
+    it("provides a way to close alerts", function() {
+        elementScope.alerts = {success: ['yo!', 'hello'], danger: ['foo']};
+        elementScope.closeAlert('success', 1);
+        expect(elementScope.alerts['success'].length).toBe(1);
+        expect(elementScope.alerts['danger'].length).toBe(1);
+    });
+
+});

data/test/components/bst-container-scroll.directive.test.js

@@ -28,7 +28,7 @@ describe('Directive: bstContainerScroll', function() {
 
     beforeEach(function() {
         tableElement = angular.element(
-            '<div bst-container-scroll control-width="table">' +
+            '<div bst-container-scroll>' +
               '<table>' +
                 '<thead>' +
                   '<tr><th>Column 1</th></tr>' +
@@ -45,19 +45,6 @@ describe('Directive: bstContainerScroll', function() {
         scope.$digest();
     });
 
-    it("should adjust the table width on window resize", function() {
-        var table = tableElement.find('table'),
-            tableWidth = table.width(),
-            windowElement = angular.element(window);
-
-        expect(table.width()).toNotEqual(windowElement.width());
-
-        table.width('300px');
-        windowElement.trigger('resize');
-
-        expect(table.width()).toEqual(windowElement.width());
-    });
-
     it("should adjust the table height on window resize", function() {
         var table = tableElement.find('table'),
             windowElement = angular.element(window);

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

@@ -105,7 +105,7 @@ describe('Directive: bstEdit', function() {
         });
 
         it("should call the method set to on-delete when clicking delete button", function() {
-            var element = editableElement.find('.icon-remove');
+            var element = editableElement.find('.fa-remove');
             spyOn(testItem, 'delete');
 
             element.trigger('click');