goodguide-gibbon 0.11.3 → 0.11.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82fbb34a8e39b9fcde0e687ebab9bdd283532f59
-  data.tar.gz: 2d89f1edb1117639947eb1d179bb782e91e9e167
+  metadata.gz: 0bd09c258129158f9313c83ebda01eb248023591
+  data.tar.gz: 7521749f7f88ea8d3d3b3be0208d77e210f6bac4
 SHA512:
-  metadata.gz: a8096b1c237f645f88349a62b8e8b5eb00172ebaaa7655abcc8160c2374121810d623ef0c7dac65e509648ce262aa920ad540b0cd4c9fe497cf3e514a1a2031f
-  data.tar.gz: fd03320f9a84009e09154a1d5e9cf1f6e77ddf90509010ad5026237f25be06f78950abf62f32c71710317e831e472e92e17e515807d46362cb1264a8d0b411a1
+  metadata.gz: d532921c46484f25d0f585e3bd9265b67a0429cb15e04f3a830a9c88e7afa82b0b17ed71c655b056a8425c88064ecc329109c50168431610a673c2c865c7cead
+  data.tar.gz: 8c3114bae320cb7618a2968807d7a0ea17f0ef889f33c181ce9744f25b8270400b9278a714b6b5a7afb43fb710674eb320c4749e27e6ed59d45258be04ab4d7f

data/lib/goodguide/gibbon.rb

@@ -27,8 +27,9 @@ module GoodGuide
 
         ruby_hash = { '__isHash__' => true }
 
