1
=== modified file 'app/app.js'
2
--- app/app.js	2012-10-19 01:44:45 +0000
3
+++ app/app.js	2012-10-23 20:09:21 +0000
4
@@ -261,7 +261,8 @@
5
261
    show_unit: function(req) {
261
    show_unit: function(req) {
6
262
      console.log(
262
      console.log(
7
263
          'App: Route: Unit', req.params.id, req.path, req.pendingRoutes);
263
          'App: Route: Unit', req.params.id, req.path, req.pendingRoutes);
9
264
      var unit_id = req.params.id.replace('-', '/');
264
      // This replacement honors service names that have a hyphen in them.
10
265
      var unit_id = req.params.id.replace(/^(\S+)-(\d+)$/, '$1/$2');
11
265
      var unit = this.db.units.getById(unit_id);
266
      var unit = this.db.units.getById(unit_id);
12
266
      if (unit) {
267
      if (unit) {
13
267
        // Once the unit is loaded we need to get the full details of the
268
        // Once the unit is loaded we need to get the full details of the
14
268
269
15
=== modified file 'app/models/charm.js'
16
--- app/models/charm.js	2012-10-19 01:53:03 +0000
17
+++ app/models/charm.js	2012-10-23 20:09:21 +0000
18
@@ -2,67 +2,12 @@
19
2
2
20
3
YUI.add('juju-charm-models', function(Y) {
3
YUI.add('juju-charm-models', function(Y) {
21
4
4
22
5
23
5
  var models = Y.namespace('juju.models');
6
  var models = Y.namespace('juju.models');
24
6
7
84
7
  // This is how the charm_id_re regex works for various inputs.  The first
8
  // Charms, once instantiated and loaded with data from their respective
85
8
  // element is always the initial string, which we have elided in the
9
  // sources, are immutable and read-only. This reflects the reality of how we
86
9
  // examples.
10
  // interact with them.
28
10
  // 'cs:~marcoceppi/precise/word-press-17' ->
29
11
  // [..."cs", "marcoceppi", "precise", "word-press", "17"]
30
12
  // 'cs:~marcoceppi/precise/word-press' ->
31
13
  // [..."cs", "marcoceppi", "precise", "word-press", undefined]
32
14
  // 'cs:precise/word-press' ->
33
15
  // [..."cs", undefined, "precise", "word-press", undefined]
34
16
  // 'cs:precise/word-press-17'
35
17
  // [..."cs", undefined, "precise", "word-press", "17"]
36
18
  var charm_id_re = /^(?:(\w+):)?(?:~(\S+)\/)?(\w+)\/(\S+?)(?:-(\d+))?$/,
37
19
      parse_charm_id = function(id) {
38
20
        var parts = charm_id_re.exec(id),
39
21
            result = {};
40
22
        if (parts) {
41
23
          parts.shift();
42
24
          Y.each(
43
25
              Y.Array.zip(
44
26
                  ['scheme', 'owner', 'series', 'package_name', 'revision'],
45
27
                  parts),
46
28
              function(pair) { result[pair[0]] = pair[1]; });
47
29
          if (!Y.Lang.isValue(result.scheme)) {
48
30
            result.scheme = 'cs'; // This is the default.
49
31
          }
50
32
          return result;
51
33
        }
52
34
        // return undefined;
53
35
      },
54
36
      _calculate_full_charm_name = function(elements) {
55
37
        var tmp = [elements.series, elements.package_name];
56
38
        if (elements.owner) {
57
39
          tmp.unshift('~' + elements.owner);
58
40
        }
59
41
        return tmp.join('/');
60
42
      },
61
43
      _calculate_charm_store_path = function(elements) {
62
44
        return [(elements.owner ? '~' + elements.owner : 'charms'),
63
45
                elements.series, elements.package_name, 'json'].join('/');
64
46
      },
65
47
      _calculate_base_charm_id = function(elements) {
66
48
        return elements.scheme + ':' + _calculate_full_charm_name(elements);
67
49
      },
68
50
      _reconsititute_charm_id = function(elements) {
69
51
        return _calculate_base_charm_id(elements) + '-' + elements.revision;
70
52
      },
71
53
      _clean_charm_data = function(data) {
72
54
        data.is_subordinate = data.subordinate;
73
55
        Y.each(['subordinate', 'name', 'revision', 'store_revision'],
74
56
               function(nm) { delete data[nm]; });
75
57
        return data;
76
58
      };
77
59
  // This is exposed for testing purposes.
78
60
  models.parse_charm_id = parse_charm_id;
79
61
80
62
  // For simplicity and uniformity, there is a single Charm class and a
81
63
  // single CharmList class. Charms, once instantiated and loaded with data
82
64
  // from their respective sources, are immutable and read-only. This reflects
83
65
  // the reality of how we interact with them.
87
66
11
88
67
  // Charm instances can represent both environment charms and charm store
12
  // Charm instances can represent both environment charms and charm store
89
68
  // charms.  A charm id is reliably and uniquely associated with a given
13
  // charms.  A charm id is reliably and uniquely associated with a given
90
@@ -70,127 +15,155 @@
91
70
15
92
71
  // Therefore, the database keeps these charms separate in two different
16
  // Therefore, the database keeps these charms separate in two different
93
72
  // CharmList instances.  One is db.charms, representing the environment
17
  // CharmList instances.  One is db.charms, representing the environment
98
73
  // charms.  The other is maintained by and within the persistent charm panel
18
  // charms.  The other, from the charm store, is maintained by and within the
99
74
  // instance. As you'd expect, environment charms are what to use when
19
  // persistent charm panel instance. As you'd expect, environment charms are
100
75
  // viewing or manipulating the environment.  Charm store charms are what we
20
  // what to use when viewing or manipulating the environment.  Charm store
101
76
  // can browse to select and deploy new charms to the environment.
21
  // charms are what we can browse to select and deploy new charms to the
102
22
  // environment.
103
77
23
106
78
  // Environment charms begin their lives with full charm ids, as provided by
24
  // Charms begin their lives with full charm ids, as provided by
107
79
  // services in the environment:
25
  // services in the environment and the charm store:
108
80
26
109
81
  // [SCHEME]:(~[OWNER]/)?[SERIES]/[PACKAGE NAME]-[REVISION].
27
  // [SCHEME]:(~[OWNER]/)?[SERIES]/[PACKAGE NAME]-[REVISION].
110
82
28
111
83
  // With an id, we can instantiate a charm: typically we use
29
  // With an id, we can instantiate a charm: typically we use
147
84
  // "db.charms.add({id: [ID]})".  Finally, we load the charm's data from the
30
  // "db.charms.add({id: [ID]})".  Finally, we load the charm's data over the
148
85
  // environment using the standard YUI Model method "load," providing an
31
  // network using the standard YUI Model method "load," providing an object
149
86
  // object with a get_charm callable, and an optional callback (see YUI
32
  // with a get_charm callable, and an optional callback (see YUI docs).  Both
150
87
  // docs).  The env has a get_charm method, so, by design, it works nicely:
33
  // the env and the charm store have a get_charm method, so, by design, it
151
88
  // "charm.load(env, optionalCallback)".  The get_charm method is expected to
34
  // works easily: "charm.load(env, optionalCallback)" or
152
89
  // return what the env version does: either an object with a "result" object
35
  // "charm.load(charm_store, optionalCallback)".  The get_charm method must
153
90
  // containing the charm data, or an object with an "err" attribute.
36
  // either callback using the default YUI approach for this code, a boolean
154
91
37
  // indicating failure, and a result; or it must return what the env version
155
92
  // The charms in the charm store have a significant difference, beyond the
38
  // does: an object with a "result" object containing the charm data, or an
156
93
  // source of their data: they are addressed in the charm store by a path
39
  // object with an "err" attribute.
122
94
  // that does not include the revision number, and charm store searches do
123
95
  // not include revision numbers in the results.  Therefore, we cannot
124
96
  // immediately instantiate a charm, because it requires a full id in order
125
97
  // to maintain the idea of an immutable charm associated with a unique charm
126
98
  // id.  However, the charm information that returns does have a revision
127
99
  // number (the most recent); moreover, over time the charm may be updated,
128
100
  // leading to a new charm revision.  We model this by creating a new charm.
129
101
130
102
  // Since we cannot create or search for charms without a revision number
131
103
  // using the normal methods, the charm list has a couple of helpers for this
132
104
  // story.  The workhorse is "loadOneByBaseId".  A "base id" is an id without
133
105
  // a revision.
134
106
135
107
  // The arguments to "loadOneById" are a base id and a hash of other options.
136
108
  // The hash must have a "charm_store" attribute, that itself loadByPath
137
109
  // method, like the one in app/store/charm.js.  It may have zero or more of
138
110
  // the following: a success callback, accepting the fully loaded charm with
139
111
  // the newest revision for the given base id; a failure callback, accepting
140
112
  // the Y.io response object after a failure; and a "force" attribute that,
141
113
  // if it is a Javascript boolean truth-y value, forces a load even if a
142
114
  // charm with the given id already is in the charm list.
143
115
144
116
  // "getOneByBaseId" simply returns the charm with the highest revision and
145
117
  // "the given base id from the charm list, without trying to load
146
118
  // "information.
157
119
40
158
120
  // In both cases, environment charms and charm store charms, a charm's
41
  // In both cases, environment charms and charm store charms, a charm's
159
121
  // "loaded" attribute is set to true once it has all the data from its
42
  // "loaded" attribute is set to true once it has all the data from its
160
122
  // environment.
43
  // environment.
161
123
44
188
124
  var Charm = Y.Base.create('charm', Y.Model, [], {
45
  var charm_id_re = /^(?:(\w+):)?(?:~(\S+)\/)?(\w+)\/(\S+?)-(\d+)$/,
189
125
    initializer: function() {
46
      id_elements = ['scheme', 'owner', 'series', 'package_name', 'revision'],
190
126
      this.loaded = false;
47
      Charm = Y.Base.create('charm', Y.Model, [], {
191
127
      this.on('load', function() { this.loaded = true; });
48
        initializer: function() {
192
128
    },
49
          var id = this.get('id'),
193
129
    sync: function(action, options, callback) {
50
              parts = id && charm_id_re.exec(id),
194
130
      if (action !== 'read') {
51
              self = this;
195
131
        throw (
52
          if (!Y.Lang.isValue(id) || !parts) {
196
132
            'Only use the "read" action; "' + action + '" not supported.');
53
            throw 'Developers must initialize charms with a well-formed id.';
197
133
      }
54
          }
198
134
      if (!Y.Lang.isValue(options.get_charm)) {
55
          this.loaded = false;
199
135
        throw 'You must supply a get_charm function.';
56
          this.on('load', function() { this.loaded = true; });
200
136
      }
57
          parts.shift();
201
137
      options.get_charm(
58
          Y.each(
202
138
          this.get('id'),
59
              Y.Array.zip(id_elements, parts),
203
139
          // This is the success callback, or the catch-all callback for
60
              function(pair) { self.set(pair[0], pair[1]); });
204
140
          // get_charm.
61
          // full_name
205
141
          function(response) {
62
          var tmp = [this.get('series'), this.get('package_name')],
206
142
            // Handle the env.get_charm response specially, for ease of use.  If
63
              owner = this.get('owner');
207
143
            // it doesn't match that pattern, pass it through.
64
          if (owner) {
208
144
            if (response.err) {
65
            tmp.unshift('~' + owner);
209
145
              callback(true, response);
66
          }
210
146
            } else if (response.result) {
67
          this.set('full_name', tmp.join('/'));
211
147
              callback(false, response.result);
68
          // charm_store_path
212
148
            } else { // This would typically be a string.
69
          this.set(
213
149
              callback(false, response);
70
              'charm_store_path',
214
71
              [(owner ? '~' + owner : 'charms'),
215
72
               this.get('series'),
216
73
               (this.get('package_name') + '-' + this.get('revision')),
217
74
               'json'
218
75
              ].join('/'));
219
76
        },
220
77
        sync: function(action, options, callback) {
221
78
          if (action !== 'read') {
222
79
            throw (
223
80
                'Only use the "read" action; "' + action + '" not supported.');
224
81
          }
225
82
          if (Y.Lang.isValue(options.get_charm)) {
226
83
            // This is an env.
227
84
            options.get_charm(
228
85
                this.get('id'),
229
86
                function(response) {
230
87
                  if (response.err) {
231
88
                    callback(true, response);
232
89
                  } else if (response.result) {
233
90
                    callback(false, response.result);
234
91
                  } else {
235
92
                    // What's going on?  This does not look like either of our
236
93
                    // expected signatures.  Declare a loading error.
237
94
                    callback(true, response);
238
95
                  }
239
96
                }
240
97
            );
241
98
          } else if (Y.Lang.isValue(options.loadByPath)) {
242
99
            // This is a charm store.
243
100
            options.loadByPath(
244
101
                this.get('charm_store_path'),
245
102
                { success: function(response) {
246
103
                  callback(false, response);
247
104
                },
248
105
                failure: function(response) {
249
106
                  callback(true, response);
250
107
                }
251
108
                });
252
109
          } else {
253
110
            throw 'You must supply a get_charm or loadByPath function.';
254
111
          }
255
112
        },
256
113
        parse: function() {
257
114
          var data = Charm.superclass.parse.apply(this, arguments),
258
115
              self = this;
259
116
          data.is_subordinate = data.subordinate;
260
117
          Y.each(data, function(value, key) {
261
118
            if (!value ||
262
119
                !self.attrAdded(key) ||
263
120
                Y.Lang.isValue(self.get(key))) {
264
121
              delete data[key];
265
150
            }
122
            }
266
151
          },
267
152
          // This is the optional error callback.
268
153
          function(response) {
269
154
            callback(true, response);
270
155
          }
271
156
      );
272
157
    },
273
158
    parse: function() {
274
159
      return _clean_charm_data(Charm.superclass.parse.apply(this, arguments));
275
160
    }
276
161
  }, {
277
162
    ATTRS: {
278
163
      id: {
279
164
        lazyAdd: false,
280
165
        setter: function(val) {
281
166
          if (!val) {
282
167
            return val;
283
168
          }
284
169
          var parts = parse_charm_id(val),
285
170
              self = this;
286
171
          parts.revision = parseInt(parts.revision, 10);
287
172
          Y.each(parts, function(value, key) {
288
173
            self._set(key, value);
289
174
          });
123
          });
294
175
          this._set(
124
          if (data.owner === 'charmers') {
295
176
              'charm_store_path', _calculate_charm_store_path(parts));
125
            delete data.owner;
296
177
          this._set('full_name', _calculate_full_charm_name(parts));
126
          }
297
178
          return _reconsititute_charm_id(parts);
127
          return data;
298
179
        },
128
        },
302
180
        validator: function(val) {
129
        compare: function(other, relevance, otherRelevance) {
303
181
          var parts = parse_charm_id(val);
130
          // Official charms sort before owned charms.
304
182
          return (parts && Y.Lang.isValue(parts.revision));
131
          // If !X.owner, that means it is owned by charmers.
305
132
          var owner = this.get('owner'),
306
133
              otherOwner = other.get('owner');
307
134
          if (!owner && otherOwner) {
308
135
            return -1;
309
136
          } else if (owner && !otherOwner) {
310
137
            return 1;
311
138
          // Relevance is next most important.
312
139
          } else if (relevance && (relevance !== otherRelevance)) {
313
140
            // Higher relevance comes first.
314
141
            return otherRelevance - relevance;
315
142
          // Otherwise sort by package name, then by owner, then by revision.
316
143
          } else {
317
144
            return (
318
145
                (this.get('package_name').localeCompare(
319
146
                other.get('package_name'))) ||
320
147
                (owner ? owner.localeCompare(otherOwner) : 0) ||
321
148
                (this.get('revision') - other.get('revision')));
322
149
          }
323
183
        }
150
        }
334
184
      },
151
      }, {
335
185
      // All of the below are loaded except as noted.
152
        ATTRS: {
336
186
      bzr_branch: {writeOnce: true},
153
          id: {
337
187
      charm_store_path: {readOnly: true}, // calculated
154
            writeOnce: true,
338
188
      config: {writeOnce: true},
155
            validator: function(val) {
339
189
      description: {writeOnce: true},
156
              return Y.Lang.isString(val) && !!charm_id_re.exec(val);
340
190
      full_name: {readOnly: true}, // calculated
157
            }
341
191
      is_subordinate: {writeOnce: true},
158
          },
342
192
      last_change:
159
          bzr_branch: {writeOnce: true},
343
193
          { writeOnce: true,
160
          charm_store_path: {writeOnce: true},
344
161
          config: {writeOnce: true},
345
162
          description: {writeOnce: true},
346
163
          full_name: {writeOnce: true},
347
164
          is_subordinate: {writeOnce: true},
348
165
          last_change: {
349
166
            writeOnce: true,
350
194
            setter: function(val) {
167
            setter: function(val) {
351
195
              // Normalize created value from float to date object.
168
              // Normalize created value from float to date object.
352
196
              if (val && val.created) {
169
              if (val && val.created) {
353
@@ -201,102 +174,42 @@
354
201
              return val;
174
              return val;
355
202
            }
175
            }
356
203
          },
176
          },
372
204
      maintainer: {writeOnce: true},
177
          maintainer: {writeOnce: true},
373
205
      metadata: {writeOnce: true},
178
          metadata: {writeOnce: true},
374
206
      package_name: {readOnly: true}, // calculated
179
          package_name: {writeOnce: true},
375
207
      owner: {readOnly: true}, // calculated
180
          owner: {writeOnce: true},
376
208
      peers: {writeOnce: true},
181
          peers: {writeOnce: true},
377
209
      proof: {writeOnce: true},
182
          proof: {writeOnce: true},
378
210
      provides: {writeOnce: true},
183
          provides: {writeOnce: true},
379
211
      requires: {writeOnce: true},
184
          requires: {writeOnce: true},
380
212
      revision: {readOnly: true}, // calculated
185
          revision: {
381
213
      scheme: {readOnly: true}, // calculated
186
            writeOnce: true,
382
214
      series: {readOnly: true}, // calculated
187
            setter: function(val) {
383
215
      summary: {writeOnce: true},
188
              if (Y.Lang.isValue(val)) {
384
216
      url: {writeOnce: true}
189
                val = parseInt(val, 10);
385
217
    }
190
              }
386
218
  });
191
              return val;
387
192
            }
388
193
          },
389
194
          scheme: {
390
195
            value: 'cs',
391
196
            writeOnce: true,
392
197
            setter: function(val) {
393
198
              if (!Y.Lang.isValue(val)) {
394
199
                val = 'cs';
395
200
              }
396
201
              return val;
397
202
            }
398
203
          },
399
204
          series: {writeOnce: true},
400
205
          summary: {writeOnce: true},
401
206
          url: {writeOnce: true}
402
207
        }
403
208
      });
404
219
  models.Charm = Charm;
209
  models.Charm = Charm;
405
220
210
406
221
  var CharmList = Y.Base.create('charmList', Y.ModelList, [], {
211
  var CharmList = Y.Base.create('charmList', Y.ModelList, [], {
485
222
    model: Charm,
212
    model: Charm
408
223
409
224
    initializer: function() {
410
225
      this._baseIdHash = {}; // base id (without revision) to array of charms.
411
226
    },
412
227
413
228
    _addToBaseIdHash: function(charm) {
414
229
      var baseId = charm.get('scheme') + ':' + charm.get('full_name'),
415
230
          matches = this._baseIdHash[baseId];
416
231
      if (!matches) {
417
232
        matches = this._baseIdHash[baseId] = [];
418
233
      }
419
234
      matches.push(charm);
420
235
      // Note that we don't handle changing baseIds or removed charms because
421
236
      // that should not happen.
422
237
      // Sort on newest charms first.
423
238
      matches.sort(function(a, b) {
424
239
        var revA = parseInt(a.get('revision'), 10),
425
240
            revB = parseInt(b.get('revision'), 10);
426
241
        return revB - revA;
427
242
      });
428
243
    },
429
244
430
245
    add: function() {
431
246
      var result = CharmList.superclass.add.apply(this, arguments);
432
247
      if (Y.Lang.isArray(result)) {
433
248
        Y.each(result, this._addToBaseIdHash, this);
434
249
      } else {
435
250
        this._addToBaseIdHash(result);
436
251
      }
437
252
      return result;
438
253
    },
439
254
440
255
    getOneByBaseId: function(id) {
441
256
      var match = parse_charm_id(id),
442
257
          baseId = match && _calculate_base_charm_id(match),
443
258
          charms = baseId && this._baseIdHash[baseId];
444
259
      return charms && charms[0];
445
260
    },
446
261
447
262
    loadOneByBaseId: function(id, options) {
448
263
      var match = parse_charm_id(id);
449
264
      if (match) {
450
265
        if (!options.force) {
451
266
          var charm = this.getOneByBaseId(_calculate_base_charm_id(match));
452
267
          if (charm) {
453
268
            if (options.success) {
454
269
              options.success(charm);
455
270
            }
456
271
            return;
457
272
          }
458
273
        }
459
274
        var path = _calculate_charm_store_path(match),
460
275
            self = this;
461
276
        options.charm_store.loadByPath(
462
277
            path,
463
278
            { success: function(data) {
464
279
              // We fall back to 0 for revision.  Some records do not have one
465
280
              // still in the charm store, such as
466
281
              // http://jujucharms.com/charms/precise/appflower/json (as of this
467
282
              // writing).
468
283
              match.revision = data.store_revision || 0;
469
284
              id = _reconsititute_charm_id(match);
470
285
              charm = self.getById(id);
471
286
              if (!charm) {
472
287
                charm = self.add({id: id});
473
288
                charm.setAttrs(_clean_charm_data(data));
474
289
                charm.loaded = true;
475
290
              }
476
291
              if (options.success) {
477
292
                options.success(charm);
478
293
              }
479
294
            },
480
295
            failure: options.failure });
481
296
      } else {
482
297
        throw id + ' is not a valid base charm id';
483
298
      }
484
299
    }
486
300
  }, {
213
  }, {
487
301
    ATTRS: {}
214
    ATTRS: {}
488
302
  });
215
  });
489
303
216
490
=== modified file 'app/modules.js'
491
--- app/modules.js	2012-10-19 01:58:34 +0000
492
+++ app/modules.js	2012-10-23 20:09:21 +0000
493
@@ -1,6 +1,6 @@
494
1
GlobalConfig = {
1
GlobalConfig = {
495
2
  // Uncomment for debug versions of YUI.
2
  // Uncomment for debug versions of YUI.
497
3
  //filter: 'debug',
3
  filter: 'debug',
498
4
  // Uncomment for verbose logging of YUI
4
  // Uncomment for verbose logging of YUI
499
5
  debug: false,
5
  debug: false,
500
6
6
501
@@ -83,6 +83,7 @@
502
83
        },
83
        },
503
84
84
504
85
        'juju-charm-models': {
85
        'juju-charm-models': {
505
86
          requires: ['juju-charm-id'],
506
86
          fullpath: '/juju-ui/models/charm.js'
87
          fullpath: '/juju-ui/models/charm.js'
507
87
        },
88
        },
508
88
89
509
@@ -103,6 +104,7 @@
510
103
        },
104
        },
511
104
105
512
105
        'juju-charm-store': {
106
        'juju-charm-store': {
513
107
          requires: ['juju-charm-id'],
514
106
          fullpath: '/juju-ui/store/charm.js'
108
          fullpath: '/juju-ui/store/charm.js'
515
107
        },
109
        },
516
108
110
517
109
111
518
=== modified file 'app/store/charm.js'
519
--- app/store/charm.js	2012-10-19 01:53:03 +0000
520
+++ app/store/charm.js	2012-10-23 20:09:21 +0000
521
@@ -16,9 +16,11 @@
522
16
        }
16
        }
523
17
      });
17
      });
524
18
    },
18
    },
528
19
    // The query can be a string that is passed directly to the search url, or a
19
    // The query can be a string that is passed directly to the search url, or
529
20
    // hash that is marshalled to the correct format (e.g., {series:precise,
20
    // a hash that is marshalled to the correct format (e.g.,
530
21
    // owner:charmers}).
21
    // {series:precise owner:charmers}).  The method returns CharmId instances
531
22
    // grouped by series and ordered within the groups according to the
532
23
    // CharmId compare function.
533
22
    find: function(query, options) {
24
    find: function(query, options) {
534
23
      if (!Y.Lang.isString(query)) {
25
      if (!Y.Lang.isString(query)) {
535
24
        var tmp = [];
26
        var tmp = [];
536
@@ -38,32 +40,33 @@
537
38
            console.log('results update', result_set);
40
            console.log('results update', result_set);
538
39
            options.success(
41
            options.success(
539
40
                this._normalizeCharms(
42
                this._normalizeCharms(
541
41
                result_set.results, options.defaultSeries));
43
                result_set.results, options.list, options.defaultSeries));
542
42
          }, this),
44
          }, this),
543
43
          'failure': options.failure
45
          'failure': options.failure
544
44
        }});
46
        }});
545
45
    },
47
    },
567
46
    // Stash the base id on each charm, convert the official "charmers" owner to
48
    // Convert the charm data into Charm instances, using only id and
568
47
    // an empty owner, and group the charms within series.  The series are
49
    // relevance.  Group them into series.  The series are arranged with first
569
48
    // arranged with first the defaultSeries, if any, and then all other
50
    // the defaultSeries, if any, and then all other available series arranged
570
49
    // available series arranged from newest to oldest. Within each series,
51
    // from newest to oldest. Within each series, official charms come first,
571
50
    // official charms come first, sorted by relevance if available and package
52
    // sorted by relevance if available and package name otherwise; and then
572
51
    // name otherwise; and then owned charms follow, sorted again by relevance
53
    // owned charms follow, sorted again by relevance if available and package
573
52
    // if available and package name otherwise.
54
    // name otherwise.
574
53
    _normalizeCharms: function(charms, defaultSeries) {
55
    _normalizeCharms: function(results, list, defaultSeries) {
575
54
      var hash = {};
56
      var hash = {},
576
55
      Y.each(charms, function(charm) {
57
          relevances = {};
577
56
        charm.baseId = charm.series + '/' + charm.name;
58
      Y.each(results, function(result) {
578
57
        if (charm.owner === 'charmers') {
59
        var charm = list.getById(result.store_url);
579
58
          charm.owner = null;
60
        if (!charm) {
580
59
        } else {
61
          charm = list.add(
581
60
          charm.baseId = '~' + charm.owner + '/' + charm.baseId;
62
              { id: result.store_url, summary: result.summary });
582
61
        }
63
        }
583
62
        charm.baseId = 'cs:' + charm.baseId;
64
        var series = charm.get('series');
584
63
        if (!Y.Lang.isValue(hash[charm.series])) {
65
        if (!Y.Lang.isValue(hash[series])) {
585
64
          hash[charm.series] = [];
66
          hash[series] = [];
586
65
        }
67
        }
587
66
        hash[charm.series].push(charm);
68
        hash[series].push(charm);
588
69
        relevances[charm.get('id')] = result.relevance;
589
67
      });
70
      });
590
68
      var series_names = Y.Object.keys(hash);
71
      var series_names = Y.Object.keys(hash);
591
69
      series_names.sort(function(a, b) {
72
      series_names.sort(function(a, b) {
592
@@ -71,42 +74,19 @@
593
71
          return -1;
74
          return -1;
594
72
        } else if (a !== defaultSeries && b === defaultSeries) {
75
        } else if (a !== defaultSeries && b === defaultSeries) {
595
73
          return 1;
76
          return 1;
596
74
        } else if (a > b) {
597
75
          return -1;
598
76
        } else if (a < b) {
599
77
          return 1;
600
78
        } else {
77
        } else {
602
79
          return 0;
78
          return -a.localeCompare(b);
603
80
        }
79
        }
604
81
      });
80
      });
