goodguide-gibbon 0.6.1 → 0.6.2

data/Gemfile

@@ -3,7 +3,11 @@ gemspec
 
 gem 'minitest', '~> 4.0'
 gem 'wrong'
+
 gem 'pry'
-gem 'pry-debugger'
+
+platforms :ruby do
+  gem 'pry-debugger'
+end
 
 gem 'rake'

data/goodguide-gibbon.gemspec

@@ -21,5 +21,9 @@ Gem::Specification.new do |s|
     'vendor/gibbon/lib/gibbon.browser.dev.js',
   ]
 
-  s.add_dependency 'therubyracer'
+  if defined?(JRUBY_VERSION)
+    s.add_dependency 'therubyrhino'
+  else
+    s.add_dependency 'therubyracer'
+  end
 end

data/lib/goodguide/gibbon.rb

@@ -1,4 +1,18 @@
-require 'v8' # therubyracer
+if defined?(JRUBY_VERSION)
+  require 'rhino' # therubyrhino
+  JSError = org.mozilla.javascript.RhinoException
+  JSContext = Rhino::Context
+  JSArray = Rhino::JS::NativeArray
+  JSObject = Rhino::JS::NativeObject
+  JSString = Java::OrgMozillaJavascript::ConsString
+else
+  require 'v8' # therubyracer
+  JSError = V8::Error
+  JSContext = V8::Context
+  JSArray = V8::Array
+  JSObject = V8::Object
+  JSString = String
+end
 
 require 'pathname'
 
@@ -11,7 +25,8 @@ module GoodGuide
 
         ruby_hash = { '__isHash__' => true }
 
-        js_hash[:each].methodcall(js_hash, lambda { |this, k, v|
+        js_hash[:each].methodcall(js_hash, lambda { |a, b, c|
+          k, v = defined?(JRUBY_VERSION) ? [a, b] : [b, c]
           ruby_hash[k] = obj_to_ruby(v)
         })
 
@@ -36,7 +51,7 @@ module GoodGuide
             constructor = gibbon[type]
             raise "unknown union #{type}" unless constructor && constructor.tags
             names = constructor.tags[tag]
-            raise "unknown tag #{tag}" unless names.is_a? V8::Array
+            raise "unknown tag #{tag}" unless names.is_a?(JSArray) or names.is_a?(Array)
 
             vals = names.map do |name|
               obj_to_js(o[name])
@@ -53,9 +68,11 @@ module GoodGuide
 
       def obj_to_ruby(o)
         case o
-        when V8::Array
+        when JSArray, Array
           o.map { |x| obj_to_ruby(x) }
-        when V8::Object
+        when JSString
+          o.to_s
+        when JSObject
           if o[:__isHash__]
             hash_to_ruby(o)
           elsif o[:__isVariant__]
@@ -247,6 +264,8 @@ module GoodGuide
 
       def proc_for(method)
         lambda do |this, *args|
+          args = ([this] + args).compact if defined?(JRUBY_VERSION)
+
           cb = args.pop
           err, val = begin
             [nil, send(method, *args)]
@@ -332,7 +351,7 @@ module GoodGuide
 
       def parse(str)
         obj_to_ruby self.gibbon.parse(str)
-      rescue V8::Error => e
+      rescue JSError => e
         raise SemanticError.new([{'_tag' => 'parse', 'message' => e.value}])
       end
 
@@ -360,22 +379,28 @@ module GoodGuide
       def capture(&b)
         output = nil
         error = nil
-        b.call do |this, error_, output_|
-          output, error = output_, error_
+        b.call do |*args|
+          # Rhino doesn't get "this", but V8 does.
+          args.shift unless defined?(JRUBY_VERSION)
+          error, output = args[0..1]
         end
 
         [output, error]
       end
     end
 
-    class JS < V8::Context
+    class JS < JSContext
       def self.default
         @default ||= new
       end
 
       class Console
         def log
-          @log ||= proc { |_, *a| puts a.map(&:to_s).join(' ') }
+          @log ||= if defined?(JRUBY_VERSION)
+            proc { |*a| puts a.map(&:to_s).join(' ') }
+          else
+            proc { |_, *a| puts a.map(&:to_s).join(' ') }
+          end
         end
       end
 
@@ -387,9 +412,9 @@ module GoodGuide
         self[:console] = Console.new
 
         if @debug
-          load GoodGuide::Gibbon.dev_js_lib
+          load GoodGuide::Gibbon.dev_js_lib.to_s
         else
-          load GoodGuide::Gibbon.js_lib
+          load GoodGuide::Gibbon.js_lib.to_s
         end
       end
 

data/lib/goodguide/gibbon/version.rb

@@ -1,7 +1,7 @@
 module GoodGuide
   module Gibbon
     def self.version
-      '0.6.1'
+      '0.6.2'
     end
   end
 end

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

@@ -1233,7 +1233,7 @@ parse = Gibbon.parse = (function() {
   lsplat = multiline(string('[*'));
   rsplat = lexeme(string('*]'));
   query = lexeme(string('.').then(identifier));
-  queryArg = lexeme(regex(/^[\w-]+/));
+  queryArg = lexeme(regex(/^\w[\w-]*/));
   accessor = lexeme(string('@').then(identifier));
   name = lexeme(identifier);
   str = lexeme(string("'").then(regex(/^[^']*/)).skip(string("'")));
@@ -3046,8 +3046,8 @@ Gibbon.Dependency = Dependency = (function(_super) {
       query: function(entity, query) {
         return "" + (JSON.stringify(query)) + "<" + entity + ">";
       },
-      lexical: function(definition) {
-        return "@" + definition.name;
+      lexical: function(key) {
+        return "@" + key;
       },
       failure: function(failure) {
         return "!";
@@ -3594,6 +3594,10 @@ Gibbon.Core = Core = (function(_super) {
     });
   };
 
+  Core.prototype.failIf = function(message, f) {
+    return f(this).branch(Core.fail(message), this);
+  };
+
   Core.prototype.alwaysFails = function() {
     return this.cases({
       query: function() {
@@ -6404,9 +6408,12 @@ Gibbon.codegen = (function() {
 })();
 
 stdlib = Gibbon.stdlib = (function() {
-  var FALSE, TRUE, equals;
+  var FALSE, TRUE, equals, isEmpty;
   TRUE = Core.constant(true);
   FALSE = Core.constant(false);
+  isEmpty = function(list) {
+    return list.len().op2('===', Core.constant(0));
+  };
   equals = function(x, y, type) {
     var direct;
     direct = function() {
@@ -6526,9 +6533,7 @@ stdlib = Gibbon.stdlib = (function() {
     },
     "empty?": {
       type: parse.type('empty? = [%] -> bool'),
-      compile: function(list) {
-        return list.len().op2('===', Core.constant(0));
-      }
+      compile: isEmpty
     },
     weight: {
       type: parse.type('weight [numeric : numeric] = % -> numeric'),
@@ -6600,6 +6605,24 @@ stdlib = Gibbon.stdlib = (function() {
         });
       }
     },
+    max: {
+      type: parse.type('max = [numeric] -> numeric'),
+      compile: function(list) {
+        list = list.failIf('max: empty list', isEmpty);
+        return list.foldList(Core.constant(-Infinity), function(el, next) {
+          return el.op2('>', next).branch(el, next);
+        });
+      }
+    },
+    min: {
+      type: parse.type('min = [numeric] -> numeric'),
+      compile: function(list) {
+        list = list.failIf('min: empty list', isEmpty);
+        return list.foldList(Core.constant(Infinity), function(el, next) {
+          return el.op2('<', next).branch(el, next);
+        });
+      }
+    },
     "case-sum": {
       type: parse.type('case-sum [bool : numeric] = % -> numeric'),
       compile: function(_, _arg) {
@@ -6635,6 +6658,25 @@ stdlib = Gibbon.stdlib = (function() {
         return input.op2('+', num.op1('-'));
       }
     },
+    mul: {
+      type: parse.type('mul numeric = numeric -> numeric'),
+      compile: function(input, _arg) {
+        var num;
+        num = _arg[0];
+        return input.op2('*', num);
+      }
+    },
+    div: {
+      type: parse.type('div numeric = numeric -> numeric'),
+      compile: function(input, _arg) {
+        var num;
+        num = _arg[0];
+        num = num.failIf('division by zero', function(n) {
+          return n.op2('===', Core.constant(0));
+        });
+        return input.op2('/', num);
+      }
+    },
     id: {
       type: parse.type('id = %a -> %a'),
       compile: function(input) {

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

@@ -1223,7 +1223,7 @@ parse = Gibbon.parse = (function() {
   lsplat = multiline(string('[*'));
   rsplat = lexeme(string('*]'));
   query = lexeme(string('.').then(identifier));
-  queryArg = lexeme(regex(/^[\w-]+/));
+  queryArg = lexeme(regex(/^\w[\w-]*/));
   accessor = lexeme(string('@').then(identifier));
   name = lexeme(identifier);
   str = lexeme(string("'").then(regex(/^[^']*/)).skip(string("'")));
@@ -3018,8 +3018,8 @@ Gibbon.Dependency = Dependency = (function(_super) {
       query: function(entity, query) {
         return "" + (JSON.stringify(query)) + "<" + entity + ">";
       },
-      lexical: function(definition) {
-        return "@" + definition.name;
+      lexical: function(key) {
+        return "@" + key;
       },
       failure: function(failure) {
         return "!";
@@ -3566,6 +3566,10 @@ Gibbon.Core = Core = (function(_super) {
     });
   };
 
+  Core.prototype.failIf = function(message, f) {
+    return f(this).branch(Core.fail(message), this);
+  };
+
   Core.prototype.alwaysFails = function() {
     return this.cases({
       query: function() {
@@ -6376,9 +6380,12 @@ Gibbon.codegen = (function() {
 })();
 
 stdlib = Gibbon.stdlib = (function() {
-  var FALSE, TRUE, equals;
+  var FALSE, TRUE, equals, isEmpty;
   TRUE = Core.constant(true);
   FALSE = Core.constant(false);
+  isEmpty = function(list) {
+    return list.len().op2('===', Core.constant(0));
+  };
   equals = function(x, y, type) {
     var direct;
     direct = function() {
@@ -6498,9 +6505,7 @@ stdlib = Gibbon.stdlib = (function() {
     },
     "empty?": {
       type: parse.type('empty? = [%] -> bool'),
-      compile: function(list) {
-        return list.len().op2('===', Core.constant(0));
-      }
+      compile: isEmpty
     },
     weight: {
       type: parse.type('weight [numeric : numeric] = % -> numeric'),
@@ -6572,6 +6577,24 @@ stdlib = Gibbon.stdlib = (function() {
         });
       }
     },
+    max: {
+      type: parse.type('max = [numeric] -> numeric'),
+      compile: function(list) {
+        list = list.failIf('max: empty list', isEmpty);
+        return list.foldList(Core.constant(-Infinity), function(el, next) {
+          return el.op2('>', next).branch(el, next);
+        });
+      }
+    },
+    min: {
+      type: parse.type('min = [numeric] -> numeric'),
+      compile: function(list) {
+        list = list.failIf('min: empty list', isEmpty);
+        return list.foldList(Core.constant(Infinity), function(el, next) {
+          return el.op2('<', next).branch(el, next);
+        });
+      }
+    },
     "case-sum": {
       type: parse.type('case-sum [bool : numeric] = % -> numeric'),
       compile: function(_, _arg) {
@@ -6607,6 +6630,25 @@ stdlib = Gibbon.stdlib = (function() {
         return input.op2('+', num.op1('-'));
       }
     },
+    mul: {
+      type: parse.type('mul numeric = numeric -> numeric'),
+      compile: function(input, _arg) {
+        var num;
+        num = _arg[0];
+        return input.op2('*', num);
+      }
+    },
+    div: {
+      type: parse.type('div numeric = numeric -> numeric'),
+      compile: function(input, _arg) {
+        var num;
+        num = _arg[0];
+        num = num.failIf('division by zero', function(n) {
+          return n.op2('===', Core.constant(0));
+        });
+        return input.op2('/', num);
+      }
+    },
     id: {
       type: parse.type('id = %a -> %a'),
       compile: function(input) {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: goodguide-gibbon
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-28 00:00:00.000000000 Z
+date: 2014-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: therubyracer