marty 2.1.5 → 2.3.0

data/app/components/marty/promise_view.rb

@@ -4,6 +4,7 @@ class Marty::PromiseView < Netzke::Tree::Base
   client_styles do |config|
     config.require :promise_view
   end
+
   client_class do |config|
     config.default_get_row_class = l(<<-JS)
     function(record, index, rowParams, ds) {
@@ -41,7 +42,7 @@ class Marty::PromiseView < Netzke::Tree::Base
   def configure(config)
     super
     config.title = I18n.t("jobs.promise_view")
-    config.model = "Marty::Promise"
+    config.model = "Marty::VwPromise"
     config.attributes = [
       {name: :title, xtype: :treecolumn},
       :user__login,
@@ -114,20 +115,20 @@ class Marty::PromiseView < Netzke::Tree::Base
   action :clear do |a|
     a.text     = a.tooltip = 'Clear'
     a.disabled = false
-    a.icon     = :application_delete
+    a.icon_cls = "fa fa-minus glyph"
     a.hidden   = !self.class.has_admin_perm?
   end
 
   action :download do |a|
     a.text     = a.tooltip = 'Download'
     a.disabled = true
-    a.icon     = :application_put
+    a.icon_cls = "fa fa-download glyph"
   end
 
   action :refresh do |a|
     a.text     = a.tooltip = 'Refresh'
     a.disabled = false
-    a.icon     = :arrow_refresh
+    a.icon_cls = "fa fa-sync-alt glyph"
   end
 
   endpoint :clear do |params|
@@ -137,7 +138,7 @@ class Marty::PromiseView < Netzke::Tree::Base
 
   def get_records params
     search_scope = config[:live_search_scope] || :live_search
-    Marty::Promise.children_for_id(params[:id], params[search_scope])
+    Marty::VwPromise.children_for_id(params[:id], params[search_scope])
   end
 
   attribute :title do |config|
@@ -172,7 +173,11 @@ class Marty::PromiseView < Netzke::Tree::Base
   end
 
   attribute :error do |config|
-    config.getter = ->(record) { record.result.to_s if record.status == false }
+    config.getter = ->(record) {
+      if !record.status
+        Marty::Promise.find_by(id: record.id).try(:result).to_s
+      end
+    }
     config.flex = 1
   end
 end

data/app/components/marty/record_form_window.rb

@@ -1,7 +1,7 @@
 class Marty::RecordFormWindow < Netzke::Basepack::RecordFormWindow
   def configure(c)
     super c
-    c.fbar = [] if c.item_id == 'view_window'
+    c.fbar = nil if c.item_id == 'view_window'
   end
 
   component :view_form do |c|

data/app/components/marty/report_form.rb

@@ -4,19 +4,19 @@ class Marty::ReportForm < Marty::Form
   action :apply do |a|
     a.text     = a.tooltip = I18n.t("reporting.background")
     a.handler  = :netzke_on_apply
-    a.icon     = :report_disk
+    a.icon_cls = "fa fa-cloud glyph"
     a.disabled = false
   end
 
   action :foreground do |a|
     a.text     = a.tooltip = I18n.t("reporting.generate")
-    a.icon     = :report_go
+    a.icon_cls = "fa fa-download glyph"
     a.disabled = false
   end
 
   action :link do |a|
     a.text     = a.tooltip = I18n.t("reporting.link")
-    a.icon     = :link_go
+    a.icon_cls = "fa fa-link glyph"
     a.disabled = false
   end
 
@@ -262,7 +262,7 @@ class Marty::ReportForm < Marty::Form
       }
     }
 
-    c.items              = items
+    c.items              = add_cls_to_fields(items)
     c.repformat          = format
     c.title              = "Generate: #{title}-#{sset.tag.name}"
     c.reptitle           = title

data/app/components/marty/report_select.rb

@@ -42,7 +42,7 @@ class Marty::ReportSelect < Marty::Form
                 {},
                 ),
       ]
-    c.bbar = []
+    c.bbar = nil
   end
 
   client_class do |c|

data/app/components/marty/script_form.rb

@@ -109,7 +109,7 @@ class Marty::ScriptForm < Marty::Form
   action :apply do |a|
     a.text     = I18n.t("script_form.save")
     a.tooltip  = I18n.t("script_form.save")
-    a.icon     = :database_save
+    a.icon_cls = "fa fa-save glyph"
     a.disabled = true
   end
 
@@ -191,9 +191,9 @@ class Marty::ScriptForm < Marty::Form
   ######################################################################
 
   action :do_print do |a|
-    a.text    = I18n.t("script_form.print")
-    a.tooltip = I18n.t("script_form.print")
-    a.icon    = :printer
+    a.text     = I18n.t("script_form.print")
+    a.tooltip  = I18n.t("script_form.print")
+    a.icon_cls = "fa fa-print glyph"
   end
 
   ######################################################################

data/app/components/marty/script_grid.rb

@@ -34,7 +34,7 @@ class Marty::ScriptGrid < Marty::Grid
   action :delete do |a|
     a.text     = I18n.t("script_grid.delete")
     a.tooltip  = I18n.t("script_grid.delete")
-    a.icon     = :script_delete
+    a.icon_cls = "fa fa-trash glyph"
     a.disabled = config[:prohibit_delete]
   end
 
@@ -77,7 +77,7 @@ class Marty::ScriptGrid < Marty::Grid
   action :add_in_form do |a|
     a.text     = I18n.t("script_grid.new")
     a.tooltip  = I18n.t("script_grid.new")
-    a.icon     = :script_add
+    a.icon_cls = "fa fa-plus glyph"
     a.disabled = !config[:permissions][:create]
   end
 

data/app/components/marty/script_tester.rb

@@ -96,7 +96,7 @@ class Marty::ScriptTester < Marty::Form
   action :apply do |a|
     a.text     = I18n.t("script_tester.compute")
     a.tooltip  = I18n.t("script_tester.compute")
-    a.icon     = :script_go
+    a.icon_cls = "fa fa-bug glyph"
     a.disabled = false
   end
 

data/app/components/marty/simple_app.rb

@@ -66,7 +66,6 @@ class Marty::SimpleApp < Netzke::Base
       :itemId => 'status_bar',
       :xtype => 'statusbar',
       :region => 'south',
-      :height => 22,
       :statusAlign => 'right',
       :busyText => 'Busy...',
       :default_text => "Ready",
@@ -78,9 +77,9 @@ class Marty::SimpleApp < Netzke::Base
   def menu_bar_config(overrides = {})
     {
       :itemId => 'menu_bar',
+      :layout => {overflow_handler: 'Menu'},
       :xtype => 'toolbar',
       :region => 'north',
-      :height => 28,
       :items => menu
     }.merge(overrides)
   end

data/app/components/marty/simple_app/client/statusbar_ext.js

@@ -2,7 +2,7 @@ Ext.override(Ext.ux.StatusBar, {
   hideBusy : function(){
     return this.setStatus({
       text: this.defaultText,
-      iconCls: this.defaultIconCls
+      icon_cls: this.defaultIconCls
     });
   }
 });

data/app/components/marty/tag_grid.rb

@@ -38,7 +38,7 @@ class Marty::TagGrid < Marty::Grid
   action :add_in_form do |a|
     a.text     = I18n.t("tag_grid.new")
     a.tooltip  = I18n.t("tag_grid.new")
-    a.icon     = :time_add
+    a.icon_cls = "fa fa-clock glyph"
     a.disabled = !config[:permissions][:create]
   end
 

data/app/components/marty/user_view.rb

@@ -100,19 +100,19 @@ module Marty; class UserView < Marty::Grid
 
   action :add do |a|
     super(a)
-    a.text    = I18n.t("user_grid.new")
-    a.tooltip = I18n.t("user_grid.new")
-    a.icon    = :user_add
+    a.text     = I18n.t("user_grid.new")
+    a.tooltip  = I18n.t("user_grid.new")
+    a.icon_cls = "fa fa-user-plus glyph"
   end
 
   action :edit do |a|
     super(a)
-    a.icon    = :user_edit
+    a.icon_cls = "fa fa-user-cog glyph"
   end
 
   action :delete do |a|
     super(a)
-    a.icon    = :user_delete
+    a.icon_cls = "fa fa-user-minus glyph"
   end
 
   def default_context_menu

data/app/controllers/marty/job_controller.rb

@@ -6,9 +6,13 @@ class Marty::JobController < ActionController::Base
 
     if promise
       format = promise.cformat
+
+      # Force result so finalized object is built
+      data = promise.result(true)
+
       # somewhat hacky: if result has "result" key, it's used as the
       # content.
-      data = promise.result["result"] || promise.result
+      data = data["result"] || data
       title = promise.title
     else
       format = "json"

data/app/models/marty/base.rb

@@ -6,21 +6,6 @@ class Marty::Base < ActiveRecord::Base
     tb = self.table_name
     self.where("#{tb}.obsoleted_dt >= ? AND #{tb}.created_dt < ?", pt, pt)
   end
-  MCFLY_PT_SIG = [1, 1]
-
-  # FIXME: hacky signatures for AR queries
-  COUNT_SIG    = [0, 0]
-  DISTINCT_SIG = [0, 100]
-  FIRST_SIG    = [0, 1]
-  GROUP_SIG    = [1, 100]
-  JOINS_SIG    = [1, 100]
-  LAST_SIG     = [0, 1]
-  LIMIT_SIG    = [1, 1]
-  NOT_SIG      = [1, 100]
-  ORDER_SIG    = [1, 100]
-  PLUCK_SIG    = [1, 100]
-  SELECT_SIG   = [1, 100]
-  WHERE_SIG    = [0, 100]
 
   class << self
     attr_accessor :struct_attrs

data/app/models/marty/data_grid.rb

@@ -188,7 +188,7 @@ class Marty::DataGrid < Marty::Base
     h = dgh["metadata"].each_with_object({}) do |m, h|
       attr = m["attr"]
       inc = h_passed.fetch(attr, :__nf__)
-      next if inc == :__nf__
+      next if inc == :__nf__ || inc.nil?
       val = (defined? inc.name) ? inc.name : inc
       h[attr] = val.is_a?(String) ?
                   ActiveRecord::Base.connection.quote(val)[1..-2] : val

data/app/models/marty/log.rb

@@ -12,6 +12,7 @@ class Marty::Log < Marty::Base
     rescue => e
       Marty::Util.logger.error("Marty::Logger failure: #{e.message}")
     end
+    true
   end
 
   def self.cleanup(days_to_keep)

data/app/models/marty/promise.rb

@@ -1,14 +1,4 @@
 class Marty::Promise < Marty::Base
-  class MarshalResult
-    def dump(v)
-      Marshal.dump(v)
-    end
-
-    def load(v)
-      # Marshal.load can't handle nil
-      v ? Marshal.load(v) : {}
-    end
-  end
 
   # default timeout (seconds) to wait for promise values
   DEFAULT_PROMISE_TIMEOUT = Rails.configuration.marty.promise_timeout || 30
@@ -16,30 +6,38 @@ class Marty::Promise < Marty::Base
   # default timeout (seconds) to wait for jobs to start
   DEFAULT_JOB_TIMEOUT = Rails.configuration.marty.job_timeout || 10
 
-  SELECT_COLS = columns.map(&:name)-["result"]
-  default_scope {
-    select(*SELECT_COLS)
-  }
-  def result
-    unless has_attribute?(:result)
-      changes_before_reload = self.changes.clone
-      self.reload
-      changes_before_reload.each{
-        |attribute_name, values|
-        self.send("#{attribute_name}=", values[1])
-      }
-    end
-    read_attribute :result
+  def result(force=false)
+    res = super()
+    Marty::Promise.load_result(res, force)
   end
 
-  serialize :result, MarshalResult.new
+  def self.load_result(obj, force=false)
+    if force && obj.respond_to?(:__force__)
+      obj = obj.__force__
+    end
+
+    case obj
+    when Array
+      obj.map {|x| load_result(x, force)}
+    when Hash
+      p = obj['__promise__']
 
-  validates_presence_of :title
+      if p && obj.length==1
+        load_result(Marty::PromiseProxy.new(*p), force)
+      else
+        obj.each_with_object({}) { |(k, v), h| h[k] = load_result(v, force) }
+      end
+    else
+      obj
+    end
+  end
 
   has_many :children,