-        js_hash[:each].methodcall(js_hash, lambda { |a, b, c|
-          k, v = defined?(JRUBY_VERSION) ? [a, b] : [b, c]
+        js_hash[:each].methodcall(js_hash, lambda { |*args|
+          args.shift unless defined?(JRUBY_VERSION)
+          k, v = args
           ruby_hash[k] = obj_to_ruby(v)
         })
 

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

@@ -671,7 +671,8 @@ Variant = (function() {
       if (values.length !== names.length) {
         throw new TypeError("wrong number of arguments: " + values.length + " for " + names.length);
       }
-      return klass.call(this, names, values);
+      klass.call(this, names, values);
+      return this;
     };
     subclass.prototype = allocate(klass.prototype);
     subclass.prototype._tag = tag;
@@ -957,16 +958,6 @@ Gibbon.Hash = Hash = (function(_super) {
 
   saltLen = salt.length;
 
-  Hash.prototype.loadKey = function(k) {
-    return salt + k;
-  };
-
-  Hash.prototype.dumpKey = function(k) {
-    if (k.indexOf(salt) === 0) {
-      return k.slice(saltLen);
-    }
-  };
-
   Hash.prototype.get = function(k) {
     return this[salt + k];
   };
@@ -985,7 +976,9 @@ Gibbon.Hash = Hash = (function(_super) {
     for (k in this) {
       if (!__hasProp.call(this, k)) continue;
       v = this[k];
-      _results.push(f(k.slice(saltLen), v));
+      if (k.indexOf(salt) === 0) {
+        _results.push(f(k.slice(saltLen), v));
+      }
     }
     return _results;
   };
@@ -2019,13 +2012,14 @@ analyze = Gibbon.analyze = (function() {
       }
 
       NativeContext.prototype.query = function(id, query, cb) {
-        var cacheKey,
+        var cacheKey, lookupFn,
           _this = this;
         cacheKey = "" + id + "/" + query.type + " " + (query.args.join(' '));
         if (this.queryCache.has(cacheKey)) {
           return Thunk.trampoline(cb(this.queryCache.get(cacheKey)));
         }
-        return this.externalLookup.call(null, id, query, Type, function(err, analysis) {
+        lookupFn = this.externalLookup;
+        return lookupFn(id, query, Type, function(err, analysis) {
           var result;
           result = err ? TypeLookup.error(err) : TypeLookup.response(query, analysis);
           _this.queryCache.set(cacheKey, result);
@@ -6423,10 +6417,23 @@ Gibbon.CompiledCode = CompiledCode = (function() {
   };
 
   CompiledCode.prototype.outputType = function(key) {
+    var e, type;
     if (key == null) {
       key = '/';
     }
-    return this.semantics.get(key).flow.type;
+    try {
+      type = this.semantics.get(key).flow.type;
+      if (type == null) {
+        throw "null type at " + key + ": " + (JSON.stringify(this.semantics));
+      }
+      if (!type.cases) {
+        throw "type without cases at " + key + ": JSON.stringify(@semantics)}";
+      }
+      return type;
+    } catch (_error) {
+      e = _error;
+      throw "" + e + " thrown at " + key + ": " + (JSON.stringify(this.semantics));
+    }
   };
 
   return CompiledCode;

data/vendor/gibbon/gibbon.browser.js

@@ -661,7 +661,8 @@ Variant = (function() {
       if (values.length !== names.length) {
         throw new TypeError("wrong number of arguments: " + values.length + " for " + names.length);
       }
-      return klass.call(this, names, values);
+      klass.call(this, names, values);
+      return this;
     };
     subclass.prototype = allocate(klass.prototype);
     subclass.prototype._tag = tag;
@@ -947,16 +948,6 @@ Gibbon.Hash = Hash = (function(_super) {
 
   saltLen = salt.length;
 
-  Hash.prototype.loadKey = function(k) {
-    return salt + k;
-  };
-
-  Hash.prototype.dumpKey = function(k) {
-    if (k.indexOf(salt) === 0) {
-      return k.slice(saltLen);
-    }
-  };
-
   Hash.prototype.get = function(k) {
     return this[salt + k];
   };
@@ -975,7 +966,9 @@ Gibbon.Hash = Hash = (function(_super) {
     for (k in this) {
       if (!__hasProp.call(this, k)) continue;
       v = this[k];
-      _results.push(f(k.slice(saltLen), v));
+      if (k.indexOf(salt) === 0) {
+        _results.push(f(k.slice(saltLen), v));
+      }
     }
     return _results;
   };
@@ -2005,13 +1998,14 @@ analyze = Gibbon.analyze = (function() {
       }
 
       NativeContext.prototype.query = function(id, query, cb) {
-        var cacheKey,
+        var cacheKey, lookupFn,
           _this = this;
         cacheKey = "" + id + "/" + query.type + " " + (query.args.join(' '));
         if (this.queryCache.has(cacheKey)) {
           return Thunk.trampoline(cb(this.queryCache.get(cacheKey)));
         }
-        return this.externalLookup.call(null, id, query, Type, function(err, analysis) {
+        lookupFn = this.externalLookup;
+        return lookupFn(id, query, Type, function(err, analysis) {
           var result;
           result = err ? TypeLookup.error(err) : TypeLookup.response(query, analysis);
           _this.queryCache.set(cacheKey, result);
@@ -6360,10 +6354,23 @@ Gibbon.CompiledCode = CompiledCode = (function() {
   };
 
   CompiledCode.prototype.outputType = function(key) {
+    var e, type;
     if (key == null) {
       key = '/';
     }
-    return this.semantics.get(key).flow.type;
+    try {
+      type = this.semantics.get(key).flow.type;
+      if (type == null) {
+        throw "null type at " + key + ": " + (JSON.stringify(this.semantics));
+      }
+      if (!type.cases) {
+        throw "type without cases at " + key + ": JSON.stringify(@semantics)}";
+      }
+      return type;
+    } catch (_error) {
+      e = _error;
+      throw "" + e + " thrown at " + key + ": " + (JSON.stringify(this.semantics));
+    }
   };
 
   return CompiledCode;

data/vendor/gibbon/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gibbon",
-  "version": "0.11.3",
+  "version": "0.11.4",
   "description": "A data language",
   "keywords": ["language"],
   "author": "Jay Adkisson <jjmadkisson at gmail dot com>",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: goodguide-gibbon
 version: !ruby/object:Gem::Version
-  version: 0.11.3
+  version: 0.11.4
 platform: ruby
 authors:
 - Jay Adkisson
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-08-01 00:00:00.000000000 Z
+date: 2014-08-12 00:00:00.000000000 Z
 dependencies: []
 description: Run and analyze gibbon code from ruby or a browser (via a ruby app).
 email:
@@ -19,35 +19,35 @@ extensions:
 extra_rdoc_files: []
 files:
 - Gemfile
-- ext/mkrf_conf.rb
 - goodguide-gibbon.gemspec
 - lib/goodguide/gibbon.rb
 - lib/goodguide/gibbon/version.rb
-- vendor/gibbon/gibbon.browser.dev.js
-- vendor/gibbon/gibbon.browser.js
 - vendor/gibbon/package.json
+- vendor/gibbon/gibbon.browser.js
+- vendor/gibbon/gibbon.browser.dev.js
+- ext/mkrf_conf.rb
 homepage: http://github.com/GoodGuide/goodguide-gibbon
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: goodguide-gibbon
-rubygems_version: 2.2.2
-signing_key: 
+rubygems_version: 2.1.9
+signing_key:
 specification_version: 4
 summary: Ruby bindings for the gibbon data language
 test_files: []
-has_rdoc: 
+has_rdoc: