Merge lp:~benji/juju-gui/stand-in-bundle-token into lp:juju-gui/experimental

[Benji York]

More renaming in preparation for bundle tokens.

This branch consists primarily of removing more "charm" from "charm token".
The only non-mechanical changes are in app/widgets/token.js.

https://codereview.appspot.com/13627053/

[Gary Poster (gary)]

LGTM, thank you. I'll try QA now.

I can't help but wish that we had some more descriptive name for this
than "Token". Hopefully we don't confuse ourselves with some semantic
overlap in the future.

https://codereview.appspot.com/13627053/

[Gary Poster (gary)]

On 2013/09/19 18:05:57, gary.poster wrote:
> LGTM, thank you. I'll try QA now.

> I can't help but wish that we had some more descriptive name for this
than
> "Token". Hopefully we don't confuse ourselves with some semantic
overlap in the
> future.

QA good. thanks!

https://codereview.appspot.com/13627053/

=== added file 'app/templates/bundle-token.handlebars'
--- app/templates/bundle-token.handlebars	1970-01-01 00:00:00 +0000
+++ app/templates/bundle-token.handlebars	2013-09-25 14:55:25 +0000
@@ -0,0 +1,6 @@
+{{! The token class is used by the deploy method in
+    test/test_charm_running.py.  If you change this name, change the other
+    one too! }}
+<a href="/{{storeId}}" class="token {{size}}" data-charmid="{{storeId}}">
+  This is a bundle token.  Deal.
+</a>

=== modified file 'app/widgets/token.js'
--- app/widgets/token.js	2013-09-24 19:58:07 +0000
+++ app/widgets/token.js	2013-09-25 14:55:25 +0000
@@ -29,6 +29,16 @@
  */
 YUI.add('browser-token', function(Y) {
 
+  var determineTokenDataType = function(tokenData) {
+    // It would be nice to restructure the token widget so that it takes
+    // a model instead of a jumble of attributes.  If we did so, this
+    // would just be a type check over the class of the model.
+    if (tokenData && 'basket_name' in tokenData) {
+      return 'bundle';
+    }
+    return 'charm';
+  };
+
   var ns = Y.namespace('juju.widgets.browser');
   ns.EVENT_CHARM_ADD = 'charm-token-add';  // XXX Is this used?
   ns.Token = Y.Base.create('Token', Y.Widget, [
@@ -47,11 +57,10 @@
       // Extract the charm/bundle values from the jumble of widget
       // cfg options.
       var attributes;
-      if (this.get('type') === 'charm') {
+      if (determineTokenDataType(cfg) === 'charm') {
         attributes = Y.Object.keys(Y.juju.models.Charm.ATTRS);
         this.TEMPLATE = templates['charm-token'];
       } else {
-        // XXX This doesn't actually work yet, but soon. (benji 2013-09-24)
         attributes = Y.Object.keys(Y.juju.models.Bundle.ATTRS);
         this.TEMPLATE = templates['bundle-token'];
       }
@@ -273,9 +282,7 @@
       type: {
         // The function name is quoted to keep the yuidoc linter happy.
         'getter': function() {
-          // TODO When we wire in the bundle handling code this will be a
-          // non-constant value.
-          return 'charm';
+          return determineTokenDataType(this.tokenData);
         }
       }
 
@@ -288,6 +295,7 @@
     'event-tracker',
     'handlebars',
     'juju-charm-models',
+    'juju-bundle-models',
     'juju-templates',
     'juju-view-utils',
     'widget',

=== modified file 'test/test_token.js'
--- test/test_token.js	2013-09-24 16:41:26 +0000
+++ test/test_token.js	2013-09-25 14:55:25 +0000
@@ -19,7 +19,7 @@
 'use strict';
 
 
-describe('charm token', function() {
+describe('charm/bundle token', function() {
   var token_container, Token, cleanIconHelper, token, utils, Y;
 
   before(function(done) {
@@ -142,7 +142,33 @@
     assert.equal(
         token_container.one('img').getAttribute('src'),
         'http://localhost.svg');
-
+  });
+
+  it('can report the kind of object it represents', function() {
+    var charmToken = new Token({
+      size: 'tiny',
+      description: 'some description',
+      mainCategory: 'app-servers',
+      iconUrl: 'http://localhost.svg'
+    });
+
+    var bundleToken = new Token({
+      size: 'small',
+      basket_name: 'BASKET-NAME'
+    });
+
+    assert.equal(charmToken.get('type'), 'charm');
+    assert.equal(bundleToken.get('type'), 'bundle');
+  });
+
+  it('can render bundles', function() {
+    var token = new Token({
+      size: 'small',
+      basket_name: 'BASKET-NAME'
+    });
+
+    token.render(token_container);
+    assert.match(token_container.getHTML(), /This is a bundle token./);
   });
 
 });