bastion 0.2.6 → 0.2.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzVmNGUwNmI0Y2IwZTcyMTBiYmMzYWRmYjNhN2NlNTE3MjA1NGYyYg==
+    MWFjYWVkN2QxYTY0ZGMwMDMxN2M1OTU1NjcxN2ZmYWIzODAxMThkZg==
   data.tar.gz: !binary |-
-    MmZiOWE3M2U4OTFiZWU4MjEyZGU2MmYxNTk2OTIzZTIxYjk4ODZjYQ==
+    N2VlNGVjNjRiNzI1MWE4YWM2NmZiNGVkOTU5YjZiNWJjMzMyNGU3ZQ==
 SHA512:
   metadata.gz: !binary |-
-    NGVmYWQ1YWZjZGYxZjI5ZTdlZTUyMjFkZTUwYzY5MTAzODcxNTk5Zjc1ZTI5
-    MTUzMDQwYmQzY2RhN2IyMGYyNTY4Y2NjNDI2MjhlNDdhZWI3MjIyNTBhODVi
-    MjliYmU4MzUxYmQ5MmMwMDczZmJlZWE1MTViNjU1YzRmZDljYjM=
+    M2RhMWQ5NDhhZmMyMDU4NTNhNTUwOWRhMmI4ZTgyZTBkZDA4M2VmZDBlZjE0
+    ODRlYzNkNDA4YWVjZjM3NTIxMTU3YjMwODdmMGEwMTEwYzBkYWRmZWRlMDk4
+    YzFiNDVhYWY3YzQ2YzRhZGEzNWVhNDY3ZGE0MzNmZWIzMmUxZmM=
   data.tar.gz: !binary |-
-    NWUyZTIyMmU5ZjNkMDJjOTI4MDEyMjM4ZTU2MjM3Yzc5NzQ3NWI3N2UyM2Y5
-    ZjExNjFhMDBjZjliNmJlZTZlZjhiNzEyODY4MjExZmRjODI5MzUxMTAyYzJj
-    MmYwYzI4ZGViODRkNDE1YmViYTAwNmRiN2E5NTg0MmFhOWIwOWI=
+    ODc1NWUwMTRiODkzOTU3ZmJmNmIyNWNmZjgxZTU1YWY2ODhiOTlhNjM2MmMx
+    YzIxOTBiYzYzYzBjNmQ5Njc5MWFjOWRkZmJiZTk2ZDUxNDhkODYzNjEyODlk
+    ZDc2NjdiYWY1OGMyYTA2ZjhjYjY0Yzg3NTZjMTgyZDEyMzczNTc=

data/app/assets/javascripts/bastion/components/bst-modal.directive.js

