Merge lp:~rharding/juju-gui/api0 into lp:juju-gui/experimental

[Richard Harding]

TBD

Unmerged revisions

416. By Richard Harding on 2013-03-05

Start to work on the api calls for the charmstore

415. By Richard Harding on 2013-03-04

Fix the broken stuff

414. By Richard Harding on 2013-03-04

Working on model code

413. By Richard Harding on 2013-03-04

start to work on model resolution

=== modified file 'app/models/charm.js'
--- app/models/charm.js	2013-03-11 13:51:08 +0000
+++ app/models/charm.js	2013-03-20 14:43:53 +0000
@@ -1,3 +1,4 @@
+/*global YUI:false*/
 'use strict';
 
 /**
@@ -10,6 +11,7 @@
 YUI.add('juju-charm-models', function(Y) {
 
   var models = Y.namespace('juju.models');
+  // Check on the idea of the id.
   var charmIdRe = /^(?:(\w+):)?(?:~(\S+)\/)?(\w+)\/(\S+?)-(\d+)$/;
   var idElements = ['scheme', 'owner', 'series', 'package_name', 'revision'];
   var simpleCharmIdRe = /^(?:(\w+):)?(?!:~)(\w+)$/;
@@ -80,13 +82,20 @@
 
     initializer: function() {
       var id = this.get('id'),
+<<<<<<< TREE
               parts = parseCharmId(id),
               self = this;
       if (!parts) {
+=======
+          parts = id && charmIdRe.exec(id),
+          self = this;
+      if (!Y.Lang.isValue(id) || !parts) {
+>>>>>>> MERGE-SOURCE
         throw 'Developers must initialize charms with a well-formed id.';
       }
       this.loaded = false;
       this.on('load', function() { this.loaded = true; });
+<<<<<<< TREE
       Y.Object.each(
           parts,
           function(value, key) { self.set(key, value); });
@@ -97,6 +106,16 @@
         tmp.unshift('~' + owner);
       }
       this.set('full_name', tmp.join('/'));
+=======
+      parts.shift();
+      var attrs = Y.Array.zip(idElements, parts);
+      Y.each(
+          attrs,
+          function(pair) {
+            self.set(pair[0], pair[1]);
+          }
+      );
+>>>>>>> MERGE-SOURCE
     },
 
     sync: function(action, options, callback) {
@@ -120,25 +139,25 @@
               }
             }
         );
-      } else if (Y.Lang.isValue(options.loadByPath)) {
+      } else if (Y.Lang.isValue(options.charm)) {
         // This is a charm store.
-        options.loadByPath(
-            this.get('charm_store_path'),
-            { success: function(response) {
+        options.charm(
+          this.get('charm_store_path'), {
+            success: function(response) {
               callback(false, response);
             },
             failure: function(response) {
               callback(true, response);
             }
-            });
+        });
       } else {
-        throw 'You must supply a get_charm or loadByPath function.';
+        throw 'You must supply a CharmStore.charm or loadByPath function.';
       }
     },
 
     parse: function() {
       var data = Charm.superclass.parse.apply(this, arguments),
-              self = this;
+          self = this;
       data.is_subordinate = data.subordinate;
       Y.each(data, function(value, key) {
         if (!value ||
@@ -157,7 +176,7 @@
       // Official charms sort before owned charms.
       // If !X.owner, that means it is owned by charmers.
       var owner = this.get('owner'),
-              otherOwner = other.get('owner');
+          otherOwner = other.get('owner');
       if (!owner && otherOwner) {
         return -1;
       } else if (owner && !otherOwner) {
@@ -183,11 +202,33 @@
           return Y.Lang.isString(val) && !!charmIdRe.exec(val);
         }
       },
-      bzr_branch: {writeOnce: true},
-      charm_store_path: {writeOnce: true},
+      charm_store_path: {
+        getter: function () {
+          // charm_store_path
+          var owner = this.get('owner');
+          return [
+            (owner ? '~' + owner : 'charms'),
+            this.get('series'),
+            (this.get('package_name') + '-' + this.get('revision')),
+            'json'
+          ].join('/');
+        },
+        writeOnce: true
+      },
       config: {writeOnce: true},
       description: {writeOnce: true},
-      full_name: {writeOnce: true},
+      full_name: {
+        getter: function () {
+          // full_name
+          var tmp = [this.get('series'), this.get('package_name')],
+              owner = this.get('owner');
+          if (owner) {
+            tmp.unshift('~' + owner);
+          }
+          return tmp.join('/');
+        },
+        writeOnce: true
+      },
       is_subordinate: {writeOnce: true},
       last_change: {
         writeOnce: true,
@@ -207,9 +248,9 @@
         }
       },
       maintainer: {writeOnce: true},
-      metadata: {writeOnce: true},
+      //metadata: {writeOnce: true},
+      owner: {writeOnce: true},
       package_name: {writeOnce: true},
-      owner: {writeOnce: true},
       peers: {writeOnce: true},
       proof: {writeOnce: true},
       provides: {writeOnce: true},
@@ -272,6 +313,119 @@
   });
   models.CharmList = CharmList;
 
+
+  models.BrowserCharm = Y.Base.create('browser-charm', Charm, [], {
+
+  }, {
+    ATTRS: {
+      id: {
+        writeOnce: true,
+        validator: function(val) {
+          return Y.Lang.isString(val) && !!charmIdRe.exec(val);
+        }
+      },
+      bzr_branch: {writeOnce: true},
+      categories: {
+        value: [],
+        writeOnce: true
+      },
+      changelog: {
+        value: {},
+        writeOnce: true
+      },
+      charm_store_path: {writeOnce: true},
+      code_source: {writeOnce: true},
+      date_created: {writeOnce: true},
+      description: {writeOnce: true},
+      files: {
+          value: {},
+          writeOnce: true
+      },
+      full_name: {
+        getter: function () {
+          // full_name
+          var tmp = [this.get('series'), this.get('package_name')],
+              owner = this.get('owner');
+          if (owner) {
+            tmp.unshift('~' + owner);
+          }
+          return tmp.join('/');
+        },
+        writeOnce: true
+      },
+      is_approved: {writeOnce: true},
+      is_new: {writeOnce: true},
+      is_popular:{writeOnce: true},
+      is_subordinate: {writeOnce: true},
+      last_change: {
+        writeOnce: true,
+
+        /**
+         * Normalize created value from float to date object.
+         *
+         * @method last_change.writeOnce.setter
+         */
+        setter: function(val) {
+          if (val && val.created) {
+            // Mutating in place should be fine since this should only
+            // come from loading over the wire.
+            val.created = new Date(val.created * 1000);
+          }
+          return val;
+        }
+      },
+      maintainer: {writeOnce: true},
+      //metadata: {writeOnce: true},
+      name: {writeOnce: true},
+      config: {writeOnce: true},
+      owner: {writeOnce: true},
+      peers: {writeOnce: true},
+      proof: {writeOnce: true},
+      provides: {writeOnce: true},
+      rating_numerator: {writeOnce: true},
+      rating_denominator: {writeOnce: true},
+      recent_downloads: {writeOnce: true},
+      relations: {writeOnce: true},
+      requires: {writeOnce: true},
+      revision: {
+        writeOnce: true,
+
+        /**
+         * Parse the revision number out of a string.
+         *
+         * @method revision.writeOnce.setter
+         */
+        setter: function(val) {
+          if (Y.Lang.isValue(val)) {
+            val = parseInt(val, 10);
+          }
+          return val;
+        }
+      },
+      scheme: {
+        value: 'cs',
+        writeOnce: true,
+
+        /**
+         * If no value is given, "cs" is used as the default.
+         *
+         * @method scheme.writeOnce.setter
+         */
+        setter: function(val) {
+          if (!Y.Lang.isValue(val)) {
+            val = 'cs';
+          }
+          return val;
+        }
+      },
+      series: {writeOnce: true},
+      summary: {writeOnce: true},
+      tested_providers: {writeOnce: true},
+      url: {writeOnce: true}
+    }
+  });
+
+
 }, '0.1.0', {
   requires: [
     'model',
@@ -279,3 +433,5 @@
     'juju-charm-id'
   ]
 });
