Rebase on JS Bin v3.41.10

.snyk

@@ -0,0 +1,104 @@
+ignore:
+  'npm:send:20151103':
+    - 'express > connect > send':
+        reason: None given
+        expires: '2016-04-15T17:54:05.442Z'
+    - 'express > send':
+        reason: None given
+        expires: '2016-04-15T17:54:05.442Z'
+  'npm:send:20140912':
+    - 'express > connect > send':
+        reason: None given
+        expires: '2016-04-15T17:54:05.442Z'
+    - 'express > send':
+        reason: None given
+        expires: '2016-04-15T17:54:05.442Z'
+  'npm:qs:20140806-1':
+    - 'express > connect > qs':
+        reason: None given
+        expires: '2016-04-15T17:54:05.442Z'
+    - 'sqlite3 > node-pre-gyp > request > qs':
+        reason: None given
+        expires: '2016-04-15T17:54:05.443Z'
+  'npm:qs:20140806':
+    - 'express > connect > qs':
+        reason: None given
+        expires: '2016-04-15T17:54:05.443Z'
+    - 'sqlite3 > node-pre-gyp > request > qs':
+        reason: None given
+        expires: '2016-04-15T17:54:05.444Z'
+  'npm:express:20140912':
+    - express:
+        reason: None given
+        expires: '2016-04-15T17:54:05.443Z'
+  'npm:connect:20130701':
+    - 'express > connect':
+        reason: None given
+        expires: '2016-04-15T17:54:05.443Z'
+  'npm:uglify-js:20151024':
+    - 'handlebars > uglify-js':
+        reason: None given
+        expires: '2016-04-15T17:54:05.443Z'
+    - 'express-hbs > handlebars > uglify-js':
+        reason: None given
+        expires: '2016-04-15T17:54:05.444Z'
+    - 'jade > transformers > uglify-js':
+        reason: None given
+        expires: '2016-04-15T17:54:05.444Z'
+    - 'jade > constantinople > uglify-js':
+        reason: None given
+        expires: '2016-04-15T17:54:05.444Z'
+  'npm:handlebars:20151207':
+    - handlebars:
+        reason: None given
+        expires: '2016-04-15T17:54:05.443Z'
+    - 'express-hbs > handlebars':
+        reason: None given
+        expires: '2016-04-15T17:54:05.443Z'
+  'npm:uglify-js:20150824':
+    - 'handlebars > uglify-js':
+        reason: None given
+        expires: '2016-04-15T17:54:05.443Z'
+    - 'express-hbs > handlebars > uglify-js':
+        reason: None given
+        expires: '2016-04-15T17:54:05.445Z'
+    - 'jade > transformers > uglify-js':
+        reason: None given
+        expires: '2016-04-15T17:54:05.445Z'
+  'npm:hawk:20160119':
+    - 'less > request > hawk':
+        reason: None given
+        expires: '2016-04-15T17:54:05.443Z'
+    - 'snyk > request > hawk':
+        reason: None given
+        expires: '2016-04-15T17:54:05.443Z'
+    - 'sqlite3 > node-pre-gyp > request > hawk':
+        reason: None given
+        expires: '2016-04-15T17:54:05.445Z'
+    - 'casperjs > phantomjs > request > hawk':
+        reason: None given
+        expires: '2016-04-15T17:54:05.445Z'
+  'npm:moment:20160126':
+    - moment:
+        reason: None given
+        expires: '2016-04-15T17:54:05.443Z'
+  'npm:is-my-json-valid:20160118':
+    - 'snyk > request > har-validator > is-my-json-valid':
+        reason: None given
+        expires: '2016-04-15T17:54:05.443Z'
+  'npm:semver:20150403':
+    - 'sqlite3 > node-pre-gyp > semver':
+        reason: None given
+        expires: '2016-04-15T17:54:05.444Z'
+  'npm:tar:20151103':
+    - 'sqlite3 > node-pre-gyp > tar':
+        reason: None given
+        expires: '2016-04-15T17:54:05.444Z'
+    - 'sqlite3 > node-pre-gyp > tar-pack > tar':
+        reason: None given
+        expires: '2016-04-15T17:54:05.444Z'
+patch:
+  'npm:uglify-js:20151024':
+    - 'jade > with > uglify-js':
+        patched: '2016-03-16T17:45:39.866Z'
+version: v1

.travis.yml

@@ -1,8 +1,16 @@
 language: node_js
 node_js:
-  - "0.10"
+  - "0.10.40"
+addons:
+  sauce_connect: true
 before_script:
   - npm install
+  - test "$TRAVIS_PULL_REQUEST" = "false" && npm start&
+script:
+  - npm test
+  - test "$TRAVIS_PULL_REQUEST" = "false" && npm run e2e-remote
+  - test "$TRAVIS_PULL_REQUEST" = "false" && pkill node || exit 0
+
 notifications:
   email: false
   irc:

CODE_OF_CONDUCT.md

@@ -0,0 +1,22 @@
+# Contributor Code of Conduct
+
+As contributors and maintainers of this project, and in the interest of fostering an open and welcoming community, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities.
+
+We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, religion, or nationality.
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery
+* Personal attacks
+* Trolling or insulting/derogatory comments
+* Public or private harassment
+* Publishing other's private information, such as physical or electronic addresses, without explicit permission
+* Other unethical or unprofessional conduct.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct. By adopting this Code of Conduct, project maintainers commit themselves to fairly and consistently applying these principles to every aspect of managing this project. Project maintainers who do not follow or enforce the Code of Conduct may be permanently removed from the project team.
+
+This code of conduct applies both within project spaces and in public spaces when an individual is representing the project or its community.
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by opening an issue or contacting one or more of the project maintainers.
+
+This Code of Conduct is adapted from the [Contributor Covenant](http://contributor-covenant.org), version 1.2.0, available at [http://contributor-covenant.org/version/1/2/0/](http://contributor-covenant.org/version/1/2/0/)

README.markdown

@@ -80,3 +80,12 @@ End points are:
 - `GET /api/:bin/:rev` - Retrieve the specific version of the bin with the specified ID and revision
 - `POST /api/save` - Create a new bin, the body of the post should be URL encoded and contain `html`, `javascript` and `css` parameters
 - `POST /api/:bin/save` - Create a new revision for the specified bin, the body of the post should be URL encoded and contain `html`, `javascript` and `css` parameters
+
+## Backers
+
+[Become a backer]((https://opencollective.com/jsbin#backer)) and show your support to our open source project.
+
+
+## Sponsors
+
+Does your company use JS Bin? Ask your manager or marketing team if your company would be interested in supporting our project. Support will allow the maintainers to dedicate more time for maintenance and new features for everyone. Also, your company's logo will show [on GitHub](https://github.com/jsbin/jsbin#readme) --who doesn't want a little extra exposure?  [Here's the info](https://opencollective.com/jsbin#sponsor).

bin/admin

@@ -2,7 +2,7 @@
 'use strict';
 var memcache = require('memcached');
 var repl = require('repl');
-var Promise = require('promise');
+var Promise = require('es6-promise');
 var m = new memcache('localhost:11211');
 var mysql = require('../lib/db/mysql');
 var config = require('../lib/config');

docs/running-your-own-jsbin.md

@@ -16,13 +16,13 @@ Historically, JS Bin v1, v2 and the first release of v3 had support for PHP. **P
 
 ### Node
 
-Install the [latest stable version](http://nodejs.org/) of Node first which will give you the `node` and `npm` programs.
+Install Node first (Node version 0.10.27 will work, no guarantee on later versions) this will give you the `node` and `npm` programs.
 
-You can (and should) install Node directly from `npm` using the following command:
+You can (and should) install JS Bin with `npm` using the following command:
 
     $ npm install -g jsbin
 
-This will automatically install all the dependancies.
+This will automatically install all the dependencies.
 
 If you're installing JS Bin for development (and hopefully contribution), clone the project from github:
 
@@ -92,7 +92,7 @@ JS Bin's build process uses Grunt, so assuming you've cloned a copy, you will ne
 
 This will generate the `public/js/prod/` directory and read the version in the `package.json` file to generate to build a number of files:
 
-1. jsbin-<version>.js - the uncompressed, concatted version of all the scripts from `/scripts.json`
+1. jsbin-<version>.js - the uncompressed, concatenated version of all the scripts from `/scripts.json`
 2. jsbin-<version>.min.js - the production compressed version of jsbin, used in the editor
 3. jsbin.map.json - the sourcemaps file (useful for debugging in live)
 4. runner-<version>.js - the runner script, used to generate the output of the user's code in an iframe
@@ -103,3 +103,11 @@ Finally, ensure either the config.local.json's `env` property is set to "product
     $ NODE_ENV=production node .
 
 And that's it.
+
+
+## End-to-end tests
+JS Bin has end-to-end tests. The tests can be found in `tests/e2e` folder. 
+
+Running the tests (JS Bin has to be running on port http://localhost:3000): 
+
+    $ npm run e2e

docs/session-keys.md

@@ -16,3 +16,8 @@ key for you, you can choose to use this or one of your own. Just place it into y
     }
   }
 ```
+
+If you are running JS Bin in a OpenShift cloud instance, set the `JSBIN_SESSION_SECRET` [environment variable](https://developers.openshift.com/en/managing-environment-variables.html#custom-variables) instead, like so:
+```
+rhc env set JSBIN_SESSION_SECRET=mekYkYMlseZo6F8lOOgny2nA
+```

emails/charge-failed.html

@@ -0,0 +1,96 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <meta name="viewport" content="width=device-width, target-densitydpi=device-dpi">
+  </head>
+  <body id="jsbinannouce" style="width: 100% !important; -webkit-text-size-adjust: none; margin: 0; padding: 0;">
+    <center>
+      <table id="backgroundTable" style="border-spacing: 0; border-collapse: collapse; font-family: proxima-nova, 'helvetica neue', helvetica, arial, geneva, sans-serif; height: 100% !important; width: 100% !important; color: #4c4c4c; font-size: 15px; line-height: 150%; background: #ffffff; margin: 0; padding: 0; border: 0;">
+        <tr style="vertical-align: top; padding: 0;">
+          <td align="center" valign="top" style="vertical-align: top; padding: 0;">
+            <table class="container" id="templateContainer" style="border-spacing: 0; border-collapse: collapse; font-family: proxima-nova, 'helvetica neue', helvetica, arial, geneva, sans-serif; height: 100%; width: 600px; color: #4c4c4c; font-size: 15px; line-height: 150%; background: #ffffff; margin: 0px 0; padding: 0; border: 0;">
+              <tr style="vertical-align: top; padding: 0;">
+                <td class="container templateContainerPadding" align="center" valign="top" style="vertical-align: top; padding: 0 40px;">
+                  <table id="templateContent" style="border-spacing: 0; border-collapse: collapse; font-family: proxima-nova, 'helvetica neue', helvetica, arial, geneva, sans-serif; height: 100%; width: 100%; background: #ffffff; margin: 0; padding: 0; border: 0;">
+                    <tr style="vertical-align: top; padding: 0;">
+                      <td style="vertical-align: top; text-align: left; padding: 0;" align="left" valign="top">
+
+
+<!-- BODY -->
+<p style="margin: 20px 0;">Just to let you know, the subscription charge for your JS Bin Pro account on {{created}}, failed against the card ending in <span style="font-family: monospace; background: #ddd;">{{last4}}</span>.</p>
+
+<p style="margin: 20px 0;">You'll need to fix this before your subscription automatically cancelled (after 3 charge attempts).</p>
+
+<p style="margin: 20px 0;"><a style="font-weight: bold; text-decoration: underline;" href="https://jsbin.com/account/subscription?utm_medium=email">Update your card details today</a></p>
+
+<p style="margin: 20px 0;">Many thanks,</p>
+<p style="margin: 20px 0;">– <a href="https://twitter.com/rem">Remy</a> (creator of JS Bin)</p>
+
+<!-- /BODY -->
+                      </td>
+                    </tr>
+                  </table>
+                </td>
+              </tr>
+              <tr style="vertical-align: top; padding: 0;">
+                <td class="container templateContainerPadding" align="center" valign="top" style="vertical-align: top; padding: 0 40px;">
+                  <table id="footerContent" style="border-spacing: 0; border-collapse: collapse; font-family: proxima-nova, 'helvetica neue', helvetica, arial, geneva, sans-serif; height: 100%; width: 100%; border-top-style: solid; border-top-color: #ebeaef; color: #999999; font-size: 12px; background: #ffffff; margin: 0; padding: 0; border-width: 1px 0 0;">
+                    <tr style="vertical-align: top; padding: 0;">
+                      <td valign="top" style="vertical-align: top; text-align: left; padding: 0;" align="left">
+                        <p style="margin: 20px 0;">
+                          Your username: {{user.name}}<br>
+                        </p>
+                      </td>
+                      <td width="30">&nbsp;</td>
+                      <td valign="top" style="vertical-align: top; text-align: right; padding: 0;" align="right">
+                        <p style="margin: 20px 0;">JS Bin Ltd.<br>Company No.&nbsp;8998555<br>Made in Brighton, UK</p>
+                      </td>
+                    </tr>
+                    <tr>
+                      <td valign="top" style="vertical-align: top; text-align: center; padding: 0;" align="center" colspan="3">
+                        <a style="color: #00F;font-weight: bold;text-decoration: none;" href="http://jsbin.com/upgrade?utm_source=pro-announce3&utm_medium=email&utm_content=logo&utm_campaign=pro"><img src="http://static.jsbin.com/images/jsbin-knockout.png" alt="JS Bin" width="128" height="128" style="outline: none; text-decoration: none; border: 0;" /></a>
+                      </td>
+                    </tr>
+                  </table>
+                </td>
+              </tr>
+            </table>
+          </td>
+        </tr>
+      </table>
+    </center>
+
+<style type="text/css">
+body {
+width: 100% !important;
+}
+.ReadMsgBody {
+width: 100%;
+}
+.ExternalClass {
+width: 100%;
+}
+body {
+-webkit-text-size-adjust: none;
+}
+body {
+margin: 0; padding: 0;
+}
+img {
+border: 0; outline: none; text-decoration: none;
+}
+#backgroundTable {
+height: 100% !important; margin: 0; padding: 0; width: 100% !important;
+}
+#backgroundTable {
+color: #4c4c4c; background-color: #ffffff; font-family: proxima-nova, 'helvetica neue', helvetica, arial, geneva, sans-serif; font-size: 15px; line-height: 150%;
+}
+
+@media screen and (max-width: 600px) {
+  body, table, td, p, a, li, blockquote { -webkit-text-size-adjust: none !important }
+  body { width: 100% !important; min-width: 100% !important }
+  .container { width: auto !important; padding: 0 10px !important;}
+}</style>
+</body>
+</html>

emails/charge-failed.txt

@@ -0,0 +1,11 @@
+Just to let you know, the subscription charge for your JS Bin Pro account on {{created}}, failed against the card ending in "{{last4}}".
+
+You'll need to fix this before your subscription automatically cancelled (after 3 charge attempts).
+
+Update your card details today:
+
+https://jsbin.com/account/subscription
+
+Many thanks,
+
+– Remy (creator of JS Bin)

emails/email-footer.html

@@ -0,0 +1,70 @@
+</td>
+                    </tr>
+                  </table>
+                </td>
+              </tr>
+              <tr style="vertical-align: top; padding: 0;">
+                <td class="container templateContainerPadding" align="center" valign="top" style="vertical-align: top; padding: 0;">
+                  <table id="footerContent" style="border-spacing: 0; border-collapse: collapse; font-family: proxima-nova, 'helvetica neue', helvetica, arial, geneva, sans-serif; height: 100%; width: 100%; border-top-style: solid; border-top-color: #ebeaef; color: #999999; font-size: 12px; background: #ffffff; margin: 0; padding: 0; border-width: 1px 0 0;">
+                    <tr style="vertical-align: top; padding: 0;">
+                      <td valign="top" style="vertical-align: top; text-align: left; padding: 0;" align="left">
+                        <p style="margin: 20px 0;">
+                          Your username: {{user.name}}<br>
+                        </p>
+                      </td>
+                      <td width="30">&nbsp;</td>
+                      <td valign="top" style="vertical-align: top; text-align: right; padding: 0;" align="right">
+                        <p style="margin: 20px 0;">JS Bin Ltd.<br>Company No.&nbsp;8998555<br>Made in Brighton, UK</p>
+                      </td>
+                    </tr>
+                    <tr>
+                      <td valign="top" style="vertical-align: top; text-align: center; padding: 0;" align="center" colspan="3">
+                        <a style="color: #00F;font-weight: bold;text-decoration: none;" href="https://jsbin.com/upgrade?utm_source=welcome-email&utm_medium=email&utm_campaign=welcome-email"><img src="https://static.jsbin.com/images/jsbin-knockout.png" alt="JS Bin" width="128" height="128" style="outline: none; text-decoration: none; border: 0;" /></a>
+                      </td>
+                    </tr>
+                  </table>
+                </td>
+              </tr>
+            </table>
+          </td>
+        </tr>
+      </table>
+    </center>
+
+<style type="text/css">
+body {
+width: 100% !important;
+}
+.ReadMsgBody {
+width: 100%;
+}
+.ExternalClass {
+width: 100%;
+}
+body {
+-webkit-text-size-adjust: none;
+}
+body {
+margin: 0; padding: 0;
+}
+img {
+border: 0; outline: none; text-decoration: none;
+}
+#backgroundTable {
+height: 100% !important; margin: 0; padding: 0; width: 100% !important;
+}
+#backgroundTable {
+color: #4c4c4c; background-color: #ffffff; font-family: sans-serif; font-size: 14px; line-height: 150%;
+}
+
+@media only screen and (min-width: 600px) {
+  .container { width: auto !important; padding: 0 40px !important;}
+}
+
+@media screen and (max-width: 600px) {
+  body, table, td, p, a, li, blockquote { -webkit-text-size-adjust: none !important }
+  body { width: 100% !important; min-width: 100% !important }
+  .container { width: auto !important; padding: 0 10px !important;}
+}</style>
+</body>
+</html>