605
82
      return Y.Array.map(series_names, function(name) {
81
      return Y.Array.map(series_names, function(name) {
606
83
        var charms = hash[name];
82
        var charms = hash[name];
607
84
        charms.sort(function(a, b) {
83
        charms.sort(function(a, b) {
628
85
          // If !a.owner, that means it is owned by charmers.
84
          return a.compare(
629
86
          if (!a.owner && b.owner) {
85
              b, relevances[a.get('id')], relevances[b.get('id')]);
610
87
            return -1;
611
88
          } else if (a.owner && !b.owner) {
612
89
            return 1;
613
90
          } else if (a.relevance < b.relevance) {
614
91
            return 1; // Higher relevance comes first.
615
92
          } else if (a.relevance > b.relevance) {
616
93
            return -1;
617
94
          } else if (a.name < b.name) {
618
95
            return -1;
619
96
          } else if (a.name > b.name) {
620
97
            return 1;
621
98
          } else if (a.owner < b.owner) {
622
99
            return -1;
623
100
          } else if (a.owner > b.owner) {
624
101
            return 1;
625
102
          } else {
626
103
            return 0;
627
104
          }
630
105
        });
86
        });
631
106
        return {series: name, charms: hash[name]};
87
        return {series: name, charms: hash[name]};
632
107
      });
88
      });
633
108
    }
89
    }
634
109
635
110
  }, {
90
  }, {
636
111
    ATTRS: {
91
    ATTRS: {
637
112
      datasource: {
92
      datasource: {
638
113
93
639
=== modified file 'app/templates/charm-search-result.handlebars'
640
--- app/templates/charm-search-result.handlebars	2012-10-19 01:44:45 +0000
641
+++ app/templates/charm-search-result.handlebars	2012-10-23 20:09:21 +0000
642
@@ -7,14 +7,11 @@
643
7
        {{#charms}}
7
        {{#charms}}
644
8
        <li class="charm-entry">
8
        <li class="charm-entry">
645
9
          <div>
9
          <div>
646
10
647
11
            <button class="btn btn-primary deploy"
10
            <button class="btn btn-primary deploy"
652
12
             data-url="{{baseId}}">Deploy</button>
11
             data-url="{{id}}">Deploy</button>
653
13
            <a class="charm-detail" href="{{baseId}}">
12
            <a class="charm-detail" href="{{id}}">
654
14
              {{#if owner}}{{owner}}/{{/if}}{{name}}</a>
13
              {{#if owner}}{{owner}}/{{/if}}{{package_name}}</a>
651
15
655
16
            <div class="charm-summary">{{summary}}</div>
14
            <div class="charm-summary">{{summary}}</div>
656
17
657
18
          </div>
15
          </div>
658
19
        </li>
16
        </li>
659
20
        {{/charms}}
17
        {{/charms}}
660
21
18
661
=== modified file 'app/views/charm-search.js'
662
--- app/views/charm-search.js	2012-10-19 01:53:03 +0000
663
+++ app/views/charm-search.js	2012-10-23 20:09:21 +0000
664
@@ -50,7 +50,8 @@
665
50
                self.set('resultEntries', charms);
50
                self.set('resultEntries', charms);
666
51
              },
51
              },
667
52
              failure: Y.bind(this._showErrors, this),
52
              failure: Y.bind(this._showErrors, this),
669
53
              defaultSeries: this.get('defaultSeries')
53
              defaultSeries: this.get('defaultSeries'),
670
54
              list: this.get('charms')
671
54
              });
55
              });
672
55
        }
56
        }
673
56
      });
57
      });
674
@@ -63,7 +64,8 @@
675
63
                self.set('defaultEntries', charms);
64
                self.set('defaultEntries', charms);
676
64
              },
65
              },
677
65
              failure: Y.bind(this._showErrors, this),
66
              failure: Y.bind(this._showErrors, this),
679
66
              defaultSeries: this.get('defaultSeries')
67
              defaultSeries: this.get('defaultSeries'),
680
68
              list: this.get('charms')
681
67
              });
69
              });
682
68
        }
70
        }
683
69
      });
71
      });
684
@@ -81,8 +83,17 @@
685
81
          searchText = this.get('searchText'),
83
          searchText = this.get('searchText'),
686
82
          defaultEntries = this.get('defaultEntries'),
84
          defaultEntries = this.get('defaultEntries'),
687
83
          resultEntries = this.get('resultEntries'),
85
          resultEntries = this.get('resultEntries'),
690
84
          entries = searchText ? resultEntries : defaultEntries;
86
          raw_entries = searchText ? resultEntries : defaultEntries,
691
85
      container.setHTML(this.template({charms: entries}));
87
          entries = raw_entries && raw_entries.map(
692
88
              function(data) {
693
89
                return {
694
90
                  series: data.series,
695
91
                  charms: data.charms.map(
696
92
                      function(charm) { return charm.getAttrs(); })
697
93
                };
698
94
              }
699
95
          );
700
96
      container.setHTML(this.template({ charms: entries }));
701
86
      return this;
97
      return this;
702
87
    },
98
    },
703
88
    showDetails: function(ev) {
99
    showDetails: function(ev) {
704
@@ -156,7 +167,7 @@
705
156
  views.CharmDescriptionView = CharmDescriptionView;
167
  views.CharmDescriptionView = CharmDescriptionView;
706
157
168
707
158
  var CharmConfigurationView = Y.Base.create(
169
  var CharmConfigurationView = Y.Base.create(
709
159
      'CharmCollectionView', Y.View, [views.JujuBaseView], {
170
      'CharmConfigurationView', Y.View, [views.JujuBaseView], {
710
160
        template: views.Templates['charm-pre-configuration'],
171
        template: views.Templates['charm-pre-configuration'],
711
161
        tooltip: null,
172
        tooltip: null,
712
162
        configFileContent: null,
173
        configFileContent: null,
713
@@ -399,7 +410,8 @@
714
399
        charmsSearchPanel = new CharmCollectionView(
410
        charmsSearchPanel = new CharmCollectionView(
715
400
              { container: charmsSearchPanelNode,
411
              { container: charmsSearchPanelNode,
716
401
                app: app,
412
                app: app,
718
402
                charmStore: charmStore }),
413
                charmStore: charmStore,
719
414
                charms: charms }),
720
403
        descriptionPanelNode = Y.Node.create(),
415
        descriptionPanelNode = Y.Node.create(),
721
404
        descriptionPanel = new CharmDescriptionView(
416
        descriptionPanel = new CharmDescriptionView(
722
405
              { container: descriptionPanelNode,
417
              { container: descriptionPanelNode,
723
@@ -432,15 +444,19 @@
724
432
        contentNode.append(panels[config.name].get('container'));
444
        contentNode.append(panels[config.name].get('container'));
725
433
        if (config.charmId) {
445
        if (config.charmId) {
726
434
          newPanel.set('model', null); // Clear out the old.
446
          newPanel.set('model', null); // Clear out the old.
736
435
          charms.loadOneByBaseId(
447
          var charm = charms.getById(config.charmId);
737
436
              config.charmId,
448
          if (charm.loaded) {
738
437
              { success: function(charm) {newPanel.set('model', charm);},
449
            newPanel.set('model', charm);
739
438
                failure: function(data) {
450
          } else {
740
439
                  console.log('error loading charm', data);
451
            charm.load(charmStore, function(err, response) {
741
440
                  newPanel.fire('changePanel', {name: 'charms'});
452
              if (err) {
742
441
                },
453
                console.log('error loading charm', response);
743
442
                charm_store: charmStore
454
                newPanel.fire('changePanel', {name: 'charms'});
744
443
              });
455
              } else {
745
456
                newPanel.set('model', charm);
746
457
              }
747
458
            });
748
459
          }
749
444
        } else { // This is the search panel.
460
        } else { // This is the search panel.
750
445
          newPanel.render();
461
          newPanel.render();
751
446
        }
462
        }
752
447
463
753
=== modified file 'test/data/search_results.json'
754
--- test/data/search_results.json	2012-10-19 01:44:45 +0000
755
+++ test/data/search_results.json	2012-10-23 20:09:21 +0000
756
@@ -1,63 +1,70 @@
757
1
{
1
{
758
2
  "matches": 7, 
2
  "matches": 7, 
760
3
  "charm_total": 466, 
3
  "charm_total": 469, 
761
4
  "results_size": 7, 
4
  "results_size": 7, 
763
5
  "search_time": 0.0011610984802246094, 
5
  "search_time": 0.001168966293334961, 
764
6
  "results": [
6
  "results": [
765
7
    {
7
    {
766
8
      "data_url": "/charms/precise/cassandra/json", 
8
      "data_url": "/charms/precise/cassandra/json", 
767
9
      "name": "cassandra", 
9
      "name": "cassandra", 
768
10
      "store_url": "cs:precise/cassandra-2", 
769
10
      "series": "precise", 
11
      "series": "precise", 
770
11
      "summary": "distributed storage system for structured data", 
12
      "summary": "distributed storage system for structured data", 
772
12
      "relevance": 29.552706339212623, 
13
      "relevance": 29.58930787782692, 
773
13
      "owner": "charmers"
14
      "owner": "charmers"
774
14
    }, 
15
    }, 
775
15
    {
16
    {
776
16
      "data_url": "/charms/oneiric/cassandra/json", 
17
      "data_url": "/charms/oneiric/cassandra/json", 
777
17
      "name": "cassandra", 
18
      "name": "cassandra", 
778
19
      "store_url": "cs:~charmers/oneiric/cassandra-0", 
779
18
      "series": "oneiric", 
20
      "series": "oneiric", 
780
19
      "summary": "distributed storage system for structured data", 
21
      "summary": "distributed storage system for structured data", 
782
20
      "relevance": 29.429741180715094, 
22
      "relevance": 29.46580425464922, 
783
21
      "owner": "charmers"
23
      "owner": "charmers"
784
22
    }, 
24
    }, 
785
23
    {
25
    {
786
24
      "data_url": "/~jjo/precise/cassandra/json", 
26
      "data_url": "/~jjo/precise/cassandra/json", 
787
25
      "name": "cassandra", 
27
      "name": "cassandra", 
788
28
      "store_url": "cs:~jjo/precise/cassandra-12", 
789
26
      "series": "precise", 
29
      "series": "precise", 
790
27
      "summary": "distributed storage system for structured data", 
30
      "summary": "distributed storage system for structured data", 
792
28
      "relevance": 28.060048153642214, 
31
      "relevance": 28.090375175505876, 
793
29
      "owner": "jjo"
32
      "owner": "jjo"
794
30
    }, 
33
    }, 
795
31
    {
34
    {
796
32
      "data_url": "/~ev/precise/errors/json", 
35
      "data_url": "/~ev/precise/errors/json", 
797
33
      "name": "errors", 
36
      "name": "errors", 
798
37
      "store_url": "cs:~ev/precise/errors-0", 
799
34
      "series": "precise", 
38
      "series": "precise", 
800
35
      "summary": "https://errors.ubuntu.com", 
39
      "summary": "https://errors.ubuntu.com", 
802
36
      "relevance": 13.168754948011127, 
40
      "relevance": 13.18957931651269, 
803
37
      "owner": "ev"
41
      "owner": "ev"
804
38
    }, 
42
    }, 
805
39
    {
43
    {
806
40
      "data_url": "/~ev/precise/daisy/json", 
44
      "data_url": "/~ev/precise/daisy/json", 
807
41
      "name": "daisy", 
45
      "name": "daisy", 
808
46
      "store_url": "cs:~ev/precise/daisy-15", 
809
42
      "series": "precise", 
47
      "series": "precise", 
810
43
      "summary": "Daisy error reporting server", 
48
      "summary": "Daisy error reporting server", 
812
44
      "relevance": 12.721871518319244, 
49
      "relevance": 12.767880577035612, 
813
45
      "owner": "ev"
50
      "owner": "ev"
814
46
    }, 
51
    }, 
815
47
    {
52
    {
816
48
      "data_url": "/~ev/precise/daisy-retracer/json", 
53
      "data_url": "/~ev/precise/daisy-retracer/json", 
817
49
      "name": "daisy-retracer", 
54
      "name": "daisy-retracer", 
818
55
      "store_url": "cs:~ev/precise/daisy-retracer-8", 
819
50
      "series": "precise", 
56
      "series": "precise", 
820
51
      "summary": "Daisy error reporting server retracer", 
57
      "summary": "Daisy error reporting server retracer", 
822
52
      "relevance": 12.662102672474589, 
58
      "relevance": 12.539732674900428, 
823
53
      "owner": "ev"
59
      "owner": "ev"
824
54
    }, 
60
    }, 
825
55
    {
61
    {
826
56
      "data_url": "/~negronjl/oneiric/cassandra/json", 
62
      "data_url": "/~negronjl/oneiric/cassandra/json", 
827
57
      "name": "cassandra", 
63
      "name": "cassandra", 
828
64
      "store_url": "cs:~negronjl/oneiric/cassandra-0", 
829
58
      "series": "oneiric", 
65
      "series": "oneiric", 
830
59
      "summary": "distributed storage system for structured data", 
66
      "summary": "distributed storage system for structured data", 
832
60
      "relevance": 30.40622159052724, 
67
      "relevance": 30.451103781408868, 
833
61
      "owner": "negronjl"
68
      "owner": "negronjl"
834
62
    }
69
    }
835
63
  ]
70
  ]
836
64
71
837
=== modified file 'test/data/series_search_results.json'
838
--- test/data/series_search_results.json	2012-10-19 01:44:45 +0000
839
+++ test/data/series_search_results.json	2012-10-23 20:09:21 +0000
840
@@ -1,12 +1,13 @@
841
1
{
1
{
842
2
  "matches": 5, 
2
  "matches": 5, 
844
3
  "charm_total": 466, 
3
  "charm_total": 469, 
845
4
  "results_size": 5, 
4
  "results_size": 5, 
847
5
  "search_time": 0.0008029937744140625, 
5
  "search_time": 0.0007879734039306641, 
848
6
  "results": [
6
  "results": [
849
7
    {
7
    {
850
8
      "data_url": "/charms/quantal/glance/json", 
8
      "data_url": "/charms/quantal/glance/json", 
851
9
      "name": "glance", 
9
      "name": "glance", 
852
10
      "store_url": "cs:~charmers/quantal/glance-2", 
853
10
      "series": "quantal", 
11
      "series": "quantal", 
854
11
      "summary": "OpenStack Image Registry and Delivery Service", 
12
      "summary": "OpenStack Image Registry and Delivery Service", 
855
12
      "relevance": 0.0, 
13
      "relevance": 0.0, 
856
@@ -15,6 +16,7 @@
857
15
    {
16
    {
858
16
      "data_url": "/charms/quantal/nova-cloud-controller/json", 
17
      "data_url": "/charms/quantal/nova-cloud-controller/json", 
859
17
      "name": "nova-cloud-controller", 
18
      "name": "nova-cloud-controller", 
860
19
      "store_url": "cs:~charmers/quantal/nova-cloud-controller-1", 
861
18
      "series": "quantal", 
20
      "series": "quantal", 
862
19
      "summary": "Openstack nova controller node.", 
21
      "summary": "Openstack nova controller node.", 
863
20
      "relevance": 0.0, 
22
      "relevance": 0.0, 
864
@@ -23,6 +25,7 @@
865
23
    {
25
    {
866
24
      "data_url": "/charms/quantal/nova-volume/json", 
26
      "data_url": "/charms/quantal/nova-volume/json", 
867
25
      "name": "nova-volume", 
27
      "name": "nova-volume", 
868
28
      "store_url": "cs:~charmers/quantal/nova-volume-0", 
869
26
      "series": "quantal", 
29
      "series": "quantal", 
870
27
      "summary": "OpenStack Compute - storage", 
30
      "summary": "OpenStack Compute - storage", 
871
28
      "relevance": 0.0, 
31
      "relevance": 0.0, 
872
@@ -31,6 +34,7 @@
873
31
    {
34
    {
874
32
      "data_url": "/charms/quantal/nova-compute/json", 
35
      "data_url": "/charms/quantal/nova-compute/json", 
875
33
      "name": "nova-compute", 
36
      "name": "nova-compute", 
876
37
      "store_url": "cs:~charmers/quantal/nova-compute-1", 
877
34
      "series": "quantal", 
38
      "series": "quantal", 
878
35
      "summary": "OpenStack compute", 
39
      "summary": "OpenStack compute", 
879
36
      "relevance": 0.0, 
40
      "relevance": 0.0, 
880
@@ -39,6 +43,7 @@
881
39
    {
43
    {
882
40
      "data_url": "/charms/quantal/nyancat/json", 
44
      "data_url": "/charms/quantal/nyancat/json", 
883
41
      "name": "nyancat", 
45
      "name": "nyancat", 
884
46
      "store_url": "cs:~charmers/quantal/nyancat-0", 
885
42
      "series": "quantal", 
47
      "series": "quantal", 
886
43
      "summary": "Nyancat telnet server", 
48
      "summary": "Nyancat telnet server", 
887
44
      "relevance": 0.0, 
49
      "relevance": 0.0, 
888
45
50
889
=== modified file 'test/test_app.js'
890
--- test/test_app.js	2012-10-19 01:53:03 +0000
891
+++ test/test_app.js	2012-10-23 20:09:21 +0000
892
@@ -88,7 +88,7 @@
893
88
88
894
89
    // charms also require a mapping but only a name, not a function
89
    // charms also require a mapping but only a name, not a function
895
90
    app.getModelURL(wp_charm).should.equal(
90
    app.getModelURL(wp_charm).should.equal(
897
91
        '/charms/charms/precise/wordpress/json');
91
        '/charms/charms/precise/wordpress-6/json');
898
92
  });
92
  });
899
93
93
900
94
  it('should display the configured environment name', function() {
94
  it('should display the configured environment name', function() {
901
95
95
902
=== modified file 'test/test_charm_configuration.js'
903
--- test/test_charm_configuration.js	2012-10-20 18:17:23 +0000
904
+++ test/test_charm_configuration.js	2012-10-23 20:09:21 +0000
905
@@ -91,7 +91,7 @@
906
91
          received_charm_url = charm_url;
91
          received_charm_url = charm_url;
907
92
          received_service_name = service_name;
92
          received_service_name = service_name;
908
93
        }},
93
        }},
910
94
        charm = new models.Charm({id: 'precise/mysql-7'}),
94
        charm = new models.Charm({id: 'cs:precise/mysql-7'}),
911
95
        view = new views.CharmConfigurationView(
95
        view = new views.CharmConfigurationView(
912
96
        { container: container,
96
        { container: container,
913
97
          model: charm,
97
          model: charm,
914
@@ -119,7 +119,7 @@
915
119
            received_config = config;
119
            received_config = config;
916
120
            received_num_units = num_units;
120
            received_num_units = num_units;
917
121
          }},
121
          }},
919
122
        charm = new models.Charm({id: 'precise/mysql-7'}),
122
        charm = new models.Charm({id: 'cs:precise/mysql-7'}),
920
123
        view = new views.CharmConfigurationView(
123
        view = new views.CharmConfigurationView(
921
124
        { container: container,
124
        { container: container,
922
125
          model: charm,
125
          model: charm,
923
126
126
924
=== modified file 'test/test_charm_search.js'
925
--- test/test_charm_search.js	2012-10-19 01:53:03 +0000
926
+++ test/test_charm_search.js	2012-10-23 20:09:21 +0000
927
@@ -5,7 +5,7 @@
928
5
      searchResult = '{"results": [{"data_url": "this is my URL", ' +
5
      searchResult = '{"results": [{"data_url": "this is my URL", ' +
929
6
      '"name": "membase", "series": "precise", "summary": ' +
6
      '"name": "membase", "series": "precise", "summary": ' +
930
7
      '"Membase Server", "relevance": 8.728194117350437, ' +
7
      '"Membase Server", "relevance": 8.728194117350437, ' +
932
8
      '"owner": "charmers"}]}';
8
      '"owner": "charmers", "store_url": "cs:precise/membase-6"}]}';
933
9
9
934
10
  before(function(done) {
10
  before(function(done) {
935
11
    Y = YUI(GlobalConfig).use(
11
    Y = YUI(GlobalConfig).use(
936
@@ -85,7 +85,7 @@
937
85
85
938
86
    searchTriggered.should.equal(true);
86
    searchTriggered.should.equal(true);
939
87
    node.one('.charm-entry .btn.deploy').getData('url').should.equal(
87
    node.one('.charm-entry .btn.deploy').getData('url').should.equal(
941
88
        'cs:precise/membase');
88
        'cs:precise/membase-6');
942
89
  });
89
  });
943
90
90
944
91
  it('must be able to trigger charm details', function() {
91
  it('must be able to trigger charm details', function() {
945
@@ -107,7 +107,7 @@
946
107
          testing: true
107
          testing: true
947
108
        }),
108
        }),
948
109
        node = panel.node;
109
        node = panel.node;
950
110
    db.charms.add({id: 'cs:precise/membase'});
110
    db.charms.add({id: 'cs:precise/membase-6'});
951
111
111
952
112
    panel.show();
112
    panel.show();
953
113
    var field = Y.one('#charm-search-field');
113
    var field = Y.one('#charm-search-field');
954
@@ -138,7 +138,7 @@
955
138
              testing: true
138
              testing: true
956
139
            }),
139
            }),
957
140
            node = panel.node,
140
            node = panel.node,
959
141
            charm = db.charms.add({id: 'cs:precise/membase'});
141
            charm = db.charms.add({id: 'cs:precise/membase-6'});
960
142
        charm.loaded = true;
142
        charm.loaded = true;
961
143
        panel.show();
143
        panel.show();
962
144
        var field = Y.one('#charm-search-field');
144
        var field = Y.one('#charm-search-field');
963
145
145
964
=== modified file 'test/test_charm_store.js'
965
--- test/test_charm_store.js	2012-10-19 01:53:03 +0000
966
+++ test/test_charm_store.js	2012-10-23 20:09:21 +0000
967
@@ -8,9 +8,10 @@
968
8
    before(function(done) {
8
    before(function(done) {
969
9
      Y = YUI(GlobalConfig).use(
9
      Y = YUI(GlobalConfig).use(
970
10
          'datasource-local', 'json-stringify', 'juju-charm-store',
10
          'datasource-local', 'json-stringify', 'juju-charm-store',
972
11
          'datasource-io', 'io', 'array-extras',
11
          'datasource-io', 'io', 'array-extras', 'juju-charm-models',
973
12
          function(Y) {
12
          function(Y) {
974
13
            juju = Y.namespace('juju');
13
            juju = Y.namespace('juju');
975
14
            models = Y.namespace('juju.models');
976
14
            done();
15
            done();
977
15
          });
16
          });
978
16
    });
17
    });
979
@@ -108,19 +109,20 @@
980
108
            results.length.should.equal(2);
109
            results.length.should.equal(2);
981
109
            results[0].series.should.equal('precise');
110
            results[0].series.should.equal('precise');
982
110
            Y.Array.map(results[0].charms, function(charm) {
111
            Y.Array.map(results[0].charms, function(charm) {
985
111
              return charm.owner;
112
              return charm.get('owner');
986
112
            }).should.eql([null, 'jjo', 'ev', 'ev', 'ev']);
113
            }).should.eql([undefined, 'jjo', 'ev', 'ev', 'ev']);
987
113
            Y.Array.map(results[0].charms, function(charm) {
114
            Y.Array.map(results[0].charms, function(charm) {
989
114
              return charm.baseId;
115
              return charm.get('id');
990
115
            }).should.eql([
116
            }).should.eql([
996
116
              'cs:precise/cassandra',
117
              'cs:precise/cassandra-2',
997
117
              'cs:~jjo/precise/cassandra',
118
              'cs:~jjo/precise/cassandra-12',
998
118
              'cs:~ev/precise/errors',
119
              'cs:~ev/precise/errors-0',
999
119
              'cs:~ev/precise/daisy',
120
              'cs:~ev/precise/daisy-15',
1000
120
              'cs:~ev/precise/daisy-retracer']);
121
              'cs:~ev/precise/daisy-retracer-8']);
1001
121
            done();
122
            done();
1002
122
          },
123
          },
1004
123
          failure: assert.fail
124
          failure: assert.fail,
1005
125
          list: new models.CharmList()
1006
124
          });
126
          });
1007
125
    });
127
    });
1008
126
128
1009
@@ -135,7 +137,8 @@
1010
135
              results[0].series.should.equal('oneiric');
137
              results[0].series.should.equal('oneiric');
1011
136
              done();
138
              done();
1012
137
            },
139
            },
1014
138
            failure: assert.fail
140
            failure: assert.fail,
1015
141
            list: new models.CharmList()
1016
139
          });
142
          });
1017
140
    });
143
    });
1018
141
144
1019
@@ -149,7 +152,7 @@
1020
149
            results.length.should.equal(1);
152
            results.length.should.equal(1);
1021
150
            results[0].series.should.equal('quantal');
153
            results[0].series.should.equal('quantal');
1022
151
            Y.Array.map(results[0].charms, function(charm) {
154
            Y.Array.map(results[0].charms, function(charm) {
1024
152
              return charm.name;
155
              return charm.get('package_name');
1025
153
            }).should.eql([
156
            }).should.eql([
1026
154
              'glance',
157
              'glance',
1027
155
              'nova-cloud-controller',
158
              'nova-cloud-controller',
1028
@@ -158,9 +161,9 @@
1029
158
              'nyancat']);
161
              'nyancat']);
1030
159
            done();
162
            done();
1031
160
          },
163
          },
1033
161
          failure: assert.fail
164
          failure: assert.fail,
1034
165
          list: new models.CharmList()
1035
162
          });
