thin_man 0.18.5 → 0.18.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72b5c248dee6812b1f50b5c11e37e7370728acb3
-  data.tar.gz: 8be59ece46ab30c0ebfa37e62fbaf0c48ea1e0f0
+  metadata.gz: db7333edac6bfd5f257266ca1b832d65cc90a54e
+  data.tar.gz: 5a128ea6f98bcfc8a28038fd26d1e4f07006187e
 SHA512:
-  metadata.gz: e2c7a10ced9a003c804d8082cb5c8eb38e1fe0e162609d3ccc10175c15154dc31b203aa8a22b3a2b4c5c0b7fc9547051176cb8fd05066e78b29b1cab6cce68e1
-  data.tar.gz: d3bafcdc3b511341ca319cdefd4f9e8a58b1766ed20d179c85941d672df3f96b57616f31162041b549f64cdd1e23f99fb90869a7dfdc16e30b9c776dc1724f17
+  metadata.gz: 5400124078dec9cac9a3caacfb4c102a805a2d6c199a9dd97e76f389f4990f25ea3d713f866f4c242a38e551030a447b66fc3af4b7222975b50bfe2c12c609a6
+  data.tar.gz: d56bc1a746c7d35df233618d8c64eefe7a4e77e997df7dd056fb1e2892a10e3373d37c0ade9dd59896843724bf20b10ee99d78b71f416ef10a7290f5c7a2e417

data/app/assets/javascripts/debug_logger.js

@@ -0,0 +1,95 @@
+// This is a bit heavy for what it does, but should be super-easy to extend/enhance
+if(typeof Class === "undefined"){
+  /* Simple JavaScript Inheritance
+   * By John Resig http://ejohn.org/
+   * MIT Licensed.
+   */
+  // Inspired by base2 and Prototype
+  (function(){
+    var initializing = false, fnTest = /xyz/.test(function(){xyz;}) ? /\b_super\b/ : /.*/;
+    // The base Class implementation (does nothing)
+    this.Class = function(){};
+
+    // Create a new Class that inherits from this class
+    Class.extend = function(prop) {
+      var _super = this.prototype;
+
+      // Instantiate a base class (but only create the instance,
+      // don't run the init constructor)
+      initializing = true;
+      var prototype = new this();
+      initializing = false;
+
+      // Copy the properties over onto the new prototype
+      for (var name in prop) {
+        // Check if we're overwriting an existing function
+        prototype[name] = typeof prop[name] == "function" &&
+          typeof _super[name] == "function" && fnTest.test(prop[name]) ?
+          (function(name, fn){
+            return function() {
+              var tmp = this._super;
+
+              // Add a new ._super() method that is the same method
+              // but on the super-class
+              this._super = _super[name];
+
+              // The method only need to be bound temporarily, so we
+              // remove it when we're done executing
+              var ret = fn.apply(this, arguments);
+              this._super = tmp;
+
+              return ret;
+            };
+          })(name, prop[name]) :
+          prop[name];
+      }
+
+      // The dummy class constructor
+      function Class() {
+        // All construction is actually done in the init method
+        if ( !initializing && this.init )
+          this.init.apply(this, arguments);
+      }
+
+      // Populate our constructed prototype object
+      Class.prototype = prototype;
+
+      // Enforce the constructor to be what we expect
+      Class.prototype.constructor = Class;
+
+      // And make this class extendable
+      Class.extend = arguments.callee;
+
+      return Class;
+    };
+  })();
+}
+
+if(typeof console == 'undefined'){
+  console = {log: function(msg){alert(msg)}}
+}
+var DebugLogger = Class.extend({
+  init: function($debug_settings){
+    if($debug_settings.data('logging_on')){
+      console.log('Debug logging turned on.')
+      this.logging_on = true;
+    } else {
+      this.logging_on = false;
+    }
+  },
+  log: function(msg){
+    if(this.logging_on){
+      console.log(msg)
+    }
+  }
+})
+
+debug_logger = {
+  log: function(){}
+}
+$(document).ready(function(){
+  if($('[data-debug_logger]')){
+    jqobj = $('[data-debug_logger]');
+    debug_logger = new DebugLogger(jqobj);
+  }
+})

data/app/assets/javascripts/simple_inheritance.hs

