netzke-basepack 0.3.10 → 0.4.0

data/lib/netzke/grid_panel_extras/js_builder.rb

@@ -7,8 +7,7 @@ module Netzke
 
       def js_config
         res = super
-        # we pass column config at the time of instantiating the JS class
-        res.merge!(:columns => get_columns || config[:columns]) # first try to get columns from DB, then from config
+        res.merge!(:columns => columns)
         res.merge!(:data_class_name => config[:data_class_name])
         res
       end
@@ -83,7 +82,14 @@ module Netzke
               this.cmConfig.push(plugin);
           
             } else {
-              var editor = (c.readOnly || !config.permissions.update) ? null : Ext.netzke.editors[c.editor](c, config);
+              // editor is created by xtype stored in c.editor
+              var editor = (c.readOnly || !config.permissions.update) ? null : Ext.ComponentMgr.create({
+                xtype:c.editor, 
+                parentConfig:config, 
+                fieldConfig:c, 
+                selectOnFocus:true
+              });
+              
               var renderer = Ext.netzke.renderer(c.renderer);
 
               this.cmConfig.push(Ext.apply({
@@ -100,8 +106,7 @@ module Netzke
           }, this);
 
           var cm = new Ext.grid.ColumnModel(this.cmConfig);
-    
-          // this.addEvents("refresh");
+          cm.on('hiddenchange', this.onColumnHiddenChange, this);
     
           // Filters
           if (config.enableColumnFilters) {
@@ -114,9 +119,9 @@ module Netzke
           }
           
           config.bbar = (config.rowsPerPage) ? new Ext.PagingToolbar({
-            pageSize:config.rowsPerPage, 
-            items:["-", config.bbar], 
-            store:ds, 
+            pageSize : config.rowsPerPage, 
+            items : config.bbar ? ["-", config.bbar] : [], 
+            store : ds, 
             emptyMsg:'Empty'}) : config.bbar
     
           JS
@@ -136,7 +141,7 @@ module Netzke
                 // auto-load
                 if (this.initialConfig.autoLoadData) {
                   // if we have a paging toolbar, load the first page
-                  if (this.getBottomToolbar().changePage) {this.getBottomToolbar().changePage(0);} else {this.store.load();}
+                  if (this.getBottomToolbar() && this.getBottomToolbar().changePage) {this.getBottomToolbar().changePage(0);} else {this.store.load();}
                 }
               }
             JS
@@ -167,8 +172,6 @@ module Netzke
                 r.set('id', r.id); // otherwise later r.get('id') returns empty string
                 this.stopEditing();
                 this.store.add(r);
-                // this.store.newRecords = this.store.newRecords || []
-                // this.store.newRecords.push(r);
                 this.tryStartEditing(this.store.indexOf(r));
               }
             JS
@@ -189,7 +192,6 @@ module Netzke
                 var editableColumns = this.getColumnModel().getColumnsBy(function(columnConfig, index){
                   return !columnConfig.hidden && !!columnConfig.editor;
                 });
-                // console.info(editableColumns);
                 var firstEditableColumn = editableColumns[0];
                 if (firstEditableColumn){
                   this.startEditing(row, firstEditableColumn.id);
@@ -303,6 +305,18 @@ module Netzke
               }
             JS
       
+            :on_column_hidden_change => <<-JS.l,
+              function(cm, index, hidden){
+                Ext.Ajax.request({
+                  url:this.initialConfig.interface.hideColumn,
+                  params:{
+                    index:index,
+                    hidden:hidden
+                  }
+                });
+              }
+            JS
+      
             :on_column_move => <<-JS.l
               function(oldIndex, newIndex){
                 Ext.Ajax.request({
@@ -310,7 +324,22 @@ module Netzke
                   params:{
                     old_index:oldIndex,
                     new_index:newIndex
-                  }
+                  },
+                  success : function(response){
+                    // we need to reconfigure ArrayReader's recordType in order to correctly interprete
+                    // the new order of data fields coming from the server
+
+                    // we receive new record order from the server, which is less error-prone than trying to
+                    // blindly track the column order on the client side
+                    columns = Ext.decode(response.responseText).columns;
+                    columnsInNewOrder = [];
+                    Ext.each(columns, function(c){
+                      columnsInNewOrder.push({name:c});
+                    });
+                    newRecordType = Ext.data.Record.create(columnsInNewOrder);
+                    this.store.reader.recordType = newRecordType; // yes, recordType is a protected property, but that's the only way we can do it, and it seems to work
+                  },
+                  scope : this
                 });
               }
             JS

data/lib/netzke/property_editor_extras/helper_model.rb

@@ -6,7 +6,8 @@ module Netzke
       end
   
       def self.exposed_columns
-        preferences = NetzkePreference.find_all_by_widget_name_and_user_id(@@widget_name, Netzke::Base.user && Netzke::Base.user.id)
+        # preferences = NetzkePreference.find_all_by_widget_name_and_user_id(@@widget_name, Netzke::Base.user && Netzke::Base.user.id)
+        preferences = NetzkePreference.find_all_for_widget(@@widget_name)
         preferences.map{|p| {
           :name => p.name,
           :field_label => p.name.gsub('__', "/").humanize,

data/lib/netzke/tab_panel.rb

@@ -20,10 +20,9 @@ module Netzke
         :load_item_widget => <<-JS.l
           function(panel) {
             if (!panel.getWidget()) {
-              if (panel.id === this.id+"_active"){
-                // active widget only needs to be instantiated, as its class has been loaded already
-                var activeItemConfig = this.initialConfig[panel.widget+"Config"];
-                panel.add(new Ext.netzke.cache[activeItemConfig.widgetClassName](activeItemConfig));
+              if (preloadedItemConfig = this.initialConfig[panel.widget+"Config"]){
+                // preloaded widget only needs to be instantiated, as its class and configuration have already been loaded
+                panel.add(new Ext.netzke.cache[preloadedItemConfig.widgetClassName](preloadedItemConfig));
                 panel.doLayout(); // always needed after adding a component
               } else {
                 // load the widget from the server
@@ -35,11 +34,16 @@ module Netzke
       }
     end
     
+    def items
+      @items ||= config[:items]
+    end
+
     def js_config
-      active_item_config = config[:items].detect{|i| i[:active]}
+      # active_item_config = items.detect{|i| i[:active]}
       super.merge({
         :items => fit_panels,
-        :active_tab => active_item_config && id_name + '_active'
+        :active_tab => id_name + '_active'
+        # :active_tab => active_item_config && id_name + '_active'
       })
     end
 
@@ -50,7 +54,7 @@ module Netzke
       # to remove duplicated active panels
       seen_active = false
 
-      config[:items].each_with_index do |item, i|
+      items.each_with_index do |item, i|
         # if the item is provided without a name, give it a generated name
         item[:name] ||= "item#{i}"
 
@@ -65,8 +69,8 @@ module Netzke
     # the items are late aggregatees, besides the one that is configured active
     def initial_aggregatees
       res = {}
-      config[:items].each_with_index do |item, i|
-        item[:late_aggregation] = !item[:active]
+      items.each_with_index do |item, i|
+        item[:late_aggregation] = !item[:active] && !item[:preloaded]
         res.merge!(item[:name].to_sym => item)
       end
       res
@@ -74,7 +78,7 @@ module Netzke
 
     def self.js_default_config
       super.merge({
-        :id_delimiter => "___", # the default is "__", and it conflicts with Netzke
+        :id_delimiter => "___", # the default is "__", which conflicts with Netzke
         :defaults => {:layout => 'fit'}, # all tabs will be Ext.Panel-s with layout 'fit' ("fit-panels")
         :listeners => {
           # when tab is activated, its content gets loaded from the server
@@ -91,7 +95,7 @@ module Netzke
     
     def fit_panels
       res = []
-      config[:items].each_with_index do |item, i|
+      items.each_with_index do |item, i|
         item_config = {
           :id => item[:active] && id_name + '_active',
           :title => item[:title] || (item[:name] && item[:name].humanize),

data/netzke-basepack.gemspec

@@ -2,37 +2,37 @@
 
 Gem::Specification.new do |s|
   s.name = %q{netzke-basepack}
-  s.version = "0.3.10"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sergei Kozlov"]
-  s.date = %q{2009-04-17}
+  s.date = %q{2009-05-07}
   s.description = %q{Base Netzke widgets - grid, form, tree, and more}
   s.email = %q{sergei@writelesscode.com}
-  s.extra_rdoc_files = ["CHANGELOG", "lib/app/models/netzke_form_panel_field.rb", "lib/app/models/netzke_grid_panel_column.rb", "lib/netzke/accordion_panel.rb", "lib/netzke/ar_ext.rb", "lib/netzke/basic_app.rb", "lib/netzke/border_layout_panel.rb", "lib/netzke/configuration_tool.rb", "lib/netzke/container.rb", "lib/netzke/db_fields.rb", "lib/netzke/fields_configurator.rb", "lib/netzke/form_panel.rb", "lib/netzke/form_panel_extras/interface.rb", "lib/netzke/form_panel_extras/javascripts/xcheckbox.js", "lib/netzke/form_panel_extras/javascripts/xdatetime.js", "lib/netzke/form_panel_extras/js_builder.rb", "lib/netzke/grid_panel.rb", "lib/netzke/grid_panel_extras/interface.rb", "lib/netzke/grid_panel_extras/javascripts/check-column.js", "lib/netzke/grid_panel_extras/javascripts/filters.js", "lib/netzke/grid_panel_extras/js_builder.rb", "lib/netzke/panel.rb", "lib/netzke/property_editor.rb", "lib/netzke/property_editor_extras/helper_model.rb", "lib/netzke/tab_panel.rb", "lib/netzke/table_editor.rb", "lib/netzke/tree_panel.rb", "lib/netzke/wrapper.rb", "lib/netzke-basepack.rb", "LICENSE", "README.rdoc", "tasks/netzke_basepack_tasks.rake", "TODO"]
-  s.files = ["CHANGELOG", "generators/netzke_basepack/netzke_basepack_generator.rb", "generators/netzke_basepack/USAGE", "generators/netzke_form_panel/netzke_form_panel_generator.rb", "generators/netzke_form_panel/templates/create_netzke_form_panel_fields.rb", "generators/netzke_grid_panel/netzke_grid_panel_generator.rb", "generators/netzke_grid_panel/templates/create_netzke_grid_panel_columns.rb", "init.rb", "install.rb", "javascripts/basepack.js", "lib/app/models/netzke_form_panel_field.rb", "lib/app/models/netzke_grid_panel_column.rb", "lib/netzke/accordion_panel.rb", "lib/netzke/ar_ext.rb", "lib/netzke/basic_app.rb", "lib/netzke/border_layout_panel.rb", "lib/netzke/configuration_tool.rb", "lib/netzke/container.rb", "lib/netzke/db_fields.rb", "lib/netzke/fields_configurator.rb", "lib/netzke/form_panel.rb", "lib/netzke/form_panel_extras/interface.rb", "lib/netzke/form_panel_extras/javascripts/xcheckbox.js", "lib/netzke/form_panel_extras/javascripts/xdatetime.js", "lib/netzke/form_panel_extras/js_builder.rb", "lib/netzke/grid_panel.rb", "lib/netzke/grid_panel_extras/interface.rb", "lib/netzke/grid_panel_extras/javascripts/check-column.js", "lib/netzke/grid_panel_extras/javascripts/filters.js", "lib/netzke/grid_panel_extras/js_builder.rb", "lib/netzke/panel.rb", "lib/netzke/property_editor.rb", "lib/netzke/property_editor_extras/helper_model.rb", "lib/netzke/tab_panel.rb", "lib/netzke/table_editor.rb", "lib/netzke/tree_panel.rb", "lib/netzke/wrapper.rb", "lib/netzke-basepack.rb", "LICENSE", "Manifest", "Rakefile", "README.rdoc", "stylesheets/basepack.css", "tasks/netzke_basepack_tasks.rake", "test/accordion_panel_test.rb", "test/app_root/app/controllers/application.rb", "test/app_root/app/models/book.rb", "test/app_root/app/models/category.rb", "test/app_root/app/models/city.rb", "test/app_root/app/models/continent.rb", "test/app_root/app/models/country.rb", "test/app_root/app/models/genre.rb", "test/app_root/config/boot.rb", "test/app_root/config/database.yml", "test/app_root/config/environment.rb", "test/app_root/config/environments/in_memory.rb", "test/app_root/config/environments/mysql.rb", "test/app_root/config/environments/postgresql.rb", "test/app_root/config/environments/sqlite.rb", "test/app_root/config/environments/sqlite3.rb", "test/app_root/config/routes.rb", "test/app_root/db/migrate/20081222033343_create_books.rb", "test/app_root/db/migrate/20081222033440_create_genres.rb", "test/app_root/db/migrate/20081222035855_create_netzke_preferences.rb", "test/app_root/db/migrate/20081223024935_create_categories.rb", "test/app_root/db/migrate/20081223025635_create_countries.rb", "test/app_root/db/migrate/20081223025653_create_continents.rb", "test/app_root/db/migrate/20081223025732_create_cities.rb", "test/app_root/db/migrate/20090102223630_create_netzke_layouts.rb", "test/app_root/db/migrate/20090102223811_create_netzke_grid_panel_columns.rb", "test/app_root/script/console", "test/app_root/vendor/plugins/acts_as_list/init.rb", "test/app_root/vendor/plugins/acts_as_list/lib/active_record/acts/list.rb", "test/app_root/vendor/plugins/acts_as_list/README", "test/ar_ext_test.rb", "test/border_layout_panel_test.rb", "test/console_with_fixtures.rb", "test/fixtures/books.yml", "test/fixtures/categories.yml", "test/fixtures/cities.yml", "test/fixtures/continents.yml", "test/fixtures/countries.yml", "test/fixtures/genres.yml", "test/grid_panel_test.rb", "test/netzke_basepack_test.rb", "test/schema.rb", "test/tab_panel_test.rb", "test/test_helper.rb", "TODO", "uninstall.rb", "netzke-basepack.gemspec"]
+  s.extra_rdoc_files = ["CHANGELOG", "lib/app/models/netzke_hash_record.rb", "lib/app/models/netzke_layout_item.rb", "lib/netzke/accordion_panel.rb", "lib/netzke/ar_ext.rb", "lib/netzke/basic_app.rb", "lib/netzke/border_layout_panel.rb", "lib/netzke/configuration_tool.rb", "lib/netzke/container.rb", "lib/netzke/db_fields.rb", "lib/netzke/field_model.rb", "lib/netzke/fields_configurator.rb", "lib/netzke/fields_configurator_old.rb", "lib/netzke/form_panel.rb", "lib/netzke/form_panel_extras/interface.rb", "lib/netzke/form_panel_extras/javascripts/xcheckbox.js", "lib/netzke/form_panel_extras/js_builder.rb", "lib/netzke/grid_panel.rb", "lib/netzke/grid_panel_extras/interface.rb", "lib/netzke/grid_panel_extras/javascripts/check-column.js", "lib/netzke/grid_panel_extras/javascripts/filters.js", "lib/netzke/grid_panel_extras/js_builder.rb", "lib/netzke/panel.rb", "lib/netzke/property_editor.rb", "lib/netzke/property_editor_extras/helper_model.rb", "lib/netzke/tab_panel.rb", "lib/netzke/table_editor.rb", "lib/netzke/tree_panel.rb", "lib/netzke/wrapper.rb", "lib/netzke-basepack.rb", "LICENSE", "README.rdoc", "tasks/netzke_basepack_tasks.rake", "TODO"]
+  s.files = ["autotest/discover.rb", "CHANGELOG", "init.rb", "install.rb", "javascripts/basepack.js", "lib/app/models/netzke_hash_record.rb", "lib/app/models/netzke_layout_item.rb", "lib/netzke/accordion_panel.rb", "lib/netzke/ar_ext.rb", "lib/netzke/basic_app.rb", "lib/netzke/border_layout_panel.rb", "lib/netzke/configuration_tool.rb", "lib/netzke/container.rb", "lib/netzke/db_fields.rb", "lib/netzke/field_model.rb", "lib/netzke/fields_configurator.rb", "lib/netzke/fields_configurator_old.rb", "lib/netzke/form_panel.rb", "lib/netzke/form_panel_extras/interface.rb", "lib/netzke/form_panel_extras/javascripts/xcheckbox.js", "lib/netzke/form_panel_extras/js_builder.rb", "lib/netzke/grid_panel.rb", "lib/netzke/grid_panel_extras/interface.rb", "lib/netzke/grid_panel_extras/javascripts/check-column.js", "lib/netzke/grid_panel_extras/javascripts/filters.js", "lib/netzke/grid_panel_extras/js_builder.rb", "lib/netzke/panel.rb", "lib/netzke/property_editor.rb", "lib/netzke/property_editor_extras/helper_model.rb", "lib/netzke/tab_panel.rb", "lib/netzke/table_editor.rb", "lib/netzke/tree_panel.rb", "lib/netzke/wrapper.rb", "lib/netzke-basepack.rb", "LICENSE", "Manifest", "Rakefile", "README.rdoc", "stylesheets/basepack.css", "tasks/netzke_basepack_tasks.rake", "test/app_root/app/controllers/application.rb", "test/app_root/app/models/book.rb", "test/app_root/app/models/category.rb", "test/app_root/app/models/city.rb", "test/app_root/app/models/continent.rb", "test/app_root/app/models/country.rb", "test/app_root/app/models/genre.rb", "test/app_root/config/boot.rb", "test/app_root/config/database.yml", "test/app_root/config/environment.rb", "test/app_root/config/environments/in_memory.rb", "test/app_root/config/environments/mysql.rb", "test/app_root/config/environments/postgresql.rb", "test/app_root/config/environments/sqlite.rb", "test/app_root/config/environments/sqlite3.rb", "test/app_root/config/routes.rb", "test/app_root/db/migrate/20081222033343_create_books.rb", "test/app_root/db/migrate/20081222033440_create_genres.rb", "test/app_root/db/migrate/20081222035855_create_netzke_preferences.rb", "test/app_root/db/migrate/20081223024935_create_categories.rb", "test/app_root/db/migrate/20081223025635_create_countries.rb", "test/app_root/db/migrate/20081223025653_create_continents.rb", "test/app_root/db/migrate/20081223025732_create_cities.rb", "test/app_root/db/migrate/20090102223630_create_netzke_layouts.rb", "test/app_root/script/console", "test/app_root/vendor/plugins/acts_as_list/init.rb", "test/app_root/vendor/plugins/acts_as_list/lib/active_record/acts/list.rb", "test/app_root/vendor/plugins/acts_as_list/README", "test/console_with_fixtures.rb", "test/fixtures/books.yml", "test/fixtures/categories.yml", "test/fixtures/cities.yml", "test/fixtures/continents.yml", "test/fixtures/countries.yml", "test/fixtures/genres.yml", "test/schema.rb", "test/test_helper.rb", "test/unit/accordion_panel_test.rb", "test/unit/ar_ext_test.rb", "test/unit/grid_panel_test.rb", "test/unit/netzke_basepack_test.rb", "test/unit/netzke_hash_record_test.rb", "test/unit/netzke_layout_item_test.rb", "test/unit/tab_panel_test.rb", "TODO", "uninstall.rb", "netzke-basepack.gemspec"]
   s.has_rdoc = true
   s.homepage = %q{http://writelesscode.com}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Netzke-basepack", "--main", "README.rdoc"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{netzke-basepack}
-  s.rubygems_version = %q{1.3.1}
+  s.rubygems_version = %q{1.3.2}
   s.summary = %q{Base Netzke widgets - grid, form, tree, and more}
-  s.test_files = ["test/accordion_panel_test.rb", "test/ar_ext_test.rb", "test/border_layout_panel_test.rb", "test/grid_panel_test.rb", "test/netzke_basepack_test.rb", "test/tab_panel_test.rb"]
+  s.test_files = ["test/unit/accordion_panel_test.rb", "test/unit/ar_ext_test.rb", "test/unit/grid_panel_test.rb", "test/unit/netzke_basepack_test.rb", "test/unit/netzke_hash_record_test.rb", "test/unit/netzke_layout_item_test.rb", "test/unit/tab_panel_test.rb"]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 2
+    s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<searchlogic>, [">= 1.6.2"])
-      s.add_runtime_dependency(%q<netzke-core>, [">= 0", "= 0.2.11"])
+      s.add_runtime_dependency(%q<netzke-core>, [">= 0", "= 0.3.0"])
     else
       s.add_dependency(%q<searchlogic>, [">= 1.6.2"])
-      s.add_dependency(%q<netzke-core>, [">= 0", "= 0.2.11"])
+      s.add_dependency(%q<netzke-core>, [">= 0", "= 0.3.0"])
     end
   else
     s.add_dependency(%q<searchlogic>, [">= 1.6.2"])
-    s.add_dependency(%q<netzke-core>, [">= 0", "= 0.2.11"])
+    s.add_dependency(%q<netzke-core>, [">= 0", "= 0.3.0"])
   end
 end

data/test/{ar_ext_test.rb → unit/ar_ext_test.rb}

@@ -9,29 +9,23 @@ class ArExtTest < ActiveSupport::TestCase
     cc = Book.default_column_config(:title)
     
     assert_equal("Title", cc[:label])
-    assert_equal(:text_field, cc[:editor])
+    assert_equal(:textfield, cc[:editor])
     assert(!cc[:height])
 
     cc = Book.default_column_config({:name => :amount, :label => 'AMOUNT'})
     
     assert_equal("AMOUNT", cc[:label])
-    assert_equal(:number_field, cc[:editor])
+    assert_equal(:numberfield, cc[:editor])
     
     cc = Book.default_column_config(:genre_id)
     assert_equal("genre__name", cc[:name])
-    assert_equal(:combo_box, cc[:editor])
+    assert_equal(:combobox, cc[:editor])
 
     cc = Book.default_column_config(:genre__popular)
     assert_equal(:checkbox, cc[:editor])
-    
-    cc = Book.default_column_config(:title)
-    
-    # cc = Book.default_field_config(:title)
-    # assert(cc[:height])
   end
   
   test "choices for column" do
-    # TODO: test virtual columns, too
     cities = City.choices_for("name")
     assert_equal(3, cities.size)
     assert(cities.include?('Cordoba') && cities.include?('Buenos Aires'))

data/test/{grid_panel_test.rb → unit/grid_panel_test.rb}

@@ -17,11 +17,6 @@ require 'netzke/ar_ext'
 
 class GridPanelTest < ActiveSupport::TestCase
   
-  test "class configuration" do
-    assert_equal(NetzkeGridPanelColumn, Netzke::GridPanel.column_manager_class)
-    assert_equal(NetzkeLayout, Netzke::GridPanel.layout_manager_class)
-  end
-  
   test "interface" do
     grid = Netzke::GridPanel.new(:name => 'grid', :data_class_name => 'Book', :layout_manager => false, :columns => [:id, :title, :recent])
 

data/test/unit/netzke_hash_record_test.rb

@@ -0,0 +1,52 @@
+require 'test_helper'
+class NetzkeHashRecordTest < ActiveSupport::TestCase
+  test "adding records" do
+    ahr = NetzkeHashRecord
+    ahr.widget = "my_widget"
+    assert_equal({}, ahr.columns_hash)
+    
+    # add a record
+    r = ahr.new
+    r.save
+    assert_equal(1, ahr.count)
+    
+    # delete all
+    ahr.delete_all
+    assert_equal(0, ahr.count)
+    
+    r = ahr.new({:name => 'One', :amount => 100, :approved => true})
+    r.save
+    r = ahr.new({:name => 'Two', :amount => 200, :approved => false})
+    r.save
+    
+    assert_equal(2, ahr.count)
+    assert_equal("One", ahr.first.name)
+    assert_equal(100, ahr.first.amount)
+    assert_equal(true, ahr.first.approved)
+    assert_equal("Two", ahr.last.name)
+    assert_equal(200, ahr.last.amount)
+    assert_equal(false, ahr.last.approved)
+    
+    r = ahr.new({:name => 'Three', :amount => 300, :approved => true})
+    r.save
+    
+    assert_equal(3, ahr.all.size) # add 3rd record
+    
+    # find
+    assert_equal("One", ahr.find(1).name)
+    assert_equal("Three", ahr.find(3).name)
+
+    # deleting records
+    ahr.delete([1,2])
+    assert_equal(1, ahr.count)
+    assert_equal("Three", ahr.last.name)
+    assert_equal(1, ahr.last.id)
+    
+    # modifying records
+    r = ahr.first
+    r.name = "New name"
+    r.save
+    
+    assert_equal("New name", ahr.first.name)
+  end
+end

data/test/unit/netzke_layout_item_test.rb

@@ -0,0 +1,28 @@
+require 'test_helper'
+class NetzkeLayoutItemTest < ActiveSupport::TestCase
+  test "moving records" do
+    nli = NetzkeLayoutItem
+    nli.widget = "my_widget"
+    nli.delete_all
+    
+    nli.new({:name => "One"}).save
+    nli.new({:name => "Two"}).save
+    nli.new({:name => "Three"}).save
+    
+    nli.move_item(0,1)
+    assert_equal(%w{ Two One Three }, nli.all.map(&:name))
+    
+    nli.move_item(2,1)
+    assert_equal(%w{ Two Three One }, nli.all.map(&:name))
+    
+    nli.move_item(0,2)
+    assert_equal(%w{ Three One Two }, nli.all.map(&:name))
+    
+    nli.move_item(2,0)
+    assert_equal(%w{ Two Three One }, nli.all.map(&:name))
+    
+    nli.save
+    nli.reload
+    assert_equal(%w{ Two Three One }, nli.all.map(&:name))
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: netzke-basepack
 version: !ruby/object:Gem::Version 
-  version: 0.3.10
+  version: 0.4.0
 platform: ruby
 authors: 
 - Sergei Kozlov
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-17 00:00:00 -04:00
+date: 2009-05-07 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -33,7 +33,7 @@ dependencies:
         version: "0"
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.2.11
+        version: 0.3.0
     version: 
 description: Base Netzke widgets - grid, form, tree, and more
 email: sergei@writelesscode.com
@@ -43,8 +43,8 @@ extensions: []
 
 extra_rdoc_files: 
 - CHANGELOG
-- lib/app/models/netzke_form_panel_field.rb
-- lib/app/models/netzke_grid_panel_column.rb
+- lib/app/models/netzke_hash_record.rb
+- lib/app/models/netzke_layout_item.rb
 - lib/netzke/accordion_panel.rb
 - lib/netzke/ar_ext.rb
 - lib/netzke/basic_app.rb
@@ -52,11 +52,12 @@ extra_rdoc_files:
 - lib/netzke/configuration_tool.rb
 - lib/netzke/container.rb
 - lib/netzke/db_fields.rb
+- lib/netzke/field_model.rb
 - lib/netzke/fields_configurator.rb
+- lib/netzke/fields_configurator_old.rb
 - lib/netzke/form_panel.rb
 - lib/netzke/form_panel_extras/interface.rb
 - lib/netzke/form_panel_extras/javascripts/xcheckbox.js
-- lib/netzke/form_panel_extras/javascripts/xdatetime.js
 - lib/netzke/form_panel_extras/js_builder.rb
 - lib/netzke/grid_panel.rb
 - lib/netzke/grid_panel_extras/interface.rb
@@ -76,18 +77,13 @@ extra_rdoc_files:
 - tasks/netzke_basepack_tasks.rake
 - TODO
 files: 
+- autotest/discover.rb
 - CHANGELOG
-- generators/netzke_basepack/netzke_basepack_generator.rb
-- generators/netzke_basepack/USAGE
-- generators/netzke_form_panel/netzke_form_panel_generator.rb
-- generators/netzke_form_panel/templates/create_netzke_form_panel_fields.rb
-- generators/netzke_grid_panel/netzke_grid_panel_generator.rb
-- generators/netzke_grid_panel/templates/create_netzke_grid_panel_columns.rb
 - init.rb
 - install.rb
 - javascripts/basepack.js
-- lib/app/models/netzke_form_panel_field.rb
-- lib/app/models/netzke_grid_panel_column.rb
+- lib/app/models/netzke_hash_record.rb
+- lib/app/models/netzke_layout_item.rb
 - lib/netzke/accordion_panel.rb
 - lib/netzke/ar_ext.rb
 - lib/netzke/basic_app.rb
@@ -95,11 +91,12 @@ files:
 - lib/netzke/configuration_tool.rb
 - lib/netzke/container.rb
 - lib/netzke/db_fields.rb
+- lib/netzke/field_model.rb
 - lib/netzke/fields_configurator.rb
+- lib/netzke/fields_configurator_old.rb
 - lib/netzke/form_panel.rb
 - lib/netzke/form_panel_extras/interface.rb
 - lib/netzke/form_panel_extras/javascripts/xcheckbox.js
-- lib/netzke/form_panel_extras/javascripts/xdatetime.js
 - lib/netzke/form_panel_extras/js_builder.rb
 - lib/netzke/grid_panel.rb
 - lib/netzke/grid_panel_extras/interface.rb
@@ -120,7 +117,6 @@ files:
 - README.rdoc
 - stylesheets/basepack.css
 - tasks/netzke_basepack_tasks.rake
-- test/accordion_panel_test.rb
 - test/app_root/app/controllers/application.rb
 - test/app_root/app/models/book.rb
 - test/app_root/app/models/category.rb
@@ -145,13 +141,10 @@ files:
 - test/app_root/db/migrate/20081223025653_create_continents.rb
 - test/app_root/db/migrate/20081223025732_create_cities.rb
 - test/app_root/db/migrate/20090102223630_create_netzke_layouts.rb
-- test/app_root/db/migrate/20090102223811_create_netzke_grid_panel_columns.rb
 - test/app_root/script/console
 - test/app_root/vendor/plugins/acts_as_list/init.rb
 - test/app_root/vendor/plugins/acts_as_list/lib/active_record/acts/list.rb
 - test/app_root/vendor/plugins/acts_as_list/README
-- test/ar_ext_test.rb
-- test/border_layout_panel_test.rb
 - test/console_with_fixtures.rb
 - test/fixtures/books.yml
 - test/fixtures/categories.yml
@@ -159,16 +152,22 @@ files:
 - test/fixtures/continents.yml
 - test/fixtures/countries.yml
 - test/fixtures/genres.yml
-- test/grid_panel_test.rb
-- test/netzke_basepack_test.rb
 - test/schema.rb
-- test/tab_panel_test.rb
 - test/test_helper.rb
+- test/unit/accordion_panel_test.rb
+- test/unit/ar_ext_test.rb
+- test/unit/grid_panel_test.rb
+- test/unit/netzke_basepack_test.rb
+- test/unit/netzke_hash_record_test.rb
+- test/unit/netzke_layout_item_test.rb
+- test/unit/tab_panel_test.rb
 - TODO
 - uninstall.rb
 - netzke-basepack.gemspec
 has_rdoc: true
 homepage: http://writelesscode.com
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --line-numbers
@@ -194,14 +193,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: netzke-basepack
-rubygems_version: 1.3.1
+rubygems_version: 1.3.2
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Base Netzke widgets - grid, form, tree, and more
 test_files: 
-- test/accordion_panel_test.rb
-- test/ar_ext_test.rb
-- test/border_layout_panel_test.rb
-- test/grid_panel_test.rb
-- test/netzke_basepack_test.rb
-- test/tab_panel_test.rb
+- test/unit/accordion_panel_test.rb
+- test/unit/ar_ext_test.rb
+- test/unit/grid_panel_test.rb
+- test/unit/netzke_basepack_test.rb
+- test/unit/netzke_hash_record_test.rb
+- test/unit/netzke_layout_item_test.rb
+- test/unit/tab_panel_test.rb