+
+// vim: set tabstop=2:shiftwidth=2

=== modified file 'app/store/charm.js'
--- app/store/charm.js	2013-03-11 13:56:47 +0000
+++ app/store/charm.js	2013-03-20 14:43:53 +0000
@@ -1,3 +1,4 @@
+/*global YUI: false, escape: false*/
 'use strict';
 
 /**
@@ -9,14 +10,18 @@
 
 YUI.add('juju-charm-store', function(Y) {
 
+  var ns = Y.namespace('juju');
+
   /**
    * The CharmStore class.
    *
    * @class CharmStore
+   * @extends {Y.Base}
+   *
    */
   var CharmStore = Y.Base.create('charm', Y.Base, [], {
 
-    loadByPath: function(path, options) {
+    charm: function(path, options) {
       this.get('datasource').sendRequest({
         request: path,
         callback: {
@@ -131,12 +136,98 @@
       }
     }
   });
-  Y.namespace('juju').CharmStore = CharmStore;
-
-}, '0.1.0', {
+  ns.CharmStore = CharmStore;
+
+
+  /**
+   * Provides hook up to the Charmworld Api v0
+   *
+   * @class Charmworld0
+   * @extends {Y.Base}
+   *
+   */
+  ns.Charmworld0 = Y.Base.create('browser-api-0', Y.Base, [], {
+    _api_path: 'api/0/',
+
+    _endpoints: {
+      'charm': 'charm/{id}/',
+      'find': 'charms/',
+      'qa': 'charm/{id}/qa/',
+      'file': 'charm/{id}/files/{path}/',
+    },
+
+    charm: function(charmid, options) {
+      var path = Y.sub(this._endpoints, {id: charmid});
+
+      // path is known
+      this.get('datasource').sendRequest({
+        request: path,
+        callback: {
+          success: function(io_request) {
+            debugger;
+            options.success(
+                Y.JSON.parse(io_request.response.results[0].responseText));
+          },
+          failure: options.failure
+        }
+      });
+    },
+
+    find: function() {
+
+    },
+
+    initializer: function(cfg) {
+
+    },
+
+    qa: function() {
+
+    },
+
+    file: function() {
+
+    }
+
+  }, {
+    ATTRS: {
+      /**
+       * api_host is the host to the api server used for all calls. It auto
+       * creates the datasource instance when set.
+       *
+       * @attribute api_host
+       * @default ''
+       * @type {String}
+       *
+       */
+      api_host: {
+          setter: function(val) {
+              var api_endpoint = [val, this._api_path].join('/');
+              this.set(
+                'datasource',
+                new Y.DataSource.IO({ source: api_endpoint }));
+              return val;
+          }
+      },
+
+      /**
+       * datasource is auto set as part of the api_host ATTR.
+       *
+       * @attribute datasource
+       * @default undefined
+       * @type {Y.DataSource.IO}
+       *
+       */
+      datasource: {}
+    }
+  });
+
+} , '0.1.0', {
   requires: [
     'juju-charm-id',
     'datasource-io',
     'json-parse'
   ]
 });
+
+// vim: set tabstop=2:shiftwidth=2