marty 0.5.41 → 1.0.0

data/app/components/marty/script_grid.rb

@@ -9,16 +9,10 @@ class Marty::ScriptGrid < Marty::Grid
     super
 
     c.model                  = "Marty::Script"
-    c.enable_extended_search = false
     c.multi_select           = false
-
-    c.columns ||= [:name, :created_dt, :tag]
+    c.attributes ||= [:name, :created_dt, :tag]
     c.title   ||= I18n.t('scripts', default: "Scripts")
-
-    c.data_store.sorters = {
-      property: :name,
-      direction: 'ASC',
-    }
+    c.store_config.merge!({sorters: [{property: :name, direction: 'ASC'}]})
   end
 
   def get_records(params)
@@ -29,90 +23,88 @@ class Marty::ScriptGrid < Marty::Grid
       # if there are no non-DEV tags we get an exception above
       ts = 'infinity'
     end
-    tb = data_class.table_name
-    data_class.where("#{tb}.obsoleted_dt >= ? AND #{tb}.created_dt < ?",
+
+    tb = model.table_name
+    model.where("#{tb}.obsoleted_dt >= ? AND #{tb}.created_dt < ?",
                      ts, ts).scoping do
       super
     end
   end
 
-  action :del do |a|
+  action :delete do |a|
     a.text     = I18n.t("script_grid.delete")
     a.tooltip  = I18n.t("script_grid.delete")
     a.icon     = :script_delete
     a.disabled = config[:prohibit_delete]
   end
 
-  endpoint :server_delete do |params, this|
-    return this.netzke_feedback("Permission Denied") if
-      config[:prohibit_delete]
+  endpoint :destroy do |params|
+    return client.netzke_notify("Permission Denied") if
+      !config[:permissions][:delete]
 
     tag = Marty::Tag.map_to_tag(root_sess[:selected_tag_id])
 
-    return this.netzke_feedback("Can only delete in DEV tag") unless
+    return client.netzke_notify("Can only delete in DEV tag") unless
       tag && tag.isdev?
 
-    super(params, this)
+    super(params)
   end
 
   # override the add_in_form endpoint.  Script creation needs to use
   # the create_script method.
-  endpoint :add_window__add_form__netzke_submit do |params, this|
+  endpoint :add_window__add_form__submit do |params|
     data = ActiveSupport::JSON.decode(params[:data])
 
-    return this.netzke_feedback("Permission Denied") if
-      config[:prohibit_create]
+    return client.netzke_notify("Permission Denied") if
+      !config[:permissions][:create]
 
     tag = Marty::Tag.map_to_tag(root_sess[:selected_tag_id])
 
-    return this.netzke_feedback("Can only add in DEV tag") unless
+    return client.netzke_notify("Can only add in DEV tag") unless
       tag && tag.isdev?
 
     name = data["name"]
     script = Marty::Script.create_script(name, "# Script #{name}")
 
     if script.valid?
-      this.success = true
-      return this.on_submit_success
+      client.success = true
+      return client.netzke_on_submit_success
     end
 
-    data_adapter.errors_array(script).each do |error|
-      flash :error => error
-    end
-    this.netzke_feedback(@flash)
+    client.netzke_notify(model_adapter.errors_array(script).join("\n"))
   end
 
   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.disabled = config[:prohibit_create]
+    a.disabled = !config[:permissions][:create]
   end
 
   def default_bbar
-    [:add_in_form, :del]
+    [:add_in_form, :delete]
   end
 
   def default_context_menu
     []
   end
 
-  def default_fields_for_forms
+  def default_form_items
     [:name]
   end
 
-  column :name do |c|
+  attribute :name do |c|
     c.flex      = 1
     c.text      = I18n.t("script_grid.name")
   end
 
-  column :created_dt do |c|
+  attribute :created_dt do |c|
     c.text      = I18n.t("script_grid.created_dt")
     c.format    = "Y-m-d H:i"
     c.read_only = true
   end
 
-  column :tag do |c|
+  attribute :tag do |c|
     c.text      = I18n.t("script_grid.tag")
     c.flex      = 1
     c.getter    = lambda { |r| r.find_tag.try(:name) }

data/app/components/marty/script_tester.rb

@@ -9,7 +9,7 @@ class Marty::ScriptTester < Marty::Form
        fieldset(I18n.t("script_tester.attributes"),
                 {
                   name:         "attrs",
-                  attr_type:    :text,
+                  xtype:        :textarea,
                   value:        "",
                   hide_label:   true,
                   min_height:   125,
@@ -19,7 +19,7 @@ class Marty::ScriptTester < Marty::Form
        fieldset(I18n.t("script_tester.parameters"),
                 {
                   name:         "params",
-                  attr_type:    :text,
+                  xtype:        :textarea,
                   value:        "",
                   hide_label:   true,
                   min_height:   125,
@@ -30,8 +30,8 @@ class Marty::ScriptTester < Marty::Form
       ]
   end
 
-  js_configure do |c|
-    c.set_result = <<-JS
+  client_class do |c|
+    c.set_result = l(<<-JS)
     function(html) {
        var result = this.netzkeGetComponent('result');
        result.updateBodyHtml(html);
@@ -47,7 +47,7 @@ class Marty::ScriptTester < Marty::Form
       get_engine(root_sess[:selected_script_name])
   end
 
-  endpoint :netzke_submit do |params, this|
+  endpoint :submit do |params|
     data = ActiveSupport::JSON.decode(params[:data])
 
     attrs = data["attrs"].split(';').map(&:strip).reject(&:empty?)
@@ -59,7 +59,7 @@ class Marty::ScriptTester < Marty::Form
     begin
       phash = ActiveSupport::JSON.decode("{ #{pjson} }")
     rescue MultiJson::DecodeError
-      this.netzke_feedback "Malformed input parameters"
+      client.netzke_notify "Malformed input parameters"
       return
     end
 
@@ -76,11 +76,11 @@ class Marty::ScriptTester < Marty::Form
         "#{a} = #{q}"
       }
 
-      this.netzke_feedback "done"
-      this.set_result result.join("<br/>")
+      client.netzke_notify "done"
+      client.set_result result.join("<br/>")
 
     rescue SystemStackError
-      return this.netzke_feedback "System Stack Error"
+      return client.netzke_notify "System Stack Error"
 
     rescue => exc
       res = Delorean::Engine.grok_runtime_exception(exc)
@@ -88,8 +88,8 @@ class Marty::ScriptTester < Marty::Form
       result = ["Error: #{res['error']}", "Backtrace:"] +
         res["backtrace"].map {|m, line, fn| "#{m}:#{line} #{fn}"}
 
-      this.netzke_feedback "failed"
-      this.set_result '<font color="red">' + result.join("<br/>") + "</font>"
+      client.netzke_notify "failed"
+      client.set_result '<font color="red">' + result.join("<br/>") + "</font>"
     end
   end
 

data/app/components/marty/scripting.rb

@@ -29,12 +29,12 @@ class Marty::Scripting < Netzke::Base
       ]
   end
 
-  js_configure do |c|
+  client_class do |c|
 
     c.header = false
     c.layout = :border
 
-    c.init_component = <<-JS
+    c.init_component = l(<<-JS)
     function() {
        var me = this;
        me.callParent();
@@ -50,10 +50,10 @@ class Marty::Scripting < Netzke::Base
              return;
 
           var tag_id = records[0].get('id');
-          me.selectTag({tag_id: tag_id});
+          me.server.selectTag({tag_id: tag_id});
           script_grid.getStore().load();
           var script_name = null;
-          script_form.netzkeLoad({script_name: script_name});
+          script_form.server.netzkeLoad({script_name: script_name});
           }, me);
 
        script_grid.getSelectionModel().on('selectionchange',
@@ -66,35 +66,35 @@ class Marty::Scripting < Netzke::Base
              return;
 
           var script_name = records[0].get('name');
-          me.selectScript({script_name: script_name});
-          script_form.netzkeLoad({script_name: script_name});
+          me.server.selectScript({script_name: script_name});
+          script_form.server.netzkeLoad({script_name: script_name});
           }, me);
     }
     JS
 