-  foreign_key: 'parent_id',
-  class_name: "Marty::Promise",
-  dependent: :destroy
+           foreign_key: 'parent_id',
+           class_name: "Marty::Promise",
+           dependent: :destroy
+
+  validates_presence_of :title
 
   belongs_to :parent, class_name: "Marty::Promise"
   belongs_to :user, class_name: "Marty::User"
@@ -53,43 +51,6 @@ class Marty::Promise < Marty::Base
     end
   end
 
-  class VirtualRoot
-    def self.primary_key
-      'id'
-    end
-
-    def id
-      'root'
-    end
-
-    def user_id
-      0
-    end
-    alias_method :job_id, :user_id
-
-    def result
-      nil
-    end
-    [:start_dt, :end_dt].each { |m| alias_method m, :result }
-
-    def status
-      true
-    end
-  end
-
-  def self.root
-    VirtualRoot.new
-  end
-
-  def self.children_for_id(id, search_order)
-    q = id == 'root' ? where(parent_id: nil) : find(id).children
-    q.live_search(search_order).order(id: :desc).includes(:children, :user)
-  end
-
-  def leaf
-    children.empty?
-  end
-
   def raw_conn
     self.class.connection.raw_connection
   end
@@ -242,22 +203,4 @@ class Marty::Promise < Marty::Base
       raw_conn.exec("UNLISTEN promise_#{id}")
     end
   end
-
-  # Support UI live search -- FIXME: hacky to have UI scoping here
-  scope :live_search, lambda { |search_text|
-    return if !search_text || search_text.strip.length < 1
-
-    # Searches user login/firstname/lastname
-    query = [
-             "marty_users.login ILIKE ?",
-             "marty_users.firstname ILIKE ?",
-             "marty_users.lastname ILIKE ?",
-             "marty_roles.name ILIKE ?",
-            ].join(' OR ')
-
-    st = "%#{search_text}%"
-    # Convert "Role Name" or "Role name" to "role_name" (underscore is key)
-    st2 = "%#{search_text.titleize.gsub(/\s/, '').underscore}%"
-    joins({:user => :roles}).where(query, st, st, st, st2).distinct
-  }
 end

data/app/models/marty/vw_promise.rb

@@ -0,0 +1,72 @@
+class Marty::VwPromise < Marty::Base
+
+  has_many :children,
+           foreign_key: 'parent_id',
+           class_name: "Marty::VwPromise",
+           dependent: :destroy
+
+  belongs_to :parent, class_name: "Marty::VwPromise"
+  belongs_to :user, class_name: "Marty::User"
+
+  self.table_name = 'marty_vw_promises'
+  self.primary_key = 'id'
+
+  class VirtualRoot
+    def self.primary_key
+      'id'
+    end
+
+    def id
+      'root'
+    end
+
+    def user_id
+      0
+    end
+    alias_method :job_id, :user_id
+
+    def result
+      nil
+    end
+    [:start_dt, :end_dt].each { |m| alias_method m, :result }
+
+    def status
+      true
+    end
+  end
+
+  def self.root
+    VirtualRoot.new
+  end
+
+  def self.children_for_id(id, search_order)
+    q = id == 'root' ? where(parent_id: nil) : find(id).children
+    q.live_search(search_order).order(id: :desc).includes(:children, :user)
+  end
+
+  def leaf
+    children.empty?
+  end
+
+  def to_s
+    inspect
+  end
+
+  # Support UI live search -- FIXME: hacky to have UI scoping here
+  scope :live_search, lambda { |search_text|
+    return if !search_text || search_text.strip.length < 1
+
+    # Searches user login/firstname/lastname
+    query = [
+             "marty_users.login ILIKE ?",
+             "marty_users.firstname ILIKE ?",
+             "marty_users.lastname ILIKE ?",
+             "marty_roles.name ILIKE ?",
+            ].join(' OR ')
+
+    st = "%#{search_text}%"
+    # Convert "Role Name" or "Role name" to "role_name" (underscore is key)
+    st2 = "%#{search_text.titleize.gsub(/\s/, '').underscore}%"
+    joins({:user => :roles}).where(query, st, st, st, st2).distinct
+  }
+end