marty 1.0.20 → 1.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ef8c8c7b0bd818fee36e9a1b008e993ee03f0a0
-  data.tar.gz: 170c2f758a76d4a6dd5b468afddec69b549639bd
+  metadata.gz: 86d8dcf6f031cb37849a2835413f01577fe15309
+  data.tar.gz: 3230c2099f30abb9f60c6d17d1b7da528e1b928c
 SHA512:
-  metadata.gz: fac49a429c93d733c9e80ff8125a6ee384cd8c84e0ef3c935191488f2c8f57ac573182b9a84a69727ba5f2da3bc53dc5aea49093362260bc34e3c3adcda4a9e1
-  data.tar.gz: 549351e7df063500acb9144d392b61324b22f305abcba00121a6e5e16499db8aefb84ef7f6483d13b9d0f6af3f18398b75e53ac3884181965f36e620ee675245
+  metadata.gz: c6ffb9f4a6e963960f7d22254444c937431f4c185a1be67b6161db0b1d50fabfc857cf39cef9c6100db74d622ea406aed702b2d37863ef5c9af6c005d60e1057
+  data.tar.gz: 4a0f2d03b75bb07f97f0fb38625a2f3b821a71df0286d27eeae4333965a8d21d6fd3bbfb819f8d47e3d2b6d771f7e33362c42e588b46d0e86f85748c3cc4e3aa

data/app/components/marty/data_grid_view.rb

@@ -0,0 +1,203 @@
+module Marty; class DataGridView < McflyGridPanel
+  has_marty_permissions create: [:admin, :dev],
+                        read: :any,
+                        update: [:admin, :dev],
+                        delete: [:admin, :dev]
+
+  include Extras::Layout
+
+  def self.show_grid_js(options={})
+    dg        = options[:data_grid] || 'data_grid'
+    title_str = options[:title_str] || 'Data Grid'
+
+    javascript = l(<<-JS)
+    function() {
+       var sel = this.getSelectionModel().selected.first();
+       var record_id = sel && sel.getId();
+       this.server.showGrid({record_id: record_id,
+                            data_grid: "#{dg}",
+                            title_str: "#{title_str}"});
+    }
+    JS
+    javascript
+  end
+
+  def self.client_show_grid_js
+    javascript = l(<<-JS)
+    function(count, data, title_str) {
+       var columns = [];
+       var fields  = [];
+
+       for (var i=0; i<count; i++) {
+          fields.push("a" + i);
+          columns.push({dataIndex: "a" + i, text: i, flex: 1});
+       }
+
+       Ext.create('Ext.Window', {
+         height:        "80%",
+         width:         "80%",
+         x:             0,
+         y:             0,
+         autoWidth:     true,
+         modal:         true,
+         autoScroll:    true,
+         title:         title_str,
+         items: {
+           xtype:       'grid',
+           border:      false,
+           hideHeaders: false,
+           columns:     columns,
+           store:       Ext.create('Ext.data.ArrayStore', {
+             fields: fields,
+             data: data,
+             })
+         },
+      }).show();
+    }
+    JS
+    javascript
+  end
+
+  client_class do |c|
+    c.netzke_show_grid        = DataGridView.show_grid_js
+    c.netzke_client_show_grid = DataGridView.client_show_grid_js
+  end
+
+  def configure(c)
+    super
+
+    c.title   = I18n.t('data_grid')
+    c.model   = "Marty::DataGrid"
+    c.attributes =
+      [
+       :name,
+       :vcols,
+       :hcols,
+       :lenient,
+       :data_type,
+       :created_dt,
+      ]
+
+    c.store_config.merge!({sorters:  [{property: :name, direction: 'ASC'}]})
+    c.editing      = :in_form
+    c.paging       = :pagination
+    c.multi_select = false
+  end
+
+  endpoint :add_window__add_form__submit do |params|
+    data = ActiveSupport::JSON.decode(params[:data])
+
+    return client.netzke_notify("Permission Denied") if
+      !config[:permissions][:create]
+
+    begin
+      DataGrid.create_from_import(data["name"], data["export"])
+      client.success = true
+      client.netzke_on_submit_success
+    rescue => exc
+      client.netzke_notify(exc.to_s)
+    end
+  end
+
+  endpoint :edit_window__edit_form__submit do |params|
+    data = ActiveSupport::JSON.decode(params[:data])
+
+    dg = DataGrid.find_by_id(data["id"])
+
+    begin
+      dg.update_from_import(data["name"], data["export"])
+      client.success = true
+      client.netzke_on_submit_success
+    rescue => exc
+      client.netzke_notify(exc.to_s)
+    end
+  end
+
+  action :show_grid do |a|
+    a.text    = "Show Grid"
+    a.icon    = :application_view_detail
+    a.handler = :netzke_show_grid
+  end
+
+  endpoint :show_grid do |params|
+    record_id = params[:record_id]
+
+    dg = DataGrid.find_by_id(record_id)
+
+    return client.netzke_notify("No data grid.") unless dg
+
+    meta_rows_raw, h_key_rows, data_rows = dg.export_array
+    meta_rows = meta_rows_raw.map do |row|
+      # need to escape for HTML, otherwise characters such as >, <,
+      # etc. not displayed properly.
+      row.map { |field| CGI::escapeHTML(field) }
+    end
+    res = meta_rows + [[]] + h_key_rows + data_rows
+
+    maxcount = res.map(&:length).max
+
+    client.netzke_client_show_grid maxcount, res, 'Data Grid'
+  end
+
+  def default_bbar
+    [:show_grid] + super
+  end
+
+  def default_context_menu
+    []
+  end
+
+  def default_form_items
+    [
+     :name,
+     textarea_field(:export, height: 300, hide_label: true),
+    ]
+  end
+
+  component :edit_window do |c|
+    super(c)
+    c.width = 700
+  end
+
+  component :add_window do |c|
+    super(c)
+    c.width = 700
+  end
+
+  attribute :name do |c|
+    c.width = 120
+  end
+
+  attribute :hcols do |c|
+    c.label  = "Horizontal Attrs"
+    c.width  = 200
+    c.getter = lambda { |r|
+      r.dir_infos("h").map {|inf| inf["attr"]}.join(', ')
+    }
+  end
+
+  attribute :vcols do |c|
+    c.label  = "Vertical Attrs"
+    c.width  = 200
+    c.getter = lambda { |r|
+      r.dir_infos("v").map {|inf| inf["attr"]}.join(', ')
+    }
+  end
+
+  attribute :lenient do |c|
+    c.width  = 75
+  end
+
+  attribute :data_type do |c|
+    c.label  = "Data Type"
+    c.width  = 200
+  end
+
+  attribute :created_dt do |c|
+    c.label     = I18n.t('updated_at')
+    c.format    = "Y-m-d H:i"
+    c.read_only = true
+  end
+end; end
+
+DataGridView = Marty::DataGridView

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

@@ -1,84 +1,151 @@
-module Marty
-  module Extras
-    module Layout
-
-      def hbox(*args)
-        params = args.pop
-        params.merge(layout: { type: :hbox, align: :stretch },
-                     items: args,
-                     )
-      end
-
-      def vbox(*args)
-        params = args.pop
-        params.merge(layout: { type: :vbox, align: :stretch },
-                     items: args,
-                     )
-      end
-
-      def fieldset(title, *args)
-        params = args.pop
-        params.merge(items: args,
-                     xtype: 'fieldset',
-                     defaults: { anchor: '100%' },
-                     title: title,
-                     )
-      end
-
-      def dispfield(params={})
-        {
-          attr_type: :displayfield,
-          hide_label: !params[:field_label],
-          read_only: true,
-        }.merge(params)
-      end
-
-      def vspacer(params={})
-        vbox({flex: 1, border: false}.merge(params))
-      end
-
-      def hspacer(params={})
-        hbox({flex: 1, border: false}.merge(params))
-      end
-
-      def textarea_field(name, options={})
-        {
-          name:        name,
-          width:       "100%",
-          height:      150,
-          xtype:       :textareafield,
-          auto_scroll: true,
-          spellcheck:  false,
-          field_style: {
-            font_family: 'courier new',
-            font_size:   '12px'
-          },
-        } + options
-      end
-
-      ######################################################################
-      # PG ENUM field handling
-
-      def enum_column(c, klass)
-        editor_config = {
-          trigger_action: :all,
-          xtype:          :combo,
-
-          # hacky: extjs has issues with forceSelection true and clearing combos
-          store:          klass::VALUES + ['---'],
-          forceSelection: true,
-        }
-        c.merge!(
-          column_config: { editor: editor_config },
-          field_config:  editor_config,
-          type:          :string,
-          setter:        enum_setter(c.name),
-        )
-      end
-
-      def enum_setter(name)
-        lambda {|r, v| r.send("#{name}=", v == '---' || v.empty? ? nil : v)}
-      end
+module Marty; module Extras
+module Layout
+  def hbox(*args)
+    params = args.pop
+    params.merge(layout: { type: :hbox, align: :stretch },
+                 items: args,
+                )
+  end
+
+  def vbox(*args)
+    params = args.pop
+    params.merge(layout: { type: :vbox, align: :stretch },
+                 items: args,
+                )
+  end
+
+  def fieldset(title, *args)
+    params = args.pop
+    params.merge(items: args,
+                 xtype: 'fieldset',
+                 defaults: { anchor: '100%' },
+                 title: title,
+                )
+  end
+
+  def dispfield(params={})
+    {
+      attr_type: :displayfield,
+      hide_label: !params[:field_label],
+      read_only: true,
+    }.merge(params)
+  end
+
+  def vspacer(params={})
+    vbox({flex: 1, border: false}.merge(params))
+  end
+
+  def hspacer(params={})
+    hbox({flex: 1, border: false}.merge(params))
+  end
+
+  def textarea_field(name, options={})
+    {
+      name:        name,
+      width:       "100%",
+      height:      150,
+      xtype:       :textareafield,
+      auto_scroll: true,
+      spellcheck:  false,
+      field_style: {
+        font_family: 'courier new',
+        font_size:   '12px'
+      },
+    } + options
+  end
+
+  ######################################################################
+  # PG ENUM field handling
+
+  def enum_column(c, klass)
+    editor_config = {
+      trigger_action: :all,
+      xtype:          :combo,
+
+      # hacky: extjs has issues with forceSelection true and clearing combos
+      store:          klass::VALUES + ['---'],
+      forceSelection: true,
+    }
+    c.merge!(
+      column_config: { editor: editor_config },
+      field_config:  editor_config,
+      type:          :string,
+      setter:        enum_setter(c.name),
+    )
+  end
+
+  def enum_setter(name)
+    lambda {|r, v| r.send("#{name}=", v == '---' || v.empty? ? nil : v)}
+  end
+
+  ######################################################################
+  # employ lots of hakery to implement NULLable boolean field in
+  # Netzke 8.x.
+
+  BOOL_MAP = {
+    nil   => "---",
+    true  => "True",
+    false => "False",
+  }
+
+  MAP_BOOL = {
+    "---"   => nil,
+    ""      => nil,
+    "True"  => true,
+    "False" => false,
+  }
+
+  def bool_getter(name)
+    lambda {|r| BOOL_MAP[r.send(name)]}
+  end
+
+  def bool_setter(name)
+    lambda {|r, v| r.send("#{name}=", MAP_BOOL[v])}
+  end
+
+  def nullable_bool_column(name)
+    editor_config = {
+      trigger_action: :all,
+      xtype:          :combo,
+      store:          ["True", "False", "---"],
+    }
+    {
+      column_config: { editor: editor_config },
+      field_config:  editor_config,
+      type:          :string,
+      getter:        bool_getter(name),
+      setter:        bool_setter(name),
+    }
+  end
+
+  ######################################################################
+  # 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))
+    }
+  end
+
+  def range_setter(name)
+    lambda do |r, v|
+      r.send("#{name}=", v && (Marty::Util.human_to_pg_range(v) rescue v))
     end
   end
