goodguide-gibbon 0.3.1 → 0.3.2

data/lib/goodguide/gibbon/version.rb

@@ -1,7 +1,7 @@
 module GoodGuide
   module Gibbon
     def self.version
-      '0.3.1'
+      '0.3.2'
     end
   end
 end

data/lib/goodguide/gibbon.rb

@@ -157,9 +157,9 @@ module GoodGuide
     end
 
     class RuntimeClient < AbstractClient
-      def perform_query(id, annotations)
+      def perform_query(id, annotations, v)
         query = get_query(annotations[:_query_type])
-        instance_exec(id, annotations, &query)
+        instance_exec(id, annotations, v, &query)
       end
 
       def to_js

data/vendor/gibbon/lib/gibbon.browser.dev.js

@@ -1890,6 +1890,9 @@ analyze = Gibbon.analyze = (function() {
           },
           func: function(name, args) {
             var arg, ast, func, i, input, scope, _i, _len, _results;
+            if (!stdlib.hasOwnProperty(name)) {
+              throw new Error("no such function " + name);
+            }
             func = stdlib[name];
             ast = func.type;
             scope = new Hash;
@@ -2609,9 +2612,6 @@ Promise = (function() {
   };
 
   Promise.unit = function(e) {
-    if (!(e instanceof Gibbon.Value)) {
-      throw new Error('only make thunks of Value for now');
-    }
     return new Promise(function(_, f) {
       return f(e, []);
     });
@@ -2756,13 +2756,13 @@ eval_ = Gibbon["eval"] = (function() {
           return input.then(function(entity) {
             var _this = this;
             return new Promise(function(fail, cc) {
-              return client.performQuery(entity.id, annotations, function(err, val) {
+              return client.performQuery(entity.id, annotations, Gibbon.Value, function(err, val) {
                 var dependency;
                 if (err) {
                   return fail(err);
                 }
                 dependency = Dependency.query(entity, flow.head);
-                return Value.fromJSON(val).promise().depends([dependency]).force(fail, cc);
+                return val.promise().depends([dependency]).force(fail, cc);
               });
             });
           });
@@ -2827,10 +2827,8 @@ eval_ = Gibbon["eval"] = (function() {
         }
       });
     };
-    return new Promise(function(fail, cc) {
-      return Promise.combine(resultThunks.values()).force(fail, function(_, deps) {
-        return cc(results, deps);
-      });
+    return Promise.combine(resultThunks.values()).map(function() {
+      return results;
     });
   };
   return function(semantics, table, id, client, finish) {
@@ -2876,7 +2874,7 @@ Gibbon.jsonConsumer = (function() {
         }
       });
     };
-    getValue = function(id, annotations, callback) {
+    getValue = function(id, annotations, v, callback) {
       var entity, values;
       if (!tables.hasOwnProperty(annotations.table)) {
         return callback(new Error("no such type " + annotations.table));
@@ -2889,7 +2887,7 @@ Gibbon.jsonConsumer = (function() {
       if (!entity.hasOwnProperty(annotations.name)) {
         return callback(null, null);
       }
-      return callback(null, entity[annotations.name]);
+      return callback(null, v.fromJSON(entity[annotations.name]));
     };
     lists = tables._lists || {};
     analyzeList = function(id, listName, t, callback) {
@@ -2919,8 +2917,8 @@ Gibbon.jsonConsumer = (function() {
             return callback(new Error("unknown query `" + query.type + "'"));
         }
       },
-      performQuery: function(id, annotations, callback) {
-        return getValue(id, annotations, callback);
+      performQuery: function(id, annotations, v, callback) {
+        return getValue(id, annotations, v, callback);
       }
     };
   };

data/vendor/gibbon/lib/gibbon.browser.js

@@ -1884,6 +1884,9 @@ analyze = Gibbon.analyze = (function() {
           },
           func: function(name, args) {
             var arg, ast, func, i, input, scope, _i, _len, _results;
+            if (!stdlib.hasOwnProperty(name)) {
+              throw new Error("no such function " + name);
+            }
             func = stdlib[name];
             ast = func.type;
             scope = new Hash;
@@ -2581,9 +2584,6 @@ Promise = (function() {
   };
 
   Promise.unit = function(e) {
-    if (!(e instanceof Gibbon.Value)) {
-      throw new Error('only make thunks of Value for now');
-    }
     return new Promise(function(_, f) {
       return f(e, []);
     });
@@ -2728,13 +2728,13 @@ eval_ = Gibbon["eval"] = (function() {
           return input.then(function(entity) {
             var _this = this;
             return new Promise(function(fail, cc) {
-              return client.performQuery(entity.id, annotations, function(err, val) {
+              return client.performQuery(entity.id, annotations, Gibbon.Value, function(err, val) {
                 var dependency;
                 if (err) {
                   return fail(err);
                 }
                 dependency = Dependency.query(entity, flow.head);
-                return Value.fromJSON(val).promise().depends([dependency]).force(fail, cc);
+                return val.promise().depends([dependency]).force(fail, cc);
               });
             });
           });
@@ -2799,10 +2799,8 @@ eval_ = Gibbon["eval"] = (function() {
         }
       });
     };
-    return new Promise(function(fail, cc) {
-      return Promise.combine(resultThunks.values()).force(fail, function(_, deps) {
-        return cc(results, deps);
-      });
+    return Promise.combine(resultThunks.values()).map(function() {
+      return results;
     });
   };
   return function(semantics, table, id, client, finish) {
@@ -2848,7 +2846,7 @@ Gibbon.jsonConsumer = (function() {
         }
       });
     };
-    getValue = function(id, annotations, callback) {
+    getValue = function(id, annotations, v, callback) {
       var entity, values;
       if (!tables.hasOwnProperty(annotations.table)) {
         return callback(new Error("no such type " + annotations.table));
@@ -2861,7 +2859,7 @@ Gibbon.jsonConsumer = (function() {
       if (!entity.hasOwnProperty(annotations.name)) {
         return callback(null, null);
       }
-      return callback(null, entity[annotations.name]);
+      return callback(null, v.fromJSON(entity[annotations.name]));
     };
     lists = tables._lists || {};
     analyzeList = function(id, listName, t, callback) {
@@ -2891,8 +2889,8 @@ Gibbon.jsonConsumer = (function() {
             return callback(new Error("unknown query `" + query.type + "'"));
         }
       },
-      performQuery: function(id, annotations, callback) {
-        return getValue(id, annotations, callback);
+      performQuery: function(id, annotations, v, callback) {
+        return getValue(id, annotations, v, callback);
       }
     };
   };

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: goodguide-gibbon
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-30 00:00:00.000000000 Z
+date: 2013-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  type: :runtime
   name: therubyracer
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  requirement: !ruby/object:Gem::Requirement
     none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
-  prerelease: false
+    none: false
 description: Run and analyze gibbon code from ruby or a browser (via a ruby app).
 email:
 - jjmadkisson@gmail.com
@@ -48,23 +48,17 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      hash: -2075265121022310565
-      segments:
-      - 0
-required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      hash: -2075265121022310565
-      segments:
-      - 0
+  none: false
 requirements: []
 rubyforge_project: goodguide-gibbon
 rubygems_version: 1.8.23
@@ -72,3 +66,4 @@ signing_key:
 specification_version: 3
 summary: Ruby bindings for the gibbon data language
 test_files: []
+has_rdoc: