netzke-basepack 0.7.2 → 0.7.3

data/CHANGELOG.rdoc

@@ -1,3 +1,8 @@
+= 0.7.3 - 2011-10-23
+* bug fix
+  * :sorting_scope config option for GridPanel is now effective
+  * regression: filtering on association column is fix (covered with tests)
+
 = 0.7.2 - 2011-10-20
 * bug fix
   * Filter on a date column

data/README.md

@@ -6,7 +6,7 @@ A pack of pre-built [Netzke](http://netzke.org) components - such as grid, form,
 
 * Ruby 1.9.2 (1.8.7 may work, too)
 * Rails >= 3.0.0
-* Ext JS >= 4.0.0
+* Ext JS = 4.0.2a
 
 ## Installation
 

data/lib/netzke/basepack/data_accessor.rb

@@ -163,9 +163,9 @@ module Netzke
           assoc, method = v["field"].split('__')
           if method
             assoc = data_class.reflect_on_association(assoc.to_sym)
-            field = [assoc.klass.table_name, method].join('.').to_sym
+            field = [assoc.klass.table_name, method].join('.')
           else
-            field = assoc.to_sym
+            field = [table_name, assoc].join('.')
           end
 
           value = v["value"]
@@ -174,15 +174,15 @@ module Netzke
 
           case v["type"]
           when "string"
-            res = res.where(["#{table_name}.#{field} like ?", "%#{value}%"])
+            res = res.where(["#{field} like ?", "%#{value}%"])
           when "date"
             # convert value to the DB date
             value.match /(\d\d)\/(\d\d)\/(\d\d\d\d)/
-            res = res.where("#{table_name}.#{field} #{op} ?", "#{$3}-#{$1}-#{$2}")
+            res = res.where("#{field} #{op} ?", "#{$3}-#{$1}-#{$2}")
           when "numeric"
-            res = res.where(["#{table_name}.#{field} #{op} ?", value])
+            res = res.where(["#{field} #{op} ?", value])
           else
-            res = res.where(["#{table_name}.#{field} = ?", value])
+            res = res.where(["#{field} = ?", value])
           end
         end
 

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

@@ -214,7 +214,7 @@ module Netzke
           end
 
           def set_default_sortable(c)
-            c[:sortable] = !c[:virtual] if c[:sortable].nil? # TODO: optimize - don't set it to false
+            c[:sortable] = !c[:virtual] || c[:sorting_scope] if c[:sortable].nil? # TODO: optimize - don't set it to false
           end
 
           def set_default_filterable(c)

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

@@ -211,6 +211,7 @@ module Netzke
               column = columns.detect { |c| c[:name] == sort_params["property"] }
               if column.has_key?(:sorting_scope)
                 relation = relation.send(column[:sorting_scope].to_sym, dir.to_sym)
+                ::Rails.logger.debug "!!! relation: #{relation.inspect}\n"
               else
                 relation = if method.nil?
                   relation.order("#{assoc} #{dir}")

data/lib/netzke/basepack/version.rb

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

data/netzke-basepack.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{netzke-basepack}
-  s.version = "0.7.2"
+  s.version = "0.7.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Sergei Kozlov}]
-  s.date = %q{2011-10-20}
+  s.date = %q{2011-10-23}
   s.description = %q{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.email = %q{sergei@playcode.nl}
   s.extra_rdoc_files = [
@@ -105,6 +105,7 @@ Gem::Specification.new do |s|
     "test/basepack_test_app/app/components/book_form_with_defaults.rb",
     "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_filtering.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",

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

@@ -6,4 +6,7 @@ class BookGrid < Netzke::Basepack::GridPanel
   add_form_config :class_name => "BookForm"
   edit_form_config :class_name => "BookForm"
   multi_edit_form_config :class_name => "BookForm"
+
+  # We need to specify how we want to sort on this virtual column:
+  override_column :author__name, :sorting_scope => :sorted_by_author_name
 end

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

@@ -0,0 +1,10 @@
+class BookGridFiltering < Netzke::Basepack::GridPanel
+  model "Book"
+
+  column :title
+  column :author__first_name
+  column :exemplars
+  column :notes
+  column :last_read_at
+  column :digitized
+end

data/test/basepack_test_app/app/models/book.rb

@@ -1,4 +1,6 @@
 class Book < ActiveRecord::Base
   belongs_to :author
   validates_presence_of :title
+
+  scope :sorted_by_author_name, lambda { |dir| joins(:author).order("authors.last_name #{dir}, authors.first_name #{dir}") }
 end

data/test/basepack_test_app/features/grid_panel_filters.feature

@@ -4,15 +4,18 @@ Feature: Grid panel filters
   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   |
+  Given an author exists with first_name: "Vladimir", last_name: "Nabokov"
+  And a book exists with author: that author, title: "Lolita", exemplars: 5, digitized: false, notes: "To read", last_read_at: "2010-12-23"
+
+  And an author exists with first_name: "Carlos", last_name: "Castaneda"
+  And a book exists with author: that author, title: "Journey to Ixtlan", exemplars: 10, digitized: true, notes: "A must-read", last_read_at: "2011-04-25"
+
+  And an author exists with first_name: "David", last_name: "Allen"
+  And a book exists with author: that author, title: "Getting Things Done", exemplars: 3, digitized: true, notes: "Productivity", last_read_at: "2011-04-26"
 
 @javascript
 Scenario: Numeric and text filter
-  When I go to the BookGrid test page
+  When I go to the BookGridFiltering test page
   And I enable filter on column "exemplars" with value "{gt:6}"
   Then the grid should show 1 records
 
@@ -24,11 +27,20 @@ Scenario: Numeric and text filter
   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)
+  # NOTE: due to some mystery, this wouldn't work in a separate scenario (e.g. "Text filter")
+  # That is, the filter just wouldn't get set.
   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 "author__first_name" with value "'d'"
+  Then the grid should show 2 records
+
+  When I clear all filters in the grid
+  And I enable filter on column "author__first_name" with value "'carl'"
+  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 "on 04/25/2011"
   Then the grid should show 1 records
@@ -52,7 +64,7 @@ Scenario: Numeric and text filter
 
 @javascript
 Scenario: Boolean filter
-  When I go to the BookGrid test page
+  When I go to the BookGridFiltering test page
   And I enable filter on column "digitized" with value "false"
   Then the grid should show 1 records
 

data/test/basepack_test_app/features/grid_sorting.feature

@@ -22,11 +22,11 @@ Feature: Grid sorting
 
   @javascript
   Scenario: Sorting on association column
-    Given an author exists with first_name: "Herman"
+    Given an author exists with first_name: "Herman", last_name: "Hesse"
     And a book exists with title: "Damian", author: that author
-    And an author exists with first_name: "Carlos"
+    And an author exists with first_name: "Carlos", last_name: "Castaneda"
     And a book exists with title: "Journey", author: that author
-    And an author exists with first_name: "John"
+    And an author exists with first_name: "John", last_name: "Fowles"
     And a book exists with title: "Magus", author: that author
 
     When I go to the BookGridWithCustomColumns test page
@@ -34,6 +34,14 @@ Feature: Grid sorting
     And I sleep 1 second
     Then the grid should have records sorted by "Author  first name"
 
-    And I click on column "Author  first name"
+    When I click on column "Author  first name"
     And I sleep 1 second
     Then the grid should have records sorted by "Author  first name" desc
+
+    When I go to the BookGrid test page
+    And I click on column "Author  name"
+    And I sleep 1 second
+    Then the grid should have records sorted by "Author  name"
+    When I click on column "Author  name"
+    And I sleep 1 second
+    Then the grid should have records sorted by "Author  name" desc

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: netzke-basepack
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-20 00:00:00.000000000Z
+date: 2011-10-23 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: netzke-core
-  requirement: &70256296535300 !ruby/object:Gem::Requirement
+  requirement: &70314345257960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.7.4
   type: :runtime
   prerelease: false
-  version_requirements: *70256296535300
+  version_requirements: *70314345257960
 - !ruby/object:Gem::Dependency
   name: will_paginate
-  requirement: &70256296534640 !ruby/object:Gem::Requirement
+  requirement: &70314345257080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70256296534640
+  version_requirements: *70314345257080
 - !ruby/object:Gem::Dependency
   name: acts_as_list
-  requirement: &70256296533980 !ruby/object:Gem::Requirement
+  requirement: &70314345256340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: 0.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *70256296533980
+  version_requirements: *70314345256340
 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
@@ -142,6 +142,7 @@ files:
 - test/basepack_test_app/app/components/book_form_with_defaults.rb
 - 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_filtering.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