netzke-basepack 0.7.6 → 0.7.7

data/CHANGELOG.rdoc

@@ -1,3 +1,13 @@
+= 0.7.7 - 2012-10-20
+* Ext JS 4.1.x support
+
+* improvements
+  * cleaner handling of association column editing in GridPanel
+
+* bug fix
+  * models with non-conventional primary keys could not be updated by gridpanel (davide)
+  * GridPanel's default forms respect "read_only" and "editable" config in fields
+
 = 0.7.6 - 2012-07-27
 * Fix netzke-core version dependency in gemspec
 

data/README.md

@@ -4,9 +4,9 @@ A pack of pre-built [Netzke](http://netzke.org) components - such as grid, form,
 
 ## Requirements
 
-* Ruby 1.9.2 (1.8.7 may work, too)
+* Ruby 1.9.2
 * Rails ~> 3.1.0
-* Ext JS = 4.0.2a
+* Ext JS ~> 4.1.x
 
 ## Installation
 
@@ -16,7 +16,7 @@ In your Gemfile:
 
 For the "edge" stuff, tell bundler to get the gem straight from GitHub:
 
-    gem 'netzke-basepack', :git => "git://github.com/skozlov/netzke-basepack.git"
+    gem 'netzke-basepack', :git => "git://github.com/nomadcoder/netzke-basepack.git"
 
 ## Usage
 
@@ -28,9 +28,9 @@ For more examples, see http://demo.netzke.com, and look into test/basepack_test_
 
 ## Testing and playing with Netzke Basepack
 
-Netzke Basepack is bundled with Cucumber and RSpec tests. If you would like to contribute to the project, you may want to learn how to [run the tests](https://github.com/skozlov/netzke-core/wiki/Automated-testing).
+Netzke Basepack is bundled with Cucumber and RSpec tests. If you would like to contribute to the project, you may want to learn how to [run the tests](https://github.com/nomadcoder/netzke-core/wiki/Automated-testing).
 
-Besides, the bundled test application is a convenient [playground](https://github.com/skozlov/netzke-core/wiki/Playground) for those who search to experiment with the framework.
+Besides, the bundled test application is a convenient [playground](https://github.com/nomadcoder/netzke-core/wiki/Playground) for those who search to experiment with the framework.
 
 After starting up the test app, you can see the list of functional test components on the index page (along with links to the source code):
 

data/Rakefile

@@ -4,12 +4,12 @@ begin
   Jeweler::Tasks.new do |gemspec|
     gemspec.version = Netzke::Basepack::Version::STRING
     gemspec.name = "netzke-basepack"
-    gemspec.summary = "Pre-built Rails + ExtJS components for your RIA"
-    gemspec.description = "A set of full-featured extendible Netzke components (such as FormPanel, GridPanel, Window, BorderLayoutPanel, etc) which can be used as building block for your RIA"
+    gemspec.summary = "Pre-built Netzke for your RIA"
+    gemspec.description = "A set of full-featured extendible Netzke components (such as FormPanel, GridPanel, Window, etc) which can be used as building block for your RIA"
     gemspec.email = "nmcoder@gmail.com"
     gemspec.homepage = "http://netzke.org"
-    gemspec.authors = ["Denis Gorin"]
-    gemspec.add_dependency("netzke-core",   "~>0.7.6")
+    gemspec.authors = ["nomadcoder"]
+    gemspec.add_dependency("netzke-core",   "~>0.7.7")
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError
@@ -23,22 +23,22 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  require './lib/netzke/basepack/version'
-  version = Netzke::Basepack::Version::STRING
+begin
+  require 'yard'
 
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "netzke-basepack #{version}"
-  # rdoc.main = "README.rdoc"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('CHANGELOG*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+  YARD::Rake::YardocTask.new do |t|
+    t.options = ['--title', "Netzke Basepack #{Netzke::Basepack::Version::STRING}"]
+  end
 
-namespace :rdoc do
-  desc "Publish rdocs"
-  task :publish => :rdoc do
-    `scp -r rdoc/* fl:www/api.netzke.org/basepack`
+  namespace :yard do
+    desc "Publish docs to api.netzke.org"
+    task :publish => :yard do
+      dir = 'www/api.netzke.org/basepack'
+      puts "Publishing to fl:#{dir}..."
+      `ssh fl "mkdir -p #{dir}"`
+      `scp -r doc/* fl:#{dir}`
+    end
   end
+rescue LoadError
+  puts "To enable yard do 'gem install yard'"
 end

data/javascripts/basepack.js

@@ -22,18 +22,24 @@ Ext.apply(Ext.History, new Ext.util.Observable());
 Ext.define('Ext.netzke.ComboBox', {
   extend        : 'Ext.form.field.ComboBox',
   alias         : 'widget.netzkeremotecombo',
-  valueField    : 'field1',
-  displayField  : 'field2',
+  valueField    : 'value',
+  displayField  : 'text',
   triggerAction : 'all',
   // WIP: Breaking - should not be 'true' if combobox is not editable
   // typeAhead     : true,
 
+  // getDisplayValue: function() {
+  //   return this.getValue() == 0 ? this.emptyText : this.callOverridden();
+  // },
+
   initComponent : function(){
     var modelName = this.parentId + "_" + this.name;
 
+    if (this.blankLine == undefined) this.blankLine = "---";
+
     Ext.define(modelName, {
         extend: 'Ext.data.Model',
-        fields: ['field1', 'field2']
+        fields: ['value', 'text']
     });
 
     var store = new Ext.data.Store({
@@ -48,11 +54,18 @@ Ext.define('Ext.netzke.ComboBox', {
       }
     });
 
-    // TODO: find a cleaner way to pass this.name to the server
     store.on('beforeload', function(self, params) {
       params.params.column = this.name;
     },this);
 
+    // insert a selectable "blank line" which allows to remove the associated record
+    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}));
+      }, this);
+    }
+
     // If inline data was passed (TODO: is this actually working?)
     if (this.store) store.loadData({data: this.store});
 
@@ -61,10 +74,6 @@ Ext.define('Ext.netzke.ComboBox', {
     this.callParent();
   },
 
-  collapse: function(){
-    // HACK: do not hide dropdown menu while loading items
-    if( !this.store.loading ) this.callParent();
-  }
 });
 
 Ext.util.Format.mask = function(v){
@@ -133,16 +142,3 @@ Ext.override( Ext.form.field.Checkbox, {
     return this.callOverridden() || false; // 'off';
   }
 });
-
-/* We were missing the 'load' event on proxy, implementing it ourselves */
-Ext.override(Ext.data.proxy.Server, {
-  constructor: function() {
-    this.addEvents('load');
-    this.callOverridden([arguments]);
-  },
-
-  processResponse: function(success, operation, request, response, callback, scope){
-    this.callOverridden(arguments);
-    this.fireEvent('load', this, response, operation);
-  }
-});

data/javascripts/xdatetime.js

@@ -6,6 +6,7 @@
  * @author ontho (http://www.sencha.com/forum/member.php?285806-ontho)
  * @author jakob.ketterl (http://www.sencha.com/forum/member.php?25102-jakob.ketterl)
  * @link http://www.sencha.com/forum/showthread.php?134345-Ext.ux.form.field.DateTime
+ * from http://www.sencha.com/forum/showthread.php?134345-Ext.ux.form.field.DateTime&p=863449&viewfull=1#post863449
  */
 Ext.define('Ext.ux.form.field.DateTime', {
     extend:'Ext.form.FieldContainer',
@@ -112,7 +113,7 @@ Ext.define('Ext.ux.form.field.DateTime', {
 
         // this dummy is necessary because Ext.Editor will not check whether an inputEl is present or not
         this.inputEl = {
-            dom:{},
+            dom: document.createElement('div'),
             swallowEvent:function(){}
         };
 
@@ -120,7 +121,7 @@ Ext.define('Ext.ux.form.field.DateTime', {
     },
 
     focus:function(){
-        this.callParent();
+        this.callParent(arguments);
         this.dateField.focus();
     },
 
@@ -131,12 +132,12 @@ Ext.define('Ext.ux.form.field.DateTime', {
         this.focussedItem = item;
     },
 
-    onItemBlur:function(item){
+    onItemBlur:function(item, e){
         var me = this;
         if (item != me.focussedItem){ return; }
         // 100ms to focus a new item that belongs to us, otherwise we will assume the user left the field
         me.blurTask = new Ext.util.DelayedTask(function(){
-            me.fireEvent('blur', me);
+            me.fireEvent('blur', me, e);
         });
         me.blurTask.delay(100);
     },

data/lib/netzke/active_record/attributes.rb

@@ -117,7 +117,7 @@ module Netzke
                   candidates = %w{name title label} << foreign_key_for_assoc(assoc)
                   assoc_method = candidates.detect{|m| (assoc.klass.instance_methods.map(&:to_s) + assoc.klass.column_names).include?(m) }
                   c[:name] = "#{assoc.name}__#{assoc_method}"
-                  c[:attr_type] = assoc.klass.columns_hash[assoc_method].try(:type) || :string # when it's an instance method rather than a column, fall back to :string
+                  c[:attr_type] = :integer # when it's an instance method rather than a column, fall back to :string
                 end
 
                 # auto set up the default value from the column settings
@@ -231,7 +231,10 @@ module Netzke
                     # what should we do in this case?
                   end
                 else
-                  self.send("#{assoc.options[:foreign_key] || assoc.name.to_s.foreign_key}=", v)
+
+                  # set the foreign key to the passed value
+                  # not that if a negative value is passed, we reset the association (set it to nil)
+                  self.send("#{assoc.foreign_key}=", v.to_i < 0 ? nil : v)
                 end
               else
                 logger.debug "Netzke::Basepack: Association #{assoc} is not known for class #{self.class.name}"

data/lib/netzke/basepack/data_adapters/active_record_adapter.rb

@@ -4,6 +4,35 @@ module Netzke::Basepack::DataAdapters
       model_class <= ActiveRecord::Base
     end
 
+    def primary_key_name
+      @model_class.primary_key.to_s
+    end
+
+    def attr_type(attr_name)
+      @model_class.association_attr?(attr_name) ? :integer : (@model_class.columns_hash[attr_name.to_s].try(:type) || :string)
+    end
+
+    def model_attributes
+      @model_class.column_names.map do |column_name|
+        {:name => column_name, :attr_type => @model_class.columns_hash[column_name].type}.tap do |c|
+
+          # If it's named as foreign key of some association, then it's an association column
+          assoc = @model_class.reflect_on_all_associations.detect { |a| foreign_key_for_assoc(a) == c[:name] }
+
+          if assoc && !assoc.options[:polymorphic]
+            candidates = %w{name title label} << foreign_key_for_assoc(assoc)
+            assoc_method = candidates.detect{|m| (assoc.klass.instance_methods.map(&:to_s) + assoc.klass.column_names).include?(m) }
+            c[:name] = "#{assoc.name}__#{assoc_method}"
+          end
+
+          c[:attr_type] = attr_type(c[:name])
+
+          # auto set up the default value from the column settings
+          c[:default_value] = @model_class.columns_hash[column_name].default if @model_class.columns_hash[column_name].default
+        end
+      end
+    end
+
     def get_records(params, columns=[])
       # build initial relation based on passed params
       relation = get_relation(params)
@@ -130,7 +159,7 @@ module Netzke::Basepack::DataAdapters
     end
 
     def find_record(id)
-      @model_class.find_all_by_id(id).first
+      @model_class.where(@model_class.primary_key => id).first
     end
 
     # Build a hash of foreign keys and the associated model

data/lib/netzke/basepack/form_panel.rb

@@ -106,7 +106,7 @@ module Netzke
 
       # A hash of record data including the meta field
       def js_record_data
-        record.netzke_hash(fields).merge(:_meta => meta_field).literalize_keys
+        record.netzke_hash(fields).merge(:meta => meta_field).literalize_keys
       end
 
       def record

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

@@ -39,8 +39,6 @@
 
     this.initialConfig.errorReader = new ErrorReader();
 
-    // this.getForm().trackResetOnLoad = true;
-
     // Now let Ext.form.FormPanel do the rest
     this.callParent(arguments);
 
@@ -176,7 +174,7 @@
   },
 
   setFormValues: function(values){
-    var assocValues = values._meta.associationValues || {};
+    var assocValues = values.meta.associationValues || {};
     for (var assocFieldName in assocValues) {
 
       var assocField = this.getForm().getFields().filter('name', assocFieldName).first();

data/lib/netzke/basepack/grid_panel.rb

@@ -76,6 +76,7 @@ module Netzke
     #     end
     #
     # * +format+ - the format to display data in case of date and datetime columns, e.g. 'Y-m-d g:i:s'.
+    # * +blank_line+ - the blank line for one-to-many association columns, defaults to "---". Set to false to exclude completely.
     #
     # Besides these options, a column can receive any meaningful config option understood by Ext.grid.column.Column.
     #

data/lib/netzke/basepack/grid_panel/columns.rb

@@ -76,7 +76,7 @@ module Netzke
         def append_meta_column(cols)
           cols << {}.tap do |c|
             c.merge!(
-              :name => "_meta",
+              :name => "meta",
               :meta => true,
               :getter => lambda do |r|
                 meta_data(r)
@@ -109,6 +109,10 @@ module Netzke
           @default_columns ||= load_model_level_attrs || data_class.netzke_attributes
         end
 
+        def set_default_attr_type(c)
+          c[:attr_type] ||= association_attr?(c) ? :integer : data_adapter.attr_type(c.name)
+        end
+
         # Columns that were overridden with :override_columns config option.
         def overridden_default_columns
           if config[:override_columns].present?
@@ -336,7 +340,9 @@ module Netzke
             selected_columns.map do |c|
               field_config = {
                 :name => c[:name],
-                :field_label => c[:text] || c[:header]
+                :field_label => c[:text] || c[:header],
+                :read_only => c[:read_only],
+                :editable => c[:editable]
               }
 
               # scopes for combobox options

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

@@ -26,23 +26,19 @@
       this.normalizeRenderer(c);
 
       // Build the field configuration for this column
-      var fieldConfig = {name: c.name, defaultValue: c.defaultValue};
+      var fieldConfig = {name: c.name, defaultValue: c.defaultValue, useNull: true}; // useNull is needed to not convert nils to 0 in associations!
 
-      if (c.name !== '_meta') fieldConfig.type = this.fieldTypeForAttrType(c.attrType); // field type (grid editors need this to function well)
+      if (c.name !== 'meta') fieldConfig.type = this.fieldTypeForAttrType(c.attrType); // field type (grid editors need this to function well)
 
       if (c.attrType == 'datetime') {
-        fieldConfig.dateFormat = 'Y-m-d g:i:s'; // in this format we receive dates from the server
+        fieldConfig.dateFormat = 'Y-m-d H:i:s'; // set the format in which we receive datetime from the server (so that the model can parse it)
 
+        // While for 'date' columns the renderer is set up automatically (through using column's xtype), there's no appropriate xtype for our custom datetime column.
+        // Thus, we need to set the renderer manually.
+        // NOTE: for Ext there's no distinction b/w date and datetime; date fields can include time.
         if (!c.renderer) {
-          c.renderer = Ext.util.Format.dateRenderer(c.format || fieldConfig.dateFormat); // format in which the data will be rendered
-        }
-      };
-
-      if (c.attrType == 'date') {
-        fieldConfig.dateFormat = 'Y-m-d'; // in this format we receive dates from the server
-
-        if (!c.renderer) {
-          c.renderer = Ext.util.Format.dateRenderer(c.format || fieldConfig.dateFormat); // format in which the data will be rendered
+          // format in which the data will be rendered; if c.format is nil, Ext.Date.defaultFormat extended with time will be used
+          c.renderer = Ext.util.Format.dateRenderer(c.format || Ext.Date.defaultFormat + " H:i:s");
         }
       };
 
@@ -61,12 +57,12 @@
 
 
       // Set rendeder for association columns (the one displaying associations by the specified method instead of id)
+
       if (c.assoc) {
         // Editor for association column
         c.editor = Ext.apply({
           parentId: this.id,
-          name: c.name,
-          selectOnFocus: true // ?
+          name: c.name
         }, c.editor);
 
         // Renderer for association column
@@ -79,15 +75,12 @@
 
       // Setting the default filter type
       if (c.filterable && !c.filter) {
-        c.filter = {type: this.fieldTypeForAttrType(c.attrType)};
+        c.filter = {type: c.assoc ? 'string' : this.fieldTypeForAttrType(c.attrType)};
       }
 
       // setting dataIndex
       c.dataIndex = c.name;
 
-      // HACK: somehow this is not set by Ext (while it should be)
-      if (c.xtype == 'datecolumn') c.format = c.format || Ext.util.Format.dateFormat;
-
     }, this);
 
     /* ... and done with the columns */
@@ -124,14 +117,12 @@
     // ... instead, define own column model
     this.columns = colModelConfig;
 
+    var reader = Ext.create('Ext.data.reader.Array', {root: 'data', totalProperty: 'total'});
+
     // DirectProxy that uses our Ext.direct provider
-    var proxy = {
-      type: 'direct',
+    var proxy = Ext.create('Ext.data.proxy.Direct', {
       directFn: Netzke.providers[this.id].getData,
-      reader: {
-        type: 'array',
-        root: 'data'
-      },
+      reader: reader,
       listeners: {
         exception: {
           fn: this.loadExceptionHandler,
@@ -149,19 +140,17 @@
           scope: this
         }
       }
-    }
+    });
 
-    this.store = Ext.create('store.store', {
+    this.store = Ext.create('Ext.data.Store', {
       model: this.id,
       proxy: proxy,
-      data: this.inlineData && [this.inlineData.data] || [], // TODO: Inline data *might* contain commands to execute
       pruneModifiedRecords: true,
       remoteSort: true,
       pageSize: this.rowsPerPage
     });
 
-    // HACK: we must let the store now totalCount, but this property is not public (yet?)
-    this.store.totalCount = this.inlineData && this.inlineData[this.store.getProxy().getReader().totalProperty];
+    if (this.inlineData) this.store.loadRawData(this.inlineData);
 
     // Drag'n'Drop
     if (this.enableRowsReordering){
@@ -183,7 +172,7 @@
         xtype: 'pagingtoolbar',
         dock: 'bottom',
         store: this.store,
-        items: this.bbar && ["-"].concat(this.bbar) // append the old bbar. TODO: get rid of it.
+        items: this.bbar && ["-"].concat(this.bbar) // append the old bbar
       });
     } else if (this.bbar) {
       this.dockedItems.push({
@@ -234,14 +223,26 @@
     // WIP: GridView
     this.getView().getRowClass = this.defaultGetRowClass;
 
+    // this.on('edit', function(editor, e) {
+    //   if (e.column.assoc && e.record.get('meta')) {
+    //     console.log("editor:", editor);
+    //     editor.setRawValue("");
+    //   }
+    // });
+
     // When starting editing as assocition column, pre-load the combobox store from the meta column, so that we don't see the real value of this cell (the id of the associated record), but rather the associated record by the configured method.
-    this.on('beforeedit', function(e){
-      if (e.column.assoc && e.record.get('_meta')) {
-        var data = [e.record.get(e.field), e.record.get('_meta').associationValues[e.field]],
-            store = e.column.getEditor().store;
-        if (store.getCount() === 0) {
-          store.loadData([data]);
+    this.on('beforeedit', function(editor, e){
+      if (e.column.assoc && e.record.get('meta')) {
+        var c = e.column,
+        combo = c.getEditor(),
+        store = combo.store,
+        id = e.record.get(e.field);
+
+        // initial load of 1 single record for the combobox store, which contains the display text (stored in the meta field) for the current value
+        if (id && -1 == store.find('value', id)) {
+          store.loadData([[e.record.get(e.field), e.record.get('meta').associationValues[e.field]]], true);
         }
+
       }
     }, this);
 
@@ -417,14 +418,13 @@
     c.renderer = function(value, a, r, ri, ci){
       var column = this.headerCt.items.getAt(ci),
           editor = column.getEditor && column.getEditor(),
-          // HACK: using private property 'store'
-          recordFromStore = editor && editor.isXType('combobox') && editor.store.findRecord('field1', value),
+          recordFromStore = editor && editor.isXType('combobox') && editor.getStore().findRecord('value', value),
           renderedValue;
 
       if (recordFromStore) {
-        renderedValue = recordFromStore.get('field2');
-      } else if (c.assoc && r.get('_meta')) {
-        renderedValue = r.get('_meta').associationValues[c.name] || value;
+        renderedValue = recordFromStore.get('text');
+      } else if (c.assoc && r.get('meta')) {
+        renderedValue = r.get('meta').associationValues[c.name] || c.emptyText;
       } else {
         renderedValue = value;
       }

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

@@ -30,13 +30,15 @@
   },
 
   afterRender: function() {
+    // delete this.record so our parent FormPanel doesn't have to load it - we do it ourselves
+    var record = this.record;
+    delete (this.record);
+
     this.callParent();
 
-    // WIP: commented out because it produces error otherwise:
-    //   el is undefined
-    //   http://nbt.local/extjs4/ext-all-debug.js?1305798122
-    //   Line 18214"
-    //          new Ext.LoadMask(this.bwrap, Ext.apply(this.applyMask, {store: this.store}));
+    if (record) this.store.loadRawData({records: [record], total: this.totalRecords});
+
+    new Ext.LoadMask(this, Ext.apply(this.applyMask, {store: this.store}));
   },
 
   initComponent: function() {
@@ -49,10 +51,8 @@
     var store = new Ext.data.DirectStore({
       directFn: Netzke.providers[this.id].getData,
       root: 'records',
-      fields: this.fieldNames.concat('_meta'),
-      pageSize: 1,
-      // HACK: we must let the store know totalCount, but this property is not public (yet?)
-      totalCount: this.totalRecords
+      fields: this.fieldNames.concat('meta'),
+      pageSize: 1
     });
 
     store.on('load', function(st, r){
@@ -73,4 +73,4 @@
 
     this.callParent();
   }
-}
+}

data/lib/netzke/basepack/query_builder.rb

@@ -73,7 +73,7 @@ module Netzke
               :listeners => {:before_select => {
                 :fn => "function(combo, record){
                   var form = Ext.getCmp('#{global_id}');
-                  form.buildFormFromQuery(record.data.field1);
+                  form.buildFormFromQuery(record.data.value);
                 }".l
               }}
             }, :save_preset.action, :delete_preset.action

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

@@ -102,20 +102,20 @@
 
     if (searchName !== "") {
       var presetsComboStore = this.presetsCombo.getStore();
-      var existingPresetIndex = presetsComboStore.find('field2', searchName);
+      var existingPresetIndex = presetsComboStore.find('text', searchName);
       if (existingPresetIndex !== -1) {
         // overwriting
         Ext.Msg.confirm(this.i18n.overwriteConfirmTitle, this.i18n.overwriteConfirm, function(btn, text){
           if (btn == 'yes') {
             var r = presetsComboStore.getAt(existingPresetIndex);
-            r.set('field1', this.getQuery(true));
+            r.set('value', this.getQuery(true));
             r.commit();
             this.doSavePreset(searchName);
           }
         }, this);
       } else {
         this.doSavePreset(searchName);
-        presetsComboStore.add({field1: this.getQuery(true), field2: searchName});
+        presetsComboStore.add({value: this.getQuery(true), text: searchName});
       }
     }
   },
@@ -147,7 +147,7 @@
 
   removePresetFromList: function(name){
     var presetsComboStore = this.presetsCombo.getStore();
-    presetsComboStore.removeAt(presetsComboStore.find('field2', name));
+    presetsComboStore.removeAt(presetsComboStore.find('text', name));
     this.presetsCombo.reset();
   }
 }

data/lib/netzke/basepack/search_window.rb

@@ -7,7 +7,7 @@ module Netzke
       end
 
       action :cancel do
-        { :text => I18n.t('netzke.basepack.search_window.action.search') }
+        { :text => I18n.t('netzke.basepack.search_window.action.cancel') }
       end
 
       js_properties :width => "50%",

data/lib/netzke/basepack/simple_app.rb

@@ -40,6 +40,11 @@ module Netzke
 
       js_mixin :simple_app
 
+      # In Ext 4.1 calling `render` on a viewport causes an error
+      def js_component_render
+        ""
+      end
+
       def configuration
         super.merge(
           :items => [main_panel_config, menu_bar_config, status_bar_config]

data/lib/netzke/basepack/version.rb

@@ -3,7 +3,7 @@ module Netzke
     module Version
       MAJOR = 0
       MINOR = 7
-      PATCH = 6
+      PATCH = 7
 
       STRING = [MAJOR, MINOR, PATCH].compact.join('.')
     end

data/locales/zh-cn.yml

@@ -0,0 +1,79 @@
+zh-cn:
+  netzke:
+    basepack:
+      grid_panel:
+        actions:
+          add: "增加"
+          edit: "编辑"
+          del: "删除"
+          apply: "保存"
+          add_in_form: "表格添加"
+          edit_in_form: "表格编辑"
+          search: "搜索"
+
+        deleted_n_records: "删除了 %{n} 条记录"
+        cannot_delete: "本用户无权限删除"
+        confirmation: "确认"
+        are_you_sure: "确认改操作吗？"
+
+        record_form_window:
+          actions:
+            ok: "确定"
+            cancel: "取消"
+
+      search_window:
+        title: "高级搜索"
+        actions:
+          search: "搜索"
+          cancel: "取消"
+
+      form_panel:
+        actions:
+          edit: "编辑"
+          edit_tooltip: "编辑"
+          cancel: "取消"
+          cancel_tooltip: "取消编辑"
+          apply: "保存"
+          apply_tooltip: "保存修改"
+
+      search_panel:
+        presets: "呈现"
+        equals: "等于"
+        greater_than: "大于"
+        less_than: "小于"
+        contains: "包含"
+        matches: "匹配"
+        date_equals: "On"
+        before: "之前"
+        after: "之后"
+
+      paging_form_panel:
+        actions:
+          search: "搜索"
+          search_tooltip: "高级搜索"
+
+      query_builder:
+        presets: "预设"
+        preset_saved: "预设成功保存"
+        preset_deleted: "预设成功删除"
+        overwrite_confirm: "确定覆盖已存在的预设 '{0}' 吗?"
+        overwrite_confirm_title: "覆盖已存在预设"
+        delete_confirm: "确定删除预设 '{0}' 吗?"
+        delete_confirm_title: "删除预设确认"
+        actions:
+          clear_all: "清除"
+          clear_all_tooltip: "清除所有条件"
+          reset: "重置"
+          reset_tooltip: "重置条件值"
+          save_preset: "保存预设"
+          save_preset_tooltip: "保存预设"
+          delete_preset: "删除预设"
+          delete_preset_tooltip: "删除预设"
+          apply: "保存"
+          apply_tooltip: "应用条件"
+
+
+    formats:
+      date: Y-m-d
+      datetime: Y-m-d H:i:s
+      time: H:i:s

data/netzke-basepack.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = "netzke-basepack"
-  s.version = "0.7.6"
+  s.version = "0.7.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Denis Gorin"]
-  s.date = "2012-07-27"
-  s.description = "A set of full-featured extendible Netzke components (such as FormPanel, GridPanel, Window, BorderLayoutPanel, etc) which can be used as building block for your RIA"
+  s.authors = ["nomadcoder"]
+  s.date = "2012-10-20"
+  s.description = "A set of full-featured extendible Netzke components (such as FormPanel, GridPanel, Window, etc) which can be used as building block for your RIA"
   s.email = "nmcoder@gmail.com"
   s.extra_rdoc_files = [
     "LICENSE",
@@ -100,6 +100,7 @@ Gem::Specification.new do |s|
     "lib/tasks/netzke_basepack_tasks.rake",
     "locales/de.yml",
     "locales/en.yml",
+    "locales/zh-cn.yml",
     "netzke-basepack.gemspec",
     "stylesheets/basepack.css",
     "stylesheets/datetimefield.css",
@@ -122,6 +123,7 @@ Gem::Specification.new do |s|
     "test/basepack_test_app/app/components/book_grid_with_column_actions.rb",
     "test/basepack_test_app/app/components/book_grid_with_custom_columns.rb",
     "test/basepack_test_app/app/components/book_grid_with_default_values.rb",
+    "test/basepack_test_app/app/components/book_grid_with_defaults.rb",
     "test/basepack_test_app/app/components/book_grid_with_extra_feedback.rb",
     "test/basepack_test_app/app/components/book_grid_with_extra_filters.rb",
     "test/basepack_test_app/app/components/book_grid_with_nested_attributes.rb",
@@ -289,18 +291,18 @@ Gem::Specification.new do |s|
   s.homepage = "http://netzke.org"
   s.require_paths = ["lib"]
   s.rubygems_version = "1.8.10"
-  s.summary = "Pre-built Rails + ExtJS components for your RIA"
+  s.summary = "Pre-built Netzke for your RIA"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<netzke-core>, ["~> 0.7.6"])
+      s.add_runtime_dependency(%q<netzke-core>, ["~> 0.7.7"])
     else
-      s.add_dependency(%q<netzke-core>, ["~> 0.7.6"])
+      s.add_dependency(%q<netzke-core>, ["~> 0.7.7"])
     end
   else
-    s.add_dependency(%q<netzke-core>, ["~> 0.7.6"])
+    s.add_dependency(%q<netzke-core>, ["~> 0.7.7"])
   end
 end
 

data/test/basepack_test_app/.rvmrc

@@ -1 +1 @@
-rvm 1.9.2
+rvm 1.9.3

data/test/basepack_test_app/Gemfile

@@ -36,7 +36,7 @@ group :development, :test do
   gem 'capybara-screenshot'
   gem 'cucumber-rails'
   gem 'cucumber'
-  gem 'selenium-webdriver', '2.17.0'
+  gem 'selenium-webdriver'
   gem 'rspec-rails'
   gem 'spork'
   gem 'launchy'    # So you can do Then show me the page

data/test/basepack_test_app/Gemfile.lock

@@ -11,7 +11,7 @@ GIT
 PATH
   remote: vendor/gems/netzke-core
   specs:
-    netzke-core (0.7.5)
+    netzke-core (0.7.6)
       activesupport (>= 3.0.0)
 
 PATH
@@ -49,9 +49,9 @@ GEM
     activesupport (3.2.1)
       i18n (~> 0.6)
       multi_json (~> 1.0)
-    addressable (2.2.7)
+    addressable (2.3.2)
     arel (3.0.2)
-    builder (3.0.0)
+    builder (3.0.3)
     capybara (1.1.2)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
@@ -59,57 +59,58 @@ GEM
       rack-test (>= 0.5.4)
       selenium-webdriver (~> 2.0)
       xpath (~> 0.1.4)
-    capybara-screenshot (0.1.10)
+    capybara-screenshot (0.2.2)
       capybara (>= 1.0)
-    childprocess (0.3.1)
-      ffi (~> 1.0.6)
-    coderay (1.0.5)
-    cucumber (1.1.9)
+    childprocess (0.3.5)
+      ffi (~> 1.0, >= 1.0.6)
+    coderay (1.0.8)
+    cucumber (1.2.1)
       builder (>= 2.1.2)
-      diff-lcs (>= 1.1.2)
-      gherkin (~> 2.9.0)
+      diff-lcs (>= 1.1.3)
+      gherkin (~> 2.11.0)
       json (>= 1.4.6)
-      term-ansicolor (>= 1.0.6)
     cucumber-rails (1.3.0)
       capybara (>= 1.1.2)
       cucumber (>= 1.1.8)
       nokogiri (>= 1.5.0)
-    daemons (1.1.8)
-    database_cleaner (0.7.2)
+    daemons (1.1.9)
+    database_cleaner (0.9.1)
     diff-lcs (1.1.3)
     erubis (2.7.0)
-    eventmachine (0.12.10)
-    factory_girl (3.0.0)
+    eventmachine (1.0.0)
+    factory_girl (4.1.0)
       activesupport (>= 3.0.0)
-    ffi (1.0.11)
-    gherkin (2.9.1)
+    ffi (1.1.5)
+    gherkin (2.11.5)
       json (>= 1.4.6)
     hike (1.2.1)
-    i18n (0.6.0)
-    journey (1.0.3)
-    json (1.6.5)
-    launchy (2.1.0)
-      addressable (~> 2.2.6)
+    i18n (0.6.1)
+    journey (1.0.4)
+    json (1.7.5)
+    launchy (2.1.2)
+      addressable (~> 2.3)
+    libwebsocket (0.1.5)
+      addressable
     mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    method_source (0.7.1)
-    mime-types (1.18)
-    multi_json (1.0.4)
+    method_source (0.8)
+    mime-types (1.19)
+    multi_json (1.3.6)
     mysql2 (0.3.11)
-    nokogiri (1.5.2)
+    nokogiri (1.5.5)
     polyglot (0.3.3)
-    pry (0.9.8.4)
+    pry (0.9.10)
       coderay (~> 1.0.5)
-      method_source (~> 0.7.1)
-      slop (>= 2.4.4, < 3)
+      method_source (~> 0.8)
+      slop (~> 3.3.1)
     rack (1.4.1)
     rack-cache (1.2)
       rack (>= 0.4)
     rack-ssl (1.3.2)
       rack
-    rack-test (0.6.1)
+    rack-test (0.6.2)
       rack (>= 1.0)
     rails (3.2.1)
       actionmailer (= 3.2.1)
@@ -129,48 +130,47 @@ GEM
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
-    rspec (2.9.0)
-      rspec-core (~> 2.9.0)
-      rspec-expectations (~> 2.9.0)
-      rspec-mocks (~> 2.9.0)
-    rspec-core (2.9.0)
-    rspec-expectations (2.9.0)
+    rspec (2.11.0)
+      rspec-core (~> 2.11.0)
+      rspec-expectations (~> 2.11.0)
+      rspec-mocks (~> 2.11.0)
+    rspec-core (2.11.1)
+    rspec-expectations (2.11.3)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.9.0)
-    rspec-rails (2.9.0)
+    rspec-mocks (2.11.3)
+    rspec-rails (2.11.4)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec (~> 2.9.0)
-    rubyzip (0.9.6.1)
-    selenium-webdriver (2.17.0)
+      rspec (~> 2.11.0)
+    rubyzip (0.9.9)
+    selenium-webdriver (2.25.0)
       childprocess (>= 0.2.5)
-      ffi (~> 1.0.9)
-      multi_json (~> 1.0.4)
+      libwebsocket (~> 0.1.3)
+      multi_json (~> 1.0)
       rubyzip
-    slop (2.4.4)
-    spork (0.9.0)
-    sprockets (2.1.2)
+    slop (3.3.3)
+    spork (0.9.2)
+    sprockets (2.1.3)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.5)
+    sqlite3 (1.3.6)
     sqlite3-ruby (1.3.3)
       sqlite3 (>= 1.3.3)
-    term-ansicolor (1.0.7)
-    thin (1.3.1)
+    thin (1.5.0)
       daemons (>= 1.0.9)
       eventmachine (>= 0.12.6)
       rack (>= 1.0.0)
     thor (0.14.6)
     tilt (1.3.3)
-    treetop (1.4.10)
+    treetop (1.4.11)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.32)
+    tzinfo (0.3.33)
     xpath (0.1.4)
       nokogiri (~> 1.3)
-    yard (0.7.5)
+    yard (0.8.3)
 
 PLATFORMS
   ruby
@@ -190,7 +190,7 @@ DEPENDENCIES
   pry
   rails (= 3.2.1)
   rspec-rails
-  selenium-webdriver (= 2.17.0)
+  selenium-webdriver
   spork
   sqlite3-ruby
   thin

data/test/basepack_test_app/app/components/book_grid_with_defaults.rb

@@ -0,0 +1,6 @@
+# Not used in automatic tests
+class BookGridWithDefaults < Netzke::Basepack::GridPanel
+  def default_config
+    super.merge(model: 'Book')
+  end
+end

data/test/basepack_test_app/app/components/user_form.rb

@@ -14,7 +14,7 @@ class UserForm < Netzke::Basepack::FormPanel
       {:name => :created_at, :disabled => true},
       {:name => :updated_at, :disabled => true}
     ]},
-    :role__name
+    { name: :role__name, empty_text: "Select a role" }
   ]
 
   # Uncomment for visual mask testing

data/test/basepack_test_app/config/application.rb

@@ -48,7 +48,7 @@ module RailsApp
     # config.netzke.basepack.grid_panel.extended_search_available = false
 
     # to build links to the code on github
-    config.repo_root = "https://github.com/skozlov/netzke-basepack/blob/master/test/basepack_test_app"
+    config.repo_root = "https://github.com/nomadcoder/netzke-basepack/blob/master/test/basepack_test_app"
 
     # Enable the asset pipeline
     config.assets.enabled = true

data/test/basepack_test_app/features/form_panel.feature

@@ -12,10 +12,10 @@ Scenario: UserForm should be rendered properly along with the data for the first
   And I should see "writer"
 
 @javascript
-  Scenario: A form should be rendered properly along with the data for the specified record
-    Given a book exists with title: "Great Book", last_read_at: "2005-01-23 11:12:13"
-    When I go to the BookFormWithDefaults test page
-    Then the form should show title: "Great Book", last_read_at: "2005-01-23 11:12:13"
+Scenario: A form should be rendered properly along with the data for the specified record
+  Given a book exists with title: "Great Book", last_read_at: "2005-01-23 11:12:13"
+  When I go to the BookFormWithDefaults test page
+  Then the form should show title: "Great Book", last_read_at: "2005-01-23 11:12:13"
 
 @javascript
 Scenario: Editing the record
@@ -37,6 +37,18 @@ Scenario: Editing the record
   And I should not see "Osminogov"
   And I should not see "musician"
 
+@javascript
+Scenario: Resetting an association
+  Given a role exists with name: "musician"
+  And a user exists with first_name: "Paul", last_name: "Bley", role: that role
+  When I go to the UserForm test page
+  And I expand combobox "Role name"
+  And I select "---" from combobox "Role name"
+  And I press "Apply"
+  And I go to the UserForm test page
+  Then I should see "Select a role"
+  But I should not see "musician"
+
 Scenario: UserFormWithDefaultFields should render properly
   Given a role exists with name: "writer"
   And a user exists with first_name: "Carlos", last_name: "Castaneda", role: that role

data/test/basepack_test_app/features/grid_panel_with_custom_primary_key.feature

@@ -3,13 +3,13 @@ Feature: Grid panel with custom primary key
   As a role
   I want feature
 
-  # @javascript
-  # Scenario: Inline editing
-  #   Given a book exists with title: "Book you are to write"
-  #   When I go to the BookWithCustomPrimaryKeyGrid test page
-  #   And I edit row 1 of the grid with title: "My fight club"
-  #   And I press "Apply"
-  #   And I wait for the response from the server
-  #   Then the grid should have 0 modified records
-  #   And a book_with_custom_primary_key should exist with title: "My fight club"
-  #   But a book should not exist with title: "Book you are to write"
+  @javascript
+  Scenario: Inline editing
+    Given a book_with_custom_primary_key exists with title: "Book you are to write"
+    When I go to the BookWithCustomPrimaryKeyGrid test page
+    And I edit row 1 of the grid with title: "My fight club"
+    And I press "Apply"
+    And I wait for the response from the server
+    Then the grid should have 0 modified records
+    And a book_with_custom_primary_key should exist with title: "My fight club"
+    But a book should not exist with title: "Book you are to write"

data/test/basepack_test_app/features/step_definitions/form_panel_steps.rb

@@ -5,7 +5,7 @@ When /^I expand combobox "([^"]*)"$/ do |combo_label|
     combo.onTriggerClick();
   JS
 
-  When "I wait for the response from the server"
+  step "I wait for the response from the server"
 end
 
 When /^I select "([^"]*)" from combobox "([^"]*)"$/ do |value, combo_label|

data/test/basepack_test_app/features/step_definitions/generic_steps.rb

@@ -36,7 +36,7 @@ Then /^the "([^"]*)" component should be hidden$/ do |id|
 end
 
 Then /^I should see "([^"]*)" within paging toolbar$/ do |text|
-  Then %Q{I should see "#{text}"}
+  step %Q{I should see "#{text}"}
   # Not working, as it checks the initial text property, not the actual one
   # page.driver.browser.execute_script(<<-JS).should == true
   #   Ext.ComponentQuery.query('pagingtoolbar')[0].query('tbtext[text="#{text}"]').length >= 1

data/test/basepack_test_app/features/step_definitions/grid_panel_steps.rb

@@ -46,7 +46,7 @@ When /^I enable filter on column "([^"]*)" with value "([^"]*)"$/ do |column, va
   page.driver.browser.execute_script <<-JS
     var grid = Ext.ComponentQuery.query('gridpanel')[0],
         filter;
-    grid.features[0].createFilters();
+    grid.filters.createFilters();
     filter = grid.filters.getFilter('#{column}');
     filter.setValue(#{value});
     filter.setActive(true);
@@ -60,7 +60,7 @@ When /^I enable date filter on column "([^"]*)" with value "([^"]*)"$/ do |colum
   page.driver.browser.execute_script <<-JS
     var grid = Ext.ComponentQuery.query('gridpanel')[0],
         filter, value;
-    grid.features[0].createFilters();
+    grid.filters.createFilters();
     filter = grid.filters.getFilter('#{column}');
     value = filter.getValue();
     value.#{operand} = new Date('#{date}'); // merge the new value with the current one
@@ -127,7 +127,7 @@ When /^I (?:drag|move) "([^"]*)" column before "([^"]*)"$/ do |header1, header2|
     cmp = Ext.ComponentQuery.query('gridpanel')[0];
     cmp.onColumnMove(null, null, #{indexi[0]}, #{indexi[1]});
   JS
-  When "I wait for the response from the server"
+  step "I wait for the response from the server"
 end
 
 Then /^I should see columns in order: "([^"]*)", "([^"]*)", "([^"]*)"$/ do |header1, header2, header3|
@@ -157,7 +157,7 @@ Then /^the grid should have records sorted by "([^"]*)"\s?(asc|desc)?$/ do |colu
         columnValues = [];
 
     grid.getStore().each(function(r){
-      var value = column.assoc ? r.get('_meta').associationValues[fieldName] : r.get(fieldName);
+      var value = column.assoc ? r.get('meta').associationValues[fieldName] : r.get(fieldName);
       if (value) columnValues.#{dir == "asc" ? "push" : "unshift"}(value);
     });
 

metadata

@@ -1,30 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: netzke-basepack
 version: !ruby/object:Gem::Version
-  version: 0.7.6
+  version: 0.7.7
   prerelease: 
 platform: ruby
 authors:
-- Denis Gorin
+- nomadcoder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-27 00:00:00.000000000 Z
+date: 2012-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: netzke-core
-  requirement: &70242119062840 !ruby/object:Gem::Requirement
+  requirement: &70189321485600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.6
+        version: 0.7.7
   type: :runtime
   prerelease: false
-  version_requirements: *70242119062840
+  version_requirements: *70189321485600
 description: A set of full-featured extendible Netzke components (such as FormPanel,
-  GridPanel, Window, BorderLayoutPanel, etc) which can be used as building block for
-  your RIA
+  GridPanel, Window, etc) which can be used as building block for your RIA
 email: nmcoder@gmail.com
 executables: []
 extensions: []
@@ -115,6 +114,7 @@ files:
 - lib/tasks/netzke_basepack_tasks.rake
 - locales/de.yml
 - locales/en.yml
+- locales/zh-cn.yml
 - netzke-basepack.gemspec
 - stylesheets/basepack.css
 - stylesheets/datetimefield.css
@@ -137,6 +137,7 @@ files:
 - test/basepack_test_app/app/components/book_grid_with_column_actions.rb
 - test/basepack_test_app/app/components/book_grid_with_custom_columns.rb
 - test/basepack_test_app/app/components/book_grid_with_default_values.rb
+- test/basepack_test_app/app/components/book_grid_with_defaults.rb
 - test/basepack_test_app/app/components/book_grid_with_extra_feedback.rb
 - test/basepack_test_app/app/components/book_grid_with_extra_filters.rb
 - test/basepack_test_app/app/components/book_grid_with_nested_attributes.rb
@@ -323,5 +324,5 @@ rubyforge_project:
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: Pre-built Rails + ExtJS components for your RIA
+summary: Pre-built Netzke for your RIA
 test_files: []