-    c.script_refresh = <<-JS
+    c.script_refresh = l(<<-JS)
     function(script_name) {
        if (!script_name) {
-          this.selectScript({});
+          this.server.selectScript({});
           this.netzkeReload();
        }
        else {
-          this.selectScript({script_name: script_name});
+          this.server.selectScript({script_name: script_name});
           this.netzkeGetComponent('tag_grid').getStore().load();
           this.netzkeGetComponent('script_grid').getStore().load();
-          this.netzkeGetComponent('script_form').netzkeLoad(
+          this.netzkeGetComponent('script_form').server.netzkeLoad(
              {script_name: script_name});
        }
     }
     JS
   end
 
-  endpoint :select_tag do |params, this|
+  endpoint :select_tag do |params|
     root_sess[:selected_tag_id]      = params[:tag_id]
     root_sess[:selected_script_name] = nil
   end
 
-  endpoint :select_script do |params, this|
+  endpoint :select_script do |params|
     root_sess[:selected_script_name] = params[:script_name]
   end
 

data/app/components/marty/simple_app.rb

@@ -29,11 +29,11 @@
 #
 # The JS side of the component will have those regions referenced as this.mainPanel, this.statusBar, and this.menuBar.
 class Marty::SimpleApp < Netzke::Base
-  js_configure do |c|
+  client_class do |c|
     c.extend = "Ext.container.Viewport"
     c.layout = :border
     c.require Netzke::Core.ext_path.join("examples", "ux/statusbar/StatusBar.js"), :statusbar_ext
-    c.mixin
+    c.include :simple_app
   end
 
   def configure(c)