netzke-basepack 0.12.0.beta → 0.12.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85ed177b26ec3cc46b9a5a1606117072bcdcc146
-  data.tar.gz: 2aa3f06ae50956fe74c668a9e4e020a145e318e1
+  metadata.gz: 817d2e083cf6654f2cda858ad90bcce10f0186d0
+  data.tar.gz: f6eea32b664e1167d575c1dceaefb04a8e39c01a
 SHA512:
-  metadata.gz: 41640719dcc8209666ba2c5ea6f76a2609ddd77e76455b365b53cfd80895fa560fe428f58925e3bc23b91821daa1671236357da4174aaf13da2998cc3410e73b
-  data.tar.gz: 74fb7310e03390c8522e10c58fb2faa57c52a888ebbfd40fecee2a985067ed47059128e8b2c7bd52dec93e981cda64b7fe6e78cedeee20f8a49e6db95adbb9bf
+  metadata.gz: 1618ba135de66f165e85463dbdd9f0a3907b97bd8a065dacd67d77707a8b3dda2543f6096b7ac5d76b0ee1048044a1fca94532422c37b0fbf83386b923c4fe43
+  data.tar.gz: 7df2684b6ccb8bf81a9235896f2fe7e1f12345cdf11b578330eee7f033d8da40fc1b2767e8c7e4c72de8e851980aed0a49210065d30436d5be2aa8948e72acb0

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.12.0 - WIP
+* ExtJS 5
+* New component: DynamicTabPanel
+
 # 0.11.0 - 2015-02-05
 * Rails 4.2
 * A few fixes from AlexKovynev

data/README.md

@@ -28,9 +28,9 @@ enhancing any grid with live search functionality
 
 ## Requirements
 
-* Ruby ~> 1.9.2
+* Ruby > 2.0.0
 * Rails ~> 4.2.0
-* Ext JS = 4.2.1
+* Ext JS = 5.1.0
 
 ## Installation
 

data/javascripts/basepack.js

@@ -26,3 +26,11 @@ Ext.override(Ext.view.BoundList, {
     this.callParent(arguments);
   },
 });
+
+Netzke.isModelDefined = function(name) {
+  return !!(Netzke.models || {})[name];
+};
+
+Netzke.modelName = function(name){
+  return "Netzke.models." + name;
+};

data/javascripts/netzkeremotecombo.js

