bastion 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8adc1edf9a3b286a1f3e59b9df31b2575dd94f65
-  data.tar.gz: a726b66ae909ddb768477067bc60684d12070057
+  metadata.gz: b8ffeee982685674e514ec036fb70f5c46267247
+  data.tar.gz: 1c2513f3cf4b6d764000c11c89654259b09f580e
 SHA512:
-  metadata.gz: 8d1dd51c3ad35b209adc6004cfb61240849cc79dda6e74067f9ef6176701d267bdcb025d8c7341b3500541adeaa080757e15e18e87a676e97f05e0ad37aee332
-  data.tar.gz: 69885c86c17f773252ce015a46c21da559867bba7d2805608f6cdd7963252657f242cd03747f208a651c39fe930a78a972fa83a4f5480444364a8745b0953588
+  metadata.gz: bb30797fdee0fc1ec84de971713c901d4c5dbde02563ae66cdf5d4fbd6c8253163aa2063b3bcb0fe9e385b5e9350d8e519933efbfa80f060108918d63736915b
+  data.tar.gz: fdef65e2a62df3d92ed7467da02022e4ad072a5280a2aa1b954096eda3f18db413e469de4e27866ec38c1215cc28ad29990e459815f8b3ce0933932e3b0b02b7

data/app/assets/javascripts/bastion/components/nutupane.factory.js

@@ -115,6 +115,48 @@ angular.module('Bastion.components').factory('Nutupane',
                 return params;
             };
 