-end
+
+  def range_field(name)
+    {
+      name:   name,
+      getter: range_getter(name),
+      setter: range_setter(name),
+    }
+  end
+
+  def range_column(c, name)
+    c.getter = range_getter(name)
+    c.setter = range_setter(name)
+    c.width  = 80
+    c.align  = 'right'
+  end
+
+end; end; end

data/app/components/marty/main_auth_app.rb

@@ -8,6 +8,7 @@ require 'marty/event_view'
 require 'marty/promise_view'
 require 'marty/api_auth_view'
 require 'marty/config_view'
+require 'marty/data_grid_view'
 
 class Marty::MainAuthApp < Marty::AuthApp
   extend ::Marty::Permissions
@@ -39,10 +40,10 @@ class Marty::MainAuthApp < Marty::AuthApp
       icon:  icon_hack(:time),
       style: (warped ? "background-color: lightGrey;" : ""),
       menu:  [
-              :new_posting,
-              :select_posting,
-              :select_now,
-             ],
+        :new_posting,
+        :select_posting,
+        :select_now,
+      ],
     }
   end
 
@@ -52,14 +53,14 @@ class Marty::MainAuthApp < Marty::AuthApp
       icon:  icon_hack(:wrench),
       style: "",
       menu:  [
-              :import_type_view,
-              :user_view,
-              :config_view,
-              :api_auth_view,
-              :event_view,
-              :reload_scripts,
-              :load_seed,
-             ] + background_jobs_menu
+        :import_type_view,
+        :user_view,
+        :config_view,
+        :api_auth_view,
+        :event_view,
+        :reload_scripts,
+        :load_seed,
+      ] + background_jobs_menu
     }
   end
 
@@ -68,25 +69,26 @@ class Marty::MainAuthApp < Marty::AuthApp
       text: I18n.t("applications"),
       icon: icon_hack(:application_cascade),
       menu: [
-             :reporting,
-             :scripting,
-             :promise_view,
-            ],
+        :data_grid_view,
+        :reporting,
+        :scripting,
+        :promise_view,
+      ],
     }
   end
 
   def background_jobs_menu
     [
-       {
-         text: 'Background Jobs',
-         icon: icon_hack(:clock),
-         disabled: !self.class.has_admin_perm?,
-         menu: [
-                :bg_status,
-                :bg_stop,
-                :bg_restart,
-               ]
-       },
+      {
+        text: 'Background Jobs',
+        icon: icon_hack(:clock),
+        disabled: !self.class.has_admin_perm?,
+        menu: [
+          :bg_status,
+          :bg_stop,
+          :bg_restart,
+        ]
+      },
     ]
   end
 
@@ -191,6 +193,13 @@ class Marty::MainAuthApp < Marty::AuthApp
     a.disabled  = !self.class.has_admin_perm?
   end
 
+  action :data_grid_view do |a|
+    a.text      = I18n.t("data_grid_view", default: "Data Grids")
+    a.handler   = :netzke_load_component_by_action
+    a.icon      = :table_multiple
+    a.disabled  = !self.class.has_any_perm?
+  end
+
   action :reload_scripts do |a|
     a.text     = 'Reload Scripts'
     a.tooltip  = 'Reload and tag Delorean scripts'
@@ -430,6 +439,7 @@ class Marty::MainAuthApp < Marty::AuthApp
   component :user_view
   component :event_view
   component :config_view
+  component :data_grid_view
   component :api_auth_view do |c|
     c.disabled = Marty::Util.warped?
   end

data/app/components/marty/user_view.rb

@@ -1,9 +1,8 @@
-class Marty::UserView < Marty::Grid
-  has_marty_permissions \
-  create: [:admin, :user_manager],
-  read: :any,
-  update: [:admin, :user_manager],
-  delete: [:admin, :user_manager]
+module Marty; class UserView < Marty::Grid
+  has_marty_permissions create: [:admin, :user_manager],
+                        read:   :any,
+                        update: [:admin, :user_manager],
+                        delete: [:admin, :user_manager]
 
   # list of columns to be displayed in the grid view
   def self.user_columns
@@ -19,15 +18,15 @@ class Marty::UserView < Marty::Grid
   def configure(c)
     super
 
-    c.title ||= I18n.t('users', default: "Users")
-    c.model                  = "Marty::User"
-    c.editing                = :in_form
-    c.paging                 = :pagination
-    c.multi_select           = false
-    c.attributes ||= self.class.user_columns
-    c.store_config.merge!({sorters: [{property: :login,
-                                 direction: 'ASC',
-                                }]}) if c.attributes.include?(:login)
+    c.attributes   ||= self.class.user_columns
+    c.title        ||= I18n.t('users', default: "Users")
+    c.model          = "Marty::User"
+    c.editing        = :in_form
+    c.paging         = :pagination
+    c.multi_select   = false
+    c.store_config.merge!(sorters: [{property: :login,
+                                     direction: 'ASC',
+                                    }]) if c.attributes.include?(:login)
     c.scope = ->(arel) { arel.includes(:roles) }
   end
 
@@ -40,14 +39,14 @@ class Marty::UserView < Marty::Grid
     end
 
     # set new roles
-    user.roles = Marty::Role.select {
+    user.roles = Role.select {
       |r| roles.include? I18n.t("roles.#{r.name}")
     }
   end
 
   def self.create_edit_user(data)
     # Creates initial place-holder user object and validate
-    user = data["id"].nil? ? Marty::User.new : Marty::User.find(data["id"])
+    user = data["id"].nil? ? User.new : User.find(data["id"])
 
     self.user_columns.each {
       |c| user.send("#{c}=", data[c.to_s]) unless c == :roles
@@ -101,19 +100,19 @@ class Marty::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    = :user_add
   end
 
   action :edit do |a|
     super(a)
-    a.icon     = :user_edit
+    a.icon    = :user_edit
   end
 
   action :delete do |a|
     super(a)
-    a.icon     = :user_delete
+    a.icon    = :user_delete
   end
 
   def default_context_menu
@@ -121,47 +120,49 @@ class Marty::UserView < Marty::Grid
   end
 
   attribute :login do |c|
-    c.width = 100
-    c.label  = I18n.t("user_grid.login")
+    c.width   = 100
+    c.label   = I18n.t("user_grid.login")
   end
 
   attribute :firstname do |c|
-    c.width = 100
-    c.label  = I18n.t("user_grid.firstname")
+    c.width   = 100
+    c.label   = I18n.t("user_grid.firstname")
   end
 
   attribute :lastname do |c|
-    c.width = 100
-    c.label  = I18n.t("user_grid.lastname")
+    c.width   = 100
+    c.label   = I18n.t("user_grid.lastname")
   end
 
   attribute :active do |c|
-    c.width = 60
-    c.label  = I18n.t("user_grid.active")
+    c.width   = 60
+    c.label   = I18n.t("user_grid.active")
   end
 
   attribute :roles do |c|
-    c.width  = 100
-    c.flex   = 1
+    c.width   = 100
+    c.flex    = 1
     c.label   = I18n.t("user_grid.roles")
-    c.type   = :string,
+    c.type    = :string,
 
     c.getter = lambda do |r|
       r.roles.map { |ur| I18n.t("roles.#{ur.name}") }.sort
     end
-    c.editor_config = { multi_select: true,
-                        empty_text: I18n.t("user_grid.select_roles"),
-                        store: Marty::Role.pluck(:name).map {
-                          |n| I18n.t("roles.#{n}")}.sort,
-                        type: :string,
-                        xtype: :combo}
+
+    c.editor_config = {
+      multi_select: true,
+      empty_text:   I18n.t("user_grid.select_roles"),
+      store:        Role.pluck(:name).map {|n| I18n.t("roles.#{n}")}.sort,
+      type:         :string,
+      xtype:        :combo,
+    }
   end
 
   attribute :created_dt do |c|
-    c.label      = I18n.t("user_grid.created_dt")
+    c.label     = I18n.t("user_grid.created_dt")
     c.format    = "Y-m-d H:i"
     c.read_only = true
   end
-end
+end; end
 
 UserView = Marty::UserView

data/app/controllers/marty/diagnostic_controller.rb

@@ -4,7 +4,9 @@ module Marty
 
     def index
       if action_methods.include?(params[:testop].to_s)
-        self.send(params[:testop])
+        send(params[:testop])
+      elsif params[:testop] == 'env'
+        send('environment')
       else
         render file: 'public/404', status: 404, layout: false
       end
@@ -15,6 +17,40 @@ module Marty
         [Diagnostic.new('Marty Version', true, VERSION)]
     end
 
+    def environment
+      rbv = "#{RUBY_VERSION}-p#{RUBY_PATCHLEVEL} (#{RUBY_PLATFORM})"
+
+      details = [
+        Diagnostic.new('Environment', true, Rails.env),
+        Diagnostic.new('Rails Version', true, Rails.version),
+        Diagnostic.new('Netzke Core Version', true, Netzke::Core::VERSION),
+        Diagnostic.new('Netzke Basepack Version', true,
+                       Netzke::Basepack::VERSION),
+        Diagnostic.new('Ruby Version', true, rbv),
+        Diagnostic.new('RubyGems Version', true, Gem::VERSION),
+        Diagnostic.new('Database Adapter', true,
+                       ActiveRecord::Base.connection.adapter_name)
+      ]
+      begin
+        status = true
+        result = ActiveRecord::Base.connection.execute('SELECT VERSION();')
+        message = result[0]['version'] if result
+      rescue => e
+        status = false
+        message = e.message
+      end
+      details << Diagnostic.new('Database Version', status, message)
+
+      begin
+        status, message = true, ActiveRecord::Migrator.current_version
+      rescue => e
+        status = false
+        message = e.message
+      end
+      details << Diagnostic.new('Database Schema Version', status, message)
+      diag_response details
+    end
+
   private
     def diag_response details
       if @aggregate_diags

data/app/models/marty/data_grid.rb

@@ -34,8 +34,8 @@ class Marty::DataGrid < Marty::Base
       dg.metadata.each do
         |inf|
 
-        attr, type, keys, dir, rs_keep =
-          inf["attr"], inf["type"], inf["keys"], inf["dir"], inf["rs_keep"]
+        attr, type, keys, rs_keep =
+          inf["attr"], inf["type"], inf["keys"], inf["rs_keep"]
 
         unless rs_keep.nil? || rs_keep.empty?
           m = /\A *(<|<=|>|>=)? *([a-z_]+) *\z/.match(rs_keep)
@@ -197,35 +197,35 @@ class Marty::DataGrid < Marty::Base
       # This would prefer more specific rather than wild card
       # solutions.  However, would need to figure out how to preserve
       # ordering on subsequent INTERSECT operations.
-      ixq = ix_class.
-            select(:index).
-            distinct.
-            where(data_grid_id: group_id,
-                  created_dt:   created_dt,
-                  attr:         inf["attr"],
-                 ).
-            where(q, v).to_sql
+      ix_class.
+        select(:index).
+        distinct.
+        where(data_grid_id: group_id,
+              created_dt:   created_dt,
+              attr:         inf["attr"],
+             ).
+        where(q, v).to_sql
     end.compact
 
     sql = sqla.join(" INTERSECT ")
 
-    self.class.connection.execute(sql).to_a.map { |h| h["index"].to_i }
+    self.class.connection.execute(sql).to_a.map { |hh| hh["index"].to_i }
   end
 
   def lookup_grid_distinct(pt, h, return_grid_data=false, distinct=true)
-    isets = ["h", "v"].each_with_object({}) do |dir, isets|
+    isets = ["h", "v"].each_with_object({}) do |dir, ih|
       infos = dir_infos(dir)
 
-      isets[dir] = query_grid_dir(h, infos)
+      ih[dir] = query_grid_dir(h, infos)
 
-      unless isets[dir] or return_grid_data
+      unless ih[dir] or return_grid_data
         attrs = infos.map { |inf| inf["attr"] }
 
         raise "#{dir} attrs not provided: %s" % attrs.join(',')
       end
 
-      raise "Grid #{name}, (#{isets[dir].count}) #{dir} matches > 1." if
-        distinct && isets[dir] && isets[dir].count > 1
+      raise "Grid #{name}, (#{ih[dir].count}) #{dir} matches > 1." if
+        distinct && ih[dir] && ih[dir].count > 1
     end
 
     # deterministic result: pick min index when there's a choice
@@ -349,7 +349,7 @@ class Marty::DataGrid < Marty::Base
     dt_row = lenient ? ["lenient"] : []
     dt_row << data_type unless [nil, DEFAULT_DATA_TYPE].member?(data_type)
 
-    meta_rows = dt_row.empty? ? [] : [dt_row]
+    meta_rows = dt_row.empty? ? [] : [[dt_row.join(' ')]]
 
     meta_rows += metadata.map { |inf|
       [inf["attr"], inf["type"], inf["dir"], inf["rs_keep"] || ""]
@@ -435,7 +435,7 @@ class Marty::DataGrid < Marty::Base
 
   def self.maybe_get_klass(type)
     begin
-      klass = type.constantize unless INDEX_MAP[type] || type == "float"
+      type.constantize unless INDEX_MAP[type] || type == "float"
     rescue NameError
       raise "unknown header type/klass: #{type}"
     end
@@ -620,8 +620,8 @@ class Marty::DataGrid < Marty::Base
     metadata_copy, data_copy = metadata.deep_dup, data.deep_dup
 
     metadata_copy.each do |meta|
-      dir, attr, keys, type, rs_keep = meta.values_at(
-                               "dir", "attr", "keys", "type", "rs_keep")
+      dir, keys, type, rs_keep = meta.values_at(
+                         "dir", "keys", "type", "rs_keep")
       next unless rs_keep
 
       if type == "numrange" || type == "int4range"

data/config/locales/en.yml

@@ -17,6 +17,8 @@ en:
   create_posting: Create
   api_auth: API Authorization
   event_view: Event View
+  data_grid_view: Data Grids
+  data_grid: Data Grids
 
   roles:
     viewer: Viewer
@@ -154,3 +156,6 @@ en:
     api_key: API Key
     app_name: Application Name
     script_name: Script Name
+    data_grid__name: Data Grid
+    breakeven_data_grid__name: Breakeven Data Grid
+    data_grid_view: Data Grids

data/lib/marty/version.rb

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

data/spec/controllers/diagnostic_controller_spec.rb

@@ -66,5 +66,37 @@ module Marty
         end
       end
     end
+
+    describe 'GET #environment' do
+      it 'returns http success' do
+        get :environment
+
+        expect(response).to have_http_status(:success)
+      end
+
+      it 'returns the environment details' do
+        get :environment
+
+        aggregate_failures do
+          expect(assigns('details').count).to eq(9)
+          expect(assigns('details').first.methods)
+            .to include(:name, :status, :description)
+          expect(assigns('details').first.description).to eq('test')
+        end
+      end
+
+      it 'returns the appropriate json' do
+        get :environment, format: :json
+
+        aggregate_failures do
+          expect(json_response.first['diag_count']).to eq(9)
+          expect(json_response.first['error_count']).to eq(0)
+          expect(json_response
+                 .find { |d| d['name'] == 'Environment' }['description'])
+            .to eq('test')
+        end
+      end
+    end
+
   end
 end

data/spec/models/data_grid_spec.rb

@@ -699,6 +699,15 @@ EOS
       end
     end
 
+    describe "exports" do
+      it 'should export lenient grids correctly' do
+        dg = dg_from_import("Gf", Gf)
+        dg2 = dg_from_import("Gf2", dg.export)
+
+        expect(dg.export).to eq(dg2.export)
+      end
+    end
+
     describe "updates" do
       it "should be possible to modify a grid referenced from a multi-grid" do
         dgb = dg_from_import("Gb", Gb, '1/1/2014')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 1.0.20
+  version: 1.0.22
 platform: ruby
 authors:
 - Arman Bostani
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-31 00:00:00.000000000 Z
+date: 2017-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -178,6 +178,7 @@ files:
 - app/components/marty/auth_app.rb
 - app/components/marty/auth_app/client/auth_app.js
 - app/components/marty/config_view.rb
+- app/components/marty/data_grid_view.rb
 - app/components/marty/event_view.rb
 - app/components/marty/extras/layout.rb
 - app/components/marty/extras/misc.rb