netzke-basepack 0.6.5 → 0.7.0

data/test/rails_app/features/paging_form_panel.feature

@@ -15,9 +15,11 @@ Scenario: Paging through records
   Then I should see "Journey to Ixtlan"
 
   When I go forward one page
+  And  I wait for the response from the server
   Then the form should show title: "Lolita"
 
   When I go forward one page
+  And  I wait for the response from the server
   Then the form should show title: "Getting Things Done"
 
 @javascript
@@ -51,3 +53,15 @@ Scenario: Editing and immediately submitting the form
   And I press "Apply"
   And I wait for the response from the server
   Then the form should show author__name: "Castaneda, Carlos"
+
+@javascript
+Scenario: I must see total records value
+  Given the following books exist:
+  | title               |
+  | Journey to Ixtlan   |
+  | Lolita              |
+  | Getting Things Done |
+
+  When I go to the BookPagingFormPanel test page
+  Then I should see "of 3" within paging toolbar
+

data/test/rails_app/features/search_in_grid.feature

@@ -22,9 +22,10 @@ Feature: Search
     Then the grid should show 4 records
 
     When I press "Search"
-    And I wait for the response from the server
+    And I wait 1 second
     And I expand combobox "undefined_attr"
     And I select "First name" from combobox "undefined_attr"
+    And I wait 1 second
     And I fill in "first_name_value" with "ai"
     And I press "Search" within "#user_grid__search_form"
     And I sleep 1 second

data/test/rails_app/features/simple_app.feature

@@ -8,3 +8,8 @@ Scenario: SimpleApp should load its components dynamically
   Given I am on the SomeSimpleApp test page
   When I press "Simple accordion"
   Then I should see "Some simple app simple accordion"
+  # TODO: there's a problem with dynamic loading of the grid: "event is undefined" as we try to load something AFTER loading grid
+  # When I press "User grid"
+  # Then I should see "Users"
+  When I press "Simple tab panel"
+  Then I should see "Some simple app simple tab panel"

data/test/rails_app/features/step_definitions/accordion_steps.rb

@@ -1,9 +1,5 @@
 When /^I expand "([^"]*)"$/ do |arg1|
   page.driver.browser.execute_script <<-JS
-    var components = [];
-    for (var cmp in Netzke.page) { components.push(cmp); }
-    var accordion = Netzke.page[components[0]];
-    var panelToExpand = accordion.items.find(function(i){return i.title == '#{arg1}';});
-    panelToExpand.expand();
+    Ext.ComponentQuery.query('panel[title="#{arg1}"]')[0].expand();
   JS
 end

data/test/rails_app/features/step_definitions/ext_steps.rb

@@ -0,0 +1,16 @@
+When /^(?:|I )check ext checkbox "([^"]*)"$/ do |field|
+  page.driver.browser.execute_script <<-JS
+    var checkbox = Ext.ComponentQuery.query("checkboxfield[fieldLabel='#{field}']")[0];
+    checkbox = checkbox || Ext.ComponentQuery.query("checkboxfield[boxLabel='#{field}']")[0];
+    checkbox.setValue(true);
+  JS
+end
+
+Then /^ext "([^"]*)" checkbox should(| not) be checked$/ do |name, arg|
+  page.driver.browser.execute_script(<<-JS).should == arg.eql?("")
+    var checkbox = Ext.ComponentQuery.query('checkboxfield[boxLabel="#{name}"]')[0];
+    checkbox = checkbox || Ext.ComponentQuery.query('checkboxfield[fieldLabel="#{name}"]')[0];
+
+    return checkbox.getValue();
+  JS
+end

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

@@ -1,7 +1,7 @@
 When /^I expand combobox "([^"]*)"$/ do |combo_label|
   page.driver.browser.execute_script <<-JS
-    var combo = Ext.ComponentMgr.all.filter('fieldLabel', '#{combo_label}').first();
-    combo = combo || Ext.ComponentMgr.all.filter('name', '#{combo_label}').first();
+    var combo = Ext.ComponentQuery.query("combobox[fieldLabel='#{combo_label}']")[0];
+    combo = combo || Ext.ComponentQuery.query("combobox[name='#{combo_label}']")[0];
     combo.onTriggerClick();
   JS
 
