command_proposal 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8248eae2534ebab49931beca4a77666ef958bc854eeb39a790808ae6112443b1
-  data.tar.gz: 8915714938d8caf78dc757cf32f47f71a447078204290711403c9ee1eecce60a
+  metadata.gz: 8cc9baadf971edd54dc7558fbec28c8f515e9fb572975705f886b18a68693b7b
+  data.tar.gz: 2793d9b73e85d8e0d509974cf9b6f7ed36517c4adbfec9a23f52bbc66d4effff
 SHA512:
-  metadata.gz: 2147b8ebcda3d8b747db413981592c915dfdae50b27ba07e1a39b6b9130b416a11bd9b5f1e728e5a2b2edc73c25302c21473d509165be38030160af7b62c70d5
-  data.tar.gz: 0d07701e418d21123a28463180104b5464ca0f45a7398015a44302e94af34f8f88be6f9592315505aa9fe95cf56c2b25cf46f0125d7c3a18f80a40c80c1b979d
+  metadata.gz: b80eb953b76e09aa2dbbc62c0df2884c15833e8dd1abc4bd66141f0c6b0adc608fcbda97efb80647ec31a1d92ac20d43fda79675560815b74cd93a878a79dc5f
+  data.tar.gz: f26da392c2ed15eaf1f362d0e0bd131ac8c9a05df30390871acc56a9fb8543cb5e69c88816be1fc36cb78478797659222a0edf8e4945b948538f17b97e206579

data/app/assets/javascripts/command_proposal/_helpers.js

@@ -1,4 +1,4 @@
-function docReady(fn) {
+function cmdDocReady(fn) {
   // see if DOM is already available
   if (document.readyState === "complete" || document.readyState === "interactive") {
     // call on next available tick
@@ -7,3 +7,64 @@ function docReady(fn) {
     document.addEventListener("DOMContentLoaded", fn)
   }
 }
+
+function HttpClient() {
+  this.request = function(method, url, opts) {
+    var req = new XMLHttpRequest()
+    req.onreadystatechange = function() {
+      if (req.status != 0 && req.readyState == 4 && opts.done) {
+        opts.done(req.responseText, req.status, req)
+      }
+    }
+
+    req.open(method, url, true)
+    if (opts.headers) {
+      Object.keys(opts.headers).forEach(function(key) {
+        req.setRequestHeader(key, opts.headers[key])
+      })
+    }
+    req.send(opts.body)
+  }
+
+  this.get = function(url, opts) {
+    this.request("GET", url, opts)
+  }
+
+  this.post = function(url, opts) {
+    this.request("POST", url, opts)
+  }
+}
+
+function CommandQueue() {
+  this.queue = []
+  this.eventCurrentlyRunning = false
+  this.runningQueue = null
+
+  this.run = function() {
+    if (!this.eventCurrentlyRunning) {
+      if (this.queue.length == 0) {
+        clearInterval(this.runningQueue)
+        this.runningQueue = null
+        return
+      }
+      var nextEvent = this.queue.shift()
+      this.eventCurrentlyRunning = true
+      nextEvent(this)
+    }
+  }
+
+  this.add = function(queued_function) {
+    this.queue.push(queued_function)
+    this.process()
+  }
+
+  this.finish = function(ms) {
+    this.eventCurrentlyRunning = false
+  }
+
+  this.process = function() {
+    if (this.runningQueue) { return }
+    var q = this
+    this.runningQueue = setInterval(function() { q.run() }, 1)
+  }
+}

data/app/assets/javascripts/command_proposal/console.js

@@ -1,11 +1,11 @@
 // Add tab / shift-tab for changing indents
-docReady(function() {
+cmdDocReady(function() {
   var cmdconsole = document.querySelector(".cmd-console")
 
   if (cmdconsole) {
     var console_input = document.querySelector(".cmd-console .cmd-entry")
     var lines = document.querySelector(".cmd-console .lines")
-    var queue = Promise.resolve()
+    var queue = new CommandQueue
     var history_cmd_idx = undefined
     var stored_entry = undefined
     var commands = getPrevCommands()
@@ -152,43 +152,38 @@ docReady(function() {
       if (/^[\s\n]*$/.test(line.textContent)) { return }
 
       commands.push(line.textContent)
-      queue = queue.then(async function() {
+      queue.add(function(evt) {
         $.rails.refreshCSRFTokens()
 
         var params = { code: line.textContent, task_id: cmdconsole.dataset.task }
 
-        var res = await fetch(cmdconsole.dataset.exeUrl, {
-          method: "POST",
+        var client = new HttpClient()
+        client.post(cmdconsole.dataset.exeUrl, {
           headers: {
             "Content-Type": "application/json",
             "X-CSRF-Token": $.rails.csrfToken()
           },
-          body: JSON.stringify(params)
-        }).then(function(res) {
-          if (res.ok) {
-            return res.json()
-          } else {
-            throw new Error("Server error")
-          }
-        }).catch(function(err) {
-          return {
-            error: err,
+          body: JSON.stringify(params),
+          done: function(res, status, req) {
+            if (status == 200) {
+              var json = JSON.parse(res)
+              var result = document.createElement("div")
+              result.classList.add("result")
+
+              if (json.error) {
+                result.classList.add("cmd-error")
+                result.textContent = json.error
+              } else {
+                result.textContent = json.result
+              }
+
+              line.appendChild(result)
+            } else {
+              console.log("Error: ", res, req);
+            }
+            evt.finish()
           }
         })
-
-        var json = await res
-
-        var result = document.createElement("div")
-        result.classList.add("result")
-
-        if (json.error) {
-          result.classList.add("cmd-error")
-          result.textContent = json.error
-        } else {
-          result.textContent = json.result
-        }
-
-        line.appendChild(result)
       })
     }
   }

data/app/assets/javascripts/command_proposal/feed.js

@@ -1,6 +1,6 @@
-docReady(function() {
+cmdDocReady(function() {
   var terminals = document.querySelectorAll("[data-feed]")
-  var queue = Promise.resolve()
+  var queue = new CommandQueue
   var continue_statuses = ["started", "approved", "cancelling"]
 
   terminals.forEach(function(terminal) {
@@ -10,42 +10,39 @@ docReady(function() {
   })
 
   function pingFeed(terminal) {
-    queue = queue.then(async function() {
+    queue.add(function(evt) {
       $.rails.refreshCSRFTokens()
 
-      var res = await fetch(terminal.dataset.feed, {
-        method: "GET",
+      var client = new HttpClient()
+      client.get(terminal.dataset.feed, {
         headers: {
           "Content-Type": "text/html",
           "X-CSRF-Token": $.rails.csrfToken()
         },
-      }).then(function(res) {
-        if (res.ok) {
-          return res.json()
-        } else {
-          throw new Error("Server error")
-        }
-      }).catch(function(err) {
-        console.log("err:", err);
-      })
-
-      var json = await res
+        done: function(res, status, req) {
+          if (status == 200) {
+            var json = JSON.parse(res)
+            if (terminal.nextElementSibling && terminal.nextElementSibling.CodeMirror) {
+              terminal.nextElementSibling.CodeMirror.doc.setValue(json.result || "")
+            } else {
+              terminal.innerHTML = json.result_html
+            }
+            document.querySelector("td[data-iteration-status]").innerText = json.status
+            document.querySelector("td[data-iteration-duration]").innerText = json.duration
 
-      if (terminal.nextElementSibling && terminal.nextElementSibling.CodeMirror) {
-        terminal.nextElementSibling.CodeMirror.doc.setValue(json.result || "")
-      } else {
-        terminal.innerHTML = json.result_html
-      }
-      document.querySelector("td[data-iteration-status]").innerText = json.status
-      document.querySelector("td[data-iteration-duration]").innerText = json.duration
-
-      if (continue_statuses.includes(json.status)) {
-        setTimeout(function() { pingFeed(terminal) }, 1000)
-      } else {
-        if (document.querySelector(".cancel-btn")) {
-          document.querySelector(".cancel-btn").remove()
+            if (continue_statuses.includes(json.status)) {
+              setTimeout(function() { pingFeed(terminal) }, 1000)
+            } else {
+              if (document.querySelector(".cancel-btn")) {
+                document.querySelector(".cancel-btn").remove()
+              }
+            }
+          } else {
+            console.log("Error: ", res, req);
+          }
+          evt.finish()
         }
-      }
+      })
     })
   }
 })

data/app/assets/javascripts/command_proposal/terminal.js

@@ -1,4 +1,4 @@
-docReady(function() {
+cmdDocReady(function() {
   var terminals = document.querySelectorAll(".cmd-terminal")
 
   function setReadOnlyUI(cm) {

data/app/helpers/command_proposal/application_helper.rb

@@ -1,5 +1,7 @@
 module CommandProposal
   module ApplicationHelper
+    include ActionDispatch::Routing::PolymorphicRoutes
+    include Rails.application.routes.url_helpers
     # In order to keep the regular app's routes working in the base template, we have to manually
     #   render the engine routes. Built a helper for this because it's long and nasty otherwise.
     def cmd_path(*args)
@@ -19,39 +21,22 @@ module CommandProposal
       args << { host: host, port: nil } if host.present?
 
       begin
-        router.url_for(args.compact)
+        command_proposal_engine.url_for(args.compact)
       rescue NoMethodError => e
-        raise "Error generating route! Please make sure `default_url_options` are set."
+        raise "Error generating route! Please make sure `config.action_mailer.default_url_options` are set."
       end
     end
 
     def string_path(*args)
-      [router.command_proposal_tasks_url + args.shift, args.to_param.presence].compact.join("?")
+      [command_proposal_engine.command_proposal_tasks_url + args.shift, args.to_param.presence].compact.join("?")
     end
 
     # Runner controller doesn't map to a model, so needs special handling
     def runner_path(task, iteration=nil)
       if iteration.present?
-        router.command_proposal_task_runner_url(task, iteration)
+        command_proposal_engine.command_proposal_task_runner_url(task, iteration)
       else
-        router.command_proposal_task_runner_index_url(task)
-      end
-    end
-
-    def router
-      @@router ||= begin
-        routes = ::CommandProposal::Engine.routes
-        routes.default_url_options = rails_default_url_options
-        routes.url_helpers
-      end
-    end
-
-    def rails_default_url_options
-      Rails.application.config.action_mailer.default_url_options.tap do |default_opts|
-        default_opts ||= {}
-        default_opts[:host] ||= "localhost"
-        default_opts[:port] ||= "3000"
-        default_opts[:protocol] ||= "http"
+        command_proposal_engine.command_proposal_task_runner_index_url(task)
       end
     end
   end

data/app/helpers/command_proposal/permissions_helper.rb

@@ -30,7 +30,7 @@ module CommandProposal
         elsif cmd_config.controller_var.blank?
           nil
         else
-          try(cmd_config.controller_var)
+          send(cmd_config.controller_var)
         end
       end
     end

data/app/models/command_proposal/task.rb

@@ -19,10 +19,10 @@ class ::CommandProposal::Task < ApplicationRecord
   enum session_type: {
     # Task will have multiple iterations that are all essentially the same just with code changes
     task:     0,
-    # Console iterations are actually line by line, so order matters
-    console:  1,
     # Function iterations are much like tasks
-    function: 2,
+    function: 1,
+    # Console iterations are actually line by line, so order matters
+    console:  2,
     # Modules are included in tasks and not run independently
     module:   3,
   }

data/lib/command_proposal/version.rb

@@ -1,3 +1,3 @@
 module CommandProposal
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: command_proposal
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Rocco Nicholls
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-25 00:00:00.000000000 Z
+date: 2021-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails