Clean up vendor.
authorDavid Schoonover <dsc@wikimedia.org>
Fri, 13 Jul 2012 09:27:43 +0000 (02:27 -0700)
committerDavid Schoonover <dsc@wikimedia.org>
Fri, 13 Jul 2012 09:27:59 +0000 (02:27 -0700)
102 files changed:
package.co
package.json
src/server/middleware.co
src/server/proxy.co
static/vendor/backbone-0.5.3.js [deleted file]
static/vendor/backbone-0.5.3.min.js [deleted file]
static/vendor/backbone-0.9.1.js [deleted file]
static/vendor/backbone-0.9.1.min.js [deleted file]
static/vendor/backbone-0.9.2.js [deleted file]
static/vendor/backbone-0.9.2.min.js [deleted file]
static/vendor/backbone-0.9.2.mod.js [deleted file]
static/vendor/backbone-0.9.2.mod.min.js [deleted file]
static/vendor/backbone.js [changed from symlink to file mode: 0000->0644]
static/vendor/backbone.min.js [changed from symlink to file mode: 0000->0644]
static/vendor/backbone.mod.js [changed from symlink to file mode: 0000->0644]
static/vendor/backbone.mod.min.js [changed from symlink to file mode: 0000->0644]
static/vendor/backbone.nested-1.1.0.js [deleted file]
static/vendor/backbone.nested-1.1.0.min.js [deleted file]
static/vendor/backbone.nested.js [changed from symlink to file mode: 0000->0644]
static/vendor/backbone.nested.min.js [changed from symlink to file mode: 0000->0644]
static/vendor/bootstrap [deleted symlink]
static/vendor/bootstrap-2.0.1/css/bootstrap-responsive.css [deleted file]
static/vendor/bootstrap-2.0.1/css/bootstrap-responsive.min.css [deleted file]
static/vendor/bootstrap-2.0.1/css/bootstrap.css [deleted file]
static/vendor/bootstrap-2.0.1/css/bootstrap.min.css [deleted file]
static/vendor/bootstrap-2.0.1/img/glyphicons-halflings-white.png [deleted file]
static/vendor/bootstrap-2.0.1/img/glyphicons-halflings.png [deleted file]
static/vendor/bootstrap-2.0.1/js/bootstrap.js [deleted file]
static/vendor/bootstrap-2.0.1/js/bootstrap.min.js [deleted file]
static/vendor/bootstrap-2.0.2/css/bootstrap-responsive.min.css [deleted file]
static/vendor/bootstrap-2.0.2/css/bootstrap.min.css [deleted file]
static/vendor/bootstrap-2.0.2/img/glyphicons-halflings-white.png [deleted file]
static/vendor/bootstrap-2.0.2/img/glyphicons-halflings.png [deleted file]
static/vendor/bootstrap-2.0.2/js/bootstrap.min.js [deleted file]
static/vendor/bootstrap/css/bootstrap-responsive.css [moved from static/vendor/bootstrap-2.0.2/css/bootstrap-responsive.css with 58% similarity]
static/vendor/bootstrap/css/bootstrap-responsive.min.css [new file with mode: 0644]
static/vendor/bootstrap/css/bootstrap.css [moved from static/vendor/bootstrap-2.0.2/css/bootstrap.css with 76% similarity]
static/vendor/bootstrap/css/bootstrap.min.css [new file with mode: 0644]
static/vendor/bootstrap/img/glyphicons-halflings-white.png [new file with mode: 0644]
static/vendor/bootstrap/img/glyphicons-halflings.png [new file with mode: 0644]
static/vendor/bootstrap/js/bootstrap.js [moved from static/vendor/bootstrap-2.0.2/js/bootstrap.js with 79% similarity]
static/vendor/bootstrap/js/bootstrap.min.js [new file with mode: 0644]
static/vendor/dygraph-extra.js [changed mode: 0755->0644]
static/vendor/jquery-1.7.1.js [deleted file]
static/vendor/jquery-1.7.1.min.js [deleted file]
static/vendor/jquery.history-1.7.0.min.js [deleted file]
static/vendor/jquery.history-1.7.1rc2.js [deleted file]
static/vendor/jquery.history-1.7.1rc2.min.js [deleted file]
static/vendor/jquery.history.js [changed from symlink to file mode: 0000->0644]
static/vendor/jquery.history.min.js [changed from symlink to file mode: 0000->0644]
static/vendor/jquery.isotope-1.5.11.js [deleted file]
static/vendor/jquery.isotope-1.5.11.min.js [deleted file]
static/vendor/jquery.isotope.js [changed from symlink to file mode: 0000->0644]
static/vendor/jquery.isotope.min.js [changed from symlink to file mode: 0000->0644]
static/vendor/jquery.js [changed from symlink to file mode: 0000->0644]
static/vendor/jquery.min.js [changed from symlink to file mode: 0000->0644]
static/vendor/jquery.spin.js [changed from symlink to file mode: 0000->0644]
static/vendor/jquery.spin.min.js [changed from symlink to file mode: 0000->0644]
static/vendor/modernizr-2.0.6.js [deleted file]
static/vendor/modernizr-2.0.6.min.js [deleted file]
static/vendor/modernizr.js [changed from symlink to file mode: 0000->0644]
static/vendor/modernizr.min.js [changed from symlink to file mode: 0000->0644]
static/vendor/moment-1.4.0.js [deleted file]
static/vendor/moment-1.4.0.min.js [deleted file]
static/vendor/moment-1.4.0.mod.js [deleted file]
static/vendor/moment-1.4.0.mod.min.js [deleted file]
static/vendor/moment.js [changed from symlink to file mode: 0000->0644]
static/vendor/moment.min.js [changed from symlink to file mode: 0000->0644]
static/vendor/moment.mod.js [changed from symlink to file mode: 0000->0644]
static/vendor/moment.mod.min.js [changed from symlink to file mode: 0000->0644]
static/vendor/require.js [new file with mode: 0644]
static/vendor/require.min.js [new file with mode: 0644]
static/vendor/spin [deleted symlink]
static/vendor/spin-1.2.0/jquery.spin.js [deleted file]
static/vendor/spin-1.2.0/jquery.spin.min.js [deleted file]
static/vendor/spin-1.2.0/spin.js [deleted file]
static/vendor/spin-1.2.0/spin.min.js [deleted file]
static/vendor/spin-1.2.5/jquery.spin.js [deleted file]
static/vendor/spin-1.2.5/jquery.spin.min.js [deleted file]
static/vendor/spin-1.2.5/spin.js [deleted file]
static/vendor/spin-1.2.5/spin.min.js [deleted file]
static/vendor/spin.js [changed from symlink to file mode: 0000->0644]
static/vendor/spin.min.js [changed from symlink to file mode: 0000->0644]
static/vendor/underscore-1.2.3.js [deleted file]
static/vendor/underscore-1.2.3.min.js [deleted file]
static/vendor/underscore-1.3.1.js [deleted file]
static/vendor/underscore-1.3.1.min.js [deleted file]
static/vendor/underscore-1.3.1.mod.js [deleted file]
static/vendor/underscore-1.3.1.mod.min.js [deleted file]
static/vendor/underscore.js [changed from symlink to file mode: 0000->0644]
static/vendor/underscore.min.js [changed from symlink to file mode: 0000->0644]
static/vendor/underscore.mod.js [deleted symlink]
static/vendor/underscore.mod.min.js [deleted symlink]
static/vendor/underscore.string-2.0.0.js [deleted file]
static/vendor/underscore.string-2.0.0.min.js [deleted file]
static/vendor/underscore.string-2.0.0.mod.js [deleted file]
static/vendor/underscore.string-2.0.0.mod.min.js [deleted file]
static/vendor/underscore.string.js [changed from symlink to file mode: 0000->0644]
static/vendor/underscore.string.min.js [changed from symlink to file mode: 0000->0644]
static/vendor/underscore.string.mod.js [changed from symlink to file mode: 0000->0644]
static/vendor/underscore.string.mod.min.js [changed from symlink to file mode: 0000->0644]
static/vendor/versions.yaml [new file with mode: 0644]

index c00dd63..e66f2d6 100644 (file)
@@ -20,7 +20,7 @@ dependencies                    :
     'underscore'                : '== 1.3.x'
     'underscore.string'         : '== 2.1.1'
     'seq'                       : '== 0.3.5'
-    'backbone'                  : '== 0.9.1'
+    'backbone'                  : '== 0.9.2'
     'express'                   : '== 2.5.11'
     'express-resource'          : '== 0.2.4'
     'request'                   : '== 2.9.x'
index d5763fd..b3474fa 100644 (file)
@@ -21,7 +21,7 @@
     "underscore": "== 1.3.x",
     "underscore.string": "== 2.1.1",
     "seq": "== 0.3.5",
-    "backbone": "== 0.9.1",
+    "backbone": "== 0.9.2",
     "express": "== 2.5.11",
     "express-resource": "== 0.2.4",
     "request": "== 2.9.x",
index d193129..327baec 100755 (executable)
@@ -139,9 +139,7 @@ application = limn.application =
         opx.enabled = true if opx.enabled is false and (opx.whitelist or opx.blacklist)
         if opx.enabled
             opx.whitelist or= [ /.*/ ]
-            opx.whitelist = [opx.whitelist] unless _.isArray opx.whitelist
             opx.blacklist or= []
-            opx.blacklist = [opx.blacklist] unless _.isArray opx.blacklist
         @set 'limn options', opts
         
         # create data directory
