Rhys/gte lte (#128)

* added support for >=, <=

* update build

* update build

* docs

.gitignore

@@ -1,5 +1,6 @@
 /node_modules/
 /bower_components/
 /.idea/
-.env
 /test.js
+.eslintrc.js
+.editorconfig

Makefile

@@ -1,10 +1,6 @@
-.PHONY: test
-
-install:
-	npm install
+include n.Makefile
 
 test-unit:
 	mocha test/helpers.js test
 
-test: test-unit
-	nbt verify --skip-layout-checks
+test: test-unit verify

README.md

@@ -74,6 +74,8 @@ Filter can be called as many times as you like
 | prop is not equal to value | `->filter(prop!=val)` | `kq.filter('prop!=val')` |
 | prop is greater than value | `->filter(prop>val)` | `kq.filter('prop>val')` |
 | prop is less than value | `->filter(prop<val)` | `kq.filter('prop<val')` |
+| prop is greater than or equal to value | `->filter(prop>=val)` | `kq.filter('prop>=val')` |
+| prop is less than or equal to value | `->filter(prop<=val)` | `kq.filter('prop<=val')` |
 | prop contains value | `->filter(prop~val)` | `kq.filter('prop~val')` |
 | prop does not contain value | `->filter(prop!~val)` | `kq.filter('prop!~val')` |
 | prop is equal to val1, val2 ... | `->filter(prop?val1,val2,val3)` | `kq.filter('prop?val1,val2,val3')` |

lib/cli.js

@@ -129,4 +129,3 @@ module.exports = {
 		}
 	}
 }
-

lib/data/immutable-matrix.js

@@ -359,5 +359,3 @@ function detectTableGaps (table1, table2) {
 module.exports.isGappy = function (table2, table1) {
 	return detectTableGaps(table1, table2) || detectTableGaps(table2, table1);
 }
-
-

lib/keen-query/filters.js

@@ -26,7 +26,7 @@ function transformValue (value, handleList) {
 }
 
 module.exports.parse = function (filter) {
-	let filterConf = /^([^!~\?]*)(=|!=|>|<|~|!~|\?|!\?)(.+)$/.exec(filter);
+	let filterConf = /^([^!~\?><]*)(>=?|<=?|=|!=|~|!~|\?|!\?)(.+)$/.exec(filter);
 	if (filterConf) {
 		if (!filterConf[1] && !filterConf[3]) {
 			throw new Error(`Filter ${filter} must specify a property name to filter on and a value to match e.g. ->filter(user.uuid${filter}abcd)`);

lib/keen-query/shorthands.js

@@ -25,6 +25,12 @@ module.exports.filters = {
 	'<': {
 		operator: 'lt'
 	},
+	'>=': {
+		operator: 'gte'
+	},
+	'<=': {
+		operator: 'lte'
+	},
 	'<<': {
 		operator: 'in',
 		handleList: true
@@ -43,6 +49,8 @@ module.exports.reverseFilters = {
 	'not_contains': '!~',
 	'gt': '>',
 	'lt': '<',
+	'gte': '>=',
+	'lte': '<=',
 	'in': '?'
 };
 

lib/post-processing/reduce.js

@@ -8,15 +8,15 @@ function linearRegression(arr){
 	var sum_y = 0;
 	var sum_xy = 0;
 	var sum_xx = 0;
-	var sum_yy = 0;
+	// var sum_yy = 0;
 
 	for (var i = 0; i < arr.length; i++) {
 
 		sum_x += i;
 		sum_y += arr[i];
 		sum_xy += (i*arr[i]);
 		sum_xx += (i*i);
-		sum_yy += (arr[i]*arr[i]);
+		// sum_yy += (arr[i]*arr[i]);
 	}
 
 	return (n * sum_xy - sum_x * sum_y) / (n*sum_xx - sum_x * sum_x);

lib/printers/ascii.js

@@ -26,9 +26,3 @@ function ascii () {
 module.exports = function () {
 	return ascii.call(this);
 }
-
-
-
-
-
-

n.Makefile

@@ -0,0 +1,149 @@
+# Warning, don't edit this file, it's maintained on GitHub and updated by running `make update-tools`
+# Submit PR's here: https://www.github.com/Financial-Times/n-makefile
+
+
+# Setup environment variables
+sinclude .env
+export $(shell [ -f .env ] && sed 's/=.*//' .env)
+
+# ./node_modules/.bin on the PATH
+export PATH := ./node_modules/.bin:$(PATH)
+
+# Use bash not sh
+SHELL := /bin/bash
+
+# Some handy utilities
+GLOB = git ls-files -z $1 | tr '\0' '\n' | xargs -I {} find {} ! -type l
+NPM_INSTALL = npm prune --production=false && npm install
+BOWER_INSTALL = bower prune && bower install --config.registry.search=http://registry.origami.ft.com --config.registry.search=https://bower.herokuapp.com
+JSON_GET_VALUE = grep $1 | head -n 1 | sed 's/[," ]//g' | cut -d : -f 2
+IS_GIT_IGNORED = grep -q $(if $1, $1, $@) .gitignore
+VERSION = v1.4.7
+APP_NAME = $(shell cat package.json 2>/dev/null | $(call JSON_GET_VALUE,name))
+DONE = echo ✓ $@ done
+CONFIG_VARS = curl -fsL https://ft-next-config-vars.herokuapp.com/$1/$(call APP_NAME)$(if $2,.$2,) -H "Authorization: `heroku config:get APIKEY --app ft-next-config-vars`"
+
+#
+# META TASKS
+#
+
+.PHONY: test
+
+#
+# COMMON TASKS
+#
+
+# clean
+clea%:
+# HACK: Can't use -e option here because it's not supported by our Jenkins
+	@git clean -fxd
+	@$(DONE)
+
+# install
+instal%: node_modules bower_components _install_scss_lint .editorconfig .eslintrc.js .scss-lint.yml .env webpack.config.js heroku-cli
+	@$(MAKE) $(foreach f, $(shell find functions/* -type d -maxdepth 0 2>/dev/null), $f/node_modules $f/bower_components)
+	@$(DONE)
+
+# deploy
+deplo%: _deploy_apex
+	@$(DONE)
+
+# verify
+verif%: _verify_lintspaces _verify_eslint _verify_scss_lint
+	@$(DONE)
+
+# assets (includes assets-production)
+asset%:
+	@if [ -e webpack.config.js ]; then webpack $(if $(findstring assets-production,$@),--bail,--dev); fi
+
+# build (includes build-production)
+buil%: public/__about.json
+	@if [ -e webpack.config.js ]; then $(MAKE) $(subst build,assets,$@); fi
+	@if [ -e Procfile ] && [ "$(findstring build-production,$@)" == "build-production" ]; then haikro build; fi
+	@$(DONE)
+
+# watch
+watc%:
+	@if [ -e webpack.config.js ]; then webpack --watch --dev; fi
+	@$(DONE)
+
+#
+# SUB-TASKS
+#
+
+# INSTALL SUB-TASKS
+
+# Regular npm install
+node_modules: package.json
+	@if [ -e package.json ]; then $(NPM_INSTALL) && $(DONE); fi
+
+# Regular bower install
+bower_components: bower.json
+	@if [ -e bower.json ]; then $(BOWER_INSTALL) && $(DONE); fi
+
+# These tasks have been intentionally left blank
+package.json:
+bower.json:
+
+# node_modules for Lambda functions
+functions/%/node_modules:
+	@cd $(dir $@) && if [ -e package.json ]; then $(NPM_INSTALL) && $(DONE); fi
+
+# bower_components for Lambda functions
+functions/%/bower_components:
+	@cd $(dir $@) && if [ -e bower.json ]; then $(BOWER_INSTALL) && $(DONE); fi
+
+_install_scss_lint:
+	@if [ ! -x "$(shell which scss-lint)" ] && [ "$(shell $(call GLOB,'*.scss'))" != "" ]; then gem install scss-lint -v 0.35.0 && $(DONE); fi
+
+# Manage various dot/config files if they're in the .gitignore
+.editorconfig .eslintrc.js .scss-lint.yml webpack.config.js: n.Makefile
+	@if $(call IS_GIT_IGNORED); then curl -sL https://raw.githubusercontent.com/Financial-Times/n-makefile/$(VERSION)/config/$@ > $@ && $(DONE); fi
+
+ENV_MSG_CANT_GET = "Cannot get config vars for this service.  Check you are added to the ft-next-config-vars service on Heroku with operate permissions.  Do that here - https://docs.google.com/spreadsheets/d/1mbJQYJOgXAH2KfgKUM1Vgxq8FUIrahumb39wzsgStu0 (or ask someone to do it for you).  Check that your package.json's name property is correct.  Check that your project has config-vars set up in models/development.js."
+.env:
+	@if $(call IS_GIT_IGNORED,*.env*) && [ -e package.json ]; then ($(call CONFIG_VARS,development,env) > .env && perl -pi -e 's/="(.*)"/=\1/' .env && $(DONE)) || (echo $(ENV_MSG_CANT_GET) && rm .env && exit 1); fi
+
+MSG_HEROKU_CLI = "Please make sure the Heroku CLI toolbelt is installed - see https://toolbelt.heroku.com/. And make sure you are authenticated by running ‘heroku login’. If this is not an app, delete Procfile."
+heroku-cli:
+	@if [ -e Procfile ]; then heroku auth:whoami &>/dev/null || (echo $(MSG_HEROKU_CLI) && exit 1); fi
+
+
+# VERIFY SUB-TASKS
+
+_verify_eslint:
+	@if [ -e .eslintrc.js ]; then $(call GLOB,'*.js') | xargs eslint && $(DONE); fi
+
+_verify_lintspaces:
+	@if [ -e .editorconfig ] && [ -e package.json ]; then $(call GLOB) | xargs lintspaces -e .editorconfig -i js-comments -i html-comments && $(DONE); fi
+
+_verify_scss_lint:
+# HACK: Use backticks rather than xargs because xargs swallow exit codes (everything becomes 1 and stoopidly scss-lint exits with 1 if warnings, 2 if errors)
+	@if [ -e .scss-lint.yml ]; then { scss-lint -c ./.scss-lint.yml `$(call GLOB,'*.scss')`; if [ $$? -ne 0 -a $$? -ne 1 ]; then exit 1; fi; $(DONE); } fi
+
+# DEPLOY SUB-TASKS
+
+APEX_PROD_ENV_FILE = .env.prod.json
+_deploy_apex:
+	@if [ -e project.json ]; then $(call CONFIG_VARS,production) > $(APEX_PROD_ENV_FILE) && apex deploy --env-file $(APEX_PROD_ENV_FILE); fi
+	@if [ -e $(APEX_PROD_ENV_FILE) ]; then rm $(APEX_PROD_ENV_FILE) && $(DONE); fi
+
+npm-publis%:
+	npm-prepublish --verbose
+	npm publish --access public
+
+# BUILD SUB-TASKS
+
+# Only apply to Heroku apps for now
+public/__about.json:
+	@if [ -e Procfile ]; then mkdir -p public && echo '{"description":"$(call APP_NAME)","support":"next.team@ft.com","supportStatus":"active","appVersion":"$(shell git rev-parse HEAD | xargs echo -n)","buildCompletionTime":"$(shell date -u +"%Y-%m-%dT%H:%M:%SZ")"}' > $@ && $(DONE); fi
+
+# UPDATE TASK
+update-tools:
+	$(eval LATEST = $(shell curl -fs https://api.github.com/repos/Financial-Times/n-makefile/tags | $(call JSON_GET_VALUE,name)))
+	$(if $(filter $(LATEST), $(VERSION)), $(error Cannot update n-makefile, as it is already up to date!))
+	@curl -sL https://raw.githubusercontent.com/Financial-Times/n-makefile/$(LATEST)/Makefile > n.Makefile
+	@sed -i "" "s/^VERSION = master/VERSION = $(LATEST)/" n.Makefile
+	@read -p "Updated tools from $(VERSION) to $(LATEST).  Do you want to commit and push? [y/N] " Y;\
+	if [ $$Y == "y" ]; then git add n.Makefile && git commit -m "Updated tools to $(LATEST)" && git push origin HEAD; fi
+	@$(DONE)

package.json

@@ -28,10 +28,12 @@
   },
   "homepage": "https://github.com/Financial-Times/keen-query#readme",
   "devDependencies": {
+    "bower": "^1.7.9",
     "chai": "^3.4.1",
+    "eslint": "^3.4.0",
     "fetch-mock": "^4.4.0",
+    "lintspaces-cli": "^0.4.0",
     "mocha": "^2.4.2",
-    "next-build-tools": "^5.16.1",
     "sinon": "^1.17.3"
   }
 }