goodguide-gibbon 0.3.0 → 0.3.1

data/lib/goodguide/gibbon.rb

@@ -24,8 +24,39 @@ module GoodGuide
       def initialize(errors)
         @errors = errors
       end
+
+      def messages
+        @errors.map(&method(:semantic_error_message))
+      end
+
+    private
+      def semantic_error_message(e)
+        case e['_tag']
+        when 'match'
+          lhs = e['lhs'].inspect
+          rhs = e['rhs'].inspect
+          "could not match #{lhs} with #{rhs}"
+        when 'destructure'
+          type = e['type'].inspect
+          "could not destructure #{type}"
+        when 'lookup'
+          query_name = e['query']['name']
+          query_type = e['query']['type']
+          query = "@#{query_type}(#{query_name})"
+          id = e['id']
+          error = e['error']
+          "error analyzing #{query} on #{id}: #{error}"
+        when 'circular'
+          chain = e['crumbs'].join(' -> ')
+          "circular dependency: #{chain}"
+        else
+          raise "unknown error type #{e['_tag']}"
+        end
+      end
     end
 
+    class QueryError < StandardError; end
+
     class RuntimeError < StandardError; end
 
     class Program
@@ -99,8 +130,8 @@ module GoodGuide
           cb = args.pop
           err, val = begin
             [nil, send(method, *args)]
-          # rescue => e
-          #   [e.to_s, nil]
+          rescue QueryError => e
+            [e.to_s, nil]
           end
 
           cb.call(err, val)
@@ -109,6 +140,10 @@ module GoodGuide
     end
 
     class StaticClient < AbstractClient
+      def query_error!(*a)
+        raise QueryError.new(*a)
+      end
+
       def analyze_query(input_id, query, t)
         query_impl = get_query(query.type)
         analysis = instance_exec(input_id, query.name, t, &query_impl)

data/lib/goodguide/gibbon/version.rb

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

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

