netzke-basepack 0.7.1 → 0.7.2

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

@@ -1,24 +1,21 @@
 class UserForm < Netzke::Basepack::FormPanel
-  js_property :title, User.model_name.human
+  title User.model_name.human
 
-  def configuration
-    sup = super
-    sup.merge({
-      :model => 'User',
-      :record_id => User.first.try(:id),
-      :items => [
-        {:xtype => 'fieldset', :title => "Basic Info", :checkboxToggle => true, :items => [
-          :first_name,
-          {:name => :last_name}
-        ]},
-        {:xtype => 'fieldset', :title => "Timestamps", :items => [
-          {:name => :created_at, :disabled => true},
-          {:name => :updated_at, :disabled => true}
-        ]},
-        :role__name
-      ]
-    })
-  end
+  model "User"
+
+  record_id User.first.try(:id)
+
+  items [
+    {:xtype => 'fieldset', :title => "Basic Info", :checkboxToggle => true, :items => [
+      :first_name,
+      {:name => :last_name}
+    ]},
+    {:xtype => 'fieldset', :title => "Timestamps", :items => [
+      {:name => :created_at, :disabled => true},
+      {:name => :updated_at, :disabled => true}
+    ]},
+    :role__name
+  ]
 
   # Uncomment for visual mask testing
   # def netzke_submit_endpoint(params)

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

@@ -1,10 +1,8 @@
 class UserGrid < Netzke::Basepack::GridPanel
-  js_property :title, "Users"
-  def configuration
-    super.merge(
-      :model => "User"
-      # :columns => [:first_name, {:name => :address__city}]
-      # :edit_form_config => {:items => [{:name => :first_name, :xtype => :htmleditor}]}
-    )
-  end
+  title "Users"
+  model "User"
+
+  add_form_config :class_name => "UserForm"
+  edit_form_config :class_name => "UserForm"
+  multi_edit_form_config :class_name => "UserForm"
 end

data/test/basepack_test_app/db/migrate/20110909071740_add_published_on_to_books.rb

@@ -0,0 +1,5 @@
+class AddPublishedOnToBooks < ActiveRecord::Migration
+  def change
+    add_column :books, :published_on, :date
+  end
+end

data/test/basepack_test_app/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20110901114016) do
+ActiveRecord::Schema.define(:version => 20110909071740) do
 
   create_table "addresses", :force => true do |t|
     t.integer  "user_id"
@@ -48,6 +48,7 @@ ActiveRecord::Schema.define(:version => 20110901114016) do
     t.datetime "created_at"
     t.datetime "updated_at"
     t.datetime "last_read_at"
+    t.date     "published_on"
   end
 
   create_table "netzke_component_states", :force => true do |t|

data/test/basepack_test_app/features/form_panel.feature

@@ -72,6 +72,17 @@ Scenario: Checkbox field should work properly
   And a book should exist with digitized: true, author: that author, exemplars: 4
   And a book should not exist with digitized: false, author: that author
 
+@javascript
+Scenario: Editing and immediately submitting the form
+  Given an author exists with first_name: "Carlos", last_name: "Castaneda"
+  And a book exists with title: "Journey to Ixtlan", author: that author
+  When I go to the BookForm test page
+  Then the form should show author__name: "Castaneda, Carlos"
+
+  When I press "Apply"
+  And I wait for the response from the server
+  Then the form should show author__name: "Castaneda, Carlos"
+
 # @javascript
 # Scenario: Checkbox group for tags should work properly
 #   Given a book exists with title: "Some Title"

data/test/basepack_test_app/features/grid_panel.feature

@@ -3,14 +3,15 @@ Feature: Grid panel
   As a role
   I want feature
 
-Scenario: UserGrid should render properly
-  Given a user exists with first_name: "Carlos", last_name: "Castaneda"
-  And a user exists with first_name: "Taisha", last_name: "Abelar"
-  When I go to the UserGrid test page
-  Then I should see "Carlos"
-  And  I should see "Castaneda"
-  And  I should see "Taisha"
-  And  I should see "Abelar"
+@javascript
+Scenario: UserGrid should correctly display data
+  Given an author exists with first_name: "Vladimir", last_name: "Nabokov"
+  And a book exists with author: that author, title: "Lolita", last_read_at: "2011-12-13", published_on: "2005-01-30"
+
+  When I go to the BookGrid test page
+  Then I should see "Nabokov, Vladimir"
+  And I should see "12/13/2011"
+  And I should see "01/30/2005"
 
 @javascript
 Scenario: Adding a record via "Add in form"
