marty 0.5.16 → 0.5.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee57ec5bc50741eda9ea8b4cc109221e1cf2e57c
-  data.tar.gz: 486efeb1bdde157cf0eff2ce7c0f67e5999727ae
+  metadata.gz: 3e0cd1fb1ea76e53a48783a66d697d7d7014d2ed
+  data.tar.gz: 4f3bc6b7970ed8f8bcb394b28ad4a91f583078bd
 SHA512:
-  metadata.gz: 44701d2a49b44b9f433e7b32f79d17d1db6d7ea1af47d660721e8f678278a919bf1f5482d6c6321ee5feef7a7b0dff751f2a50713d968a98c9adc4165091ecf8
-  data.tar.gz: c16b0685d1a63cd10afd0e3b6b8fefa0336c792bceba6df7946e9ed11a80c5833032728cd866354fe263da42a181d28b03ec11385fe5144ead71cbec16f55a8d
+  metadata.gz: 9d0859d91f1b17547f132cef0123b19255f8186839fcbc11e145d716272de3f2b3f749eec155e5f00ff249b4640f2e61ee76cb01f7c2d6b8f37e57cd7637f8bf
+  data.tar.gz: 9d05effd3f15b9f08ac668c6ba9cd7bfa6d3bb22eac7351c7cd3726cab51e7da6bea0683080023234683d52d6373735818bc50a96a160f26ddc4535719192361

data/app/components/marty/report_form.rb

@@ -25,7 +25,15 @@ class Marty::ReportForm < Marty::Form
 
   ######################################################################
 
-  def _get_report_engine(params)
+  # FIXME: Most of the following functionality should be moved out to
+  # a library.  It doesn't belong here in a component.  These are
+  # currently also getting called form the report controller.
+
+  # FIXME: The usage of session/root_sess should be entirely removed.
+  # Instead we should send in :selected_node, :selected_tag_id,
+  # :selected_script_name as params.
+
+  def self.get_report_engine(params, session)
     d_params = ActiveSupport::JSON.decode(params[:data] || "{}")
     d_params.each_pair do |k,v|
       d_params[k] = nil if v.blank? || v == "null"
@@ -39,11 +47,15 @@ class Marty::ReportForm < Marty::Form
     [engine, d_params]
   end
 
-  def run_eval(params)
-    engine, d_params = _get_report_engine(params)
+  def self.run_eval(params, session)
+    node = session[:selected_node]
+
+    raise "no selected report node" unless String === node
+
+    engine, d_params = get_report_engine(params, session)
 
     begin
-      engine.evaluate(session[:selected_node], "result", d_params)
+      engine.evaluate(node, "result", d_params)
     rescue => exc
       Marty::Util.logger.error "run_eval failed: #{exc.backtrace}"
 
@@ -55,7 +67,7 @@ class Marty::ReportForm < Marty::Form
   end
 
   def export_content(format, title, params={})
-    data = run_eval(params)
+    data = self.class.run_eval(params, session)
 
     # hacky: shouldn't have error parsing logic here
     format = "json" if data.is_a?(Hash) && (data[:error] || data["error"])
@@ -75,7 +87,7 @@ class Marty::ReportForm < Marty::Form
   endpoint :netzke_submit do |params, this|
     # We get here when user is asking for a background report
 
-    engine, d_params = _get_report_engine(params)
+    engine, d_params = self.class.get_report_engine(params, session)
 
     roles = engine.
       evaluate(session[:selected_node], "roles", {}) rescue nil
@@ -100,39 +112,37 @@ class Marty::ReportForm < Marty::Form
   ######################################################################
 
   js_configure do |c|
-    # FIXME: Can we use POST instead of get:
-    # http://stackoverflow.com/questions/133925/javascript-post-request-like-a-form-submit
-    # arman -- I tried this solution. However, with a POST, the
-    # component doesn't get the session cookie.  Therefore, we don't
-    # have access to the selected script.  QQQ: why not just send the
-    # session cookie in the header??  also see -- using XMLHttpRequest
-    # http://stackoverflow.com/questions/9516865/how-to-set-a-header-field-on-post-a-form
-    # http://stackoverflow.com/questions/9713058/sending-post-data-with-a-xmlhttprequest
-    # Or, perhaps use ExtJS Ajax:
-    # http://stackoverflow.com/questions/2917581/how-to-post-json-data-with-extjs
+    # Find the mount path for the Marty engine. FIXME: this is likely
+    # very brittle.
+    @@mount_path = Rails.application.routes.routes.detect {
+      |r| r.app.app == Marty::Engine
+    }.format({})
 
     c.on_foreground = <<-JS
     function() {
        var values = this.getForm().getValues();
-       var data = escape(Ext.encode(values));
-       if (data.length > 4096) {
-          msg = "There is too much data to run as a foreground report." +\
-                "<br/>Please run as a background report."
-          Ext.create('Ext.Window', {
-            height:        100,
-            minWidth:      350,
-            autoWidth:     true,
-            modal:         true,
-            autoScroll:    true,
-            html:          msg,
-            title:         "Warning"
-          }).show();
-       } else {
-         // FIXME: this is very hacky since it bypasses Netzke channel.
-         // This is a security hole wrt to the report role mechanism.
-         window.location = "/marty/components/#{self.name}." + this.repformat +\
-            "?data=" + data + "&reptitle=" + this.reptitle;
+       var data = Ext.encode(values);
+
+       var form = document.createElement("form");
+       form.setAttribute("method", "post");
+       form.setAttribute("action", "#{@@mount_path}/report."+this.repformat);
+
+       var params = {data: data, reptitle: this.reptitle};
+
+       for(var key in params) {
+          if (params.hasOwnProperty(key)) {
+             var hiddenField = document.createElement("input");
+             hiddenField.setAttribute("type", "hidden");
+             hiddenField.setAttribute("name", key);
+             hiddenField.setAttribute("value", params[key]);
+
+            form.appendChild(hiddenField);
+          }
        }
+
+       document.body.appendChild(form);
+       form.submit();
+       document.body.removeChild(form);
     }
     JS
   end

data/app/controllers/marty/components_controller.rb

@@ -3,37 +3,11 @@ class Marty::ComponentsController < Marty::ApplicationController
   # appropriate route needs to be defined.
   # <base_url>/components/<ComponentCamelCaseName>
 
-  # FIXME: what is this??????
-  # helper Rails.application.routes.url_helpers
-
   def index
     component = params[:component]
 
     return redirect_to root_path unless component
 
-    format, req_disposition, title =
-      params[:format], params[:disposition], params[:reptitle]
-
-    if format && Marty::ContentHandler::GEN_FORMATS.member?(format)
-      klass = component.constantize
-
-      raise "bad component" unless klass < Netzke::Base
-
-      inst = klass.new
-      return unless inst.respond_to?(:export_content)
-
-      title ||= component
-
-      res, type, disposition, filename =
-        inst.export_content(format, title, params)
-
-      return send_data(res,
-                       type:        type,
-                       filename:    filename,
-                       disposition: req_disposition || disposition,
-                       )
-    end
-
     cname = component.gsub("::", "_").underscore
     render layout: true,
     inline: "<%= netzke :#{cname}, class_name: '#{component}', height: 650 %>"

data/app/controllers/marty/report_controller.rb

@@ -0,0 +1,29 @@
+class Marty::ReportController < ActionController::Base
+  def index
+    format, req_disposition, title =
+      params[:format], params[:disposition], params[:reptitle]
+
+    raise "bad format" unless Marty::ContentHandler::GEN_FORMATS.member?(format)
+
+    data = Marty::ReportForm.run_eval(params, session)
+
+    # hacky: shouldn't have error parsing logic here
+    format = "json" if data.is_a?(Hash) && (data[:error] || data["error"])
+
+    # hack for testing -- txt -> csv
+    exp_format = format == "txt" ? "csv" : format
+
+    res, type, disposition, filename =
+                            Marty::ContentHandler.
+                              export(data, exp_format, title)
+
+    # hack for testing -- set content-type
+    type = "text/plain" if format == "txt" && type =~ /csv/
+
+    return send_data(res,
+                     type:        type,
+                     filename:    filename,
+                     disposition: req_disposition || disposition,
+                    )
+  end
+end

data/config/routes.rb

@@ -3,4 +3,5 @@ require 'netzke-core'
 Marty::Engine.routes.draw do
   match via: [:get, :post], "rpc/:action(.:format)" => "rpc", as: :rpc
   get "job/:action" => "job", as: :job
+  match via: [:get, :post], "report(.:format)" => "report#index", as: :report
 end

data/lib/marty/data_conversion.rb

@@ -43,7 +43,7 @@ class Marty::DataConversion
       case v.to_s.downcase
       when "true",  "1", "y" then true
       when "false", "0", "n" then false
-      else raise "unknown boolean #{v}"
+      else raise "unknown boolean: #{v.inspect}"
       end
     when :string, :text
       v
@@ -55,27 +55,25 @@ class Marty::DataConversion
       v.to_d
     when :date
       # Dates are kept as float in Google spreadsheets.  Need to
-      # convert them to dates. FIXME: 'infinity' as a date in
-      # Rails 3.2 appears to be broken. Setting a date field to
-      # 'infinity' sets it to nil.
+      # convert them to dates.
       begin
         v =~ FLOAT_PAT ? EXCEL_START_DATE + v.to_f :
           Mcfly.is_infinity(v) ? 'infinity' : v.to_date
       rescue => exc
-        raise "date conversion failed for #{v}"
+        raise "date conversion failed for #{v.inspect}}"
       end
     when :datetime
       begin
         Mcfly.is_infinity(v) ? 'infinity' : v.to_datetime
       rescue => exc
-        raise "datetime conversion failed for #{v}"
+        raise "datetime conversion failed for #{v.inspect}}"
       end
     when :numrange, :int4range, :int8range
       v.to_s
     when :float_array, :json, :jsonb
       JSON.parse Marty::DataExporter.decode_json(v)
     else
-      raise "unknown type #{type} for #{v}"
+      raise "unknown type #{type} for #{v.inspect}}"
     end
   end
 

data/lib/marty/version.rb

@@ -1,3 +1,3 @@
 module Marty
-  VERSION = "0.5.16"
+  VERSION = "0.5.17"
 end

data/spec/features/jobs_dashboard_spec.rb

@@ -16,6 +16,7 @@ describe 'Jobs Dashboard', type: :feature, js: true, capybara: true do
       start_dt: Time.now
 
     visit "/"
+    all 'span', text: 'Sign in'
     find(ext_button_id('Sign in')).click
     fill_in 'Login', with: 'marty'
     fill_in 'Password', with: 'marty'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 0.5.16
+  version: 0.5.17
 platform: ruby
 authors:
 - Arman Bostani
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-27 00:00:00.000000000 Z
+date: 2015-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -355,6 +355,7 @@ files:
 - app/controllers/marty/application_controller.rb
 - app/controllers/marty/components_controller.rb
 - app/controllers/marty/job_controller.rb
+- app/controllers/marty/report_controller.rb
 - app/controllers/marty/rpc_controller.rb
 - app/helpers/marty/application_helper.rb
 - app/helpers/marty/script_set.rb