define getter for links

HISTORY.md

@@ -6,20 +6,21 @@ Wishlist
 * Specify timeouts
 * Provide an accurate clientId, bound to user/machine (even in the browser)
 
-=> dox; vows; pretty code
+=> dox
+=> vows / merge airline tests and introduce fake passengers with faker
 => many of the headers should go in the defaults, instead of so much setup
-=> issue 6 / test jquery version
-=> Meta prototype.__defineGetter__('links', function() {})
 => search for err & throws, go for node like api function(err, resp, meta)
 => links uri-unescape
 => "keys" support
 => check possible merge with technoweenie/nori
 => one client enough for parallel?
+=> issue 6 / test jquery version / transporter for jquery
 
 DONE
-=> modularize code, use require() and transporter for jquery*
+=> modularize code, use require()
 => docs: getAll(where)
 => changed license to MIT
+=> Meta prototype.__defineGetter__('links', function() {}) // change your calls from meta.links() to meta.links
 
 0.2.3 / 2010-06-21
 ------------------

lib/meta.js

@@ -14,15 +14,14 @@ Meta.prototype.addLinks = function(links) {
 }
 
 Meta.prototype.removeLink = function(link) {
-  this.headers.link = this.makeLinks(this.links().filter(function(n) {
+  this.headers.link = this.makeLinks(this.links.filter(function(n) {
     return n.bucket !== link.bucket || n.key !== link.key
-    })
-  )
+  }))
 }
 
-Meta.prototype.links = function() {
+Meta.prototype.__defineGetter__('links', function() {
   return utils.stringToLinks(this.headers.link)
-}
+})
 
 Meta.prototype.makeLinks = function(links) {
   var self = this;

lib/riak.js

@@ -1,13 +1,13 @@
-var utils = require('./utils')
+var utils = require('./utils'),
+  Meta = require('./meta'),
+  Mapper = require('./mapper')
 
 var Riak = function (settings) {
   this.defaults = utils.mixin({}, this.defaults, settings);
   this.client = Riak.prototype.getClient(this.defaults.port || 8098, this.defaults.host || 'localhost', this.defaults);
   delete this.defaults.host;
   delete this.defaults.port;
-},
-Meta = require('./meta'),
-Mapper = require('./mapper')
+}
 
 Riak.prototype.defaults = {
   clientId: 'riak-js', 
@@ -92,10 +92,10 @@ Riak.prototype.walk = function(bucket, key, spec, options) {
   });
 
   return this
-      .link(linkPhases)
-      .reduce({ language: "erlang", module: "riak_kv_mapreduce", "function": "reduce_set_union"})
-      .map("Riak.mapValuesJson")
-      .run(key ? [[bucket, key]] : bucket, options);
+    .link(linkPhases)
+    .reduce({ language: "erlang", module: "riak_kv_mapreduce", "function": "reduce_set_union"})
+    .map("Riak.mapValuesJson")
+    .run(key ? [[bucket, key]] : bucket, options);
 }
 
 // map/reduce api

test/riak-test-before.js

@@ -74,14 +74,14 @@ module.exports = {
         headers: { link: '</riak/list/3>; riaktag="next"' }
       })(
         function(response, meta) {
-          assert.equal(meta.links().length, 3)
+          assert.equal(meta.links.length, 3)
           meta.removeLink({bucket: bucket, key: 'KLM-8098'})
-          assert.equal(meta.links().length, 2)
+          assert.equal(meta.links.length, 2)
           meta.addLinks([{bucket: bucket, key: 'KLM-6024'}, {bucket: bucket, key: 'KLM-1012'}])
-          db.save(bucket, 'link-test', '', { links: meta.links(), returnbody: true })(
+          db.save(bucket, 'link-test', '', { links: meta.links, returnbody: true })(
             function(response, meta) {
-              assert.equal(meta.links().length, 4)
-              assert.ok(meta.links().every(function(n) { return n.bucket !== bucket || n.key !== 'KLM-8098' }))
+              assert.equal(meta.links.length, 4)
+              assert.ok(meta.links.every(function(n) { return n.bucket !== bucket || n.key !== 'KLM-8098' }))
             }
           )
         }