goodguide-gibbon 0.11.7 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b87fbbaef96ba223caea6829637a4c7ab6daba5
-  data.tar.gz: 4ed0b5550c8c267f29e81f2a7adfa9f43ab092d5
+  metadata.gz: dd0051c5ce366bc971e7da78cbbabbf1cd910ca0
+  data.tar.gz: 1d7e31d0f072cebd2c9fcfd0b1be31208a528d93
 SHA512:
-  metadata.gz: 08fdfed3ab060c75e60be231ba3a508a5a7293f772471015882789636bf4c77b2e4931b06a792045d6ee38ba4a143824b85564ea51ab75a192454a8607343064
-  data.tar.gz: 8c0da5fc5e7d391895b21da974bc95321d1a3ce309afa5503b8c646b1f0a640bee5c0eee10ff95ebb2ceec204ffc9c96416c502e52d7dfcc7e3db882a3323548
+  metadata.gz: 7d04d1bb9f9d3d442da46da10f250c323c69547e2d42f2809293c2b0a9242b302979810ac6f4084d06f60742f77e7f07cb66b6b70977fb9ccb7e6372b685d5b8
+  data.tar.gz: 13d9885e4c1bd39a1a334a1858cdf487b04622d09809121cfaccbe26d5575683d0f882690abe1acd74465a5dbe3ddeb4e46646f48191b62957621c6935049261

data/lib/goodguide/gibbon.rb

@@ -172,21 +172,30 @@ module GoodGuide
       end
     end
 
-    class QueryError < StandardError; end
+    class GibbonError < StandardError
+      def to_js(gibbon)
+        raise "abstract"
+      end
+    end
+
+    class StaticError < GibbonError
+      def to_js(*)
+        message
+      end
+    end
+
+    class RuntimeError < GibbonError
+    end
 
-    class RuntimeError < StandardError; end
     class MissingData < RuntimeError
       attr_reader :query_type, :id, :annotations
+      attr_accessor :annotations
       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?
+      def to_js(gibbon)
+        gibbon['Failure'].query(@id, @annotations)
       end
 
       def as_json(*)
@@ -199,16 +208,21 @@ module GoodGuide
       end
     end
 
-    class Failure < RuntimeError
+    class QueryError < RuntimeError
       attr_reader :message
       def initialize(message)
         @message = message
       end
 
+      def to_js(gibbon)
+        gibbon['Failure'].message(@message)
+      end
+
       def as_json(*)
         {
           'status' => 'failure',
           'message' => message,
+          'annotations' => annotations
         }
       end
     end
@@ -221,7 +235,7 @@ module GoodGuide
         context = info[:context] || Context.new
 
         syntax = context.parse(source)
-        semantics, errors = context.analyze(syntax, global, client.to_js)
+        errors, semantics = context.analyze(syntax, global, client.to_js(context.gibbon))
 
         raise SemanticError.new(errors, context) if errors
 
@@ -264,16 +278,7 @@ module GoodGuide
       end
 
       def call(runtime_client, entity_id)
-        values, error = @context.run_compiled(@compiled, entity_id, runtime_client.to_js)
-
-        case error
-        when String
-          raise GoodGuide::Gibbon::Failure.new(error)
-        when nil
-          values
-        else
-          raise error
-        end
+        @context.run_compiled(@compiled, entity_id, runtime_client.to_js(@context.gibbon))
       end
     end
 
@@ -286,7 +291,7 @@ module GoodGuide
         queries[type.to_s] = impl
       end
 
-      def to_js
+      def to_js(gibbon)
         raise 'abstract'
       end
 
@@ -295,15 +300,15 @@ module GoodGuide
         self.class.queries[type.to_s]
       end
 
-      def proc_for(method)
-        lambda do |this, *args|
-          args = ([this] + args).compact if defined?(JRUBY_VERSION)
+      def proc_for(gibbon, method)
+        lambda do |*args|
+          args.shift unless defined?(JRUBY_VERSION)
 
           cb = args.pop
           err, val = begin
             [nil, send(method, *args)]
-          rescue QueryError, RuntimeError => e
-            [e, nil]
+          rescue GibbonError => e
+            [e.to_js(gibbon), nil]
           end
 
           cb.call(err, val)
@@ -315,7 +320,7 @@ module GoodGuide
       include Util
 
       def query_error!(*a)
-        raise QueryError.new(*a)
+        raise StaticError.new(*a)
       end
 
       def self.query(type, opts={}, &impl)
@@ -339,8 +344,8 @@ module GoodGuide
         analysis
       end
 
-      def to_js
-        { :analyzeQuery => proc_for(:analyze_query) }
+      def to_js(gibbon)
+        { :analyzeQuery => proc_for(gibbon, :analyze_query) }
       end
     end
 
@@ -348,7 +353,6 @@ module GoodGuide
       include Util
       def perform_query(id, annotations)
         annotations = obj_to_ruby(annotations)
-
         query_type = annotations.delete('_query_type')
 
         # stash this data in case missing_data! is called
@@ -364,8 +368,8 @@ module GoodGuide
         raise MissingData.new(@last_query_type, @last_id, @last_annotations)
       end
 
-      def to_js
-        { :performQuery => proc_for(:perform_query) }
+      def to_js(gibbon)
+        { :performQuery => proc_for(gibbon, :perform_query) }
       end
     end
 
@@ -401,17 +405,16 @@ module GoodGuide
       end
 
       def run_compiled(compiled, entity_id, runtime_client)
-        values, error = capture do |&callback|
-          compiled.run('/', entity_id, runtime_client, callback)
+        results, _ = capture do |&callback|
+          compiled.run(entity_id, runtime_client, callback)
         end
 
-        [hash_to_ruby(values), obj_to_ruby(error)]
+        obj_to_ruby(results)
       end
 
     private
       def capture(&b)
-        output = nil
-        error = nil
+        callback_args = nil
         call_count = 0
 
         b.call do |*args|
@@ -421,17 +424,17 @@ module GoodGuide
           call_count += 1
 
           if call_count >= 2
-            first = [error, output].inspect
+            first = callback_args.inspect
             second = args.inspect
             raise "gibbon: callback called twice with #{first} and #{second}"
           end
 
-          error, output = args[0..1]
+          callback_args = args
         end
 
         raise "gibbon: callback never called" unless call_count >= 1
 
-        [output, error]
+        callback_args
       end
     end
 

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

@@ -469,7 +469,7 @@ Parsimmon.Parser = P(function(_, _super, Parser) {
   return Parsimmon;
 })()
 // Generated by CoffeeScript 1.6.3
-var AST, CompiledCode, Core, DEBUG, Dependency, Failure, Gibbon, Hash, JS, List, Map, ObjHash, RVal, Semantic, Step, Thunk, Trace, Type, TypeAST, TypeExpr, TypeLookup, Value, VarTrace, Variant, analyze, applyOp1, applyOp2, asyncMap, contIter, contMap, equalArrays, eval_, inspectNative, isArray, nameGen, parse, stdlib, uniq, _ref, _ref1, _ref10, _ref11, _ref12, _ref13, _ref14, _ref15, _ref16, _ref17, _ref2, _ref3, _ref4, _ref5, _ref6, _ref7, _ref8, _ref9,
+var AST, CompiledCode, Core, DEBUG, Dependency, Failure, Gibbon, Hash, JS, List, Map, ObjHash, RVal, Result, Semantic, Step, Thunk, Trace, Type, TypeAST, TypeExpr, TypeLookup, Value, VarTrace, Variant, analyze, applyOp1, applyOp2, asyncMap, contIter, contMap, equalArrays, eval_, inspectNative, isArray, nameGen, parse, stdlib, uniq, _ref, _ref1, _ref10, _ref11, _ref12, _ref13, _ref14, _ref15, _ref16, _ref17, _ref18, _ref2, _ref3, _ref4, _ref5, _ref6, _ref7, _ref8, _ref9,
   __slice = [].slice,
   __hasProp = {}.hasOwnProperty,
   __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
@@ -1229,7 +1229,7 @@ parse = Gibbon.parse = (function() {
   string = Parsimmon.string, regex = Parsimmon.regex, succeed = Parsimmon.succeed, fail = Parsimmon.fail;
   seq = Parsimmon.seq, lazy = Parsimmon.lazy;
   whitespace = regex(/^[ \t]*/);
-  blankLines = regex(/^[\n\s]+/);
+  blankLines = regex(/^[\n;\s]+/);
   comment = regex(/^#.*?(\n|$)/);
   lines = (blankLines.or(comment)).many();
   lexeme = function(p) {
@@ -2634,7 +2634,7 @@ analyze = Gibbon.analyze = (function() {
 })();
 
 eval_ = Gibbon["eval"] = function(semantics, table, id, client, finish) {
-  return Gibbon.compile(semantics).run('/', id, client, finish);
+  return Gibbon.compile(semantics).run(id, client, finish);
 };
 
 Gibbon.Core = Core = (function(_super) {
@@ -5875,7 +5875,7 @@ stdlib = Gibbon.stdlib = (function() {
     first: {
       type: parse.type('first = [%a] -> %a'),
       compile: function(list) {
-        return list.delist(ZERO);
+        return Core.len(list).op2('===', ZERO).branch(Core.fail('first: empty list'), list.delist(ZERO));
       }
     },
     left: {
@@ -6205,7 +6205,7 @@ Gibbon.Dependency = Dependency = (function(_super) {
   Dependency.variants({
     query: ['entity', 'query', 'value'],
     lexical: ['key'],
-    failure: ['failure']
+    failure: ['entity', 'query']
   });
 
   Dependency.prototype.equals = function(other) {
@@ -6234,13 +6234,13 @@ Gibbon.Dependency = Dependency = (function(_super) {
   Dependency.prototype.inspect = function() {
     return this.cases({
       query: function(entity, query) {
-        return "" + (JSON.stringify(query)) + "<" + entity + ">";
+        return "(query " + entity + ":" + (JSON.stringify(query)) + ")";
       },
       lexical: function(key) {
-        return "@" + key;
+        return "(lexical " + key + ")";
       },
-      failure: function(failure) {
-        return "!";
+      failure: function(entity, query) {
+        return "(failure " + entity + " " + (JSON.stringify(query)) + ")";
       }
     });
   };
@@ -6296,6 +6296,23 @@ Gibbon.Failure = Failure = (function(_super) {
 
 })(Variant);
 
+Gibbon.Result = Result = (function(_super) {
+  __extends(Result, _super);
+
+  function Result() {
+    _ref18 = Result.__super__.constructor.apply(this, arguments);
+    return _ref18;
+  }
+
+  Result.variants({
+    success: ['dependencies', 'value'],
+    failure: ['dependencies', 'failure']
+  });
+
+  return Result;
+
+})(Variant);
+
 Gibbon.CompiledCode = CompiledCode = (function() {
   var idFor, trampoline;
 
@@ -6323,35 +6340,45 @@ Gibbon.CompiledCode = CompiledCode = (function() {
   }
 
   CompiledCode.prototype.functionFor = function(key) {
-    return this.functions.get(key);
+    return this.functions.get(key) || (function() {
+      throw "no such key " + key;
+    })();
   };
 
-  CompiledCode.prototype.run = function(rootKey, input, client, cb) {
-    var FAIL, RETURN, dependencies, failures, mkQuery, results, runKey, thunk,
+  CompiledCode.prototype.run = function(input, client, resultCallback) {
+    var dependencies, failures, mapper, mkQuery, results, runKey,
       _this = this;
     results = new Hash;
     dependencies = new Hash;
     failures = new Hash;
     runKey = function(key, fail, succeed) {
       var deps, onFailure, onSuccess, query;
-      DEBUG.log('evaluating key', key);
       if (results.has(key)) {
+        DEBUG.log("" + key + ": cached success");
         return succeed(results.get(key));
       }
       if (failures.has(key)) {
+        DEBUG.log("" + key + ": cached failure");
         return fail(failures.get(key));
       }
+      DEBUG.log("" + key + ": starting eval");
       deps = dependencies.set(key, []);
       query = mkQuery(function(d) {
+        DEBUG.log("" + key + ": depends: " + (d.inspect()));
         return deps.push(d);
       });
       onSuccess = function(data) {
+        DEBUG.log("" + key + ": success: " + (JSON.stringify(data)));
         results.set(key, data);
         return succeed(data);
       };
       onFailure = function(err) {
+        if (typeof err === 'string') {
+          err = Failure.message(err);
+        }
+        DEBUG.log("" + key + ": failure: " + (JSON.stringify(err)));
         failures.set(key, err);
-        return fail(err);
+        return fail(err, dependencies);
       };
       return _this.functionFor(key)(input, query, onFailure, onSuccess);
     };
@@ -6367,7 +6394,7 @@ Gibbon.CompiledCode = CompiledCode = (function() {
         out = client.performQuery(id, annotations, function(err, data) {
           var publicValue;
           if (err) {
-            pushDep(Dependency.failure(err));
+            pushDep(Dependency.failure(id, annotations));
             if (isSynchronous) {
               return function() {
                 return onFailure(err);
@@ -6391,13 +6418,10 @@ Gibbon.CompiledCode = CompiledCode = (function() {
         return out;
       };
     };
-    FAIL = function(f) {
-      return cb(f);
-    };
-    RETURN = function(d) {
-      return cb(null, d);
+    mapper = function(key, cb) {
+      return trampoline(runKey(key, cb, cb));
     };
-    thunk = runKey(rootKey, cb, function() {
+    return contMap(this.semantics.keys(), mapper, function() {
       var out;
       out = new Hash;
       results.each(function(k, v) {
@@ -6407,7 +6431,7 @@ Gibbon.CompiledCode = CompiledCode = (function() {
         deps = uniq(deps, function(x, y) {
           return x.equals(y);
         });
-        return out.set(k, [value, deps]);
+        return out.set(k, Result.success(deps, value));
       });
       failures.each(function(k, v) {
         var deps;
@@ -6415,11 +6439,10 @@ Gibbon.CompiledCode = CompiledCode = (function() {
         deps = uniq(deps, function(x, y) {
           return x.equals(y);
         });
-        return out.set(k, [v, deps]);
+        return out.set(k, Result.failure(deps, v));
       });
-      return cb(null, out);
+      return resultCallback(out);
     });
-    return trampoline(thunk);
   };
 
   CompiledCode.prototype.outputType = function(key) {

data/vendor/gibbon/gibbon.browser.js

@@ -469,7 +469,7 @@ Parsimmon.Parser = P(function(_, _super, Parser) {
   return Parsimmon;
 })()
 // Generated by CoffeeScript 1.6.3
-var AST, CompiledCode, Core, DEBUG, Dependency, Failure, Gibbon, Hash, JS, List, Map, ObjHash, RVal, Semantic, Step, Thunk, Trace, Type, TypeAST, TypeExpr, TypeLookup, Value, VarTrace, Variant, analyze, applyOp1, applyOp2, asyncMap, contIter, contMap, equalArrays, eval_, inspectNative, isArray, nameGen, parse, stdlib, uniq, _ref, _ref1, _ref10, _ref11, _ref12, _ref13, _ref14, _ref15, _ref16, _ref17, _ref2, _ref3, _ref4, _ref5, _ref6, _ref7, _ref8, _ref9,
+var AST, CompiledCode, Core, DEBUG, Dependency, Failure, Gibbon, Hash, JS, List, Map, ObjHash, RVal, Result, Semantic, Step, Thunk, Trace, Type, TypeAST, TypeExpr, TypeLookup, Value, VarTrace, Variant, analyze, applyOp1, applyOp2, asyncMap, contIter, contMap, equalArrays, eval_, inspectNative, isArray, nameGen, parse, stdlib, uniq, _ref, _ref1, _ref10, _ref11, _ref12, _ref13, _ref14, _ref15, _ref16, _ref17, _ref18, _ref2, _ref3, _ref4, _ref5, _ref6, _ref7, _ref8, _ref9,
   __slice = [].slice,
   __hasProp = {}.hasOwnProperty,
   __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
@@ -1219,7 +1219,7 @@ parse = Gibbon.parse = (function() {
   string = Parsimmon.string, regex = Parsimmon.regex, succeed = Parsimmon.succeed, fail = Parsimmon.fail;
   seq = Parsimmon.seq, lazy = Parsimmon.lazy;
   whitespace = regex(/^[ \t]*/);
-  blankLines = regex(/^[\n\s]+/);
+  blankLines = regex(/^[\n;\s]+/);
   comment = regex(/^#.*?(\n|$)/);
   lines = (blankLines.or(comment)).many();
   lexeme = function(p) {
@@ -2602,7 +2602,7 @@ analyze = Gibbon.analyze = (function() {
 })();
 
 eval_ = Gibbon["eval"] = function(semantics, table, id, client, finish) {
-  return Gibbon.compile(semantics).run('/', id, client, finish);
+  return Gibbon.compile(semantics).run(id, client, finish);
 };
 
 Gibbon.Core = Core = (function(_super) {
@@ -5812,7 +5812,7 @@ stdlib = Gibbon.stdlib = (function() {
     first: {
       type: parse.type('first = [%a] -> %a'),
       compile: function(list) {
-        return list.delist(ZERO);
+        return Core.len(list).op2('===', ZERO).branch(Core.fail('first: empty list'), list.delist(ZERO));
       }
     },
     left: {
@@ -6142,7 +6142,7 @@ Gibbon.Dependency = Dependency = (function(_super) {
   Dependency.variants({
     query: ['entity', 'query', 'value'],
     lexical: ['key'],
-    failure: ['failure']
+    failure: ['entity', 'query']
   });
 
   Dependency.prototype.equals = function(other) {
@@ -6171,13 +6171,13 @@ Gibbon.Dependency = Dependency = (function(_super) {
   Dependency.prototype.inspect = function() {
     return this.cases({
       query: function(entity, query) {
-        return "" + (JSON.stringify(query)) + "<" + entity + ">";
+        return "(query " + entity + ":" + (JSON.stringify(query)) + ")";
       },
       lexical: function(key) {
-        return "@" + key;
+        return "(lexical " + key + ")";
       },
-      failure: function(failure) {
-        return "!";
+      failure: function(entity, query) {
+        return "(failure " + entity + " " + (JSON.stringify(query)) + ")";
       }
     });
   };
@@ -6233,6 +6233,23 @@ Gibbon.Failure = Failure = (function(_super) {
 
 })(Variant);
 
+Gibbon.Result = Result = (function(_super) {
+  __extends(Result, _super);
+
+  function Result() {
+    _ref18 = Result.__super__.constructor.apply(this, arguments);
+    return _ref18;
+  }
+
+  Result.variants({
+    success: ['dependencies', 'value'],
+    failure: ['dependencies', 'failure']
+  });
+
+  return Result;
+
+})(Variant);
+
 Gibbon.CompiledCode = CompiledCode = (function() {
   var idFor, trampoline;
 
@@ -6260,35 +6277,45 @@ Gibbon.CompiledCode = CompiledCode = (function() {
   }
 
   CompiledCode.prototype.functionFor = function(key) {
-    return this.functions.get(key);
+    return this.functions.get(key) || (function() {
+      throw "no such key " + key;
+    })();
   };
 
-  CompiledCode.prototype.run = function(rootKey, input, client, cb) {
-    var FAIL, RETURN, dependencies, failures, mkQuery, results, runKey, thunk,
+  CompiledCode.prototype.run = function(input, client, resultCallback) {
+    var dependencies, failures, mapper, mkQuery, results, runKey,
       _this = this;
     results = new Hash;
     dependencies = new Hash;
     failures = new Hash;
     runKey = function(key, fail, succeed) {
       var deps, onFailure, onSuccess, query;
-      
       if (results.has(key)) {
+        
         return succeed(results.get(key));
       }
       if (failures.has(key)) {
+        
         return fail(failures.get(key));
       }
+      
       deps = dependencies.set(key, []);
       query = mkQuery(function(d) {
+        
         return deps.push(d);
       });
       onSuccess = function(data) {
+        
         results.set(key, data);
         return succeed(data);
       };
       onFailure = function(err) {
+        if (typeof err === 'string') {
+          err = Failure.message(err);
+        }
+        
         failures.set(key, err);
-        return fail(err);
+        return fail(err, dependencies);
       };
       return _this.functionFor(key)(input, query, onFailure, onSuccess);
     };
@@ -6304,7 +6331,7 @@ Gibbon.CompiledCode = CompiledCode = (function() {
         out = client.performQuery(id, annotations, function(err, data) {
           var publicValue;
           if (err) {
-            pushDep(Dependency.failure(err));
+            pushDep(Dependency.failure(id, annotations));
             if (isSynchronous) {
               return function() {
                 return onFailure(err);
@@ -6328,13 +6355,10 @@ Gibbon.CompiledCode = CompiledCode = (function() {
         return out;
       };
     };
-    FAIL = function(f) {
-      return cb(f);
-    };
-    RETURN = function(d) {
-      return cb(null, d);
+    mapper = function(key, cb) {
+      return trampoline(runKey(key, cb, cb));
     };
-    thunk = runKey(rootKey, cb, function() {
+    return contMap(this.semantics.keys(), mapper, function() {
       var out;
       out = new Hash;
       results.each(function(k, v) {
@@ -6344,7 +6368,7 @@ Gibbon.CompiledCode = CompiledCode = (function() {
         deps = uniq(deps, function(x, y) {
           return x.equals(y);
         });
-        return out.set(k, [value, deps]);
+        return out.set(k, Result.success(deps, value));
       });
       failures.each(function(k, v) {
         var deps;
@@ -6352,11 +6376,10 @@ Gibbon.CompiledCode = CompiledCode = (function() {
         deps = uniq(deps, function(x, y) {
           return x.equals(y);
         });
-        return out.set(k, [v, deps]);
+        return out.set(k, Result.failure(deps, v));
       });
-      return cb(null, out);
+      return resultCallback(out);
     });
-    return trampoline(thunk);
   };
 
   CompiledCode.prototype.outputType = function(key) {

data/vendor/gibbon/package.json

@@ -1,9 +1,9 @@
 {
   "name": "gibbon",
-  "version": "0.11.7",
+  "version": "0.12.0",
   "description": "A data language",
   "keywords": ["language"],
-  "author": "Jay Adkisson <jjmadkisson at gmail dot com>",
+  "author": "Jeanine Adkisson <jjmadkisson at gmail dot com>",
   "repository": "git://github.com/GoodGuide/gibbon",
 
   "files": ["index.js", "src", "test", "Makefile", "package.json"],

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: goodguide-gibbon
 version: !ruby/object:Gem::Version
-  version: 0.11.7
+  version: 0.12.0
 platform: ruby
 authors:
 - Jay Adkisson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-15 00:00:00.000000000 Z
+date: 2014-10-09 00:00:00.000000000 Z
 dependencies: []
 description: Run and analyze gibbon code from ruby or a browser (via a ruby app).
 email: