chrisisbeef · eirslett · Jun 23, 2016
diff --git a/README.md b/README.md
@@ -12,11 +12,13 @@ Download the [production version][min] or the [development version][max].
 
 Run `npm install` to install the plugin dependencies
 
-  * John Resig's Class.create.js 1.1.4+
+  * John Resig's [Class.extend](https://github.com/mattinsler/resig-class)
+
+
 
 Or download the [Class Library][classes_lib] manually.
 
-[classes_lib]: https://raw.github.com/chrisisbeef/jquery-encoder/master/list/class.min.js
+[classes_lib]: https://raw.githubusercontent.com/mattinsler/resig-class/master/index.js
 
 ## Usage
 

diff --git a/libs/class.min.js b/libs/class.min.js
diff --git a/libs/jquery-loader.js b/libs/jquery-loader.js
diff --git a/libs/jquery/jquery.js b/libs/jquery/jquery.js
diff --git a/libs/qunit/qunit.css b/libs/qunit/qunit.css
diff --git a/libs/qunit/qunit.js b/libs/qunit/qunit.js
diff --git a/package.json b/package.json
@@ -1,12 +1,17 @@
 {
-  "name": "jquery-plugin",
-  "version": "0.0.0-ignored",
+  "name": "jquery-encoder",
+  "version": "1.0.0",
   "engines": {
     "node": ">= 0.8.0"
   },
+  "main": "src/jquery.jquery-encoder.js",
   "scripts": {
     "test": "grunt qunit"
   },
+  "dependencies": {
+    "jquery": "*",
+    "resig-class": "^1.0.0"
+  },
   "devDependencies": {
     "grunt": "~0.4.5",
     "grunt-contrib-clean": "~0.4.0",
@@ -15,6 +20,22 @@
     "grunt-contrib-qunit": "~0.2.0",
     "grunt-contrib-uglify": "~0.2.0",
     "grunt-contrib-watch": "~0.4.0",
-    "node.class": "^1.1.4"
-  }
+    "qunitjs": "^1.23.1"
+  },
+  "license": "MIT",
+  "description": "A Contextual Encoding Plugin for jQuery",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/chrisisbeef/jquery-encoder.git"
+  },
+  "keywords": [
+    "jquery",
+    "plugin",
+    "encode"
+  ],
+  "author": "Chris Schmidt",
+  "bugs": {
+    "url": "https://github.com/chrisisbeef/jquery-encoder/issues"
+  },
+  "homepage": "https://github.com/chrisisbeef/jquery-encoder#readme"
 }
diff --git a/src/jquery.jquery-encoder.js b/src/jquery.jquery-encoder.js
@@ -4,7 +4,34 @@
  * The jquery-encoder is published by OWASP under the MIT license. You should read and accept the
  * LICENSE before you use, modify, and/or redistribute this software.
  */
-(function($) {
+(function (factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD. Register as an anonymous module.
+    define(['jquery', 'resig-class'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // Node/CommonJS
+    module.exports = function( root, jQuery ) {
+      var Class = require('resig-class');
+      if ( jQuery === undefined ) {
+        // require('jQuery') returns a factory that requires window to
+        // build a jQuery instance, we normalize how we use modules
+        // that require this pattern but the window provided is a noop
+        // if it's defined (how jquery works)
+        if ( typeof window !== 'undefined' ) {
+          jQuery = require('jquery');
+        }
+        else {
+          jQuery = require('jquery')(root);
+        }
+      }
+      factory(jQuery, Class);
+      return jQuery;
+    };
+  } else {
+    // Browser globals
+    factory(jQuery, Class);
+  }
+}(function ($, Class) {
   var default_immune = {
     'js'        : [',','.','_',' ']
   };
@@ -1446,4 +1473,4 @@
     $.encoder = Object.preventExtensions($.encoder);
     $.fn.encode = Object.preventExtensions($.fn.encode);
   }
-})(jQuery);
+}));
diff --git a/test/jquery-encoder.html b/test/jquery-encoder.html
@@ -12,14 +12,10 @@
 <head>
   <meta charset="utf-8">
   <title>jQuery Encoder Plugin Test Suite</title>
-  <!-- Load local jQuery. This can be overridden with a ?jquery=___ param. -->
-  <!--<script type="text/javascript" src="https://code.jquery.com/jquery-1.9.0.min.js"></script>-->
-  <script src="../libs/jquery-loader.js"></script>
+  <script src="script-loader.js"></script>
   <!-- Load local QUnit. -->
-  <link rel="stylesheet" href="../libs/qunit/qunit.css" media="screen">
-  <script src="../libs/qunit/qunit.js"></script>
-  <!-- Load local lib and tests. -->
-  <script type="text/javascript" src="../node_modules/node.class/class.min.js"></script>
+  <link rel="stylesheet" href="../node_modules/qunitjs/qunit/qunit.css" media="screen">
+  <script src="../node_modules/qunitjs/qunit/qunit.js"></script>
   <script src="../src/jquery.jquery-encoder.js"></script>
   <!--<script src="jquery-encoder_test.js"></script>-->
   <!-- Removing access to jQuery and $. But it'll still be available as _$, if

diff --git a/test/script-loader.js b/test/script-loader.js
@@ -0,0 +1,22 @@
+(function() {
+  function loadScript(path) {
+    // This is the only time I'll ever use document.write, I promise!
+    document.write('<script src="' + path + '"></script>');
+  }
+  function loadClassLib() {
+    loadScript('../node_modules/resig-class/index.js');
+  }
+  function loadJQueryLib() {
+    // Get any jquery=___ param from the query string.
+    var jqversion = location.search.match(/[?&]jquery=(.*?)(?=&|$)/);
+    // If a version was specified, use that version from code.jquery.com.
+    if (jqversion) {
+      loadScript('http://code.jquery.com/jquery-' + jqversion[1] + '.js');
+    } else {
+      // Default to local jquery
+      loadScript('../node_modules/jquery/dist/jquery.js');
+    }
+  }
+  loadClassLib();
+  loadJQueryLib();
+}());