marty 0.5.41 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1cc0b3b8b64fe73e733f400846ff9e944b1dc113
-  data.tar.gz: 87db6321d7a7d2117e2b55bea1979bc0a8ac8e2d
+  metadata.gz: 8f0f6b19ce2c15e5918e27386f89e6bf83bc3738
+  data.tar.gz: 3da45154c7ad5476a9748af3b11ac158bbdf12d6
 SHA512:
-  metadata.gz: ec029611b74c122897ad1497d9ff9ab06b68198354ab942e542759b8bbbfb553c37527615749c3eb14d62e6420fa2bb64df28b41c7a1afb41758ba9ccc6fc07c
-  data.tar.gz: fabfcf96a6a52c4211d0fac59ff573844246ce08f4c752dbe70c339b1c4c041bf84e4354221302b0528a81ea7ff89211ba3840095af0a89fc93f4fb3feecaf94
+  metadata.gz: 44bd77724a580c2bd0ea7cbf22db382135dfe8bd4f853a9ca9c5299edfd25daa2f1a79421f4b85accd8364711a4183ccaa844a6c99be710d14b28f5a2cc16a60
+  data.tar.gz: 28623145da5a246f826bd5879e2b1c5dab4a39fb73af9e45ce65e48c448dadb8bdb97746b1aacfac38672ef4ef0ef6c98a755238ef3c438730b3dbdb3745afea

data/Gemfile

@@ -18,10 +18,11 @@ group :development, :test do
   gem 'selenium-webdriver'
   gem 'timecop'
   gem 'database_cleaner'
+
   gem 'netzke-core'
   gem 'netzke-basepack'
-  gem 'netzke-testing' #, path: File.expand_path('../../netzke-testing', __FILE__)
+  gem 'netzke-testing'
 
-  #gem 'marty_rspec', path: File.expand_path('../../marty_rspec', __FILE__)
   gem 'marty_rspec'
+
 end

data/app/components/marty/api_auth_view.rb

@@ -9,22 +9,19 @@ class Marty::ApiAuthView < Marty::McflyGridPanel
 
     c.title   = I18n.t('api_auth', default: "API Authorization")
     c.model   = "Marty::ApiAuth"
-    c.columns = [:app_name, :api_key, :script_name]
-
-    c.enable_extended_search = false
-
-    c.data_store.sorters = {property: :app_name, direction: 'ASC'}
+    c.attributes = [:app_name, :api_key, :script_name]
+    c.store_config.merge!({sorters: [{property: :app_name, direction: 'ASC'}]})
   end
 
-  column :app_name do |c|
+  attribute :app_name do |c|
     c.flex = 1
   end
 
-  column :api_key do |c|
+  attribute :api_key do |c|
     c.flex = 1
   end
 
-  column :script_name do |c|
+  attribute :script_name do |c|
     c.flex = 1
   end
 end

data/app/components/marty/auth_app.rb

@@ -3,8 +3,8 @@
 # == Extending Marty::AuthApp
 # DOCFIX
 class Marty::AuthApp < Marty::SimpleApp
-  js_configure do |c|
-    c.mixin
+  client_class do |c|
+    c.include :auth_app
   end
 
   # Set the Logout button if current_user is set
@@ -37,20 +37,19 @@ class Marty::AuthApp < Marty::SimpleApp
     c.text = "Sign out #{Mcfly.whodunnit.name}" if Mcfly.whodunnit
   end
 
-  endpoint :sign_in do |params,this|
+  endpoint :sign_in do |params|
     user = Marty::User.try_to_login(params[:login], params[:password])
-
     if user
       Netzke::Base.controller.set_user(user)
-      this.netzke_set_result(true)
+      client.netzke_set_result(true)
     else
-      this.netzke_set_result(false)
-      this.netzke_feedback("Wrong credentials")
+      client.netzke_set_result(false)
+      client.netzke_notify("Wrong credentials")
     end
   end
 
-  endpoint :sign_out do |params,this|
+  endpoint :sign_out do
     Netzke::Base.controller.logout_user
-    this.netzke_set_result(true)
+    client.netzke_set_result(true)
   end
 end

data/app/components/marty/auth_app/{javascripts → client}/auth_app.js

@@ -1,5 +1,5 @@
 {
-    onSignIn: function() {
+    netzkeOnSignIn: function() {
         var me = this;
         this.signinWin = this.signinWin || Ext.create('Ext.Window', {
             width:      300,
@@ -12,7 +12,7 @@
                 var values      = form.getForm().getValues();
 
                 // calling the endpoint
-                me.signIn(values, function(res) {
+                me.server.signIn(values, function(res) {
                     if (res) {
                         if (!me.authSpecMode) { this.signinWin.close(); }
                         Ext.Msg.show({
@@ -75,8 +75,8 @@
         this.signinWin.down('textfield').focus(false, 100);
     },
 
-    onSignOut: function() {
-        this.signOut(null, function(success) {
+    netzkeOnSignOut: function() {
+        this.server.signOut(null, function(success) {
             if (success) {
                 Ext.Msg.show({
                     title:      "Signed out",

data/app/components/marty/config_view.rb

@@ -12,10 +12,9 @@ class Marty::ConfigView < Marty::Grid
 
     c.title   = I18n.t('config', default: "Config")
     c.model   = "Marty::Config"
-    c.columns = [:key, :value, :description]
-
-    c.enable_extended_search = false
-    c.data_store.sorters     = {property: :key, direction: 'ASC'}
+    c.attributes = [:key, :value, :description]
+    c.store_config.merge!({sorters: [{property: :key, direction: 'ASC'}]})
+    c.editing = :both
   end
 
   # need a getter / setter to call the []= and [] methods now
@@ -31,7 +30,7 @@ class Marty::ConfigView < Marty::Grid
     }
   end
 
-  def default_fields_for_forms
+  def default_form_items
     [
       :key,
       {
@@ -53,18 +52,17 @@ class Marty::ConfigView < Marty::Grid
     ]
   end
 
-  column :key do |c|
+  attribute :key do |c|
     c.flex = 1
   end
 
-  column :value do |c|
+  attribute :value do |c|
     c.flex = 3
     c.getter  = my_jsonb_getter
     c.setter  = my_jsonb_setter
   end
-  column :description do |c|
+  attribute :description do |c|
     c.flex = 1
-    c.width = 200
   end
 
 end

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

@@ -1,6 +1,6 @@
 module Marty::Extras::Misc
   MM_OPTIONS = {
-    editor: {
+    editor_config: {
       trigger_action: :all,
       xtype: :combo,
       store: (1..12).map {|x| [x, "%02d" % x]},
@@ -15,4 +15,17 @@ module Marty::Extras::Misc
     # didn't work.
     default_value: Date.today.month
   }
+  def self.numberfield_cfg(decimal_places)
+    {
+      format: "0." + "0"*decimal_places,
+      xtype: 'numbercolumn',
+      editor_config: { hide_trigger: true,
+                       decimal_precision: decimal_places },
+      field_config: { decimal_precision: decimal_places,
+                      xtype: :numberfield,
+                      hide_trigger: true,
+                      key_nav_enabled: false,
+                      mouse_wheel_enabled: false }
+    }
+  end
 end

data/app/components/marty/form.rb

@@ -1,4 +1,4 @@
 # Netzke Form with Marty permissions
-class Marty::Form < Netzke::Basepack::Form
+class Marty::Form < Netzke::Form::Base
   extend ::Marty::Permissions
 end

data/app/components/marty/grid.rb

@@ -1,9 +1,10 @@
-class Marty::Grid < ::Netzke::Basepack::Grid
+class Marty::Grid < ::Netzke::Grid::Base
+
   extend ::Marty::Permissions
 
   has_marty_permissions read: :any
 
-  def preconfigure_record_window(c)
+  def configure_form_window(c)
     super
     # Fix Add in form/Edit in form modal popup width
     # Netzke 0.10.1 defaults width to 80% of screen which is too wide
@@ -12,30 +13,42 @@ class Marty::Grid < ::Netzke::Basepack::Grid
     c.width = 475
   end
 
-  js_configure do |c|
+  client_class do |c|
     # For some reason the grid update function was removed in Netzke
     # 0.10.1.  So, add it here.
-    c.cm_update = <<-JS
+    c.cm_update = l(<<-JS)
     function() {
       this.store.load();
     }
     JS
+
+  end
+
+  def class_can?(op)
+    self.class.can_perform_action?(op)
   end
 
   def configure(c)
     super
 
-    create = self.class.can_perform_action?(:create)
-    read   = self.class.can_perform_action?(:read)
-    update = self.class.can_perform_action?(:update)
-    delete = self.class.can_perform_action?(:delete)
+    c.permissions = {
+      create:      class_can?(:create),
+      read:        class_can?(:read),
+      update:      class_can?(:update),
+      delete:      class_can?(:delete)
+    }
+    c.editing                = :both
+    c.store_config           = {page_size: 30}
+  end
 
-    c.prohibit_create     = !create
-    c.prohibit_read       = !read
-    c.prohibit_update     = !update
-    c.prohibit_delete     = !delete
+  def has_search_action?
+    false
+  end
 
-    c.enable_edit_inline  = update
-    c.enable_edit_in_form = update
+  def get_json_sorter(json_col, field)
+    lambda do |r, dir|
+      r.order("#{json_col} ->> '#{field}' " + dir.to_s)
+    end
   end
+
 end

data/app/components/marty/grid_append_only.rb

@@ -2,11 +2,9 @@ class Marty::GridAppendOnly < Marty::McflyGridPanel
   def configure(c)
     super
 
-    c.enable_extended_search = false
-    c.prohibit_update        = true
+    c.paging                 = :pagination
+    c.editing                = :in_form
+    c.permissions[:update]   = false
   end
 
-  def default_bbar
-    [:del, :add_in_form]
-  end
 end

data/app/components/marty/import_type_view.rb

@@ -10,7 +10,7 @@ class Marty::ImportTypeView < Marty::Grid
 
     c.title   = I18n.t('import_type', default: "ImportType")
     c.model   = "Marty::ImportType"
-    c.columns =
+    c.attributes =
       [
        :name,
        :role__name,
@@ -19,33 +19,30 @@ class Marty::ImportTypeView < Marty::Grid
        :validation_function,
        :preprocess_function,
       ]
-
-    c.enable_extended_search = false
-
-    c.data_store.sorters = {property: :name, direction: 'ASC'}
+    c.store_config.merge!({sorters: [{property: :name, direction: 'ASC'}]})
   end
 
-  column :name do |c|
+  attribute :name do |c|
     c.flex = 1
   end
 
-  column :role__name do |c|
+  attribute :role__name do |c|
     c.width = 150
   end
 
-  column :db_model_name do |c|
+  attribute :db_model_name do |c|
     c.flex = 1
   end
 
-  column :cleaner_function do |c|
+  attribute :cleaner_function do |c|
     c.flex = 1
   end
 
-  column :validation_function do |c|
+  attribute :validation_function do |c|
     c.flex = 1
   end
 
-  column :preprocess_function do |c|
+  attribute :preprocess_function do |c|
     c.flex = 1
   end
 end

data/app/components/marty/live_search_grid_panel.rb

@@ -13,8 +13,8 @@
 #
 
 class Marty::LiveSearchGridPanel < Marty::McflyGridPanel
-  js_configure do |c|
-    c.listen_fn = <<-JS
+  client_class do |c|
+    c.listen_fn = l(<<-JS)
     function(obj, search_text) {
         var lg = this.ownerCt.ownerCt;
         lg.getStore().getProxy().extraParams.live_search = search_text;
@@ -39,7 +39,7 @@ class Marty::LiveSearchGridPanel < Marty::McflyGridPanel
 
   def get_records(params)
     search_scope = config[:live_search_scope] || :live_search
-    data_class.send(search_scope, params && params[:live_search] || '').scoping do
+    model.send(search_scope, params && params[:live_search] || '').scoping do
       super
     end
   end

data/app/components/marty/main_auth_app.rb

@@ -183,38 +183,36 @@ class Marty::MainAuthApp < Marty::AuthApp
     a.disabled  = Marty::Util.warped? || !self.class.has_posting_perm?
   end
 
-  js_configure do |c|
-    c.on_new_posting = <<-JS
+  client_class do |c|
+    c.netzke_on_new_posting = l(<<-JS)
     function(params) {
-      this.netzkeLoadComponent({
-            name: "new_posting_window",
-            callback: function(w) { w.show(); },
+      this.netzkeLoadComponent("new_posting_window",
+            { callback: function(w) { w.show(); },
       });
     }
     JS
 
-    c.on_select_posting = <<-JS
+    c.netzke_on_select_posting = l(<<-JS)
     function(params) {
-      this.netzkeLoadComponent({
-            name: "posting_window",
-            callback: function(w) { w.show(); },
+      this.netzkeLoadComponent("posting_window",
+            { callback: function(w) { w.show(); },
       });
     }
     JS
 
-    c.on_reload = <<-JS
+    c.netzke_on_reload = l(<<-JS)
     function(params) {
       window.location.reload();
     }
     JS
 
-    c.on_select_now = <<-JS
+    c.netzke_on_select_now = l(<<-JS)
     function(params) {
-      this.serverSelectPosting({});
+      this.server.selectPosting({});
     }
     JS
 
-    c.on_reload_scripts = <<-JS
+    c.netzke_on_reload_scripts = l(<<-JS)
     function(params) {
        var me = this;
        Ext.Msg.show({
@@ -224,7 +222,7 @@ class Marty::MainAuthApp < Marty::AuthApp
          buttons: Ext.Msg.OKCANCEL,
          prompt: true,
          fn: function (btn, value) {
-           btn == "ok" && value == "RELOAD" && me.serverReloadScripts({});
+           btn == "ok" && value == "RELOAD" && me.server.reloadScripts({});
          }
        });
     }
@@ -237,13 +235,13 @@ class Marty::MainAuthApp < Marty::AuthApp
     a.icon      = :timeline_marker
   end
 
-  endpoint :server_select_posting do |params, this|
+  endpoint :select_posting do |params|
     sid = params && params[0]
     Marty::Util.set_posting_id(sid)
     posting = sid && Marty::Posting.find(sid)
 
-    this.netzke_feedback "Selected '#{posting ? posting.name : 'NOW'}'"
-    this.on_reload 1
+    client.netzke_notify "Selected '#{posting ? posting.name : 'NOW'}'"
+    client.netzke_on_reload 1
   end
 
   action :select_now do |a|
@@ -270,9 +268,9 @@ class Marty::MainAuthApp < Marty::AuthApp
     c.disabled = Marty::Util.warped?
   end
 
-  endpoint :server_reload_scripts do |params, this|
+  endpoint :reload_scripts do |params|
     Marty::Script.load_scripts
-    this.netzke_feedback 'Scripts have been reloaded'
+    client.netzke_notify 'Scripts have been reloaded'
   end
 end
 

data/app/components/marty/mcfly_grid_panel.rb

@@ -4,22 +4,21 @@ class Marty::McflyGridPanel < Marty::Grid
 
     warped = Marty::Util.warped?
 
-    c.enable_extended_search = false
-    c.enable_edit_in_form    &&= !warped
-    c.prohibit_update        ||= warped
-    c.prohibit_delete        ||= warped
-    c.prohibit_create        ||= warped
-    #c.prohibit_read         ||= !self.class.has_any_perm?
+    c.editing  = !warped && c.editing || :none
+
+    [:update, :delete, :create].each do |perm|
+      c.permissions[perm] = false if warped
+    end
 
     # default sort all Mcfly grids with id
-    c.data_store.sorters ||= {property: :id, direction: 'ASC'}
+    c.store_config.merge!({sorters: [{property: :id, direction: 'ASC'}]})
   end
 
   def get_records(params)
    ts = Mcfly.normalize_infinity(Marty::Util.get_posting_time)
-   tb = data_class.table_name
+   tb = model.table_name
 
-    data_class.where("#{tb}.obsoleted_dt >= ? AND #{tb}.created_dt < ?",
+   model.where("#{tb}.obsoleted_dt >= ? AND #{tb}.created_dt < ?",
                      ts, ts).scoping do
       super
     end
@@ -27,21 +26,20 @@ class Marty::McflyGridPanel < Marty::Grid
 
   ######################################################################
 
-  def augment_column_config(c)
+  def augment_attribute_config(c)
     super
 
     # Set mcfly_scope if the attribute is a mcfly association
-    if !c[:scope] && data_adapter.association_attr?(c)
+    if !c[:scope] && model_adapter.association_attr?(c)
       assoc_name, assoc_method = c[:name].split('__')
       begin
-        aklass = data_class.reflect_on_association(assoc_name.to_sym).klass
+        aklass = model.reflect_on_association(assoc_name.to_sym).klass
       rescue
-        raise "trouble finding #{assoc_name} assoc class on #{data_class}"
+        raise "trouble finding #{assoc_name} assoc class on #{model}"
       end
-
       c[:scope] = Mcfly.has_mcfly?(aklass) ?
       self.class.mcfly_scope(assoc_method || 'id') :
-        self.class.sorted_scope(assoc_method || 'id')
+                  self.class.sorted_scope(assoc_method || 'id')
     end
   end