166
          });
1036
163
    });
167
    });
1037
164
1038
165
  });
168
  });
1039
166
})();
169
})();
1040
167
170
1041
=== modified file 'test/test_model.js'
1042
--- test/test_model.js	2012-10-19 01:53:03 +0000
1043
+++ test/test_model.js	2012-10-23 20:09:21 +0000
1044
@@ -19,56 +19,19 @@
1045
19
      var _ = expect(charm.get('owner')).to.not.exist;
19
      var _ = expect(charm.get('owner')).to.not.exist;
1046
20
      charm.get('full_name').should.equal('precise/openstack-dashboard');
20
      charm.get('full_name').should.equal('precise/openstack-dashboard');
1047
21
      charm.get('charm_store_path').should.equal(
21
      charm.get('charm_store_path').should.equal(
1049
22
          'charms/precise/openstack-dashboard/json');
22
          'charms/precise/openstack-dashboard-0/json');
1050
23
    });
23
    });
1051
24
24
1052
25
    it('must convert timestamps into time objects', function() {
25
    it('must convert timestamps into time objects', function() {
1053
26
      var time = 1349797266.032,
26
      var time = 1349797266.032,
1054
27
          date = new Date(time),
27
          date = new Date(time),
1055
28
          charm = new models.Charm(
28
          charm = new models.Charm(
1057
29
          { id: 'precise/foo', last_change: {created: time / 1000} });
29
          { id: 'cs:precise/foo-9', last_change: {created: time / 1000} });
1058
30
      charm.get('last_change').created.should.eql(date);
30
      charm.get('last_change').created.should.eql(date);
1059
31
    });
31
    });
