goodguide-gibbon 0.4.1 → 0.4.2

data/lib/goodguide/gibbon/version.rb

@@ -1,7 +1,7 @@
 module GoodGuide
   module Gibbon
     def self.version
-      '0.4.1'
+      '0.4.2'
     end
   end
 end

data/lib/goodguide/gibbon.rb

@@ -116,6 +116,14 @@ module GoodGuide
       def initialize(type, id, annotations)
         @query_type, @id, @annotations = type, id, annotations
       end
+
+      def equals(other)
+        [
+          query_type == other.query_type,
+          id == other.id,
+          annotations == other.annotations
+        ].all?
+      end
     end
 
     class Program
@@ -169,7 +177,7 @@ module GoodGuide
         @queries ||= {}
       end
 
-      def self.query(type, &impl)
+      def self.query(type, opts={}, &impl)
         queries[type.to_s] = impl
       end
 
@@ -205,6 +213,20 @@ module GoodGuide
         raise QueryError.new(*a)
       end
 
+      def self.query(type, opts={}, &impl)
+        arity = opts.fetch(:arity, 1)
+        super type, opts do |input, args, builder|
+          if args.size != arity
+            query_error!(
+              "wrong number of arguments: " +
+              "#{args.size} for #{arity} (in .#{type} #{args.join(' ')})"
+            )
+          end
+
+          self.instance_exec(input, *args, builder, &impl)
+        end
+      end
+
       def analyze_query(input_id, query, t)
         query_impl = get_query(query.type)
         analysis = instance_exec(input_id, obj_to_ruby(query.args), t, &query_impl)

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

@@ -1110,7 +1110,6 @@ parse = Gibbon.parse = (function() {
     return AST.string(s);
   });
   accessorExpr = accessor.map(function(name) {
-    debugger;
     return AST.query('access', [name]);
   });
   queryExpr = query.then(function(q) {
@@ -2366,10 +2365,12 @@ Value = Gibbon.Value = Value = (function(_super) {
         });
       },
       pair: function(eFirst, eSecond) {
-        return Promise.combine([eFirst, eSecond]).then(function(first, second) {
-          return Promise.combine([f(first), f(second)]).map(function(_arg) {
+        return Promise.combine([eFirst, eSecond]).then(function(_arg) {
+          var first, second;
+          first = _arg[0], second = _arg[1];
+          return Promise.combine([f(first), f(second)]).map(function(_arg1) {
             var mFirst, mSecond;
-            mFirst = _arg[0], mSecond = _arg[1];
+            mFirst = _arg1[0], mSecond = _arg1[1];
             return Value.pair(mFirst, mSecond);
           });
         });
@@ -2626,7 +2627,7 @@ Gibbon.Dependency = Dependency = (function(_super) {
 eval_ = Gibbon["eval"] = (function() {
   var evalAll;
   evalAll = function(semantics, entity, client) {
-    var evalFlow, globalPromise, resultThunks, results;
+    var evalFlow, globalPromise, resultThunks, results, toForce;
     results = new Hash;
     globalPromise = Promise.unit(entity);
     resultThunks = new Hash;
@@ -2634,11 +2635,6 @@ eval_ = Gibbon["eval"] = (function() {
       return resultThunks.set(key, Promise.lazy(function() {
         return evalFlow(definition.flow, globalPromise).then(function(val) {
           return val.resolve();
-        }).after(function(val, deps) {
-          deps = uniq(deps, function(x, y) {
-            return x.equals(y);
-          });
-          return results.set(key, [val, deps]);
         });
       }));
     });
@@ -2728,7 +2724,20 @@ eval_ = Gibbon["eval"] = (function() {
         }
       });
     };
-    return Promise.combine(resultThunks.values()).map(function() {
+    toForce = [];
+    resultThunks.each(function(key, thunk) {
+      return toForce.push(thunk.rescue(function(failure) {
+        results.set(key, [null, [Dependency.failure(failure)]]);
+        resultThunks.set(key, Promise.fail(failure));
+        return Promise.unit(null);
+      }).after(function(val, deps) {
+        deps = uniq(deps, function(x, y) {
+          return x.equals(y);
+        });
+        return results.set(key, [val, deps]);
+      }));
+    });
+    return Promise.combine(toForce).map(function() {
       return results;
     });
   };
@@ -2749,7 +2758,13 @@ eval_ = Gibbon["eval"] = (function() {
       return finish(fail);
     };
     onSuccess = function(vals) {
-      return finish(null, vals);
+      var deps, val, _ref4;
+      _ref4 = vals.get('/'), val = _ref4[0], deps = _ref4[1];
+      if (val) {
+        return finish(null, vals);
+      } else {
+        return finish(deps[0].failure);
+      }
     };
     return evalAll(semantics, entity, client).force(onFailure, onSuccess);
   };
@@ -3324,7 +3339,6 @@ stdlib = Gibbon.stdlib = (function() {
     "case-eq": {
       type: parse.type('case-eq [%a : %b] = %a -> %b'),
       impl: function(evalInput, evalList) {
-        debugger;
         return combine([evalInput, evalList]).then(function(_arg) {
           var input, list, out, step;
           input = _arg[0], list = _arg[1];
@@ -3455,7 +3469,6 @@ stdlib = Gibbon.stdlib = (function() {
     "include?": {
       type: parse.type('include? %a = [%a] -> bool'),
       impl: function(evalList, evalElement) {
-        debugger;
         return combine([evalElement, evalList]).then(function(_arg) {
           var booleans, el, list, p;
           el = _arg[0], list = _arg[1];
@@ -3729,24 +3742,16 @@ stdlib = Gibbon.stdlib = (function() {
             _results = [];
             for (_i = 0, _len = elements.length; _i < _len; _i++) {
               promise = elements[_i];
-              _results.push(promise.map(function(e) {
-                return [e];
+              _results.push(promise.then(function(e) {
+                return e.resolve().map(function(e) {
+                  return [e.promise()];
+                });
               }).or(unit([])));
             }
             return _results;
           })();
           return combine(wrapped).map(function(lists) {
-            var e;
-            return Value.list((function() {
-              var _i, _len, _ref, _results;
-              _ref = catLists(lists);
-              _results = [];
-              for (_i = 0, _len = _ref.length; _i < _len; _i++) {
-                e = _ref[_i];
-                _results.push(unit(e));
-              }
-              return _results;
-            })());
+            return Value.list(catLists(lists));
           });
         });
       },
@@ -3920,7 +3925,6 @@ Gibbon.jsonConsumer = (function() {
     };
     return {
       analyzeQuery: function(id, query, t, callback) {
-        debugger;
         switch (query.type) {
           case 'access':
             return getType(id, query.args[0], t, callback);

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

@@ -1104,7 +1104,6 @@ parse = Gibbon.parse = (function() {
     return AST.string(s);
   });
   accessorExpr = accessor.map(function(name) {
-    debugger;
     return AST.query('access', [name]);
   });
   queryExpr = query.then(function(q) {
@@ -2338,10 +2337,12 @@ Value = Gibbon.Value = Value = (function(_super) {
         });
       },
       pair: function(eFirst, eSecond) {
-        return Promise.combine([eFirst, eSecond]).then(function(first, second) {
-          return Promise.combine([f(first), f(second)]).map(function(_arg) {
+        return Promise.combine([eFirst, eSecond]).then(function(_arg) {
+          var first, second;
+          first = _arg[0], second = _arg[1];
+          return Promise.combine([f(first), f(second)]).map(function(_arg1) {
             var mFirst, mSecond;
-            mFirst = _arg[0], mSecond = _arg[1];
+            mFirst = _arg1[0], mSecond = _arg1[1];
             return Value.pair(mFirst, mSecond);
           });
         });
@@ -2598,7 +2599,7 @@ Gibbon.Dependency = Dependency = (function(_super) {
 eval_ = Gibbon["eval"] = (function() {
   var evalAll;
   evalAll = function(semantics, entity, client) {
-    var evalFlow, globalPromise, resultThunks, results;
+    var evalFlow, globalPromise, resultThunks, results, toForce;
     results = new Hash;
     globalPromise = Promise.unit(entity);
     resultThunks = new Hash;
@@ -2606,11 +2607,6 @@ eval_ = Gibbon["eval"] = (function() {
       return resultThunks.set(key, Promise.lazy(function() {
         return evalFlow(definition.flow, globalPromise).then(function(val) {
           return val.resolve();
-        }).after(function(val, deps) {
-          deps = uniq(deps, function(x, y) {
-            return x.equals(y);
-          });
-          return results.set(key, [val, deps]);
         });
       }));
     });
@@ -2700,7 +2696,20 @@ eval_ = Gibbon["eval"] = (function() {
         }
       });
     };
-    return Promise.combine(resultThunks.values()).map(function() {
+    toForce = [];
+    resultThunks.each(function(key, thunk) {
+      return toForce.push(thunk.rescue(function(failure) {
+        results.set(key, [null, [Dependency.failure(failure)]]);
+        resultThunks.set(key, Promise.fail(failure));
+        return Promise.unit(null);
+      }).after(function(val, deps) {
+        deps = uniq(deps, function(x, y) {
+          return x.equals(y);
+        });
+        return results.set(key, [val, deps]);
+      }));
+    });
+    return Promise.combine(toForce).map(function() {
       return results;
     });
   };
@@ -2721,7 +2730,13 @@ eval_ = Gibbon["eval"] = (function() {
       return finish(fail);
     };
     onSuccess = function(vals) {
-      return finish(null, vals);
+      var deps, val, _ref4;
+      _ref4 = vals.get('/'), val = _ref4[0], deps = _ref4[1];
+      if (val) {
+        return finish(null, vals);
+      } else {
+        return finish(deps[0].failure);
+      }
     };
     return evalAll(semantics, entity, client).force(onFailure, onSuccess);
   };
@@ -3296,7 +3311,6 @@ stdlib = Gibbon.stdlib = (function() {
     "case-eq": {
       type: parse.type('case-eq [%a : %b] = %a -> %b'),
       impl: function(evalInput, evalList) {
-        debugger;
         return combine([evalInput, evalList]).then(function(_arg) {
           var input, list, out, step;
           input = _arg[0], list = _arg[1];
@@ -3427,7 +3441,6 @@ stdlib = Gibbon.stdlib = (function() {
     "include?": {
       type: parse.type('include? %a = [%a] -> bool'),
       impl: function(evalList, evalElement) {
-        debugger;
         return combine([evalElement, evalList]).then(function(_arg) {
           var booleans, el, list, p;
           el = _arg[0], list = _arg[1];
@@ -3701,24 +3714,16 @@ stdlib = Gibbon.stdlib = (function() {
             _results = [];
             for (_i = 0, _len = elements.length; _i < _len; _i++) {
               promise = elements[_i];
-              _results.push(promise.map(function(e) {
-                return [e];
+              _results.push(promise.then(function(e) {
+                return e.resolve().map(function(e) {
+                  return [e.promise()];
+                });
               }).or(unit([])));
             }
             return _results;
           })();
           return combine(wrapped).map(function(lists) {
-            var e;
-            return Value.list((function() {
-              var _i, _len, _ref, _results;
-              _ref = catLists(lists);
-              _results = [];
-              for (_i = 0, _len = _ref.length; _i < _len; _i++) {
-                e = _ref[_i];
-                _results.push(unit(e));
-              }
-              return _results;
-            })());
+            return Value.list(catLists(lists));
           });
         });
       },
@@ -3892,7 +3897,6 @@ Gibbon.jsonConsumer = (function() {
     };
     return {
       analyzeQuery: function(id, query, t, callback) {
-        debugger;
         switch (query.type) {
           case 'access':
             return getType(id, query.args[0], t, callback);

data/vendor/gibbon/package.json

@@ -13,8 +13,7 @@
     "chai": "1.5.x",
     "coffee-script": "1.6.x",
     "supervisor": "0.5.x",
-    "node-inspector": "0.2.x",
-    "falafel": "0.2.x"
+    "node-inspector": "0.2.x"
   },
   "dependencies": {
     "parsimmon": "0.0.6",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: goodguide-gibbon
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-16 00:00:00.000000000 Z
+date: 2013-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: therubyracer
@@ -55,7 +55,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 970045023532317633
+      hash: 207982896115587216
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -64,7 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 970045023532317633
+      hash: 207982896115587216
 requirements: []
 rubyforge_project: goodguide-gibbon
 rubygems_version: 1.8.23