marty 1.0.22 → 1.0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86d8dcf6f031cb37849a2835413f01577fe15309
-  data.tar.gz: 3230c2099f30abb9f60c6d17d1b7da528e1b928c
+  metadata.gz: d0f81a144144beb77d9fafc82b8d638be6fbb501
+  data.tar.gz: 49a509cc8458a156deaf186c4401acbc10411436
 SHA512:
-  metadata.gz: c6ffb9f4a6e963960f7d22254444c937431f4c185a1be67b6161db0b1d50fabfc857cf39cef9c6100db74d622ea406aed702b2d37863ef5c9af6c005d60e1057
-  data.tar.gz: 4a0f2d03b75bb07f97f0fb38625a2f3b821a71df0286d27eeae4333965a8d21d6fd3bbfb819f8d47e3d2b6d771f7e33362c42e588b46d0e86f85748c3cc4e3aa
+  metadata.gz: eb8843be6891a672779cca79c29ca08b8879d58ef1f7c99a6353ecbd1cc5c28ced1f42913e891f7cb4311a0c5f59d50d906899488ea0978c87a2a75c7543a602
+  data.tar.gz: fd0588d9011f7734e478eca8a51e7f3092bd2fbb4a4734f399c2ee91dacad499b27d6ed70d062c877356c90d9be7235b191151618f7f0e8514b724a963bc3989

data/app/components/marty/report_form.rb

@@ -185,7 +185,8 @@ class Marty::ReportForm < Marty::Form
 
       raise "bad form items" unless items.is_a?(Array)
       raise "bad format" unless
-        ["csv", "xlsx", "zip", "json"].member?(format)
+        Marty::ContentHandler::GEN_FORMATS.member?(format)
+
     rescue => exc
       c.title = "ERROR"
       c.items =

data/app/components/marty/script_form.rb

@@ -27,12 +27,6 @@ class Marty::ScriptForm < Marty::Form
     }
     JS
 
-    c.get_script_body = l(<<-JS)
-    function() {
-       return this.getForm().findField('body').getValue();
-    }
-    JS
-
     # Sets an editor line class (unset any previous line class).  For
     # now, only one line is classed at a time.
     c.set_line_error = l(<<-JS)
@@ -59,14 +53,16 @@ class Marty::ScriptForm < Marty::Form
 
     ######################################################################
 
-    # FIXME: no longer works -- see related FIXME below.
-    c.on_print = l(<<-JS)
-    function() {
-       window.open(
-          "/marty/components/#{self.name}.html?script_id=" + this.getScriptId(),
-          "printing",
-          'width=800,height=700,toolbar=no,location=no,directories=no,'+
-          'status=no,menubar=no,scrollbars=yes,copyhistory=no,resizable=yes');
+    c.netzke_on_do_print = l(<<-JS)
+    function(params) {
+      this.server.doPrint(this.getScriptId());
+    }
+    JS
+
+    c.download_report = l(<<-JS)
+    function(jid) {
+      // FIXME: seems pretty hacky
+      window.location = "#{Marty::Util.marty_path}/job/download?job_id=" + jid;
     }
     JS
   end
@@ -170,13 +166,36 @@ class Marty::ScriptForm < Marty::Form
     client.netzke_apply_form_errors(build_form_errors(record))
   end
 
+  endpoint :do_print do |script_id|
+    return client.netzke_notify("Permission Denied") unless
+      self.class.has_any_perm?
+
+    script = Marty::Script.find_by_id(script_id)
+
+    return client.netzke_notify("bad script") unless script
+
+    begin
+      job_id = Marty::Util.
+               background_report("ScriptReport",
+                                 "PrettyScript",
+                                 {
+                                   "script_id" => script.id,
+                                   "title"     => script.name,
+                                 },
+                                 true,
+                                )
+      client.download_report job_id
+    rescue => exc
+      return client.netzke_notify "ERROR: #{exc}"
+    end
+  end
+
   ######################################################################
 
-  action :print do |a|
+  action :do_print do |a|
     a.text    = I18n.t("script_form.print")
     a.tooltip = I18n.t("script_form.print")
     a.icon    = :printer
-    a.handler = :on_print
   end
 
   ######################################################################
@@ -184,26 +203,12 @@ class Marty::ScriptForm < Marty::Form
   def default_bbar
     [
       :apply,
-      :print,
+      :do_print,
     ]
   end
 
   ######################################################################
 
-  # Used for printing: REALLY FIXME -- this no longer works since the
-  # removal of the component export_content hack. -- To fix, we should
-  # create a ScriptPrint report.  Then, we should have the button run
-  # this report in the foreground.  The problem is that we currently
-  # don't have any delorean files in Marty to create a report.
-  def export_content(format, title, params={})
-    raise "unknown format: #{format}" unless format == "html"
-
-    r = Marty::Script.find_by_id(params[:script_id])
-    res = CodeRay.scan(r.body, :ruby).div(line_numbers: :table)
-
-    [res, "text/html", "inline", "#{title}.html"]
-  end
-
   def configure(c)
     super
 

data/app/models/marty/script.rb

@@ -107,12 +107,15 @@ class Marty::Script < Marty::Base
     elsif Rails.configuration.marty.delorean_scripts_path
       paths = Rails.configuration.marty.delorean_scripts_path
     else
-      paths = ["#{Rails.root}/delorean",
-                File.expand_path('../../../../delorean', __FILE__)]
+      paths = [
+        "#{Rails.root}/delorean",
+        # FIXME: HACKY, wouldn't it be better to use
+        # Gem::Specification.find_by_name("marty").gem_dir??
+        File.expand_path('../../../../delorean', __FILE__),
+      ]
     end
   end
 
-
   def self.delete_scripts
     ActiveRecord::Base.connection.
       execute("ALTER TABLE marty_scripts DISABLE TRIGGER USER;")
@@ -139,4 +142,13 @@ class Marty::Script < Marty::Base
     # current tag can caused problems.
     res
   end
+
+  delorean_fn :pretty_print, sig: 1 do
+    |id|
+    script = find_by_id id
+
+    next "unknown script #{id}" unless script
+
+    CodeRay.scan(script.body, :ruby).div(line_numbers: :table)
+  end
 end

data/db/seeds.rb

@@ -49,5 +49,5 @@ end
 
 # one time set up for delayed_job/promises, override only needed
 # if DELAYED_JOB_PATH is not bin/delayed_job
-Marty::Config["DELAYED_JOB_PARAMS"] = "-n 4"
+Marty::Config["DELAYED_JOB_PARAMS"] ||= "-n 4 --sleep-delay 5"
 # Marty::Config["DELAYED_JOB_PATH"]   = "script/delayed_job"

data/delorean/script_report.dl

@@ -0,0 +1,12 @@
+IdField:
+    xtype        = ":numberfield"
+    field_label  = "Id"
+    name         = "script_id"
+
+PrettyScript:
+    script_id =? nil
+    title     =? "Script Printing"
+
+    form   = [IdField]
+    result = Marty::Script.pretty_print(script_id)
+    format = "html"

data/lib/marty/content_handler.rb

@@ -3,7 +3,7 @@ module Marty::ContentHandler
     "csv"  => ['text/csv',                 'download'],
     "zip"  => ['application/zip',          'download'],
     "xlsx" => ['application/vnd.ms-excel', 'download'],
-    "html" => ['text/html',                'inline'],
+    "html" => ['text/html',                'download'],
     "txt"  => ['text/plain',               'inline'],
     "json" => ['application/json',         'download'],
 
@@ -29,6 +29,8 @@ module Marty::ContentHandler
         res = to_zip(data)
       when nil, "json"
         res, format = data.to_json, "json"
+      when "html"
+        res = data.to_s
       else
         res, format = {error: "Unknown format: #{format}"}.to_json, "json"
       end

data/lib/marty/util.rb

@@ -107,4 +107,18 @@ module Marty::Util
       obj.is_a?(Float)? obj.round(digits) : obj
     end
   end
+
+  # Run a report as a promise and return its promise ID.
+  def self.background_report(script_name, node_name, params, force)
+    engine = Marty::ScriptSet.new.get_engine(script_name)
+    res = engine.background_eval(node_name,
+                                 params,
+                                 ["result", "title", "format"],
+                                )
+
+    promise_id = res.__promise__.id
+    res.force if force
+
+    promise_id
+  end
 end

data/lib/marty/version.rb

@@ -1,3 +1,3 @@
 module Marty
-  VERSION = "1.0.22"
+  VERSION = "1.0.23"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 1.0.22
+  version: 1.0.23
 platform: ruby
 authors:
 - Arman Bostani
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-13 00:00:00.000000000 Z
+date: 2017-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -440,6 +440,7 @@ files:
 - db/migrate/201_create_marty_events.rb
 - db/migrate/202_add_completion_status_to_event.rb
 - db/seeds.rb
+- delorean/script_report.dl
 - gemini_deprecations.md
 - lib/marty.rb
 - lib/marty/content_handler.rb