1060
32
32
1061
33
  });
33
  });
1062
34
34
1063
35
  describe('charm id helper functions', function() {
1064
36
    var Y, models;
1065
37
1066
38
    before(function(done) {
1067
39
      Y = YUI(GlobalConfig).use('juju-models', function(Y) {
1068
40
            models = Y.namespace('juju.models');
1069
41
            done();
1070
42
      });
1071
43
    });
1072
44
1073
45
    it('must parse fully qualified names', function() {
1074
46
      // undefined never equals undefined.
1075
47
      var res = models.parse_charm_id('cs:precise/openstack-dashboard-0');
1076
48
      res.scheme.should.equal('cs');
1077
49
      var _ = expect(res.owner).to.not.exist;
1078
50
      res.series.should.equal('precise');
1079
51
      res.package_name.should.equal('openstack-dashboard');
1080
52
      res.revision.should.equal('0');
1081
53
    });
1082
54
1083
55
    it('must parse names without revisions', function() {
1084
56
      var res = models.parse_charm_id('cs:precise/openstack-dashboard'),
1085
57
          _ = expect(res.revision).to.not.exist;
1086
58
    });
1087
59
1088
60
    it('must parse fully qualified names with owners', function() {
1089
61
      models.parse_charm_id('cs:~bac/precise/openstack-dashboard-0').owner
1090
62
        .should.equal('bac');
1091
63
    });
1092
64
1093
65
    it('must parse fully qualified names with hyphenated owners', function() {
1094
66
      models.parse_charm_id('cs:~alt-bac/precise/openstack-dashboard-0').owner
1095
67
        .should.equal('alt-bac');
1096
68
    });
1097
69
1098
70
  });
1099
71
1100
72
  describe('juju models', function() {
35
  describe('juju models', function() {
1101
73
    var Y, models;
36
    var Y, models;
1102
74
37
1103
@@ -81,15 +44,16 @@
1104
81
44
1105
82
    it('must be able to create charm', function() {
45
    it('must be able to create charm', function() {
1106
83
      var charm = new models.Charm(
46
      var charm = new models.Charm(
1108
84
          {id: 'cs:~bac/precise/openstack-dashboard-0'});
47
          {id: 'cs:~alt-bac/precise/openstack-dashboard-0'});
1109
85
      charm.get('scheme').should.equal('cs');
48
      charm.get('scheme').should.equal('cs');
1111
86
      charm.get('owner').should.equal('bac');
49
      charm.get('owner').should.equal('alt-bac');
1112
87
      charm.get('series').should.equal('precise');
50
      charm.get('series').should.equal('precise');
1113
88
      charm.get('package_name').should.equal('openstack-dashboard');
51
      charm.get('package_name').should.equal('openstack-dashboard');
1114
89
      charm.get('revision').should.equal(0);
52
      charm.get('revision').should.equal(0);
1116
90
      charm.get('full_name').should.equal('~bac/precise/openstack-dashboard');
53
      charm.get('full_name').should.equal(
1117
54
          '~alt-bac/precise/openstack-dashboard');
1118
91
      charm.get('charm_store_path').should.equal(
55
      charm.get('charm_store_path').should.equal(
1120
92
          '~bac/precise/openstack-dashboard/json');
56
          '~alt-bac/precise/openstack-dashboard-0/json');
1121
93
    });
57
    });
1122
94
58
1123
95
    it('must be able to parse real-world charm names', function() {
59
    it('must be able to parse real-world charm names', function() {
1124
@@ -97,7 +61,12 @@
1125
97
      charm.get('full_name').should.equal('precise/openstack-dashboard');
61
      charm.get('full_name').should.equal('precise/openstack-dashboard');
1126
98
      charm.get('package_name').should.equal('openstack-dashboard');
62
      charm.get('package_name').should.equal('openstack-dashboard');
1127
99
      charm.get('charm_store_path').should.equal(
63
      charm.get('charm_store_path').should.equal(
1129
100
          'charms/precise/openstack-dashboard/json');
64
          'charms/precise/openstack-dashboard-0/json');
1130
65
      charm.get('scheme').should.equal('cs');
1131
66
      var _ = expect(charm.get('owner')).to.not.exist;
1132
67
      charm.get('series').should.equal('precise');
1133
68
      charm.get('package_name').should.equal('openstack-dashboard');
1134
69
      charm.get('revision').should.equal(0);
1135
101
    });
70
    });
1136
102
71
1137
103
    it('must be able to parse individually owned charms', function() {
72
    it('must be able to parse individually owned charms', function() {
1138
@@ -108,14 +77,28 @@
1139
108
      charm.get('full_name').should.equal('~marco-ceppi/precise/wordpress');
77
      charm.get('full_name').should.equal('~marco-ceppi/precise/wordpress');
1140
109
      charm.get('package_name').should.equal('wordpress');
78
      charm.get('package_name').should.equal('wordpress');
1141
110
      charm.get('charm_store_path').should.equal(
79
      charm.get('charm_store_path').should.equal(
1143
111
          '~marco-ceppi/precise/wordpress/json');
80
          '~marco-ceppi/precise/wordpress-17/json');
1144
81
      charm.get('revision').should.equal(17);
1145
112
    });
82
    });
1146
113
83
1147
114
    it('must reject bad charm ids.', function() {
84
    it('must reject bad charm ids.', function() {
1152
115
      var charm = new models.Charm({id: 'foobar'});
85
      try {
1153
116
      var _ = expect(charm.get('id')).to.not.exist;
86
        var charm = new models.Charm({id: 'foobar'});
1154
117
      charm.set('id', 'barfoo');
87
        assert.fail('Should have thrown an error');
1155
118
      _ = expect(charm.get('id')).to.not.exist;
88
      } catch (e) {
1156
89
        e.should.equal(
1157
90
            'Developers must initialize charms with a well-formed id.');
1158
91
      }
1159
92
    });
1160
93
1161
94
    it('must reject missing charm ids at initialization.', function() {
1162
95
      try {
1163
96
        var charm = new models.Charm();
1164
97
        assert.fail('Should have thrown an error');
1165
98
      } catch (e) {
1166
99
        e.should.equal(
1167
100
            'Developers must initialize charms with a well-formed id.');
1168
101
      }
1169
119
    });
102
    });
1170
120
103
1171
121
    it('must be able to create charm list', function() {
104
    it('must be able to create charm list', function() {
1172
@@ -403,7 +386,7 @@
1173
403
    });
386
    });
1174
404
387
1175
405
    it('will throw an exception with non-read sync', function() {
388
    it('will throw an exception with non-read sync', function() {
1177
406
      var charm = new models.Charm({id: 'local:precise/foo'});
389
      var charm = new models.Charm({id: 'local:precise/foo-4'});
1178
407
      try {
390
      try {
1179
408
        charm.sync('create');
391
        charm.sync('create');
1180
409
        assert.fail('Should have thrown an error');
392
        assert.fail('Should have thrown an error');
1181
@@ -424,39 +407,40 @@
1182
424
      }
407
      }
1183
425
    });
408
    });
1184
426
409
1209
427
    it('throws an error if you do not pass a get_charm function', function() {
410
    it('throws an error if you do not pass get_charm or loadByPath function',
1210
428
      var charm = new models.Charm({id: 'local:precise/foo'});
411
       function() {
1211
429
      try {
412
         var charm = new models.Charm({id: 'local:precise/foo-4'});
1212
430
        charm.sync('read', {});
413
         try {
1213
431
        assert.fail('Should have thrown an error');
414
           charm.sync('read', {});
1214
432
      } catch (e) {
415
           assert.fail('Should have thrown an error');
1215
433
        e.should.equal(
416
         } catch (e) {
1216
434
            'You must supply a get_charm function.');
417
           e.should.equal(
1217
435
      }
418
           'You must supply a get_charm or loadByPath function.');
1218
436
      try {
419
         }
1219
437
        charm.sync('read', {env: 42});
420
         try {
1220
438
        assert.fail('Should have thrown an error');
421
           charm.sync('read', {env: 42});
1221
439
      } catch (e) {
422
           assert.fail('Should have thrown an error');
1222
440
        e.should.equal(
423
         } catch (e) {
1223
441
            'You must supply a get_charm function.');
424
           e.should.equal(
1224
442
      }
425
           'You must supply a get_charm or loadByPath function.');
1225
443
      try {
426
         }
1226
444
        charm.sync('read', {charm_store: 42});
427
         try {
1227
445
        assert.fail('Should have thrown an error');
428
           charm.sync('read', {charm_store: 42});
1228
446
      } catch (e) {
429
           assert.fail('Should have thrown an error');
1229
447
        e.should.equal(
430
         } catch (e) {
1230
448
            'You must supply a get_charm function.');
431
           e.should.equal(
1231
449
      }
432
           'You must supply a get_charm or loadByPath function.');
1232
450
    });
433
         }
1233
434
       });
1234
451
435
1235
452
    it('must send request to juju environment for local charms', function() {
436
    it('must send request to juju environment for local charms', function() {
1237
453
      var charm = new models.Charm({id: 'local:precise/foo'}).load(env);
437
      var charm = new models.Charm({id: 'local:precise/foo-4'}).load(env);
1238
454
      assert(!charm.loaded);
438
      assert(!charm.loaded);
1239
455
      conn.last_message().op.should.equal('get_charm');
439
      conn.last_message().op.should.equal('get_charm');
1240
456
    });
440
    });
1241
457
441
1242
458
    it('must handle success from local charm request', function(done) {
442
    it('must handle success from local charm request', function(done) {
1244
459
      var charm = new models.Charm({id: 'local:precise/foo'}).load(
443
      var charm = new models.Charm({id: 'local:precise/foo-4'}).load(
1245
460
          env,
444
          env,
1246
461
          function(err, response) {
445
          function(err, response) {
1247
462
            assert(!err);
446
            assert(!err);
1248
@@ -471,7 +455,7 @@
1249
471
    });
455
    });
1250
472
456
1251
473
    it('must handle failure from local charm request', function(done) {
457
    it('must handle failure from local charm request', function(done) {
1253
474
      var charm = new models.Charm({id: 'local:precise/foo'}).load(
458
      var charm = new models.Charm({id: 'local:precise/foo-4'}).load(
1254
475
          env,
459
          env,
1255
476
          function(err, response) {
460
          function(err, response) {
1256
477
            assert(err);
461
            assert(err);
1257
@@ -490,22 +474,18 @@
1258
490
          { responseText: Y.JSON.stringify(
474
          { responseText: Y.JSON.stringify(
1259
491
          { summary: 'wowza', subordinate: true, store_revision: 7 })});
475
          { summary: 'wowza', subordinate: true, store_revision: 7 })});
1260
492
476
1265
493
      var list = new models.CharmList();
477
      var charm = new models.Charm({id: 'cs:precise/foo-7'});
1266
494
      list.loadOneByBaseId(
478
      charm.load(
1267
495
          'cs:precise/foo',
479
          charm_store,
1268
496
          { success: function(charm) {
480
          function(err, data) {
1269
481
            if (err) { assert.fail('should succeed!'); }
1270
497
            assert(charm.loaded);
482
            assert(charm.loaded);
1271
498
            charm.get('summary').should.equal('wowza');
483
            charm.get('summary').should.equal('wowza');
1272
499
            charm.get('is_subordinate').should.equal(true);
484
            charm.get('is_subordinate').should.equal(true);
1273
500
            charm.get('scheme').should.equal('cs');
485
            charm.get('scheme').should.equal('cs');
1274
501
            charm.get('revision').should.equal(7);
486
            charm.get('revision').should.equal(7);
1275
502
            charm.get('id').should.equal('cs:precise/foo-7');
487
            charm.get('id').should.equal('cs:precise/foo-7');
1276
503
            list.getById('cs:precise/foo-7').should.equal(charm);
1277
504
            list.getOneByBaseId('cs:precise/foo').should.equal(charm);
1278
505
            done();
488
            done();
1279
506
          },
1280
507
          failure: assert.fail,
1281
508
          charm_store: charm_store
1282
509
          });
489
          });
1283
510
    });
490
    });
1284
511
491
1285
@@ -521,15 +501,14 @@
1286
521
        original.apply(datasource, [e]);
501
        original.apply(datasource, [e]);
1287
522
      };
502
      };
1288
523
      data.push({responseText: Y.JSON.stringify({darn_it: 'uh oh!'})});
503
      data.push({responseText: Y.JSON.stringify({darn_it: 'uh oh!'})});
1298
524
      list.loadOneByBaseId(
504
      var charm = new models.Charm({id: 'cs:precise/foo-7'});
1299
525
          'cs:precise/foo',
505
      charm.load(
1300
526
          { success: assert.fail,
506
          charm_store,
1301
527
            failure: function(err) {
507
          function(err, data) {
1302
528
              var _ = expect(list.getOneByBaseId('cs:precise/foo'))
508
            if (!err) {
1303
529
                .to.not.exist;
509
              assert.fail('should fail!');
1304
530
              done();
510
            }
1305
531
            },
511
            done();
1297
532
            charm_store: charm_store
1306
533
          });
512
          });
1307
534
    });
513
    });
1308
535
514
1309
536
515
1310
=== modified file 'test/test_service_view.js'
1311
--- test/test_service_view.js	2012-10-12 18:27:36 +0000
1312
+++ test/test_service_view.js	2012-10-23 20:09:21 +0000
1313
@@ -30,7 +30,7 @@
1314
30
      app = { env: env, db: db,
30
      app = { env: env, db: db,
1315
31
              getModelURL: function(model, intent) {
31
              getModelURL: function(model, intent) {
1316
32
                return model.get('name'); }};
32
                return model.get('name'); }};
1318
33
      charm = new models.Charm({id: 'cs:precise/mysql',
33
      charm = new models.Charm({id: 'cs:precise/mysql-5',
1319
34
        description: 'A DB'});
34
        description: 'A DB'});
1320
35
      db.charms.add([charm]);
35
      db.charms.add([charm]);
1321
36
      // Add units sorted by id as that is what we expect from the server.
36
      // Add units sorted by id as that is what we expect from the server.
1322
@@ -40,7 +40,7 @@
1323
40
          ]);
40
          ]);
1324
41
      service = new models.Service({
41
      service = new models.Service({
1325
42
        id: 'mysql',
42
        id: 'mysql',
1327
43
        charm: 'cs:precise/mysql',
43
        charm: 'cs:precise/mysql-5',
1328
44
        unit_count: db.units.size(),
44
        unit_count: db.units.size(),
1329
45
        exposed: false});
45
        exposed: false});
1330
46
46
Status:	Merged
Merged at revision:	206
Proposed branch:	lp:~gary/juju-gui/simplifycharmstore
Merge into:	lp:juju-gui/experimental
Diff against target:	1329 lines (+365/-462) 14 files modified app/app.js (+2/-1) app/models/charm.js (+172/-259) app/modules.js (+3/-1) app/store/charm.js (+31/-51) app/templates/charm-search-result.handlebars (+3/-6) app/views/charm-search.js (+31/-15) test/data/search_results.json (+16/-9) test/data/series_search_results.json (+7/-2) test/test_app.js (+1/-1) test/test_charm_configuration.js (+2/-2) test/test_charm_search.js (+4/-4) test/test_charm_store.js (+17/-14) test/test_model.js (+74/-95) test/test_service_view.js (+2/-2)
To merge this branch:	bzr merge lp:~gary/juju-gui/simplifycharmstore
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Juju GUI Hackers		2012-10-23	Pending
Review via email: mp+131086@code.launchpad.net