@@ -1500,7 +1500,8 @@ Gibbon.TypeLookup = TypeLookup = (function(_super) {
 
   TypeLookup.types({
     response: ['analysis'],
-    local: ['name']
+    local: ['name'],
+    error: ['error']
   });
 
   return TypeLookup;
@@ -1781,9 +1782,10 @@ analyze = Gibbon.analyze = (function() {
       NativeContext.prototype.query = function(id, query, cb) {
         return this.externalLookup.call(null, id, query, TypeAST, function(err, analysis) {
           if (err) {
-            throw err;
+            return cb(TypeLookup.error(err));
+          } else {
+            return cb(TypeLookup.response(analysis));
           }
-          return cb(TypeLookup.response(analysis));
         });
       };
 
@@ -1978,9 +1980,8 @@ analyze = Gibbon.analyze = (function() {
 
       TypeError.types({
         match: ['lhs', 'rhs'],
-        infinite: ['type'],
         destructure: ['type'],
-        access: ['type'],
+        lookup: ['query', 'id', 'error'],
         circular: ['crumbs']
       });
 
@@ -2085,6 +2086,9 @@ analyze = Gibbon.analyze = (function() {
                     return scope.lookup(id, query, function(lookup) {
                       dependencies.push(lookup);
                       return lookup.cases({
+                        error: function(e) {
+                          return cb(error('lookup', query, id, e));
+                        },
                         response: function(analysis) {
                           semanticAccessors.set(query, Semantic.query(analysis.annotations));
                           return cb(TypeExpr.fromAST(analysis.type));
@@ -2854,7 +2858,7 @@ eval_ = Gibbon["eval"] = (function() {
 // Generated by CoffeeScript 1.6.3
 Gibbon.jsonConsumer = (function() {
   return function(tables) {
-    var getType, getValue;
+    var analyzeList, getType, getValue, lists;
     getType = function(id, accessorName, t, callback) {
       var fields;
       if (!tables.hasOwnProperty(id)) {
@@ -2887,11 +2891,30 @@ Gibbon.jsonConsumer = (function() {
       }
       return callback(null, entity[annotations.name]);
     };
+    lists = tables._lists || {};
+    analyzeList = function(id, listName, t, callback) {
+      var list;
+      if (!lists.hasOwnProperty(listName)) {
+        callback(new Error("unkown list `" + listName + "'"));
+      }
+      list = lists[listName];
+      if (id !== list.type) {
+        callback(new Error("wrong type " + id + " for list `" + listName + "'"));
+      }
+      return callback(null, {
+        type: t.concrete('bool'),
+        annotations: {
+          list: listName
+        }
+      });
+    };
     return {
       analyzeQuery: function(id, query, t, callback) {
         switch (query.type) {
           case 'access':
             return getType(id, query.name, t, callback);
+          case 'on':
+            return analyzeList(id, query.name, t, callback);
           default:
             return callback(new Error("unknown query `" + query.type + "'"));
         }

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

@@ -1494,7 +1494,8 @@ Gibbon.TypeLookup = TypeLookup = (function(_super) {
 
   TypeLookup.types({
     response: ['analysis'],
-    local: ['name']
+    local: ['name'],
+    error: ['error']
   });
 
   return TypeLookup;
@@ -1775,9 +1776,10 @@ analyze = Gibbon.analyze = (function() {
       NativeContext.prototype.query = function(id, query, cb) {
         return this.externalLookup.call(null, id, query, TypeAST, function(err, analysis) {
           if (err) {
-            throw err;
+            return cb(TypeLookup.error(err));
+          } else {
+            return cb(TypeLookup.response(analysis));
           }
-          return cb(TypeLookup.response(analysis));
         });
       };
 
@@ -1972,9 +1974,8 @@ analyze = Gibbon.analyze = (function() {
 
       TypeError.types({
         match: ['lhs', 'rhs'],
-        infinite: ['type'],
         destructure: ['type'],
-        access: ['type'],
+        lookup: ['query', 'id', 'error'],
         circular: ['crumbs']
       });
 
@@ -2065,6 +2066,9 @@ analyze = Gibbon.analyze = (function() {
                     return scope.lookup(id, query, function(lookup) {
                       dependencies.push(lookup);
                       return lookup.cases({
+                        error: function(e) {
+                          return cb(error('lookup', query, id, e));
+                        },
                         response: function(analysis) {
                           semanticAccessors.set(query, Semantic.query(analysis.annotations));
                           return cb(TypeExpr.fromAST(analysis.type));
@@ -2826,7 +2830,7 @@ eval_ = Gibbon["eval"] = (function() {
 // Generated by CoffeeScript 1.6.3
 Gibbon.jsonConsumer = (function() {
   return function(tables) {
-    var getType, getValue;
+    var analyzeList, getType, getValue, lists;
     getType = function(id, accessorName, t, callback) {
       var fields;
       if (!tables.hasOwnProperty(id)) {
@@ -2859,11 +2863,30 @@ Gibbon.jsonConsumer = (function() {
       }
       return callback(null, entity[annotations.name]);
     };
+    lists = tables._lists || {};
+    analyzeList = function(id, listName, t, callback) {
+      var list;
+      if (!lists.hasOwnProperty(listName)) {
+        callback(new Error("unkown list `" + listName + "'"));
+      }
+      list = lists[listName];
+      if (id !== list.type) {
+        callback(new Error("wrong type " + id + " for list `" + listName + "'"));
+      }
+      return callback(null, {
+        type: t.concrete('bool'),
+        annotations: {
+          list: listName
+        }
+      });
+    };
     return {
       analyzeQuery: function(id, query, t, callback) {
         switch (query.type) {
           case 'access':
             return getType(id, query.name, t, callback);
+          case 'on':
+            return analyzeList(id, query.name, t, callback);
           default:
             return callback(new Error("unknown query `" + query.type + "'"));
         }

metadata

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