RubyGems - marty - Versions diffs - 2.1.5 → 2.3.0 - Mend

marty 2.1.5 → 2.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (66) hide show

checksums.yaml +4 -4
data/Gemfile +2 -0
data/Gemfile.lock +4 -4
data/app/components/marty/auth_app.rb +3 -3
data/app/components/marty/auth_app/client/auth_app.js +1 -3
data/app/components/marty/base_rule_view.rb +32 -20
data/app/components/marty/data_grid_view.rb +3 -3
data/app/components/marty/event_view.rb +0 -5
data/app/components/marty/form.rb +8 -1
data/app/components/marty/form/client/form.css +3 -0
data/app/components/marty/grid.rb +174 -33
data/app/components/marty/import_view.rb +151 -0
data/app/components/marty/main_auth_app.rb +28 -28
data/app/components/marty/mcfly_grid_panel.rb +1 -1
data/app/components/marty/new_posting_form.rb +3 -3
data/app/components/marty/new_posting_window.rb +5 -6
data/app/components/marty/posting_grid.rb +2 -2
data/app/components/marty/posting_window.rb +1 -2
data/app/components/marty/promise_view.rb +11 -6
data/app/components/marty/record_form_window.rb +1 -1
data/app/components/marty/report_form.rb +4 -4
data/app/components/marty/report_select.rb +1 -1
data/app/components/marty/script_form.rb +4 -4
data/app/components/marty/script_grid.rb +2 -2
data/app/components/marty/script_tester.rb +1 -1
data/app/components/marty/simple_app.rb +1 -2
data/app/components/marty/simple_app/client/statusbar_ext.js +1 -1
data/app/components/marty/tag_grid.rb +1 -1
data/app/components/marty/user_view.rb +5 -5
data/app/controllers/marty/job_controller.rb +5 -1
data/app/models/marty/base.rb +0 -15
data/app/models/marty/data_grid.rb +1 -1
data/app/models/marty/log.rb +1 -0
data/app/models/marty/promise.rb +27 -84
data/app/models/marty/vw_promise.rb +72 -0
data/app/views/layouts/marty/application.html.erb +6 -3
data/config/locales/en.yml +4 -0
data/db/migrate/410_jsonb_promise_result.rb +9 -0
data/db/migrate/411_create_vw_promises.rb +26 -0
data/lib/marty/data_change.rb +3 -4
data/lib/marty/data_conversion.rb +1 -2
data/lib/marty/data_importer.rb +13 -14
data/lib/marty/javascript/{overrides.js → grid_view_in_form.js} +10 -6
data/lib/marty/mcfly_model.rb +13 -20
data/lib/marty/monkey.rb +33 -40
data/lib/marty/promise_job.rb +8 -2
data/lib/marty/promise_proxy.rb +6 -11
data/lib/marty/rule_script_set.rb +5 -2
data/lib/marty/version.rb +1 -1
data/marty.gemspec +1 -1
data/other/marty/diagnostic/delayed_job_workers.rb +8 -5
data/spec/controllers/job_controller_spec.rb +34 -15
data/spec/dummy/app/components/gemini/my_rule_view.rb +6 -0
data/spec/dummy/app/models/gemini/helper.rb +2 -2
data/spec/dummy/config/application.rb +1 -1
data/spec/features/rule_spec.rb +100 -5
data/spec/fixtures/csv/rule/MyRule.csv +1 -1
data/spec/job_helper.rb +2 -4
data/spec/lib/data_importer_spec.rb +10 -10
data/spec/lib/delorean_query_spec.rb +13 -2
data/spec/lib/logger_spec.rb +16 -14
data/spec/models/data_grid_spec.rb +4 -10
data/spec/models/promise_spec.rb +8 -8
data/spec/models/rule_spec.rb +7 -7
data/spec/spec_helper.rb +1 -1
metadata +10 -5

data/app/views/layouts/marty/application.html.erb CHANGED

@@ -1,8 +1,11 @@
 <!DOCTYPE html>
 <html>
-<head>
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <title><%= Rails.application.class.parent %></title>
+  <head>
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.2.0/css/all.css"
+	  integrity="sha384-hWVjflwFxL6sNzntih27bfxkr27PmbbK/iSvJ+a4+0owXq79v+lsFkW54bOGbiDQ"
+	  crossorigin="anonymous">
+    <title><%= Rails.application.class.parent %></title>
   <%= load_netzke theme: Rails.configuration.marty.extjs_theme %>
   <%= csrf_meta_tag %>
 </head>

data/config/locales/en.yml CHANGED

@@ -20,6 +20,10 @@ en:
   data_grid_view: Data Grids
   data_grid: Data Grids
+  data_import_view:
+    import: Import
+    results: Results
   roles:
     viewer: Viewer
     admin: Admin

data/db/migrate/410_jsonb_promise_result.rb ADDED

@@ -0,0 +1,9 @@
+class JsonbPromiseResult < ActiveRecord::Migration[5.1]
+  def change
+    table = :marty_promises
+    execute "delete from #{table}"
+    change_column table, :result, :jsonb, default: {}, using: 'result::text::jsonb'
+  end
+end

data/db/migrate/411_create_vw_promises.rb ADDED

@@ -0,0 +1,26 @@
+class CreateVwPromises < ActiveRecord::Migration[5.1]
+  def up
+    execute <<SQL
+drop view if exists marty_vw_promises;
+create or replace view marty_vw_promises
+as
+select
+id,
+title,
+user_id,
+cformat,
+parent_id,
+job_id,
+status,
+start_dt,
+end_dt
+from marty_promises;
+grant select on marty_vw_promises to public;
+SQL
+  end
+  def down
+    execute "drop view if exists marty_vw_promises;"
+  end
+end

data/lib/marty/data_change.rb CHANGED

@@ -141,9 +141,8 @@ class Marty::DataChange
       ' OR (created_dt >= ? AND created_dt < ?)'
     # find all changes from t0 to t1 -- orders by id to get the lower
-    # ones since those are the original version in Mcfly.  Using
-    # unscoped to get around lazy loaded column scopes.
-    changes = klass.unscoped.select("DISTINCT ON (group_id) *").
+    # ones since those are the original version in Mcfly.
+    changes = klass.select("DISTINCT ON (group_id) *").
       where(change_q, t0, t1, t0, t1).
       order("group_id, id").
       to_a
@@ -174,7 +173,7 @@ class Marty::DataChange
     change_q = '(obsoleted_dt >= ? AND obsoleted_dt < ?)' +
                ' OR (created_dt >= ? AND created_dt < ?)'
-    countq = klass.unscoped.where(change_q, t0, t1, t0, t1)
+    countq = klass.where(change_q, t0, t1, t0, t1)
     dataq = klass.where(change_q, t0, t1, t0, t1)
     if ids

data/lib/marty/data_conversion.rb CHANGED

@@ -157,8 +157,7 @@ class Marty::DataConversion
     raise "no keys for #{klass} -- #{options}" if find_options.empty?
-    # unscope klass since we're sometimes sent lazy column classes
-    q = klass.unscoped.where(find_options)
+    q = klass.where(find_options)
     q = q.where("obsoleted_dt >= ? AND created_dt < ?", dt, dt) if
        dt && Mcfly.has_mcfly?(klass)

data/lib/marty/data_importer.rb CHANGED

@@ -1,17 +1,16 @@
 module Marty
-  class DataImporterError < StandardError
-    attr_reader :lines
+  class DataImporter
+    class Error < StandardError
+      attr_reader :lines
-    def initialize(message, lines)
-      msg = lines && lines.respond_to?(:join) ?
-      "#{message} - lines: #{lines.join(',')}" : message
+      def initialize(message, lines)
+        msg = lines && lines.respond_to?(:join) ?
+                "#{message} - lines: #{lines.join(',')}" : message
-      super(msg)
-      @lines = lines
+        super(msg)
+        @lines = lines
+      end
     end
-  end
-  class DataImporter
     # perform cleaning and do_import and summarize its results
     def self.do_import_summary(klass,
                                data,
@@ -81,14 +80,14 @@ module Marty
           end
         rescue => exc
           # to find problems with the importer, comment out the rescue block
-          raise Marty::DataImporterError.new(exc.to_s, [eline])
+          raise Error.new(exc.to_s, [eline])
         end
         ids = {}
         # raise an error if record referenced more than once.
         res.each_with_index do
           |(op, id), line|
-          raise Marty::DataImporterError.
+          raise Error.
             new("record referenced more than once", [ids[id], line]) if
             op != :blank && ids.member?(id) && !allow_dups
@@ -100,12 +99,12 @@ module Marty
           klass.send(validation_function.to_sym, ids.keys) if
             validation_function
         rescue => exc
-          raise Marty::DataImporterError.new(exc.to_s, [])
+          raise Error.new(exc.to_s, [])
         end
         remainder_ids = cleaner_ids - ids.keys
-        raise Marty::DataImporterError.
+        raise Error.
           new("Missing import data. " +
               "Please provide header line and at least one data line.", [1]) if
           ids.keys.compact.count == 0

data/lib/marty/javascript/{overrides.js → grid_view_in_form.js} RENAMED

@@ -12,16 +12,21 @@ Ext.define('Netzke.Grid.EventHandlers', {
     }
   },
-  netzkeReloadStore: function() {
+    netzkeReloadStore: function(opts={}) {
     var store = this.getStore();
-    // MONKEY: add netzkereload event on store
-    store.fireEvent('netzkereload');
+    // MONKEY: add beforenetzkereload and netzkerevent on store
+    store.fireEvent('beforenetzkereload');
+    var callback = opts.callback;
+    opts.callback = function() {
+      if (callback) { callback() }
+      store.fireEvent('netzkereload');
+    }
     // NETZKE'S HACK to work around buffered store's buggy reload()
     if (!store.lastRequestStart) {
-      store.load();
-    } else store.reload();
+      store.load(opts);
+    } else store.reload(opts);
   },
 });
@@ -74,4 +79,3 @@ Ext.define('Netzke.Grid.Columns', {
     };
   },
 });

data/lib/marty/mcfly_model.rb CHANGED

@@ -52,6 +52,10 @@ module Mcfly::Model
       end
     end
+    def hash_if_necessary(q, private)
+      !private && q.is_a?(ActiveRecord::Base) ? make_openstruct(q) : q
+    end
     def base_mcfly_lookup(meth, name, options = {}, &block)
       priv = options[:private]
@@ -70,19 +74,7 @@ module Mcfly::Model
         q = q.first if q.respond_to?(:first) && options[:mode] == :first
-        next q if priv
-        case
-        when q.is_a?(ActiveRecord::Relation)
-          # shouldn't happen - lookups that are mode nil should be
-          # private raise "#{self}.#{name} can't convert
-          # ActiveRecord::Relation to OpenStruct"
-          q
-        when q.is_a?(ActiveRecord::Base)
-          make_openstruct(q)
-        else
-          q
-        end
+        hash_if_necessary(q, priv)
       end
     end
@@ -169,10 +161,11 @@ module Mcfly::Model
       raise "#{rel_attr} should be mapped in attrs" if attrs[rel_attr].nil?
       cat_assoc_klass = cat_assoc_name.constantize
+      cat_attr_id = "#{cat_attr}_id"
       # replace rel_attr with cat_attr in attrs
       pc_attrs = attrs.each_with_object({}) {|(k, v), h|
-        h[k == rel_attr ? "#{cat_attr}_id" : k] = v
+        h[k == rel_attr ? cat_attr_id : k] = v
       }
       pc_name = "pc_#{name}".to_sym
@@ -186,6 +179,7 @@ module Mcfly::Model
       # cache if mode is not nil
       fn = options.fetch(:mode, :first) ? :cached_delorean_fn : :delorean_fn
+      priv = options[:private]
       send(fn, name, sig: attrs.length+1) do
         |ts, *args|
@@ -196,13 +190,12 @@ module Mcfly::Model
         args[lpi] = cat_assoc_klass.
                       mcfly_pt(ts).
-                      # FIXME: XXXX why is this join needed???
-                      # joins(cat_attr).
-                      where(rel_attr => rel).
-                      pluck("#{cat_attr}_id").
-                      first
+                      select(cat_attr_id).
+                      find_by(rel_attr => rel).
+                      send(cat_attr_id)
-        self.send(pc_name, ts, *args)
+        q = self.send(pc_name, ts, *args)
+        hash_if_necessary(q, priv)
       end
     end
   end

data/lib/marty/monkey.rb CHANGED

@@ -106,23 +106,6 @@ end
 require 'netzke/basepack/data_adapters/active_record_adapter'
 module Netzke::Basepack::DataAdapters
   class ActiveRecordAdapter < AbstractAdapter
-    # FIXME: another giant hack to handle lazy_load columns.
-    # Modified original count_records to call count on first passed column.name
-    # when lazy-loaded.  Otherwise, we run into issues with
-    # counting records in the default_scope placed by the lazy_load
-    # module.
-    def count_records(params, columns=[])
-      relation = @relation || get_relation(params)
-      columns.each do |c|
-        assoc, method = c[:name].split('__')
-        relation = relation.includes(assoc.to_sym).references(assoc.to_sym) if method
-      end
-      @model.const_defined?(:SELECT_COLS) ? relation.count(columns.first.name) :
-        relation.count
-    end
     ######################################################################
     # The following is a hack to get around Netzke's broken handling
     # of filtering on PostgreSQL enums columns.
@@ -238,11 +221,32 @@ class ActiveRecord::Relation
     tb = cls.table_name
     self.where("#{tb}.obsoleted_dt >= ? AND #{tb}.created_dt < ?", pt, pt)
   end
+  def attributes
+    to_a.map(&:attributes)
+  end
 end
 ######################################################################
 class ActiveRecord::Base
+  MCFLY_PT_SIG = [1, 1]
+  # FIXME: hacky signatures for AR queries on classes
+  COUNT_SIG    = [0, 0]
+  DISTINCT_SIG = [0, 100]
+  FIND_BY_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
     alias_method :old_joins, :joins
@@ -258,22 +262,23 @@ class ActiveRecord::Base
   end
 end
-args_hack = [[ActiveRecord::Relation, ActiveRecord::QueryMethods::WhereChain]] +
-            [[Object, nil]]*10
+ar_instances = [ActiveRecord::Relation, ActiveRecord::QueryMethods::WhereChain]
+args_hack = [ar_instances] + [[Object, nil]]*10
 Delorean::RUBY_WHITELIST.merge!(
-  count:    [ActiveRecord::Relation],
+  count:    [ar_instances],
   distinct: args_hack,
   find_by:  args_hack,
   group:    args_hack,
   joins:    args_hack,
-  limit:    [ActiveRecord::Relation, Integer],
+  limit:    [ar_instances, Integer],
   not:      args_hack,
   order:    args_hack,
   pluck:    args_hack,
   select:   args_hack,
   where:    args_hack,
-  mcfly_pt: [ActiveRecord::Relation,
+  mcfly_pt: [ar_instances,
              [Date, Time, ActiveSupport::TimeWithZone, String],
              [nil, Class]],
   lookup_grid_distinct_entry: [OpenStruct,
@@ -293,22 +298,10 @@ end
 ######################################################################
 class OpenStruct
-  def save
-    loc = %r([^/]+:[0-9]+).match(caller.first)[0]
-    raise "save called from #{loc} on #{self}"
-  end
-  def save!
-    loc = %r([^/]+:[0-9]+).match(caller.first)[0]
-    raise "save! called from #{loc} on #{self}"
-  end
-  def reload
-    loc = %r([^/]+:[0-9]+).match(caller.first)[0]
-    raise "reload called from #{loc} on #{self}"
+  # the default as_json produces {"table"=>h} which is quite goofy
+  def as_json(*)
+    self.to_h
   end
-  #def method_missing(meth, *args)
-  #  puts caller[0..8]
-  #  super
-  #end
 end
 ######################################################################
@@ -322,10 +315,10 @@ module Netzke
           include_core_js(res)
-          # MONKEY: load javascript overrides
-          overrides = ["#{File.dirname(__FILE__)}/javascript/overrides.js"]
+          # MONKEY: load marty custom javascript
+          marty_javascripts = Dir["#{File.dirname(__FILE__)}/javascript/*.js"]
-          (Netzke::Core.ext_javascripts + overrides).each do |path|
+          (Netzke::Core.ext_javascripts + marty_javascripts).each do |path|
             f = File.new(path)
             res << f.read
           end

data/lib/marty/promise_job.rb CHANGED

@@ -10,6 +10,10 @@ class Delorean::BaseModule::NodeCall
     params[:_user_id]   = _e[:_user_id]    || Mcfly.whodunnit.try(:id)
   end
+  # def log(msg)
+  #   open('/tmp/dj.out', 'a') { |f| f.puts msg }
+  # end
   # Monkey-patch '|' method for Delorean NodeCall to create promise
   # jobs and return promise proxy objects.
   def |(args)
@@ -25,11 +29,13 @@ class Delorean::BaseModule::NodeCall
     nn = node.is_a?(Class) ? node.name : node.to_s
     begin
       # make sure params is serialzable before starting a Job
-      Marshal.dump(params)
+      JSON.dump(params)
     rescue => exc
-      raise "non-serializable parameters"
+      raise "non-serializable parameters: #{params} #{exc}"
     end
+    # log "||||| #{args.inspect} #{params.inspect}"
     title   = params["p_title"]   || "#{script}::#{nn.demodulize}"
     timeout = params["p_timeout"] || Marty::Promise::DEFAULT_PROMISE_TIMEOUT
     hook    = params["p_hook"]

data/lib/marty/promise_proxy.rb CHANGED

@@ -4,8 +4,6 @@
 class Marty::PromiseProxy < BasicObject
   NOT_SET = ::Object.new.freeze
   METH_SET = ::Set[
-                   :marshal_load,
-                   :marshal_dump,
                    :force,
                    :__force__,
                    # Added for Rails 4 -- were causing forced eval.
@@ -13,25 +11,22 @@ class Marty::PromiseProxy < BasicObject
                    # ActiveRecord treats assignment to proxy objs.
                    :is_a?,
                    :nested_under_indifferent_access,
+                   :as_json,
                   ]
   instance_methods.each {|m| undef_method m unless m =~ /^(__.*|object_id)$/}
   def initialize(promise_id, timeout, attr=nil)
-    marshal_load([promise_id, timeout, attr])
-  end
-  def marshal_dump
-    [@promise.id, @timeout, @attr]
-  end
-  def marshal_load(args)
-    promise_id, @timeout, @attr = args
+    promise_id, @timeout, @attr = promise_id, timeout, attr
     @promise = ::Marty::Promise.find(promise_id)
     @mutex   = ::Mutex.new
     @result  = NOT_SET
   end
+  def as_json(*)
+    {'__promise__' => [@promise.id, @timeout, @attr]}
+  end
   def __promise__
     @promise
   end