@@ -8,20 +8,24 @@ Ext.define('Ext.netzke.ComboBox', {
   forceSelection: true,
 
   initComponent : function(){
-    var modelName = this.parentId + "_" + this.name;
+    var parent = this.netzkeParent || this.findParentBy(function(c) { return c.isNetzke; }),
+      modelName = parent.id + "_" + this.name;
 
     if (this.blankLine == undefined) this.blankLine = "---";
 
-    Ext.define(modelName, {
+    if (!Netzke.isModelDefined(modelName)) {
+      Ext.define(Netzke.modelName(modelName), {
         extend: 'Ext.data.Model',
         fields: ['value', 'text']
-    });
+      });
+    };
 
     var store = new Ext.data.Store({
-      model: modelName,
+      model: Netzke.modelName(modelName),
       proxy: {
         type: 'direct',
-        directFn: Netzke.providers[this.parentId].getComboboxOptions,
+        directFn: Netzke.providers[parent.id].getComboboxOptions,
+        extraParams: {configs: parent.buildParentClientConfigs()},
         reader: {
           type: 'array',
           rootProperty: 'data'
@@ -37,7 +41,7 @@ Ext.define('Ext.netzke.ComboBox', {
     if (this.blankLine) {
       store.on('load', function(self, params) {
         // append a selectable "empty line" which will allow remove the association
-        self.add(Ext.create(modelName, {value: -1, text: this.blankLine}));
+        self.add(Ext.create(Netzke.modelName(modelName), {value: -1, text: this.blankLine}));
       }, this);
     }
 
@@ -47,6 +51,5 @@ Ext.define('Ext.netzke.ComboBox', {
     this.store = store;
 
     this.callParent();
-  },
-
+  }
 });

data/lib/netzke/basepack/action_column.rb

@@ -12,7 +12,7 @@ module Netzke
     #       end
     #
     #       def columns
-    #         super + [:basic_actions, :extra_actions]
+    #         super + [:actions]
     #       end
     #
     #       column :actions do |c|
@@ -38,20 +38,10 @@ module Netzke
     module ActionColumn
       extend ActiveSupport::Concern
 
-      included do |base|
-        js_configure do |c|
-          c.require :action_column
-        end
-      end
-
-      # This can be optimized in order to generate less json in the column getter
       def augment_column_config(c)
         if c[:type] == :action
-          c.xtype = :netzkeactioncolumn
-
-          c[:getter] = lambda do |r|
-            c.actions.map {|a| build_action_config(a)}.netzke_jsonify.to_json
-          end
+          c.xtype = :actioncolumn
+          c.items = c.actions.map {|a| build_action_config(a)}.netzke_jsonify
         end
 
         super
@@ -61,10 +51,21 @@ module Netzke
 
       def build_action_config(a)
         a = {name: a} if a.is_a?(Symbol)
+        a[:handler] ||= a[:name]
         a.tap do |a|
           a[:tooltip] ||= a[:name].to_s.humanize
           a[:icon] ||= a[:name].to_sym
-          a[:handler] ||= "on_#{a[:name]}"
+          a[:handler] = Netzke::Core::JsonLiteral.new <<-JS
+          function() {
+            var cmp = Ext.getCmp('#{js_id}'),
+                f = cmp.on#{a[:handler].to_s.camelize};
+            if (Ext.isFunction(f)) {
+              f.apply(cmp, arguments);
+            } else {
+              Netzke.warning("Undefined handler for action '#{a[:name]}'");
+            }
+          }
+          JS
 
           a[:icon] = "#{Netzke::Core.icons_uri}/#{a[:icon]}.png" if a[:icon].is_a?(Symbol)
         end

data/lib/netzke/basepack/dynamic_tab_panel.rb

@@ -0,0 +1,22 @@
+module Netzke
+  module Basepack
+    # A tab panel that can load components dynamically by their class name. Components can be loaded in the current or new tab.
+    # For example:
+    #
+    #     this.netzkeLoadComponentByClass('BookGrid', {newTab: true, clientConfig: {read_only: true}});
+    #
+    class DynamicTabPanel < Netzke::Base
+      js_configure do |c|
+        c.extend = "Ext.tab.Panel"
+        c.mixin
+      end
+
+      # Override this method if you need more control on what components can/cannot be loaded, or in order to access
+      # `client_config`
+      component :child do |c|
+        # c.client_config <== is accessible here
+        c.klass = (c.client_config[:klass] || "Netzke::Core::Panel").constantize
+      end
+    end
+  end
+end

data/lib/netzke/basepack/dynamic_tab_panel/javascripts/dynamic_tab_panel.js

@@ -0,0 +1,29 @@
+{
+  netzkeTabComponentDelivered: function(c, config) {
+    var tab,
+        i,
+        activeTab = this.getActiveTab(),
+        cmp = Ext.ComponentManager.create(Ext.apply(c, {closable: true}));
+
+    if (config.newTab || activeTab == null) {
+      tab = this.add(cmp);
+    } else {
+      tab = this.getActiveTab();
+      i = this.items.indexOf(tab);
+      this.remove(tab);
+      tab = this.insert(i, cmp);
+    }
+
+    this.setActiveTab(tab);
+  },
+
+  netzkeLoadComponentByClass: function(klass, options) {
+    this.netzkeLoadComponent('child', Ext.apply(options, {
+      configOnly: true,
+      clone: true,
+      clientConfig: Ext.apply(options.clientConfig || {}, {klass: klass}),
+      callback: this.netzkeTabComponentDelivered,
+      scope: this,
+    }));
+  }
+}

data/lib/netzke/basepack/fields.rb

@@ -47,9 +47,6 @@ module Netzke
           @fields_from_items[c.name.to_sym] = c
 
           c.set_defaults!
-
-          # netzkeremotecombo requires our js_id
-          c.parent_id = self.js_id if c.xtype == :netzkeremotecombo
         end
       end
 

data/lib/netzke/basepack/grid/endpoints.rb

@@ -31,6 +31,7 @@ module Netzke
           # +query+ - what's typed-in in the combobox
           # +id+ - selected record id
           endpoint :get_combobox_options do |params, this|
+            ::Rails.logger.debug "\n!!! params: #{params.inspect}\n"
             column = final_columns.detect{ |c| c[:name] == params[:attr] }
             this.data = data_adapter.combo_data(column, params[:query])
           end

data/lib/netzke/basepack/grid/javascripts/event_handling.js

@@ -67,7 +67,7 @@
 
   /* Exception handler. TODO: will responses with status 200 land here? */
   loadExceptionHandler: function(proxy, response, operation){
-    Netzke.warning('Server exception occured. Override loadExceptionHandler, or catch globally by listenning to serverexception event of Netzke.directProvider');
+    Netzke.warning('Server exception occured. Override loadExceptionHandler, or catch globally by listenning to exception event of Netzke.directProvider');
   },
 
   // Inline editing of 1 row

data/lib/netzke/basepack/grid/javascripts/grid.js

@@ -22,8 +22,8 @@
     this.netzkeProcessColumns();
 
     // Define the model
-    if (!this.netzkeIsModelDefined()) {
-      Ext.define(this.netzkeModelName(), {
+    if (!Netzke.isModelDefined(this.id)) {
+      Ext.define(Netzke.modelName(this.id), {
         extend: 'Ext.data.Model',
         idProperty: this.pri, // Primary key
         fields: this.fields
@@ -218,7 +218,7 @@
       }
 
       if (c.editor) {
-        Ext.applyIf(c.editor, {selectOnFocus: true, parentId: this.id});
+        Ext.applyIf(c.editor, {selectOnFocus: true, netzkeParent: this});
       }
 
       // Setting the default filter type
@@ -234,7 +234,7 @@
 
   netzkeBuildStore: function() {
     var store = Ext.create('Ext.data.Store', Ext.apply({
-      model: this.netzkeModelName(),
+      model: Netzke.modelName(this.id),
       proxy: this.netzkeBuildProxy(),
       pruneModifiedRecords: true,
       remoteSort: true,
@@ -309,14 +309,6 @@
     return r.isNew ? "grid-dirty-record" : ""
   },
 
-  netzkeModelName: function(){
-    return "Netzke.models." + this.id;
-  },
-
-  netzkeIsModelDefined: function(){
-    return !!(Netzke.models || {})[this.id];
-  },
-
   // Normalizes the renderer for a column.
   // Renderer may be:
   // 1) a string that contains the name of the function to be used as renderer.

data/lib/netzke/basepack/version.rb

@@ -1,5 +1,5 @@
 module Netzke
   module Basepack
-    VERSION = "0.12.0.beta"
+    VERSION = "0.12.0.rc1"
   end
 end

data/netzke-basepack.gemspec

@@ -4,7 +4,7 @@ Gem::Specification.new do |s|
   s.name        = "netzke-basepack"
   s.version     = Netzke::Basepack::VERSION
   s.author      = "Max Gorin"
-  s.email       = "gorinme@gmail.com"
+  s.email       = "max@goodbitlabs.com"
   s.homepage    = "http://netzke.org"
   s.summary     = "Pre-built Netzke components"
   s.description = "A set of feature-rich extendible Netzke components (such as Form, Grid, Window, TabPanel, etc) and component extensions which can be used as building blocks for your RIA"
@@ -13,7 +13,8 @@ Gem::Specification.new do |s|
   s.test_files    = Dir["{test}/**/*"]
   s.require_paths = ["lib"]
 
-  s.add_dependency 'netzke-core', '~> 0.12.0.beta'
+  s.add_dependency 'netzke-core', '~> 0.12.0.rc1'
+  s.add_dependency 'netzke-testing', '~> 0.12.0.beta2'
 
   s.add_development_dependency 'rails', '~> 4.2.0'
   s.add_development_dependency 'sqlite3'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: netzke-basepack
 version: !ruby/object:Gem::Version
-  version: 0.12.0.beta
+  version: 0.12.0.rc1
 platform: ruby
 authors:
 - Max Gorin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-08 00:00:00.000000000 Z
+date: 2015-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: netzke-core
@@ -16,14 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0.beta
+        version: 0.12.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0.beta
+        version: 0.12.0.rc1
+- !ruby/object:Gem::Dependency
+  name: netzke-testing
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.12.0.beta2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.12.0.beta2
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -97,7 +111,7 @@ dependencies:
 description: A set of feature-rich extendible Netzke components (such as Form, Grid,
   Window, TabPanel, etc) and component extensions which can be used as building blocks
   for your RIA
-email: gorinme@gmail.com
+email: max@goodbitlabs.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -115,7 +129,6 @@ files:
 - lib/netzke/basepack.rb
 - lib/netzke/basepack/accordion.rb
 - lib/netzke/basepack/action_column.rb
-- lib/netzke/basepack/action_column/javascripts/action_column.js
 - lib/netzke/basepack/active_record.rb
 - lib/netzke/basepack/active_record/relation_extensions.rb
 - lib/netzke/basepack/attr_config.rb
@@ -124,6 +137,8 @@ files:
 - lib/netzke/basepack/data_accessor.rb
 - lib/netzke/basepack/data_adapters/abstract_adapter.rb
 - lib/netzke/basepack/data_adapters/active_record_adapter.rb
+- lib/netzke/basepack/dynamic_tab_panel.rb
+- lib/netzke/basepack/dynamic_tab_panel/javascripts/dynamic_tab_panel.js
 - lib/netzke/basepack/field_config.rb
 - lib/netzke/basepack/fields.rb
 - lib/netzke/basepack/form.rb

data/lib/netzke/basepack/action_column/javascripts/action_column.js

@@ -1,61 +0,0 @@
-Ext.define('Ext.grid.column.NetzkeAction', {
-    extend: 'Ext.grid.column.Action',
-    alias: ['widget.netzkeactioncolumn'],
-
-    constructor: function(config) {
-        var me = this,
-            cfg = Ext.apply({}, config),
-            i,
-            item;
-
-        me.callParent([cfg]);
-
-        me.renderer = function(actions, meta) {
-          // previous renderer
-          var v = Ext.isFunction(cfg.renderer) ? cfg.renderer.apply(this, arguments)||'' : '',
-              actions = Ext.isEmpty(actions) ? [] : Ext.decode(actions),
-              l = actions.length,
-              action;
-
-          meta.tdCls += ' ' + Ext.baseCSSPrefix + 'action-col-cell';
-
-          for (i = 0; i < l; i++) {
-            action = actions[i];
-            if (!action.hidden) {
-              v += '<img alt="' + (action.altText || me.altText) + '" src="' + (action.icon || Ext.BLANK_IMAGE_URL) +
-                  '" class="' + Ext.baseCSSPrefix + 'action-col-icon ' + Ext.baseCSSPrefix + 'action-col-' + String(i) + ' ' +  (action.iconCls || '') +
-                  ' ' + (Ext.isFunction(action.getClass) ? action.getClass.apply(action.scope||me.scope||me, arguments) : (me.iconCls || '')) + '"' +
-                  ((action.tooltip) ? ' data-qtip="' + action.tooltip + '"' : '') +
-                  ' data-name="' + action.name + '"' +
-                  ((action.handler) ? ' data-handler="' + action.handler + '"' : '') + ' />';
-            }
-          }
-
-          return v;
-        };
-    },
-
-    processEvent : function(type, view, cell, recordIndex, cellIndex, e){
-        var me = this,
-            target = e.getTarget(),
-            match = target.className.match("x-action-col-icon"),
-            fn, grid, record;
-        if (match) {
-            if (type == 'click') {
-                grid = me.ownerCt.ownerCt;
-                fn = (target.getAttribute("data-handler") || "").camelize(true);
-                fn = Ext.isFunction(grid[fn]) ? grid[fn] : undefined;
-                // if (fn) fn.call(grid, view, recordIndex, cellIndex, target, e);
-                if (fn) {
-                  record = grid.getStore().getAt(recordIndex);
-                  fn.call(grid, record, target, e);
-                } else {
-                  Netzke.warning("Undefined handler for column action '" + target.getAttribute("data-name") + "'");
-                }
-            } else if (type == 'mousedown') {
-                return false;
-            }
-        }
-        return me.callParent(arguments);
-    }
-});