@@ -223,19 +221,19 @@ application = limn.application =
             
             # wrap modules in commonjs closure for browser
             @use compiler do
-                enabled : 'commonjs_define'
+                enabled : <[ amd commonjs_define ]>
                 src     : [ STATIC ]
                 dest    : varDir
                 options :
-                    commonjs        : { drop_path_parts:1, drop_full_ext:false }
+                    amd             : { drop_path_parts:1, drop_full_ext:false }
                     commonjs_define : { drop_path_parts:1, drop_full_ext:false }
                 log_level : LOG_LEVEL
             @use compiler do
-                enabled : 'commonjs_define'
+                enabled : <[ amd commonjs_define ]>
                 src     : [ varDir, WWW ]
                 dest    : varDir
                 options :
-                    commonjs        : { drop_path_parts:1, drop_full_ext:true }
+                    amd             : { drop_path_parts:1, drop_full_ext:true }
                     commonjs_define : { drop_path_parts:1, drop_full_ext:true }
                 log_level : LOG_LEVEL
         
index 8dafdf6..a4331f0 100644 (file)
@@ -1,4 +1,3 @@
-_         = require 'underscore'
 url       = require 'url'
 minimatch = require 'minimatch'
 request   = require 'request'
@@ -10,8 +9,10 @@ matchesList = (list, value) ->
     false
 
 ProxyMiddleware = (options={}) ->
-    {whitelist, blacklist} = options = {whitelist:[], blacklist:[], ...options}
+    options = {whitelist, blacklist} = {-verbose, whitelist:[], blacklist:[], ...options}
+    whitelist = [whitelist] unless Array.isArray whitelist
     whitelist .= map -> minimatch.filter it, {+nocase}
+    blacklist = [blacklist] unless Array.isArray blacklist
     blacklist .= map -> minimatch.filter it, {+nocase}
     
     return (req, res) ->
@@ -29,7 +30,7 @@ ProxyMiddleware = (options={}) ->
         # Set the no-buffering flag for nginx
         res.header 'X-Accel-Buffering', 'no'
         
-        console.log "[Proxy] #targetUrl"
+        console.log "[Proxy] #targetUrl" if options.verbose
         request.get targetUrl .pipe res
 
 
diff --git a/static/vendor/backbone-0.5.3.js b/static/vendor/backbone-0.5.3.js
deleted file mode 100644 (file)
index b2e4932..0000000
+++ /dev/null
@@ -1,1158 +0,0 @@
-//     Backbone.js 0.5.3
-//     (c) 2010 Jeremy Ashkenas, DocumentCloud Inc.
-//     Backbone may be freely distributed under the MIT license.
-//     For all details and documentation:
-//     http://documentcloud.github.com/backbone
-
-(function(){
-
-  // Initial Setup
-  // -------------
-
-  // Save a reference to the global object.
-  var root = this;
-
-  // Save the previous value of the `Backbone` variable.
-  var previousBackbone = root.Backbone;
-
-  // The top-level namespace. All public Backbone classes and modules will
-  // be attached to this. Exported for both CommonJS and the browser.
-  var Backbone;
-  if (typeof exports !== 'undefined') {
-    Backbone = exports;
-  } else {
-    Backbone = root.Backbone = {};
-  }
-
-  // Current version of the library. Keep in sync with `package.json`.
-  Backbone.VERSION = '0.5.3';
-
-  // Require Underscore, if we're on the server, and it's not already present.
-  var _ = root._;
-  if (!_ && (typeof require !== 'undefined')) _ = require('underscore')._;
-
-  // For Backbone's purposes, jQuery or Zepto owns the `$` variable.
-  var $ = root.jQuery || root.Zepto;
-
-  // Runs Backbone.js in *noConflict* mode, returning the `Backbone` variable
-  // to its previous owner. Returns a reference to this Backbone object.
-  Backbone.noConflict = function() {
-    root.Backbone = previousBackbone;
-    return this;
-  };
-
-  // Turn on `emulateHTTP` to support legacy HTTP servers. Setting this option will
-  // fake `"PUT"` and `"DELETE"` requests via the `_method` parameter and set a
-  // `X-Http-Method-Override` header.
-  Backbone.emulateHTTP = false;
-
-  // Turn on `emulateJSON` to support legacy servers that can't deal with direct
-  // `application/json` requests ... will encode the body as
-  // `application/x-www-form-urlencoded` instead and will send the model in a
-  // form param named `model`.
-  Backbone.emulateJSON = false;
-
-  // Backbone.Events
-  // -----------------
-
-  // A module that can be mixed in to *any object* in order to provide it with
-  // custom events. You may `bind` or `unbind` a callback function to an event;
-  // `trigger`-ing an event fires all callbacks in succession.
-  //
-  //     var object = {};
-  //     _.extend(object, Backbone.Events);
-  //     object.bind('expand', function(){ alert('expanded'); });
-  //     object.trigger('expand');
-  //
-  Backbone.Events = {
-
-    // Bind an event, specified by a string name, `ev`, to a `callback` function.
-    // Passing `"all"` will bind the callback to all events fired.
-    bind : function(ev, callback, context) {
-      var calls = this._callbacks || (this._callbacks = {});
-      var list  = calls[ev] || (calls[ev] = []);
-      list.push([callback, context]);
-      return this;
-    },
-
-    // Remove one or many callbacks. If `callback` is null, removes all
-    // callbacks for the event. If `ev` is null, removes all bound callbacks
-    // for all events.
-    unbind : function(ev, callback) {
-      var calls;
-      if (!ev) {
-        this._callbacks = {};
-      } else if (calls = this._callbacks) {
-        if (!callback) {
-          calls[ev] = [];
-        } else {
-          var list = calls[ev];
-          if (!list) return this;
-          for (var i = 0, l = list.length; i < l; i++) {
-            if (list[i] && callback === list[i][0]) {
-              list[i] = null;
-              break;
-            }
-          }
-        }
-      }
-      return this;
-    },
-
-    // Trigger an event, firing all bound callbacks. Callbacks are passed the
-    // same arguments as `trigger` is, apart from the event name.
-    // Listening for `"all"` passes the true event name as the first argument.
-    trigger : function(eventName) {
-      var list, calls, ev, cal