bastion 0.1.8 → 0.1.9

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

@@ -19,8 +19,6 @@
  *   Module for menu related functionality.
  */
 angular.module('Bastion.menu', [
-    'alchemy',
-    'alch-templates',
     'Bastion',
-    'Bastion.widgets'
+    'Bastion.components'
 ]);

data/app/views/bastion/layouts/application.html.erb

@@ -1,6 +1,10 @@
 <% content_for(:stylesheets) do %>
   <%= stylesheet_link_tag "bastion/bastion" %>
-  <%= yield :stylesheets %>
+  <% Bastion.plugins.each do |name, plugin| %>
+    <% if plugin[:stylesheet] %>
+      <%= stylesheet_link_tag(plugin[:stylesheet]) %>
+    <% end %>
+  <% end %>
 <% end %>
 
 <% content_for(:content) do %>

data/bower.json

@@ -14,7 +14,6 @@
     "angular-gettext": "=1.0.0",
     "angular-ui-router": "=0.2.10",
     "angular-blocks": "~>0.1.8",
-    "alchemy": ">=0.0.1",
     "underscore": "=1.5.2",
     "ngUpload": "~0.5.5",
     "bootstrap": "~3.0.1",
@@ -71,10 +70,6 @@
     "angular-uuid4": {
       "javascripts/bastion": "angular-uuid4.js"
     },
-    "alchemy": {
-      "javascripts/bastion": "alchemy.js",
-      "stylesheets/bastion": "*.scss"
-    },
     "underscore": {
       "javascripts/bastion": "underscore.js"
     },

data/grunt/karma.js

@@ -24,7 +24,6 @@ module.exports = {
             basePath + 'vendor/assets/javascripts/bastion/angular-animate/angular-animate.js',
             basePath + 'vendor/assets/javascripts/bastion/angular-bootstrap/ui-bootstrap.js',
             basePath + 'vendor/assets/javascripts/bastion/angular-bootstrap/ui-bootstrap-tpls.js',
-            basePath + 'vendor/assets/javascripts/bastion/alchemy/alchemy.js',
             basePath + 'vendor/assets/javascripts/bastion/underscore/underscore.js',
             basePath + 'vendor/assets/javascripts/bastion/angular-ui-router/angular-ui-router.js',
             basePath + 'vendor/assets/javascripts/bastion/angular-gettext/angular-gettext.js',
@@ -36,16 +35,16 @@ module.exports = {
             basePath + 'app/assets/javascripts/bastion/bastion-resource.factory.js',
             basePath + 'app/assets/javascripts/bastion/i18n/i18n.module.js',
             basePath + 'app/assets/javascripts/bastion/i18n/*.js',
-            basePath + 'app/assets/javascripts/bastion/widgets/widgets.module.js',
-            basePath + 'app/assets/javascripts/bastion/widgets/*.js',
             basePath + 'app/assets/javascripts/bastion/auth/auth.module.js',
             basePath + 'app/assets/javascripts/bastion/auth/*.js',
             basePath + 'app/assets/javascripts/bastion/utils/utils.module.js',
             basePath + 'app/assets/javascripts/bastion/utils/*.js',
             basePath + 'app/assets/javascripts/bastion/menu/menu.module.js',
             basePath + 'app/assets/javascripts/bastion/menu/*.js',
-            basePath + 'app/assets/javascripts/bastion/incubator/*.js',
-            basePath + 'app/assets/javascripts/bastion/incubator/**/*.js',
+            basePath + 'app/assets/javascripts/bastion/components/components.module.js',
+            basePath + 'app/assets/javascripts/bastion/components/*.js',
+            basePath + 'app/assets/javascripts/bastion/components/formatters/components-formatters.module.js',
+            basePath + 'app/assets/javascripts/bastion/components/formatters/*.js',
 
             basePath + 'test/bastion/test-constants.js',
             basePath + 'app/assets/javascripts/bastion/**/*.html',

data/lib/bastion/version.rb

@@ -1,3 +1,3 @@
 module Bastion
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

data/test/{incubator/alch-alert.directive.test.js → components/bst-alert.directive.test.js}

@@ -11,13 +11,13 @@
  * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
  */
 
-describe('Directive: alchAlert', function() {
+describe('Directive: bstAlert', function() {
     var scope,
         compile,
         element,
         elementScope;
 
-    beforeEach(module('alchemy', 'incubator/views/alch-alert.html'));
+    beforeEach(module('Bastion.components', 'components/views/bst-alert.html'));
 
     beforeEach(inject(function(_$compile_, _$rootScope_) {
         compile = _$compile_;
@@ -25,7 +25,7 @@ describe('Directive: alchAlert', function() {
     }));
 
     beforeEach(function() {
-        element = angular.element('<div alch-alert ' +
+        element = angular.element('<div bst-alert ' +
             'success-messages="successMessages" ' +
             'info-messages="infoMessages" ' +
             'warning-messages="warningMessages" ' +

data/test/{incubator/alch-container-scroll.directive.test.js → components/bst-container-scroll.directive.test.js}

@@ -12,13 +12,13 @@
  */
 
 
-describe('Directive: alchContainerScroll', function() {
+describe('Directive: bstContainerScroll', function() {
     var scope,
         compile,
         window,
         tableElement;
 
-    beforeEach(module('alchemy'));
+    beforeEach(module('Bastion.components'));
 
     beforeEach(inject(function(_$compile_, _$rootScope_, _$window_) {
         compile = _$compile_;
@@ -28,7 +28,7 @@ describe('Directive: alchContainerScroll', function() {
 
     beforeEach(function() {
         tableElement = angular.element(
-            '<div alch-container-scroll control-width="table">' +
+            '<div bst-container-scroll control-width="table">' +
               '<table>' +
                 '<thead>' +
                   '<tr><th>Column 1</th></tr>' +

data/test/{incubator/alch-dropdown.directive.test.js → components/bst-dropdown.directive.test.js}

@@ -11,7 +11,7 @@
  * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
  */
 
-describe('Directive: alchDropdown', function() {
+describe('Directive: bstDropdown', function() {
     var scope,
         compile,
         testItems,
@@ -19,9 +19,9 @@ describe('Directive: alchDropdown', function() {
         elementScope;
 
     beforeEach(module(
-        'alchemy',
-        'incubator/views/alch-dropdown.html',
-        'incubator/views/alch-flyout.html'
+        'Bastion.components',
+        'components/views/bst-dropdown.html',
+        'components/views/bst-flyout.html'
     ));
 
     beforeEach(inject(function(_$compile_, _$rootScope_) {
@@ -40,7 +40,7 @@ describe('Directive: alchDropdown', function() {
         ];
         scope.items = testItems;
 
-        element = angular.element('<ul alch-dropdown="items"></ul>');
+        element = angular.element('<ul bst-dropdown="items"></ul>');
         compile(element)(scope);
         scope.$digest();
 

data/test/{incubator/alch-edit.directive.test.js → components/bst-edit.directive.test.js}

@@ -12,22 +12,22 @@
  */
 
 
-describe('Directive: alchEdit', function() {
+describe('Directive: bstEdit', function() {
     var scope,
         compile,
         testItem;
 
-    beforeEach(module('alchemy',
-        'alchemy.format',
-        'incubator/views/alch-edit.html',
-        'incubator/views/alch-edit-text.html',
-        'incubator/views/alch-edit-textarea.html',
-        'incubator/views/alch-edit-select.html',
-        'incubator/views/alch-edit-add-item.html',
-        'incubator/views/alch-edit-checkbox.html',
-        'incubator/views/alch-edit-add-remove-cancel.html',
-        'incubator/views/alch-edit-multiselect.html',
-        'incubator/views/alch-edit-save-cancel.html'));
+    beforeEach(module('Bastion.components',
+        'Bastion.components.formatters',
+        'components/views/bst-edit.html',
+        'components/views/bst-edit-text.html',
+        'components/views/bst-edit-textarea.html',
+        'components/views/bst-edit-select.html',
+        'components/views/bst-edit-add-item.html',
+        'components/views/bst-edit-checkbox.html',
+        'components/views/bst-edit-add-remove-cancel.html',
+        'components/views/bst-edit-multiselect.html',
+        'components/views/bst-edit-save-cancel.html'));
 
     beforeEach(module(function($provide) {
         testItem = {
@@ -56,22 +56,22 @@ describe('Directive: alchEdit', function() {
         scope = _$rootScope_;
     }));
 
-    describe('alchEdit controller', function() {
+    describe('bstEdit controller', function() {
         var element,
             editController;
 
         beforeEach(inject(function($controller) {
-            editController = $controller('AlchEditController', {$scope: scope});
+            editController = $controller('BstEditController', {$scope: scope});
         }));
 
     });
 
-    describe('alchEdit directive', function() {
+    describe('bstEdit directive', function() {
         var editableElement;
 
         beforeEach(function() {
             editableElement = angular.element(
-                '<span alch-edit-text="item.name" on-save="item.save()" on-delete="item.delete()" ' +
+                '<span bst-edit-text="item.name" on-save="item.save()" on-delete="item.delete()" ' +
                     'on-cancel="item.revert()"></span>');
 
             scope.item = testItem;
@@ -143,12 +143,12 @@ describe('Directive: alchEdit', function() {
         });
     });
 
-    describe('alchEditText directive', function() {
+    describe('bstEditText directive', function() {
         var editableElement;
 
         beforeEach(function() {
             editableElement = angular.element(
-                '<span alch-edit-text="item.name"></span>');
+                '<span bst-edit-text="item.name"></span>');
 
             scope.item = testItem;
 
@@ -166,12 +166,12 @@ describe('Directive: alchEdit', function() {
 
     });
 
-    describe('alchEditCheckbox directive', function() {
+    describe('bstEditCheckbox directive', function() {
         var editableElement;
 
         beforeEach(function() {
             editableElement = angular.element(
-                '<span alch-edit-checkbox="item.name"></span>');
+                '<span bst-edit-checkbox="item.name"></span>');
 
             scope.item = testItem;
 
@@ -189,12 +189,12 @@ describe('Directive: alchEdit', function() {
 
     });
 
-    describe('alchEditTextarea directive', function() {
+    describe('bstEditTextarea directive', function() {
         var editableElement;
 
         beforeEach(function() {
             editableElement = angular.element(
-                '<span alch-edit-textarea="item.name"></span>');
+                '<span bst-edit-textarea="item.name"></span>');
 
             scope.item = testItem;
             scope.tacoOptions = ['baja shrimp', 'barbacoa', 'carnitas', 'spicy tinga chicken'];
@@ -213,14 +213,14 @@ describe('Directive: alchEdit', function() {
 
     });
 
-    describe('alchEditSelect directive', function() {
+    describe('bstEditSelect directive', function() {
         var editableElement;
 
         beforeEach(function() {
             scope.tacoOptions = [{id: 1, name: 'Carnitas'}, {id: 2, name: 'Tilapia'}];
 
             editableElement = angular.element(
-                '<span alch-edit-select="item.taco" options="tacoOptions" ></span>'
+                '<span bst-edit-select="item.taco" options="tacoOptions" ></span>'
             );
 
             scope.item = testItem;
@@ -245,14 +245,14 @@ describe('Directive: alchEdit', function() {
 
     });
 
-    describe('alchEditMultiselect directive', function() {
+    describe('bstEditMultiselect directive', function() {
         var editableElement,
             directiveScope,
             multiSelectController;
 
         beforeEach(function() {
             editableElement = angular.element(
-                '<span alch-edit-multiselect="tacos" options="tacoOptions"></span>');
+                '<span bst-edit-multiselect="tacos" options="tacoOptions"></span>');
 
             scope.tacos = [{id: 2, name: 'barbacoa'}, {id: 3, name: 'carnitas'}];
             scope.tacoOptions = [{id: 1, name: 'baja shrimp'}, {id: 2, name: 'barbacoa'},
@@ -264,7 +264,7 @@ describe('Directive: alchEdit', function() {
         });
 
         beforeEach(inject(function($controller) {
-            multiSelectController = $controller('AlchEditMultiselectController', {$scope: directiveScope});
+            multiSelectController = $controller('BstEditMultiselectController', {$scope: directiveScope});
         }));
 
         it("should display a multi select on editable click", function() {
@@ -294,12 +294,12 @@ describe('Directive: alchEdit', function() {
 
     });
 
-    describe('alchEditAddItem directive', function() {
+    describe('bstEditAddItem directive', function() {
         var editableElement;
 
         beforeEach(function() {
             editableElement = angular.element(
-                '<span alch-edit-add-item="item.name" on-add="item.add()"></span>');
+                '<span bst-edit-add-item="item.name" on-add="item.add()"></span>');
 
             scope.item = testItem;
 

data/test/{incubator/alch-flyout.directive.test.js → components/bst-flyout.directive.test.js}

@@ -11,14 +11,14 @@
  * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
  */
 
-describe('Directive: alchFlyout', function() {
+describe('Directive: bstFlyout', function() {
     var scope,
         compile,
         testItems,
         element,
         elementScope;
 
-    beforeEach(module('alchemy', 'incubator/views/alch-flyout.html'));
+    beforeEach(module('Bastion.components', 'components/views/bst-flyout.html'));
 
     beforeEach(inject(function(_$compile_, _$rootScope_) {
         compile = _$compile_;
@@ -32,7 +32,7 @@ describe('Directive: alchFlyout', function() {
         ];
         scope.items = testItems;
 
-        element = angular.element('<ul alch-flyout="items"></ul>');
+        element = angular.element('<ul bst-flyout="items"></ul>');
         compile(element)(scope);
         scope.$digest();
 

data/test/{incubator/alch-form-buttons.directive.test.js → components/bst-form-buttons.directive.test.js}

@@ -12,13 +12,13 @@
  */
 
 
-describe('Directive: alchFormButtons', function() {
+describe('Directive: bstFormButtons', function() {
     var $scope, $compile, element;
 
     beforeEach(module(
-        'alchemy',
-        'incubator/views/alch-save-control.html',
-        'incubator/views/alch-form-buttons.html'
+        'Bastion.components',
+        'components/views/bst-save-control.html',
+        'components/views/bst-form-buttons.html'
     ));
 
     beforeEach(inject(function(_$compile_, _$rootScope_) {
@@ -29,7 +29,7 @@ describe('Directive: alchFormButtons', function() {
     beforeEach(function() {
         element = '<form name="testForm">' +
                     '<input name="name" ng-model="fake.name" required>' +
-                    '<div alch-form-buttons ' +
+                    '<div bst-form-buttons ' +
                         'on-cancel="transitionTo(\'product.index\')" ' +
                         'on-save="save(product)" ' +
                         'working="working"> ' +

data/test/{incubator/alch-form-group.directive.test.js → components/bst-form-group.directive.test.js}

@@ -12,12 +12,12 @@
  */
 
 
-describe('Directive: alchFormGroup', function() {
+describe('Directive: bstFormGroup', function() {
     var $scope, $compile, element;
 
     beforeEach(module(
-        'alchemy',
-        'incubator/views/alch-form-group.html'
+        'Bastion.components',
+        'components/views/bst-form-group.html'
     ));
 
     beforeEach(inject(function(_$compile_, _$rootScope_) {
@@ -27,7 +27,7 @@ describe('Directive: alchFormGroup', function() {
 
     beforeEach(function() {
         element = '<form name="testForm">' +
-                    '<div alch-form-group label="Name" required>' +
+                    '<div bst-form-group label="Name" required>' +
                         '<input id="name" ' +
                                'name="name" ' +
                                'ng-model="fake.name" ' +

data/test/{incubator/alch-infinite-scroll.directive.test.js → components/bst-infinite-scroll.directive.test.js}

@@ -10,10 +10,10 @@
  * 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: alchInfiniteScroll', function () {
+describe('Directive: bstInfiniteScroll', function () {
     var $scope, $compile, $q, element;
 
-    beforeEach(module('alchemy'));
+    beforeEach(module('Bastion.components'));
 
     beforeEach(inject(function ($rootScope, _$compile_, _$q_){
         $scope = $rootScope;
@@ -29,7 +29,7 @@ describe('Directive: alchInfiniteScroll', function () {
             }
         };
         $scope.data = [];
-        element = angular.element('<div data="data" alch-infinite-scroll="scrollHandler.doIt()" style=" height: 100px; position: absolute; overflow-y: auto;"></div>');
+        element = angular.element('<div data="data" bst-infinite-scroll="scrollHandler.doIt()" style=" height: 100px; position: absolute; overflow-y: auto;"></div>');
         $('body').append(element);
     }));
 

data/test/{incubator/alch-menu.directive.test.js → components/bst-menu.directive.test.js}

@@ -11,7 +11,7 @@
  * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
  */
 
-describe('Directive: alchMenu', function() {
+describe('Directive: bstMenu', function() {
     var scope,
         compile,
         window,
@@ -20,10 +20,10 @@ describe('Directive: alchMenu', function() {
         elementScope;
 
     beforeEach(module(
-        'alchemy',
-        'incubator/views/alch-menu.html',
-        'incubator/views/alch-dropdown.html',
-        'incubator/views/alch-flyout.html'
+        'Bastion.components',
+        'components/views/bst-menu.html',
+        'components/views/bst-dropdown.html',
+        'components/views/bst-flyout.html'
     ));
 
     beforeEach(inject(function(_$compile_, _$rootScope_, $window) {
@@ -43,7 +43,7 @@ describe('Directive: alchMenu', function() {
         ]};
         scope.items = testMenu;
 
-        element = angular.element('<nav alch-menu="items"></nav>');
+        element = angular.element('<nav bst-menu="items"></nav>');
         compile(element)(scope);
         scope.$digest();