@@ -10,26 +10,24 @@ end
 
 When /^I select "([^"]*)" from combobox "([^"]*)"$/ do |value, combo_label|
   page.driver.browser.execute_script <<-JS
-    var combo = Ext.ComponentMgr.all.filter('fieldLabel', '#{combo_label}').first();
-    combo = combo || Ext.ComponentMgr.all.filter('name', '#{combo_label}').first();
-    var index = combo.getStore().find('field2', '#{value}');
-    combo.select(index);
-    combo.onViewClick(false);
+    var combo = Ext.ComponentQuery.query("combobox[fieldLabel='#{combo_label}']")[0];
+    combo = combo || Ext.ComponentQuery.query("combobox[name='#{combo_label}']")[0];
+    var rec = combo.findRecordByDisplay('#{value}');
+    combo.select( rec );
+    combo.fireEvent('select', combo, rec );
   JS
 end
 
 Then /the form should show #{capture_fields}$/ do |fields|
   fields = ActiveSupport::JSON.decode("{#{fields}}")
   page.driver.browser.execute_script(<<-JS).should == true
-    var components = [];
-    for (var cmp in Netzke.page) { components.push(cmp); }
-    var form = Netzke.page[components[0]].getForm();
+    var form = Ext.ComponentQuery.query('form')[0].getForm();
     var result = true;
     var values = #{fields.to_json};
     for (var fieldName in values) {
-      result = form.findField(fieldName).getValue() === values[fieldName] || form.findField(fieldName).getRawValue() === values[fieldName];
+      result = (form.findField(fieldName).getValue() === values[fieldName]) || (form.findField(fieldName).getRawValue() === values[fieldName]);
       return result;
     }
     return result;
   JS
-end
+end

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

@@ -10,17 +10,17 @@ Then /^button "([^"]*)" should be disabled$/ do |arg1|
   Netzke.should be # PENDING!
 end
 
-When /I sleep (\d+) seconds?/ do |arg1|
-  sleep arg1.to_i
+When /I (?:sleep|wait) (\d+) (\w+)/ do |amount, unit|
+  sleep amount.to_i.send(unit)
 end
 
 When /^I wait for the response from the server$/ do
-  page.wait_until{ page.driver.browser.execute_script("return !Ext.Ajax.isLoading();") }
+  page.wait_until{ page.driver.browser.execute_script("return !Netzke.ajaxIsLoading()") }
 end
 
 When /^I go forward one page$/ do
   page.driver.browser.execute_script(<<-JS)
-    var toolbar = Ext.ComponentMgr.all.find(function(c){ return c.getXType() === 'paging'});
+    var toolbar = Ext.ComponentQuery.query('pagingtoolbar')[0];
     toolbar.moveNext();
   JS
   page.wait_until{ page.driver.browser.execute_script("return !Ext.Ajax.isLoading();") }
@@ -32,3 +32,11 @@ Then /^the "([^"]*)" component should be hidden$/ do |id|
     return cmp.isVisible();
   JS
 end
+
+Then /^I should see "([^"]*)" within paging toolbar$/ do |text|
+  Then %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
+  # JS
+end

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

@@ -1,9 +1,6 @@
 When /^I select first row in the grid$/ do
   page.driver.browser.execute_script <<-JS
-    var components = [];
-    for (var cmp in Netzke.page) { components.push(cmp); }
-    var grid = Netzke.page[components[0]];
-    grid.getSelectionModel().selectFirstRow();
+    Ext.ComponentQuery.query('gridpanel')[0].getSelectionModel().select(0);
   JS
 end
 
@@ -41,22 +38,22 @@ end
 
 Then /^the grid should have (\d+) modified records$/ do |n|
   page.driver.browser.execute_script(<<-JS).should == n.to_i
-    var components = [];
-    for (var cmp in Netzke.page) { components.push(cmp); }
-    var grid = Netzke.page[components[0]];
-    return grid.getStore().getModifiedRecords().length;
+    return Ext.ComponentQuery.query('gridpanel')[0].getStore().getUpdatedRecords().length;
   JS
 end
 
 When /^I enable filter on column "([^"]*)" with value "([^"]*)"$/ do |column, value|
   page.driver.browser.execute_script <<-JS
-    var components = [];
-    for (var cmp in Netzke.page) { components.push(cmp); }
-    var grid = Netzke.page[components[0]];
-    var filter = grid.filters.getFilter(grid.getColumnModel().getDataIndex(grid.getColumnModel().findColumnIndex('#{column}')));
+    var grid = Ext.ComponentQuery.query('gridpanel')[0],
+        filter;
+    while (!(filter = grid.filters.getFilter('#{column}'))) {
+      // Need to show the menu once, as only then the filters get created
+      grid.headerCt.getMenu().showBy(grid.headerCt.items.first());
+    }
     filter.setValue(#{value});
     filter.setActive(true);
   JS
+  sleep 1
 end
 
 When /^I clear all filters in the grid$/ do
@@ -70,35 +67,33 @@ end
 
 When /^I expand combobox "([^"]*)" in row (\d+) of the grid$/ do |field, row|
   page.driver.browser.execute_script <<-JS
-    var components = [];
-    for (var cmp in Netzke.page) { components.push(cmp); }
-    var grid = Netzke.page[components[0]];
-    var colId = grid.getColumnModel().findColumnIndex("#{field}");
-    var col = grid.getColumnModel().getColumnById(colId);
-    grid.startEditing(#{row.to_i - 1}, colId);
-    col.editor.onTriggerClick();
+    var grid    = Ext.ComponentQuery.query('gridpanel')[0],
+        editor  = grid.getPlugin('celleditor');
+
+    editor.startEditByPosition({ row:#{row.to_i-1}, column:grid.headerCt.items.findIndex('name', '#{field}') });
   JS
+
+  sleep 0.5
+
+  page.driver.browser.execute_script("Ext.ComponentQuery.query('netzkeremotecombo')[0].onTriggerClick();");
 end
 
 When /^I select "([^"]*)" in combobox "([^"]*)" in row (\d+) of the grid$/ do |value, field, row|
   page.driver.browser.execute_script <<-JS
-    var components = [];
-    for (var cmp in Netzke.page) { components.push(cmp); }
-    var grid = Netzke.page[components[0]];
-    var colId = grid.getColumnModel().findColumnIndex("#{field}");
-    var col = grid.getColumnModel().getColumnById(colId);
-    var index = col.editor.getStore().find('field2', '#{value}');
-    col.editor.setValue(col.editor.getStore().getAt(index).get('field1'));
-    col.editor.onTriggerClick();
+    var grid   = Ext.ComponentQuery.query('gridpanel')[0],
+        col    = Ext.ComponentQuery.query('gridcolumn[name="#{field}"]'),
+        colId  = grid.headerCt.items.findIndex('name', '#{field}'),
+        combo  = Ext.ComponentQuery.query('netzkeremotecombo')[0];
+
+    combo.setValue( combo.findRecordByDisplay('#{value}') );
+    combo.onTriggerClick();
   JS
 end
 
 When /^I stop editing the grid$/ do
   page.driver.browser.execute_script <<-JS
-    var components = [];
-    for (var cmp in Netzke.page) { components.push(cmp); }
-    var grid = Netzke.page[components[0]];
-    grid.stopEditing();
+    var p;
+    (p = Ext.ComponentQuery.query('gridpanel')[0].getPlugin('celleditor')) && p.completeEdit();
   JS
 end
 
@@ -107,6 +102,26 @@ When /^I reload the grid$/ do
     var components = [];
     for (var cmp in Netzke.page) { components.push(cmp); }
     var grid = Netzke.page[components[0]];
-    grid.getStore().reload();
+    grid.getStore().load();
   JS
 end
+
+When /^I (?:drag|move) "([^"]*)" column before "([^"]*)"$/ do |header1, header2|
+  headers=[header1,header2].map {|s| s=s.gsub(/ /, '  ')}
+  indexi =[0,1].map { |i| i=page.driver.browser.execute_script %Q(return Ext.ComponentQuery.query('gridcolumn[text="#{headers[i]}"]')[0].getIndex()) }
+  page.driver.browser.execute_script <<-JS
+    cmp = Ext.ComponentQuery.query('gridpanel')[0];
+    cmp.onColumnMove(null, null, #{indexi[0]}, #{indexi[1]});
+  JS
+  When "I wait for the response from the server"
+end
+
+Then /^I should see columns in order: "([^"]*)", "([^"]*)", "([^"]*)"$/ do |header1, header2, header3|
+  headers=[header1,header2,header3].map {|s| s=s.gsub(/ /, '  ')}
+  page.driver.browser.execute_script(<<-JS).should be_true
+    return (Ext.ComponentQuery.query('gridcolumn[text="#{headers[0]}"]')[0].getIndex() == 1) &&
+           (Ext.ComponentQuery.query('gridcolumn[text="#{headers[1]}"]')[0].getIndex() == 2) &&
+           (Ext.ComponentQuery.query('gridcolumn[text="#{headers[2]}"]')[0].getIndex() == 3)
+  JS
+end
+

data/test/rails_app/features/tab_panel.feature

@@ -6,7 +6,7 @@ Feature: Tab panel
 @javascript
 Scenario: Lazy loading of a component into a tab when the latter gets open
   Given I am on the SimpleTabPanel test page
-  When I follow "Panel Two"
+  When I press "Panel Two"
   Then I should see "Original HTML"
   When I press "Update html"
-  Then I should see "Update for Panel Two"
+  Then I should see "Update for Panel Two"

data/test/rails_app/spec/factories.rb

@@ -22,3 +22,7 @@ Factory.define :address do |f|
   f.city "Lost Children"
   f.postcode "1234"
 end
+
+Factory.define :book_with_custom_primary_key do |f|
+  f.title "Book you will write"
+end

metadata

@@ -2,7 +2,7 @@
 name: netzke-basepack
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.6.5
+  version: 0.7.0
 platform: ruby
 authors: 
 - Sergei Kozlov
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-16 00:00:00 +02:00
+date: 2011-08-09 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,7 +21,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.6.7
+        version: 0.7.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -30,9 +30,9 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.3
+        version: 1.0.0
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -43,7 +43,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 3.0.pre2
+        version: 3.0.0
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -52,9 +52,9 @@ dependencies:
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.1.4
   type: :runtime
   version_requirements: *id004
 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
@@ -65,23 +65,21 @@ extensions: []
 
 extra_rdoc_files: 
 - LICENSE
-- README.rdoc
+- README.md
 files: 
 - .autotest
 - CHANGELOG.rdoc
 - LICENSE
-- README.rdoc
+- README.md
 - Rakefile
 - TODO.rdoc
 - app/models/netzke_field_list.rb
 - app/models/netzke_model_attr_list.rb
 - app/models/netzke_persistent_array_auto_model.rb
-- from_05_to_06.rdoc
 - init.rb
 - install.rb
 - javascripts/basepack.js
 - javascripts/datetimefield.js
-- javascripts/feedback_ghost.js
 - lib/generators/netzke/basepack_generator.rb
 - lib/generators/netzke/templates/assets/ts-checkbox.gif
 - lib/generators/netzke/templates/create_netzke_field_lists.rb
@@ -95,6 +93,7 @@ files:
 - lib/netzke/basepack/auth_app.rb
 - lib/netzke/basepack/basic_app.rb
 - lib/netzke/basepack/border_layout_panel.rb
+- lib/netzke/basepack/border_layout_panel/javascripts/border_layout_panel.js
 - lib/netzke/basepack/data_accessor.rb
 - lib/netzke/basepack/form_panel.rb
 - lib/netzke/basepack/form_panel/fields.rb
@@ -108,7 +107,9 @@ files:
 - lib/netzke/basepack/grid_panel.rb
 - lib/netzke/basepack/grid_panel/columns.rb
 - lib/netzke/basepack/grid_panel/javascripts/advanced_search.js
+- lib/netzke/basepack/grid_panel/javascripts/check_column_fix.js
 - lib/netzke/basepack/grid_panel/javascripts/edit_in_form.js
+- lib/netzke/basepack/grid_panel/javascripts/event_handling.js
 - lib/netzke/basepack/grid_panel/javascripts/grid_panel.js
 - lib/netzke/basepack/grid_panel/javascripts/misc.js
 - lib/netzke/basepack/grid_panel/javascripts/rows-dd.js
@@ -116,6 +117,7 @@ files:
 - lib/netzke/basepack/grid_panel/record_form_window.rb
 - lib/netzke/basepack/grid_panel/services.rb
 - lib/netzke/basepack/paging_form_panel.rb
+- lib/netzke/basepack/paging_form_panel/javascripts/paging_form_panel.js
 - lib/netzke/basepack/panel.rb
 - lib/netzke/basepack/query_builder.rb
 - lib/netzke/basepack/query_builder/javascripts/query_builder.js
@@ -130,9 +132,11 @@ files:
 - lib/netzke/basepack/tab_panel/javascripts/tab_panel.js
 - lib/netzke/basepack/version.rb
 - lib/netzke/basepack/window.rb
+- lib/netzke/basepack/window/javascripts/window.js
 - lib/netzke/basepack/wrap_lazy_loaded.rb
 - lib/netzke/basepack/wrapper.rb
 - lib/tasks/netzke_basepack_tasks.rake
+- locales/de.yml
 - locales/en.yml
 - netzke-basepack.gemspec
 - stylesheets/basepack.css
@@ -151,6 +155,7 @@ files:
 - test/rails_app/Gemfile.lock
 - test/rails_app/README
 - test/rails_app/Rakefile
+- test/rails_app/app/components/author_form.rb
 - test/rails_app/app/components/author_grid.rb
 - test/rails_app/app/components/book_form.rb
 - test/rails_app/app/components/book_form_with_custom_fields.rb
@@ -159,7 +164,11 @@ files:
 - test/rails_app/app/components/book_grid_loader.rb
 - test/rails_app/app/components/book_grid_with_custom_columns.rb
 - test/rails_app/app/components/book_grid_with_default_values.rb
+- test/rails_app/app/components/book_grid_with_extra_feedback.rb
+- test/rails_app/app/components/book_grid_with_extra_filters.rb
 - test/rails_app/app/components/book_grid_with_nested_attributes.rb
+- test/rails_app/app/components/book_grid_with_paging.rb
+- test/rails_app/app/components/book_grid_with_persistence.rb
 - test/rails_app/app/components/book_grid_with_scoped_authors.rb
 - test/rails_app/app/components/book_grid_with_virtual_attributes.rb
 - test/rails_app/app/components/book_paging_form_panel.rb
@@ -167,6 +176,7 @@ files:
 - test/rails_app/app/components/book_query_builder.rb
 - test/rails_app/app/components/book_search_panel.rb
 - test/rails_app/app/components/book_search_panel/javascripts/i18n_de.js
+- test/rails_app/app/components/book_with_custom_primary_key_grid.rb
 - test/rails_app/app/components/books_bound_to_author.rb
 - test/rails_app/app/components/double_book_grid.rb
 - test/rails_app/app/components/form_without_model.rb
@@ -197,6 +207,7 @@ files:
 - test/rails_app/app/models/address.rb
 - test/rails_app/app/models/author.rb
 - test/rails_app/app/models/book.rb
+- test/rails_app/app/models/book_with_custom_primary_key.rb
 - test/rails_app/app/models/role.rb
 - test/rails_app/app/models/user.rb
 - test/rails_app/app/presenters/forms/generic_user.rb
@@ -228,12 +239,14 @@ files:
 - test/rails_app/db/migrate/20101026190021_create_books.rb
 - test/rails_app/db/migrate/20110101143818_create_addresses.rb
 - test/rails_app/db/migrate/20110213213050_create_netzke_component_states.rb
+- test/rails_app/db/migrate/20110701070052_create_book_with_custom_primary_keys.rb
 - test/rails_app/db/schema.rb
 - test/rails_app/db/seeds.rb
 - test/rails_app/features/accordion_panel.feature
 - test/rails_app/features/components_in_view.feature
 - test/rails_app/features/form_panel.feature
 - test/rails_app/features/grid_panel.feature
+- test/rails_app/features/grid_panel_with_custom_primary_key.feature
 - test/rails_app/features/i18n.feature
 - test/rails_app/features/nested_attributes.feature
 - test/rails_app/features/paging_form_panel.feature
@@ -241,6 +254,7 @@ files:
 - test/rails_app/features/simple_app.feature
 - test/rails_app/features/simple_panel.feature
 - test/rails_app/features/step_definitions/accordion_steps.rb
+- test/rails_app/features/step_definitions/ext_steps.rb
 - test/rails_app/features/step_definitions/form_panel_steps.rb
 - test/rails_app/features/step_definitions/generic_steps.rb
 - test/rails_app/features/step_definitions/grid_panel_steps.rb
@@ -268,7 +282,6 @@ files:
 - test/rails_app/public/javascripts/effects.js
 - test/rails_app/public/javascripts/prototype.js
 - test/rails_app/public/javascripts/rails.js
-- test/rails_app/public/netzke/basepack/ts-checkbox.gif
 - test/rails_app/public/robots.txt
 - test/rails_app/public/stylesheets/.gitkeep
 - test/rails_app/script/cucumber