marty 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5462fab5388f7bad639810faa08b6e3fc2958153
-  data.tar.gz: ada66e1090a390c88f62e7ec4667bc31be8e49d8
+  metadata.gz: f72e47b8af214afae1185098fad62b86cb4c740c
+  data.tar.gz: f23fdf9fb57e514b3d67340abd050b59b7c1b8ec
 SHA512:
-  metadata.gz: 2b42c74d0222cdaba7b04f02035eeed7a892c4dd7b0eb8c49abf713f90f870c9c5159aa61e405b5a9445e218223b4474a574e19febafda665071a87c3cf11cae
-  data.tar.gz: 686efe822c601622d5272fc5d6fcd9ebeee9b0887bb469f5e82b7f501786995767998e6ad56c7edae2579333eef7cfe5c8a93c6061874f07d8d83e735ba50561
+  metadata.gz: 35b2e57e4e67136307490955a47ecdd8ad4a8b45c0d4752492a4b144a9a3764a51c7f7f48fbf844e9ddeb7b92364b3d38d86c30fe3990e60fc27627556ca1612
+  data.tar.gz: bd9300147c167ac3e3934666c8249cf80f2c35e20ec67723d0a70311c6e1cc64e2f20a5bb5ad5931b4ee43876e8cad9d8dcde4f8c1bfbaf7ddc80884c96ec85e

data/Gemfile

@@ -27,5 +27,6 @@ group :development, :test do
   gem 'netzke-testing'
   gem 'rspec-instafail', require: false
 
-  gem 'marty_rspec'
+# gem 'marty_rspec', path: File.expand_path('../../marty_rspec', __FILE__) 
+gem 'marty_rspec'
 end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    marty (1.2.0)
+    marty (1.2.1)
       axlsx (= 2.1.0pre)
       coderay
       delorean_lang (~> 0.3.33)
@@ -83,7 +83,7 @@ GEM
     delayed_job_active_record (4.1.2)
       activerecord (>= 3.0, < 5.2)
       delayed_job (>= 3.0, < 5)
-    delorean_lang (0.3.34)
+    delorean_lang (0.3.33)
       activerecord (>= 3.2)
       treetop (~> 1.5)
     diff-lcs (1.3)

data/app/components/marty/base_rule_view.rb

@@ -0,0 +1,279 @@
+class Marty::BaseRuleView < Marty::McflyGridPanel
+  include Marty::Extras::Layout
+
+  def self.klass
+    Marty::BaseRule
+  end
+  def klass
+    self.class.klass
+  end
+
+  def self.base_fields
+    [:name]
+  end
+  def self.computed_fields
+    [:computed_guards, :grids, :results]
+  end
+  def configure(c)
+    super
+    c.model = self.class.klass
+    c.title = I18n.t('rule')
+    c.attributes = self.class.base_fields +
+                   klass.guard_info.
+                     sort_by{|_, h| h[:order] || 0}.
+                     reject{|_, h| h[:hidden]}.
+                     map { |name, _| name.to_sym } + self.class.computed_fields
+    c.store_config.merge!(sorters: [{property: :name, direction: 'ASC'}])
+    c.editing      = :in_form
+    c.paging       = :pagination
+    c.multi_select = false
+  end
+
+  def default_bbar
+    super + [:dup_in_form]
+  end
+
+  def default_context_menu
+    []
+  end
+
+  class DupKeyError < StandardError
+    def initialize(key, lineno)
+      @key    = key
+      @lineno = lineno
+    end
+    def message
+      "keyword '#{@key}' specified more than once (line #{@lineno})"
+    end
+  end
+
+  def self.simple_to_hashstr(s)
+    pairs = []
+    keys = Set.new
+    s.lines.each.with_index(1) do |line, idx|
+      next if /\A\s*\z/.match(line)
+      line.chomp!
+      begin
+        m = /\A\s*([a-z0-9][a-z0-9_]*)\s*=\s*(.*)\s*\z/.match(line)
+        k, v = m[1], m[2]
+        v = [v].to_json[1..-2]
+        raise DupKeyError.new(k, idx) if keys.include?(k)
+        raise unless /\A['"].*['"]\z/.match(v)
+        keys << k
+      rescue DupKeyError => e
+        raise
+      rescue => e
+        raise "syntax error on line #{idx}"
+      end
+      pairs << [k, v]
+    end
+
+    kvs = pairs.map { |k, v| %Q("#{k}":#{v}) }.join(",")
+    "{#{kvs}}"
+  end
+
+  def self.hash_to_simple(h)
+    return unless h && h.present?
+    fmt = '%-' +  h.keys.map(&:length).max.to_s + 's = %s'
+    h.map do |k, vstr|
+      fmt % [k, vstr]
+    end.join("\n") || ''
+  end
+
+  def jsonb_getter(c)
+    lambda { |r| md = r.send(c); md.present? && md.to_json || '' }
+  end
+
+  def jsonb_simple_getter(c)
+    lambda {|r| Marty::BaseRuleView.hash_to_simple(r.send(c)) }
+  end
+
+  def jsonb_simple_setter(c)
+    msg = "#{c}="
+    lambda { |r, v|
+      return r.send(msg, nil) if v.blank?
+
+      begin
+        v = ActiveSupport::JSON.decode(
+          Marty::BaseRuleView.simple_to_hashstr(v))
+      rescue => e
+        v = { "~~ERROR~~": e.message }
+      end
+      r.send(msg, v)
+    }
+  end
+
+  def self.jsonb_field_getter(j, c)
+    lambda { |r| r.send(j)[c]||"" }
+  end
+
+  def self.jsonb_field_setter(j, c)
+    lambda do |r, v|
+      v.blank? ||  v == '---' ? r.send(j).delete(c) : r.send(j)[c] = v
+    end
+  end
+
+  def json_sort_scope(c)
+    lambda { |r, dir| r.order("#{c}::text " + dir.to_s) }
+  end
+
+  component :add_window do |c|
+    super(c)
+    c.width = 1500
+    c.height = 740
+  end
+
+  component :edit_window do |c|
+    super(c)
+    c.width = 1500
+    c.height = 740
+  end
+
+  attribute :name do |c|
+    c.width = 150
+  end
+
+  def self.grid_column(c, label=nil)
+    editor_config = {
+      trigger_action: :all,
+      xtype:          :combo,
+      store:          Marty::DataGrid.where(obsoleted_dt: 'infinity').
+        pluck(:name) + ['---'],
+      forceSelection: true,
+    }
+    {
+      name: label || c,
+      width: 200,
+      column_config: { editor: editor_config },
+      field_config:  editor_config,
+      type:          :string,
+      getter: jsonb_field_getter(:grids, c.to_s),
+      setter: jsonb_field_setter(:grids, c.to_s),
+#      getter: lambda { |r| r.grids[c.to_s] },
+#      setter: lambda { |r, v| r.grids[c.to_s] = v },
+    }
+  end
+
+  def form_items_attrs
+    self.class.base_fields
+  end
+
+  def form_items_guards
+    klass.guard_info.reject{|_, h| h[:hidden]}.keys.map{|x|x.to_sym}
+  end
+
+  def form_items_grids
+    [jsonb_field(:grids,
+                 getter: jsonb_simple_getter(:grids),
+                 setter: jsonb_simple_setter(:grids),
+                 height: 75)]
+  end
+
+  def form_items_computed_guards
+    [jsonb_field(:computed_guards,
+                 getter: jsonb_simple_getter(:computed_guards),
+                 setter: jsonb_simple_setter(:computed_guards),
+                 height: 150)]
+  end
+
+  def form_items_results
+    [jsonb_field(:results,
+                 getter: jsonb_simple_getter(:results),
+                 setter: jsonb_simple_setter(:results),
+                 height: 150)]
+  end
+
+  def default_form_items
+    [
+      hbox(
+        vbox(*form_items_attrs +
+             form_items_guards,
+             border: false,
+             width: "40%",
+        ),
+        vbox(width: '2%', border: false),
+        vbox(
+             width: '55%', border: false),
+        height: '40%',
+        border: false,
+      ),
+      hbox(
+        vbox(*form_items_computed_guards +
+             form_items_grids +
+             form_items_results,
+             width: '99%',
+             border: false
+        ),
+        height: '40%',
+       border: false
+      )
+    ]
+  end
+
+  def self.field_maker(namestr, h, meth)
+    name = namestr.to_sym
+    attribute name do |c|
+      c.width = h[:width] || 150
+      case h[:type]
+      when :datetime; c.format = 'Y-m-d H:i'
+      when :date; c.format = 'Y-m-d'
+      else c.type = h[:type] || :string
+      end
+      c.label = h[:label] if h[:label]
+      if h[:enum]
+        if h[:multi]
+          enum_array(c, h[:enum])
+        else
+          enum_column(c, h[:enum])
+        end
+      end
+      # for some unexplained reason the getter/setter need the full
+      # class qualification
+      if h[:type] != :range
+        c.getter = Marty::DeloreanRuleView.jsonb_field_getter(meth, namestr)
+        c.setter = Marty::DeloreanRuleView.jsonb_field_setter(meth, namestr)
+        c.filter_with = lambda do |rel, value, op|
+          v = ActiveRecord::Base.connection.quote(value)[1..-2]
+          rel.where("#{meth}->>'#{namestr}' like '%#{v}%'")
+        end
+      else
+        c.getter = range_getter(namestr, meth)
+        c.setter = range_setter(namestr, meth)
+        c.filterable = false
+      end
+      c.sorting_scope = get_json_sorter(meth, namestr)
+    end
+  end
+
+  attribute :start_dt do |c|
+    c.width = 100
+    c.format = 'Y-m-d H:i'
+  end
+
+  attribute :end_dt do |c|
+    c.width = 100
+    c.format = 'Y-m-d H:i'
+  end
+
+  attribute :rule_type do |c|
+    c.width = 200
+  end
+
+  def self.init_fields
+    klass.guard_info.each do |namestr, h|
+      field_maker(namestr, h, :simple_guards)
+    end
+  end
+
+  computed_fields.each do |a|
+    column a do |c|
+      c.flex   = 1
+      c.getter = jsonb_getter(a.to_s)
+      c.sorting_scope = json_sort_scope(a)
+      c.filter_with = lambda do |rel, value, op|
+        v = ActiveRecord::Base.connection.quote(value)[1..-2]
+        rel.where("#{a}::text like '%#{v}%'")
+      end
+    end
+  end
+end

data/app/components/marty/delorean_rule_view.rb

@@ -0,0 +1,26 @@
+class Marty::DeloreanRuleView < Marty::BaseRuleView
+  include Marty::Extras::Layout
+
+  def self.klass
+    Marty::DeloreanRule
+  end
+
+  def self.base_fields
+    super + [:rule_type, :start_dt, :end_dt]
+  end
+
+  attribute :start_dt do |c|
+    c.width = 150
+    c.format = 'Y-m-d H:i'
+  end
+
+  attribute :end_dt do |c|
+    c.width = 150
+    c.format = 'Y-m-d H:i'
+  end
+
+  attribute :rule_type do |c|
+    c.width = 200
+  end
+
+end

data/app/components/marty/extras/layout.rb

@@ -154,15 +154,30 @@ module Layout
   ######################################################################
   # make sure to validate range vals on the model (e.g. see rule.rb)
 
-  def range_getter(name)
-    lambda { |r|
-      Marty::Util.pg_range_to_human(r.send(name))
-    }
+  def range_getter(name, json_field=nil)
+    if json_field
+      lambda { |r| Marty::Util.pg_range_to_human(r.send(json_field)[name]) }
+    else
+      lambda { |r| Marty::Util.pg_range_to_human(r.send(name)) }
+    end
   end
 
-  def range_setter(name)
-    lambda do |r, v|
-      r.send("#{name}=", v && (Marty::Util.human_to_pg_range(v) rescue v))
+  def range_setter(name, json_field=nil)
+    if json_field
+      lambda do |r, v|
+        cookedv = v && v.present? && (Marty::Util.human_to_pg_range(v) rescue v)
+        h  = r.send(json_field)
+        if cookedv
+          r.send("#{json_field}=", h + {name=>cookedv})
+        else
+          h.delete(name)
+          r.send("#{json_field}=", h)
+        end
+      end
+    else
+      lambda do |r, v|
+        r.send("#{name}=", v && (Marty::Util.human_to_pg_range(v) rescue v))
+      end
     end
   end
 

data/app/components/marty/log_view.rb

@@ -81,7 +81,7 @@ class Marty::LogView < Marty::Grid
     c.text      = I18n.t("log_grid.details")
     c.width     = 900
     c.read_only = true
-    c.getter    = lambda { |r| r.details.to_s}
+    c.getter    = lambda { |r| r.details.pretty_inspect}
   end
 end
 

data/app/components/marty/mcfly_grid_panel.rb

@@ -43,6 +43,59 @@ class Marty::McflyGridPanel < Marty::Grid
     end
   end
 
+  client_class do |c|
+    c.init_component = l(<<-JS)
+      function() {
+         this.callParent();
+
+         // dup is a non standard button, so we have to explicitly manage
+         // its clickability
+         this.getSelectionModel().on('selectionchange', function(selModel) {
+            this.actions.dupInForm &&
+                this.actions.dupInForm.setDisabled(!selModel.hasSelection() ||
+                                                   !this.permissions.create);
+         }, this);
+      }
+   JS
+  end
+
+  client_class do |c|
+    c.include :dup_in_form
+  end
+
+  action :dup_in_form do |a|
+    a.hidden   = !config[:permissions][:create]
+    a.icon     = :page_copy
+    a.disabled = true
+  end
+
+  # edit-in-form submit with dup support
+  endpoint :edit_window__edit_form__submit do |params|
+
+    if params["dup"]
+      # FIXME: copied from basepack grid endpoint
+      # :add_window__add_form__netzke_submit
+
+      params[:data] = ActiveSupport::JSON.
+                      decode(params[:data]).merge(id: nil).to_json
+
+      client.merge!(component_instance(:add_window).
+                   component_instance(:add_form).
+                   invoke_endpoint(:submit, [params]))
+
+      on_data_changed if client.netzke_set_form_values.present?
+      client.delete(:netzke_set_form_values)
+    else
+      # FIXME: copied from basepack grid endpoint
+      # :edit_window__edit_form__netzke_submit
+      client.merge!(component_instance(:edit_window).
+                     component_instance(:edit_form).
+                     invoke_endpoint(:submit, [params]))
+      on_data_changed if client.netzke_set_form_values.present?
+      client.delete(:netzke_set_form_values)
+    end
+  end
+
 private
   def self.mcfly_scope(sort_column)
     lambda { |r|