@@ -59,8 +60,8 @@ Scenario: Multi-editing records
   And I press "Edit in form"
   And I fill in "First name:" with "Maxim"
   And I press "OK"
-  Then I should see "Updated 2 records."
-  And the following users should exist:
+  And I wait for the response from the server
+  Then the following users should exist:
   | first_name | last_name |
   | Maxim | Castaneda |
   | Maxim | Hesse |
@@ -113,29 +114,6 @@ Scenario: Inline editing
   And a book should exist with title: "Collector", exemplars: 200
   But a book should not exist with title: "Magus"
 
-@javascript
-Scenario: Column filters
-  Given the following books exist:
-  | title               | exemplars | digitized | notes        |
-  | Journey to Ixtlan   | 10        | true      | A must-read  |
-  | Lolita              | 5         | false     | To read      |
-  | Getting Things Done | 3         | true      | Productivity |
-  When I go to the BookGrid test page
-  And I enable filter on column "exemplars" with value "{gt:6}"
-  Then the grid should show 1 records
-
-  When I clear all filters in the grid
-  And I enable filter on column "notes" with value "'read'"
-  Then the grid should show 2 records
-
-  When I clear all filters in the grid
-  And I enable filter on column "digitized" with value "false"
-  Then the grid should show 1 records
-
-  When I clear all filters in the grid
-  And I enable filter on column "digitized" with value "true"
-  Then the grid should show 2 records
-
 @javascript
 Scenario: Inline editing of association
   Given an author exists with first_name: "Vladimir", last_name: "Nabokov"
@@ -248,3 +226,26 @@ Scenario: I must see total records value
 
   When I go to the BookGridWithPaging test page
   Then I should see "of 2" within paging toolbar
+
+@javascript
+Scenario: GridPanel with overridden columns
+  Given an author exists with first_name: "Vladimir", last_name: "Nabokov"
+  And a book exists with title: "Lolita", author: that author
+  When I go to the BookGridWithOverriddenColumns test page
+  Then I should see "LOLITA"
+  And I should see "Nabokov, Vladimir"
+
+@javascript
+  Scenario: Virtual attributes should not be editable
+    Given a book exists with title: "Some Title"
+    When I go to the BookGridWithVirtualAttributes test page
+    Then the grid's column "In abundance" should not be editable
+
+@javascript
+  Scenario: Delete record via an column action
+    Given a book exists with title: "Some Title"
+    When I go to the BookGridWithColumnActions test page
+    And I click the "Delete row" action icon
+    And I press "Yes"
+    Then I should see "Deleted 1 record(s)"
+    And a book should not exist with title: "Some Title"

data/test/basepack_test_app/features/grid_panel_filters.feature

@@ -0,0 +1,61 @@
+Feature: Grid panel filters
+  In order to value
+  As a role
+  I want feature
+
+Background:
+  Given the following books exist:
+  | title               | exemplars | digitized | notes        | last_read_at |
+  | Journey to Ixtlan   | 10        | true      | A must-read  | 2011-04-25   |
+  | Lolita              | 5         | false     | To read      | 2010-12-23   |
+  | Getting Things Done | 3         | true      | Productivity | 2011-04-26   |
+
+@javascript
+Scenario: Numeric and text filter
+  When I go to the BookGrid test page
+  And I enable filter on column "exemplars" with value "{gt:6}"
+  Then the grid should show 1 records
+
+  When I clear all filters in the grid
+  And I enable filter on column "exemplars" with value "{eq:5}"
+  Then the grid should show 1 records
+
+  When I clear all filters in the grid
+  And I enable filter on column "exemplars" with value "{eq:6}"
+  Then the grid should show 0 records
+
+  # Due to some mystery, this wouldn't work in a separate scenario (e.g. Text filter)
+  When I clear all filters in the grid
+  And I enable filter on column "notes" with value "'read'"
+  Then the grid should show 2 records
+
+  When I clear all filters in the grid
+  And I enable date filter on column "last_read_at" with value "on 04/25/2011"
+  Then the grid should show 1 records
+
+  When I clear all filters in the grid
+  And I enable date filter on column "last_read_at" with value "after 04/25/2011"
+  Then the grid should show 1 records
+
+  When I clear all filters in the grid
+  And I enable date filter on column "last_read_at" with value "before 12/24/2010"
+  Then the grid should show 1 records
+
+  When I clear all filters in the grid
+  And I enable date filter on column "last_read_at" with value "after 12/23/2010"
+  Then the grid should show 2 records
+
+  When I clear all filters in the grid
+  And I enable date filter on column "last_read_at" with value "after 12/23/2010"
+  And I enable date filter on column "last_read_at" with value "before 04/26/2011"
+  Then the grid should show 1 records
+
+@javascript
+Scenario: Boolean filter
+  When I go to the BookGrid test page
+  And I enable filter on column "digitized" with value "false"
+  Then the grid should show 1 records
+
+  When I clear all filters in the grid
+  And I enable filter on column "digitized" with value "true"
+  Then the grid should show 2 records

data/test/basepack_test_app/features/paging_form_panel.feature

@@ -3,14 +3,15 @@ Feature: Paging form panel
   As a role
   I want feature
 
-@javascript
-Scenario: Paging through records
+Background:
   Given the following books exist:
-  | title               |
-  | Journey to Ixtlan   |
-  | Lolita              |
-  | Getting Things Done |
+  | title               | exemplars | digitized | notes        | published_on | last_read_at |
+  | Journey to Ixtlan   | 10        | true      | A must-read  | 2001-01-02   | 2011-01-02   |
+  | Lolita              | 5         | false     | To read      | 1988-04-05   | 2011-03-04   |
+  | Getting Things Done | 3         | true      | Productivity | 2005-06-07   | 2011-12-13   |
 
+@javascript
+Scenario: Paging through records
   When I go to the BookPagingFormPanel test page
   Then I should see "Journey to Ixtlan"
 
@@ -24,12 +25,6 @@ Scenario: Paging through records
 
 @javascript
 Scenario: Searching
-  Given the following books exist:
-  | title               | exemplars | digitized | notes        |
-  | Journey to Ixtlan   | 10        | true      | A must-read  |
-  | Lolita              | 5         | false     | To read      |
-  | Getting Things Done | 3         | true      | Productivity |
-
   When I go to the BookPagingFormPanel test page
   And I press "Search"
   And I wait for the response from the server
@@ -42,25 +37,7 @@ Scenario: Searching
   And I wait for the response from the server
   Then the form should show title: "Getting Things Done"
 
-@javascript
-Scenario: Editing and immediately submitting the form
-  Given an author exists with first_name: "Carlos", last_name: "Castaneda"
-  And a book exists with title: "Journey to Ixtlan", author: that author
-  When I go to the BookPagingFormPanel test page
-  Then the form should show author__name: "Castaneda, Carlos"
-
-  When I press "Edit"
-  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/basepack_test_app/features/step_definitions/grid_panel_steps.rb

@@ -54,6 +54,22 @@ When /^I enable filter on column "([^"]*)" with value "([^"]*)"$/ do |column, va
   sleep 1
 end
 
+# E.g.: And I enable date filter on column "last_read_at" with value "after 04/25/2011" (this date should be in the US format)
+When /^I enable date filter on column "([^"]*)" with value "([^"]*)"$/ do |column, value|
+  operand, date = value.split
+  page.driver.browser.execute_script <<-JS
+    var grid = Ext.ComponentQuery.query('gridpanel')[0],
+        filter, value;
+    grid.features[0].createFilters();
+    filter = grid.filters.getFilter('#{column}');
+    value = filter.getValue();
+    value.#{operand} = new Date('#{date}'); // merge the new value with the current one
+    filter.setValue(value);
+    filter.setActive(true);
+  JS
+  sleep 1
+end
+
 When /^I clear all filters in the grid$/ do
   page.driver.browser.execute_script <<-JS
     var components = [];
@@ -148,3 +164,15 @@ Then /^the grid should have records sorted by "([^"]*)"\s?(asc|desc)?$/ do |colu
     return (columnValues.length > 0) && (columnValues.toString() === Ext.Array.sort(columnValues).toString());
   JS
 end