+            self.table.autocomplete = function (term) {
+                var data, promise, params;
+                if (resource.autocomplete) {
+                    params = self.getParams();
+                    params.search = term;
+                    data = resource.autocomplete(params);
+                } else {
+                    data = self.table.fetchAutocomplete(term);
+                }
+
+                promise = data.$promise;
+                if (promise) {
+                    return promise.then(function (data) {
+                        return self.table.transformScopedSearch(data);
+                    });
+                }
+                else {
+                    return data;
+                }
+            };
+
+            self.table.transformScopedSearch = function (results) {
+                var rows = [],
+                    categoriesFound = [];
+                angular.forEach(results, function (row) {
+                    if (row.category && row.category.length > 0) {
+                        if (categoriesFound.indexOf(row.category) === -1) {
+                            categoriesFound.push(row.category);
+                            rows.push({category: row.category, isCategory: true});
+                        }
+                    }
+                    rows.push(row);
+                });
+
+                return rows;
+            };
+
+            //Overridable by real controllers, but default to nothing
+            self.table.fetchAutocomplete = function () {
+                return [];
+            };
+
             self.enableSelectAllResults = function () {
                 self.table.selectAllResultsEnabled = true;
                 self.table.allResultsSelected = false;

data/app/assets/javascripts/bastion/components/typeahead-empty.directive.js

@@ -0,0 +1,42 @@
+/**
+ 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.
+ **/
+
+/**
+ * @ngdoc directive
+ * @name Bastion.components.directive:typeaheadEmpty
+ *
+ *
+ * @description
+ *  Used to support autocompletion on focus, not just after the user types a single character
+ *
+ * @example
+    <input
+    typeahead="item as item.label for item in table.autocomplete($viewValue)"
+    typeahead-empty />
+ */
+
+angular.module('Bastion.components').directive('typeaheadEmpty', function () {
+    return {
+        require: 'ngModel',
+        link: function (scope, element, attrs, modelCtrl) {
+            element.bind('focus', function () {
+                if (modelCtrl.$viewValue === undefined || modelCtrl.$viewValue === '') {
+                    modelCtrl.$setViewValue(' ');
+                }
+                else {
+                    modelCtrl.$setViewValue(modelCtrl.$viewValue);
+                }
+            });
+        }
+    };
+});

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

@@ -0,0 +1,10 @@
+<i class='ui-autocomplete-category' ng-show="match.model.isCategory">
+  {{ match.model.category }}
+</i>
+
+<a ng-hide="match.model.isCategory">
+  <i class='ui-autocomplete-completed'>
+    {{ match.model.completed }}
+  </i>
+  {{ match.model.part }}
+</a>

data/app/assets/javascripts/bastion/layouts/details-nutupane.html

@@ -20,7 +20,12 @@
                  class="form-control"
                  placeholder="{{ 'Search...' | translate }}"
                  ng-model="detailsTable.searchTerm"
-                 bst-on-enter="detailsTable.search(detailsTable.searchTerm)"/>
+                 bst-on-enter="detailsTable.search(detailsTable.searchTerm)"
+                 ng-trim="false"
+                 typeahead="item.label for item in detailsTable.autocomplete($viewValue)"
+                 typeahead-empty
+                 typeahead-template-url="widgets/views/autocomplete-scoped-search.html"/>
+
           <span class="input-group-btn">
             <button ng-click="detailsTable.search(detailsTable.searchTerm)" class="btn btn-default" type="button"><i class="icon-search"></i></button>
           </span>

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

@@ -16,8 +16,12 @@
         <input type="text"
                class="form-control"
                placeholder="{{ 'Search...' | translate }}"
+               bst-on-enter="table.search(table.searchTerm)"
                ng-model="table.searchTerm"
-               bst-on-enter="table.search(table.searchTerm)"/>
+               ng-trim="false"
+               typeahead="item.label for item in table.autocomplete($viewValue)"
+               typeahead-empty
+               typeahead-template-url="components/views/autocomplete-scoped-search.html"/>
         <span class="input-group-btn">
           <button ng-click="table.search(table.searchTerm)" class="btn btn-default" type="button"><i class="icon-search"></i></button>
         </span>

data/app/assets/stylesheets/bastion/nutupane.less

@@ -112,7 +112,6 @@ td.row-select {
   background: rgb(250, 250, 250);
   padding: 10px 15px 10px 0;
   border-bottom: 1px solid rgb(230, 230, 230);
-  overflow: auto;
 
   h2 { margin: 5px 0 0 0; }
 
@@ -124,6 +123,10 @@ td.row-select {
       margin-bottom: 0;
     }
   }
+
+  .dropdown-menu {
+    width: 100%;
+  }
 }
 
 .nutupane-details-bar {

data/lib/bastion/engine.rb

@@ -14,12 +14,8 @@ module Bastion
       app.routes_reloader.paths.unshift("#{Bastion::Engine.root}/config/routes.rb")
     end
 
-    initializer "bastion.assets.paths", :group => :all do |app|
-      if defined? Less::Rails
-        app.config.less.paths << "#{Bastion::Engine.root}/app/assets/stylesheets/bastion"
-        app.config.less.paths << "#{Bastion::Engine.root}/vendor/assets/stylesheets/bastion"
-      end
-
+    initializer "bastion.plugin", :group => :all do |app|
+      app.config.assets.paths << "#{Bastion::Engine.root}/vendor/assets/stylesheets/bastion"
       app.middleware.use ::ActionDispatch::Static, "#{Bastion::Engine.root}/app/assets/javascripts/bastion"
 
       SETTINGS[:bastion] = {:assets => {}} if SETTINGS[:bastion].nil?

data/lib/bastion/version.rb

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

data/lib/bastion.rb

@@ -3,7 +3,7 @@ require 'rails'
 lib_foreman = File.expand_path('lib/foreman', Rails.root)
 require lib_foreman unless !Dir.exist?(lib_foreman)
 
-require 'less-rails' if !Rails.env.production? || Foreman.in_rake?
+require 'less-rails' unless Rails.env.production?
 require 'angular-rails-templates'
 
 require File.expand_path('bastion/engine', File.dirname(__FILE__))

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

@@ -233,6 +233,39 @@ describe('Factory: Nutupane', function() {
             expect(results.included.search).toBe("FOO");
         });
 
+        it("provides a way to translate scoped search queries", function() {
+            var translated,
+                data = [{label: 'bar', category: 'foo'},
+                        {label: 'bar2', category: 'foo'}];
+
+            translated = nutupane.table.transformScopedSearch(data);
+            expect(translated.length).toBe(3);
+            expect(translated[0].isCategory).toBeTruthy();
+            expect(translated[0].category).toBe('foo');
+            expect(translated[1]).toBe(data[0]);
+            expect(translated[2]).toBe(data[1]);
+        });
+
+        it("autocompletes using the original resource if possible", function() {
+            var data;
+            Resource.autocomplete = function() {return ["foo"]};
+            spyOn(Resource, 'autocomplete').andCallThrough();
+
+            data = nutupane.table.autocomplete();
+            expect(Resource.autocomplete).toHaveBeenCalled();
+            expect(data[0]).toBe("foo");
+        });
+
+        it("autocompletes using fetchAutocomplete if resource doesn't support autocomplete", function() {
+            var data;
+            nutupane.table.fetchAutocomplete = function() {return ['bar']};
+            spyOn(nutupane.table, 'fetchAutocomplete').andCallThrough();
+
+            data = nutupane.table.autocomplete();
+            expect(nutupane.table.fetchAutocomplete).toHaveBeenCalled();
+            expect(data[0]).toBe("bar");
+        });
+
         describe("provides a way to sort the table", function() {
             it ("defaults the sort to ascending if the previous sort does not match the new sort.", function() {
                 var expectedParams = {sort_by: 'name', sort_order: 'ASC', search: '', page: 1};

data/test/components/typeahead-empty.directive.test.js

@@ -0,0 +1,62 @@
+/**
+ * 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: typeahead-empty', function() {
+    var scope,
+        compile,
+        element,
+        elementScope;
+
+
+    beforeEach(module(
+        'Bastion.components'
+    ));
+
+    beforeEach(inject(function(_$compile_, _$rootScope_) {
+        compile = _$compile_;
+        scope = _$rootScope_;
+    }));
+
+    beforeEach(function() {
+        element = angular.element('<input ng-model="myInput" type="text" typeahead-empty />');
+
+        compile(element)(scope);
+        scope.$digest();
+
+        elementScope = element.isolateScope();
+    });
+
+    it("should adjust empty string", function() {
+        scope.myInput = '';
+        scope.$digest();
+        element.triggerHandler('focus');
+
+        expect(scope.myInput).toBe(' ');
+    });
+
+    it("should adjust undefined", function() {
+        scope.myInput = undefined;
+        scope.$digest();
+        element.triggerHandler('focus');
+
+        expect(scope.myInput).toBe(' ');
+    });
+
+    it("should not adjust otherss", function() {
+        scope.myInput = 'foo';
+        scope.$digest();
+        element.triggerHandler('focus');
+
+        expect(scope.myInput).toBe('foo');
+    });
+});

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bastion
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - Katello
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-17 00:00:00.000000000 Z
+date: 2014-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: angular-rails-templates
@@ -96,6 +96,8 @@ files:
 - app/assets/javascripts/bastion/components/page-title.directive.js
 - app/assets/javascripts/bastion/components/page-title.service.js
 - app/assets/javascripts/bastion/components/path-selector.directive.js
+- app/assets/javascripts/bastion/components/typeahead-empty.directive.js
+- app/assets/javascripts/bastion/components/views/autocomplete-scoped-search.html
 - app/assets/javascripts/bastion/components/views/bst-alert.html
 - app/assets/javascripts/bastion/components/views/bst-dropdown.html
 - app/assets/javascripts/bastion/components/views/bst-edit-add-item.html
@@ -181,6 +183,7 @@ files:
 - test/components/page-title.directive.test.js
 - test/components/page-title.service.test.js
 - test/components/path-selector.directive.test.js
+- test/components/typeahead-empty.directive.test.js
 - test/i18n/translate.service.test.js
 - test/menu/menu-expander.service.test.js
 - test/test-mocks.module.js
@@ -370,6 +373,7 @@ test_files:
 - test/components/bst-menu.directive.test.js
 - test/components/bst-edit.directive.test.js
 - test/components/path-selector.directive.test.js
+- test/components/typeahead-empty.directive.test.js
 - test/components/bst-form-buttons.directive.test.js
 - test/components/page-title.service.test.js
 - test/bastion/test-constants.js