goodguide-gibbon 0.3.5 → 0.3.6

data/lib/goodguide/gibbon/version.rb

@@ -1,7 +1,7 @@
 module GoodGuide
   module Gibbon
     def self.version
-      '0.3.5'
+      '0.3.6'
     end
   end
 end

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

@@ -1008,7 +1008,7 @@ Gibbon.TypeAST = TypeAST = (function(_super) {
 })(Union);
 
 parse = Gibbon.parse = (function() {
-  var arrow, arrowType, assertString, bang, blockExpr, blockType, comma, comment, component, concrete, decimal, decimalExpr, define, definition, expr, fail, flow, fraction, fractionExpr, frame, freeFrame, fullSignature, func, funcPlaceholder, identifier, ignore, innerFrame, integer, integerExpr, isString, label, labelVal, lbrace, lbrack, lexeme, listExpr, listType, lparen, metadata, name, nativeId, nativeType, nonPairedFlow, numericExpr, pair, parenFlow, parenFrame, parenType, percent, percentExpr, program, query, question, rbrace, rbrack, regex, rparen, signature, simpleType, singletonFlow, str, string, stringExpr, substExpr, succeed, tassign, type, typeVar, variable, whitespace, wildType, wildcard;
+  var accessor, accessorExpr, arrow, arrowType, assertString, bang, blockExpr, blockType, comma, comment, component, concrete, decimal, decimalExpr, define, definition, expr, fail, flow, fraction, fractionExpr, frame, freeFrame, fullSignature, func, funcPlaceholder, identifier, ignore, innerFrame, integer, integerExpr, isString, label, labelVal, lbrace, lbrack, lexeme, listExpr, listType, lparen, metadata, name, nativeId, nativeType, nonPairedFlow, numericExpr, pair, parenFlow, parenFrame, parenType, percent, percentExpr, program, query, queryExpr, question, rbrace, rbrack, regex, rparen, signature, simpleType, singletonFlow, str, string, stringExpr, substExpr, succeed, tassign, type, typeVar, variable, whitespace, wildType, wildcard;
   string = Parsimmon.string, regex = Parsimmon.regex, succeed = Parsimmon.succeed, fail = Parsimmon.fail;
   Parsimmon.Parser.prototype.expected = function(message) {
     var _this = this;
@@ -1046,6 +1046,8 @@ parse = Gibbon.parse = (function() {
   rparen = lexeme(string(')'));
   comma = lexeme(string(','));
   question = lexeme(string('?'));
+  query = lexeme(string('.').then(identifier.expected()));
+  accessor = lexeme(string('@').then(identifier.expected()));
   name = lexeme(identifier);
   str = lexeme(string("'").then(regex(/^[^']*/)).skip(string("'").expected()));
   fraction = lexeme(regex(/^\d+\/\d+/));
@@ -1074,19 +1076,14 @@ parse = Gibbon.parse = (function() {
   stringExpr = str.map(function(s) {
     return AST.string(s);
   });
-  query = string('@').then((function() {
-    var accessor, fullQuery, parenName;
-    parenName = lparen.then(lexeme(identifier).expected()).skip(rparen.expected());
-    accessor = parenName.map(function(name) {
-      return AST.query('access', name);
-    });
-    fullQuery = identifier.then(function(q) {
-      return parenName.map(function(name) {
-        return AST.query(q, name);
-      });
+  accessorExpr = accessor.map(function(name) {
+    return AST.query('access', name);
+  });
+  queryExpr = query.then(function(q) {
+    return name.map(function(n) {
+      return AST.query(q, n);
     });
-    return accessor.or(fullQuery);
-  })());
+  });
   numericExpr = percentExpr.or(decimalExpr.or(fractionExpr.or(integerExpr)));
   parenFlow = lparen.then(function() {
     return flow.expected().skip(rparen.expected());
@@ -1107,7 +1104,7 @@ parse = Gibbon.parse = (function() {
   blockExpr = lbrace.then(function() {
     return flow.skip(rbrace.expected());
   }).map(AST.block);
-  expr = query.or(substExpr.or(listExpr.or(stringExpr.or(blockExpr.or(numericExpr)))));
+  expr = queryExpr.or(accessorExpr.or(substExpr.or(listExpr.or(stringExpr.or(blockExpr.or(numericExpr))))));
   singletonFlow = expr.map(function(e) {
     return AST.flow(e, null);
   });

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

@@ -1002,7 +1002,7 @@ Gibbon.TypeAST = TypeAST = (function(_super) {
 })(Union);
 
 parse = Gibbon.parse = (function() {
-  var arrow, arrowType, assertString, bang, blockExpr, blockType, comma, comment, component, concrete, decimal, decimalExpr, define, definition, expr, fail, flow, fraction, fractionExpr, frame, freeFrame, fullSignature, func, funcPlaceholder, identifier, ignore, innerFrame, integer, integerExpr, isString, label, labelVal, lbrace, lbrack, lexeme, listExpr, listType, lparen, metadata, name, nativeId, nativeType, nonPairedFlow, numericExpr, pair, parenFlow, parenFrame, parenType, percent, percentExpr, program, query, question, rbrace, rbrack, regex, rparen, signature, simpleType, singletonFlow, str, string, stringExpr, substExpr, succeed, tassign, type, typeVar, variable, whitespace, wildType, wildcard;
+  var accessor, accessorExpr, arrow, arrowType, assertString, bang, blockExpr, blockType, comma, comment, component, concrete, decimal, decimalExpr, define, definition, expr, fail, flow, fraction, fractionExpr, frame, freeFrame, fullSignature, func, funcPlaceholder, identifier, ignore, innerFrame, integer, integerExpr, isString, label, labelVal, lbrace, lbrack, lexeme, listExpr, listType, lparen, metadata, name, nativeId, nativeType, nonPairedFlow, numericExpr, pair, parenFlow, parenFrame, parenType, percent, percentExpr, program, query, queryExpr, question, rbrace, rbrack, regex, rparen, signature, simpleType, singletonFlow, str, string, stringExpr, substExpr, succeed, tassign, type, typeVar, variable, whitespace, wildType, wildcard;
   string = Parsimmon.string, regex = Parsimmon.regex, succeed = Parsimmon.succeed, fail = Parsimmon.fail;
   Parsimmon.Parser.prototype.expected = function(message) {
     var _this = this;
@@ -1040,6 +1040,8 @@ parse = Gibbon.parse = (function() {
   rparen = lexeme(string(')'));
   comma = lexeme(string(','));
   question = lexeme(string('?'));
+  query = lexeme(string('.').then(identifier.expected()));
+  accessor = lexeme(string('@').then(identifier.expected()));
   name = lexeme(identifier);
   str = lexeme(string("'").then(regex(/^[^']*/)).skip(string("'").expected()));
   fraction = lexeme(regex(/^\d+\/\d+/));
@@ -1068,19 +1070,14 @@ parse = Gibbon.parse = (function() {
   stringExpr = str.map(function(s) {
     return AST.string(s);
   });
-  query = string('@').then((function() {
-    var accessor, fullQuery, parenName;
-    parenName = lparen.then(lexeme(identifier).expected()).skip(rparen.expected());
-    accessor = parenName.map(function(name) {
-      return AST.query('access', name);
-    });
-    fullQuery = identifier.then(function(q) {
-      return parenName.map(function(name) {
-        return AST.query(q, name);
-      });
+  accessorExpr = accessor.map(function(name) {
+    return AST.query('access', name);
+  });
+  queryExpr = query.then(function(q) {
+    return name.map(function(n) {
+      return AST.query(q, n);
     });
-    return accessor.or(fullQuery);
-  })());
+  });
   numericExpr = percentExpr.or(decimalExpr.or(fractionExpr.or(integerExpr)));
   parenFlow = lparen.then(function() {
     return flow.expected().skip(rparen.expected());
@@ -1101,7 +1098,7 @@ parse = Gibbon.parse = (function() {
   blockExpr = lbrace.then(function() {
     return flow.skip(rbrace.expected());
   }).map(AST.block);
-  expr = query.or(substExpr.or(listExpr.or(stringExpr.or(blockExpr.or(numericExpr)))));
+  expr = queryExpr.or(accessorExpr.or(substExpr.or(listExpr.or(stringExpr.or(blockExpr.or(numericExpr))))));
   singletonFlow = expr.map(function(e) {
     return AST.flow(e, null);
   });

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: goodguide-gibbon
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-07 00:00:00.000000000 Z
+date: 2013-08-13 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: 1343523825652260222
+      hash: -2471759766594341795
 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: 1343523825652260222
+      hash: -2471759766594341795
 requirements: []
 rubyforge_project: goodguide-gibbon
 rubygems_version: 1.8.23