arel - npm Package Compare versions

Comparing version 0.2.2 to 0.3.0

lib/Predications.js

@@ -7,2 +7,6 @@ 'use strict';
 
+var _toConsumableArray2 = require('babel-runtime/helpers/toConsumableArray');
+
+var _toConsumableArray3 = _interopRequireDefault(_toConsumableArray2);
+
 var _isArray = require('lodash/isArray');
@@ -22,6 +26,6 @@
   notEqAny: function notEqAny(others) {
-    return this.groupingAny('not_eq', others);
+    return this.groupingAny('notEq', others);
   },
   notEqAll: function notEqAll(others) {
-    return this.groupingAll('not_eq', others);
+    return this.groupingAll('notEq', others);
   },
@@ -66,4 +70,11 @@ eq: function eq(other) {
   },
-  inAny: function inAny(others) {},
-  inAll: function inAll(others) {},
+  inAny: function inAny(others) {
+    return this.groupingAny('in', others);
+  },
+  inAll: function inAll(others) {
+    return this.groupingAll('in', others);
+  },
+
+
+  // TODO
   notBetween: function notBetween(other) {},
@@ -85,4 +96,8 @@ notIn: function notIn(other) {
   },
-  notInAny: function notInAny(others) {},
-  notInAll: function notInAll(others) {},
+  notInAny: function notInAny(others) {
+    return this.groupingAny('notIn', others);
+  },
+  notInAll: function notInAll(others) {
+    return this.groupingAll('notIn', others);
+  },
   matches: function matches(other) {
@@ -108,2 +123,4 @@ var escape = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
     var caseSensitive = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+
+    return this.groupingAny('matches', others, escape, caseSensitive);
   },
@@ -113,2 +130,4 @@ matchesAll: function matchesAll(others) {
     var caseSensitive = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+
+    return this.groupingAll('matches', others, escape, caseSensitive);
   },
@@ -134,5 +153,9 @@ doesNotMatch: function doesNotMatch(other) {
     var escape = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
+
+    return this.groupingAny('doesNotMatch', others, escape);
   },
   doesNotMatchAll: function doesNotMatchAll(others) {
     var escape = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
+
+    return this.groupingAll('doesNotMatch', others, escape);
   },
@@ -145,4 +168,8 @@ gteq: function gteq(right) {
   },
-  gteqAny: function gteqAny(others) {},
-  gteqAll: function gteqAll(others) {},
+  gteqAny: function gteqAny(others) {
+    return this.groupingAny('gteq', others);
+  },
+  gteqAll: function gteqAll(others) {
+    return this.groupingAll('gteq', others);
+  },
   gt: function gt(right) {
@@ -154,4 +181,8 @@ var _require13 = require('./nodes'),
   },
-  gtAny: function gtAny(others) {},
-  gtAll: function gtAll(others) {},
+  gtAny: function gtAny(others) {
+    return this.groupingAny('gt', others);
+  },
+  gtAll: function gtAll(others) {
+    return this.groupingAll('gt', others);
+  },
   lt: function lt(right) {
@@ -163,4 +194,8 @@ var _require14 = require('./nodes'),
   },
-  ltAny: function ltAny(others) {},
-  ltAll: function ltAll(others) {},
+  ltAny: function ltAny(others) {
+    return this.groupingAny('lt', others);
+  },
+  ltAll: function ltAll(others) {
+    return this.groupingAll('lt', others);
+  },
   lteq: function lteq(right) {
@@ -172,4 +207,8 @@ var _require15 = require('./nodes'),
   },
-  lteqAny: function lteqAny(others) {},
-  lteqAll: function lteqAll(others) {},
+  lteqAny: function lteqAny(others) {
+    return this.groupingAny('lteq', others);
+  },
+  lteqAll: function lteqAll(others) {
+    return this.groupingAll('lteq', others);
+  },
   when: function when(right) {
@@ -191,20 +230,52 @@ var _require16 = require('./nodes'),
 
-  groupingAny: function groupingAny(methodId, others) {},
-  groupingAll: function groupingAll(methodId, others) {},
-  quotedNode: function quotedNode(other) {
+  groupingAny: function groupingAny(methodId, others) {
+    for (var _len = arguments.length, extras = Array(_len > 2 ? _len - 2 : 0), _key = 2; _key < _len; _key++) {
+      extras[_key - 2] = arguments[_key];
+    }
+
+    var _this = this;
+
     var _require18 = require('./nodes'),
-        buildQuoted = _require18.buildQuoted;
+        Grouping = _require18.Grouping,
+        Or = _require18.Or;
 
+    var nodes = others.map(function (expr) {
+      return _this[methodId].apply(_this, [expr].concat((0, _toConsumableArray3.default)(extras)));
+    });
+    return new Grouping(nodes.reduce(function (memo, node) {
+      return new Or(memo, node);
+    }));
+  },
+  groupingAll: function groupingAll(methodId, others) {
+    for (var _len2 = arguments.length, extras = Array(_len2 > 2 ? _len2 - 2 : 0), _key2 = 2; _key2 < _len2; _key2++) {
+      extras[_key2 - 2] = arguments[_key2];
+    }
+
+    var _this2 = this;
+
+    var _require19 = require('./nodes'),
+        Grouping = _require19.Grouping,
+        And = _require19.And;
+
+    var nodes = others.map(function (expr) {
+      return _this2[methodId].apply(_this2, [expr].concat((0, _toConsumableArray3.default)(extras)));
+    });
+    return new Grouping(new And(nodes));
+  },
+  quotedNode: function quotedNode(other) {
+    var _require20 = require('./nodes'),
+        buildQuoted = _require20.buildQuoted;
+
     return buildQuoted(other, this);
   },
   quotedArray: function quotedArray(others) {
-    var _this = this;
+    var _this3 = this;
 
     return others.map(function (v) {
-      return _this.quotedNode(v);
+      return _this3.quotedNode(v);
     });
   },
   equalsQuoted: function equalsQuoted(maybeQuoted, value) {
-    var _require19 = require('./nodes'),
-        Quoted = _require19.Quoted;
+    var _require21 = require('./nodes'),
+        Quoted = _require21.Quoted;
 
@@ -211,0 +282,0 @@ if (maybeQuoted instanceof Quoted) {

package.json

 {
   "name": "arel",
-  "version": "0.2.2",
+  "version": "0.3.0",
   "description": "arel",
@@ -5,0 +5,0 @@ "main": "index.js",

No alert changes

Improved metrics

Total package byte prevSize

344076

increased by0.6%

Lines of code

6076

increased by0.95%

No dependency changes