@@ -25,56 +25,52 @@
 angular.module('Bastion.components').directive('bstModal',
     ['$templateCache', '$modal', function ($templateCache, $modal) {
     return {
-        // To be expanded when we add additional type of modals
-        templateUrl: 'components/views/bst-modal.html',
-        replace: true,
+        transclude: true,
         scope: {
             action: '&bstModal',
             modelName: '@model',
-            model: '=',
-            modalHeader: '@',
-            modalBody: '@'
+            model: '='
         },
-        compile: function (element) {
-            return function (scope) {
-                var modalInstance, modalController, modalId;
+        link: function (scope, iElement, iAttrs, nullCtrl, transclude) {
+            var modalInstance, modalController, modalId;
 
-                modalId = 'bstModal%d.html'.replace('%d', Math.random().toString());
+            modalId = 'bstModal%d.html'.replace('%d', Math.random().toString());
 
-                modalController = ['$scope', '$modalInstance', 'model', function ($scope, $modalInstance, model) {
-                    $scope[scope.modelName] = model;
-                    $scope.modalHeader = scope.modalHeader;
-                    $scope.modalBody = scope.modalBody;
+            modalController = ['$scope', '$modalInstance', 'model', function ($scope, $modalInstance, model) {
+                $scope[scope.modelName] = model;
 
-                    $scope.ok = function () {
-                        $modalInstance.close();
-                    };
+                $scope.ok = function () {
+                    $modalInstance.close();
+                };
 
-                    $scope.cancel = function () {
-                        $modalInstance.dismiss('cancel');
-                    };
-                }];
+                $scope.cancel = function () {
+                    $modalInstance.dismiss('cancel');
+                };
+            }];
 
-                scope.openModal = function () {
-                    modalInstance = $modal.open({
-                        templateUrl: modalId,
-                        controller: modalController,
-                        resolve: {
-                            model: function () {
-                                return scope[scope.modelName];
-                            }
+            scope.openModal = function () {
+                modalInstance = $modal.open({
+                    templateUrl: modalId,
+                    controller: modalController,
+                    resolve: {
+                        model: function () {
+                            return scope[scope.modelName];
                         }
-                    });
+                    }
+                });
 
-                    modalInstance.result.then(function () {
-                        scope.action();
-                    });
-                };
+                modalInstance.result.then(function () {
+                    scope.action();
+                });
+            };
 
-                scope.$parent.openModal = scope.openModal;
+            scope.$parent.openModal = scope.openModal;
 
-                $templateCache.put(modalId, element.html());
-            };
+            transclude(function (clone) {
+                var template = angular.element('<div extend-template="components/views/bst-modal.html"></div>');
+                template.append(clone);
+                $templateCache.put(modalId, template);
+            });
         }
     };
 }]);

data/app/assets/javascripts/bastion/components/views/bst-modal.html

@@ -1,13 +1,16 @@
-<script type="text/ng-template">
-  <div class="modal-header">
-    <i class="fa fa-remove close" ng-click="cancel()"></i>
-    <h3>{{ modalHeader | translate }}</h3>
-  </div>
-  <div class="modal-body">
-    <p>{{ modalBody | translate }}</p>
-  </div>
-  <div class="modal-footer">
-    <button class="btn btn-danger" ng-click="ok()" translate>Remove</button>
-    <button class="btn btn-default" ng-click="cancel()" translate>Cancel</button>
-  </div>
-</script>
+<div class="modal-header">
+  <button type="button" class="close" aria-label="Close" ng-click="cancel()">
+    <span aria-hidden="true">&times;</span>
+  </button>
+
+  <h3 data-block="modal-header"></h3>
+</div>
+<div class="modal-body">
+  <p data-block="modal-body"></p>
+</div>
+<div class="modal-footer">
+  <button class="btn btn-danger" ng-click="ok()">
+    <span data-block="modal-confirm-button" translate>Remove</span>
+  </button>
+  <button class="btn btn-default" ng-click="cancel()" translate>Cancel</button>
+</div>

data/lib/bastion/version.rb

@@ -1,3 +1,3 @@
 module Bastion
-  VERSION = "0.2.6"
+  VERSION = "0.2.7"
 end

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

@@ -15,8 +15,9 @@ describe('Directive: bstModal', function() {
     var scope,
         compile,
         $modal,
+        $templateCache,
         $q,
-        translate,
+        modalId,
         testItem,
         element,
         elementScope;
@@ -30,12 +31,6 @@ describe('Directive: bstModal', function() {
             delete: function() {}
         };
 
-        translate = function() {
-            this.$get = function() {
-                return function() {};
-            };
-        };
-
         $modal = {
             $get: function() {
                 return this;
@@ -50,25 +45,39 @@ describe('Directive: bstModal', function() {
             }
         };
 
-        $provide.provider('translateFilter', translate);
         $provide.provider('$modal', $modal);
     }));
 
-    beforeEach(inject(function(_$compile_, _$rootScope_, _$q_) {
+    beforeEach(inject(function(_$compile_, _$rootScope_, _$q_, _$templateCache_) {
         compile = _$compile_;
         scope = _$rootScope_;
         $q = _$q_;
+        $templateCache = _$templateCache_;
     }));
 
     beforeEach(function() {
-        element = angular.element(
-            '<span bst-modal="item.delete(item)" model="testItem">' +
-                '<p>Hello!</p></span>');
+        var html = '<span bst-modal="item.delete(item)">' +
+                     '<p data-block="modal-header">Header</p>' +
+                     '<p data-block="modal-body">Body</p>' +
+                   '</span>';
+
+        element = angular.element(html);
+        spyOn($templateCache, 'put').andCallThrough();
 
         compile(element)(scope);
         scope.$digest();
 
         elementScope = element.scope();
+        modalId = $templateCache.put.mostRecentCall.args[0];
+    });
+
+    it("uses angular-blocks to extend a modal template", function () {
+        var modal = $templateCache.get(modalId);
+
+        expect($templateCache.put).toHaveBeenCalled();
+        expect(modal.attr('extend-template')).toBe('components/views/bst-modal.html');
+        expect(modal.find('[data-block="modal-header"]').html()).toBe('Header');
+        expect(modal.find('[data-block="modal-body"]').html()).toBe('Body');
     });
 
     it("allows the opening of a modal dialog via bootstrap ui", function() {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bastion
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Katello
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-18 00:00:00.000000000 Z
+date: 2015-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: angular-rails-templates