+
+Then /^the grid's column "([^"]*)" should not be editable$/ do |column_name|
+  column = column_name.downcase.gsub(' ', '_')
+  page.driver.browser.execute_script(<<-JS).should be_true
+    var col = Ext.ComponentQuery.query('gridcolumn[name="#{column}"]')[0];
+    return typeof col.getEditor() == 'undefined';
+  JS
+end
+
+When /^I click the "([^"]*)" action icon$/ do |action_name|
+  find("img[data-qtip='#{action_name}']").click
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: netzke-basepack
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-04 00:00:00.000000000Z
+date: 2011-10-20 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: netzke-core
-  requirement: &70122130214940 !ruby/object:Gem::Requirement
+  requirement: &70256296535300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.7.4
   type: :runtime
   prerelease: false
-  version_requirements: *70122130214940
+  version_requirements: *70256296535300
 - !ruby/object:Gem::Dependency
   name: will_paginate
-  requirement: &70122130214460 !ruby/object:Gem::Requirement
+  requirement: &70256296534640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70122130214460
+  version_requirements: *70256296534640
 - !ruby/object:Gem::Dependency
   name: acts_as_list
-  requirement: &70122130213980 !ruby/object:Gem::Requirement
+  requirement: &70256296533980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: 0.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *70122130213980
+  version_requirements: *70256296533980
 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
@@ -77,6 +77,8 @@ files:
 - lib/netzke/active_record/relation_extensions.rb
 - lib/netzke/basepack.rb
 - lib/netzke/basepack/accordion_panel.rb
+- lib/netzke/basepack/action_column.rb
+- lib/netzke/basepack/action_column/javascripts/action_column.js
 - lib/netzke/basepack/auth_app.rb
 - lib/netzke/basepack/basic_app.rb
 - lib/netzke/basepack/border_layout_panel.rb
@@ -100,7 +102,6 @@ files:
 - 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
-- lib/netzke/basepack/grid_panel/multi_edit_form.rb
 - lib/netzke/basepack/grid_panel/record_form_window.rb
 - lib/netzke/basepack/grid_panel/services.rb
 - lib/netzke/basepack/paging_form_panel.rb
@@ -142,11 +143,13 @@ files:
 - test/basepack_test_app/app/components/book_form_with_nested_attributes.rb
 - test/basepack_test_app/app/components/book_grid.rb
 - test/basepack_test_app/app/components/book_grid_loader.rb
+- 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_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
+- test/basepack_test_app/app/components/book_grid_with_overridden_columns.rb
 - test/basepack_test_app/app/components/book_grid_with_paging.rb
 - test/basepack_test_app/app/components/book_grid_with_persistence.rb
 - test/basepack_test_app/app/components/book_grid_with_scoped_authors.rb
@@ -224,12 +227,14 @@ files:
 - test/basepack_test_app/db/migrate/20110213213050_create_netzke_component_states.rb
 - test/basepack_test_app/db/migrate/20110701070052_create_book_with_custom_primary_keys.rb
 - test/basepack_test_app/db/migrate/20110901114016_add_last_read_at_to_books.rb
+- test/basepack_test_app/db/migrate/20110909071740_add_published_on_to_books.rb
 - test/basepack_test_app/db/schema.rb
 - test/basepack_test_app/db/seeds.rb
 - test/basepack_test_app/features/accordion_panel.feature
 - test/basepack_test_app/features/components_in_view.feature
 - test/basepack_test_app/features/form_panel.feature
 - test/basepack_test_app/features/grid_panel.feature
+- test/basepack_test_app/features/grid_panel_filters.feature
 - test/basepack_test_app/features/grid_panel_with_custom_primary_key.feature
 - test/basepack_test_app/features/grid_sorting.feature
 - test/basepack_test_app/features/i18n.feature