@@ -0,0 +1,63 @@
+/* Simple JavaScript Inheritance
+ * By John Resig http://ejohn.org/
+ * MIT Licensed.
+ */
+// Inspired by base2 and Prototype
+(function(){
+  var initializing = false, fnTest = /xyz/.test(function(){xyz;}) ? /\b_super\b/ : /.*/;
+  // The base Class implementation (does nothing)
+  this.Class = function(){};
+  
+  // Create a new Class that inherits from this class
+  Class.extend = function(prop) {
+    var _super = this.prototype;
+    
+    // Instantiate a base class (but only create the instance,
+    // don't run the init constructor)
+    initializing = true;
+    var prototype = new this();
+    initializing = false;
+    
+    // Copy the properties over onto the new prototype
+    for (var name in prop) {
+      // Check if we're overwriting an existing function
+      prototype[name] = typeof prop[name] == "function" && 
+        typeof _super[name] == "function" && fnTest.test(prop[name]) ?
+        (function(name, fn){
+          return function() {
+            var tmp = this._super;
+            
+            // Add a new ._super() method that is the same method
+            // but on the super-class
+            this._super = _super[name];
+            
+            // The method only need to be bound temporarily, so we
+            // remove it when we're done executing
+            var ret = fn.apply(this, arguments);        
+            this._super = tmp;
+            
+            return ret;
+          };
+        })(name, prop[name]) :
+        prop[name];
+    }
+    
+    // The dummy class constructor
+    function Class() {
+      // All construction is actually done in the init method
+      if ( !initializing && this.init )
+        this.init.apply(this, arguments);
+    }
+    
+    // Populate our constructed prototype object
+    Class.prototype = prototype;
+    
+    // Enforce the constructor to be what we expect
+    Class.prototype.constructor = Class;
+
+    // And make this class extendable
+    Class.extend = arguments.callee;
+    
+    return Class;
+  };
+})();

data/app/assets/javascripts/thin_man.js

@@ -1,3 +1,5 @@
+//= require simple_inheritance
+//= require debug_logger
 var initThinMan = function(){
   thin_man = {
     getSubClass: function(sub_class_name,parent_class){
@@ -32,10 +34,17 @@ var initThinMan = function(){
     LinkGroup: Class.extend({
       init: function(name){
         this.name = name
+        this.resetLinks()
+      },
+      resetLinks: function(){
         this.links = {}
         this.current_number = 0
       },
       addLink: function(link_submission, sequence_number){
+        if(this.links.hasOwnProperty(sequence_number)){
+          //If there is already a link with this number, we're starting over with a new list
+          this.resetLinks()
+        }
         this.links[sequence_number] = link_submission
         link_submission.addWatcher(this)
         if(sequence_number == this.current_number){
@@ -45,7 +54,6 @@ var initThinMan = function(){
       fire: function(){
         if(this.links.hasOwnProperty(this.current_number)){
           this.links[this.current_number].fire()
-          delete this.links[this.current_number]
         }
       },
       linkCompleted: function(link_submission){

data/lib/thin_man/version.rb

@@ -1,3 +1,3 @@
 module ThinMan
-  VERSION = "0.18.5"
+  VERSION = "0.18.6"
 end

data/test/javascript/karma.conf.js

@@ -18,6 +18,8 @@ module.exports = function(config) {
       'test-main.js',
       {pattern: 'jquery.js'},
       {pattern: 'jasmine-fixture.js'},
+      {pattern: '../../app/assets/javascripts/simple_inheritance.js'},
+      {pattern: '../../app/assets/javascripts/debug_logger.js'},
       {pattern: '../../app/assets/javascripts/thin_man.js'},
       {pattern: 'spec/helpers/*.js'},
       {pattern: 'spec/**/*Spec.js', included: false}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thin_man
 version: !ruby/object:Gem::Version
-  version: 0.18.5
+  version: 0.18.6
 platform: ruby
 authors:
 - Eric Draut, Adam Bialek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-16 00:00:00.000000000 Z
+date: 2017-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -88,6 +88,8 @@ extra_rdoc_files: []
 files:
 - MIT-LICENSE
 - Rakefile
+- app/assets/javascripts/debug_logger.js
+- app/assets/javascripts/simple_inheritance.hs
 - app/assets/javascripts/thin_man.js
 - lib/tasks/thin_man_tasks.rake
 - lib/thin_man.rb