netzke-basepack 0.8.3 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1cf0253e7faf8d9b55ec4d2fa9ce2cadbbd67001
-  data.tar.gz: 160491e2c4291ac17a98587f1bafc23c41b5d372
+  metadata.gz: 5c6fa2322cb559185c96b7c94bc81b5ac2659c11
+  data.tar.gz: 81749e01b515bc0d9048cbe416ff5d4e04883123
 SHA512:
-  metadata.gz: 0bd90a75392a7a98308282006b47d2d2eb33d4d3769eab68f6873d7ffa707dea63c3201b9bd970ed7f47e0c3bdf1ec36bb834c09f836036d70a64d10159f1e4d
-  data.tar.gz: b2fd784bff28d8f61b42e5f340d6e0ff5144bb4d3347c4621b529c30abbeae13b41e01cd882e452548873f65fddc927215a54e7c00e87bca9a3eb71f2dbc5170
+  metadata.gz: e25dfd01b65fabf7d9965319eb195e3bf62d08bf5135e420fc1e29685220366a676d5b6f66f02e2b884f5c5d34b368dba07308c3d09138d6f3f67469768e6ad4
+  data.tar.gz: d20dde81ffbc3ad01fe891e5671d262a3f3fae50a1b0872e0e7e0825991e6b5951794b0f668622843d3b299d70460fefafbc45b8ee934a38fa035d5d750769e8

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.8.4 - 2013-05-22
+* bug fix
+  * the 'on' filter on date works again (thanks Simon Willmann)
+
 # 0.8.3 - 2013-04-24
 * improvements
   * implement advanced searching by association (issue #93)

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

@@ -370,6 +370,9 @@ module Netzke::Basepack::DataAdapters
         value = v["value"]
         op = v['comparison']
 
+        # safety
+        raise "Invalid filter operator '#{op}'" unless op.blank? || %w(lt gt lteq gteq eq contains).include?(op)
+
         col_filter = @cls.inject(nil) { |fil, col|
           if col.is_a?(Hash) && col[:filter_with] && col[:name].to_sym == v['field'].to_sym
             fil = col[:filter_with]
@@ -382,7 +385,6 @@ module Netzke::Basepack::DataAdapters
           next
         end
 
-
         case v["type"]
         when "string"
           res = res.where(arel_table[field].matches("%#{value}%"))
@@ -390,8 +392,8 @@ module Netzke::Basepack::DataAdapters
           # convert value to the DB date
           value.match(/(\d\d)\/(\d\d)\/(\d\d\d\d)/)
           if op == 'eq'
-            res = res.where(arel_table[field].ge("#{$3}-#{$1}-#{$2}".to_date.beginning_of_day))
-            res = res.where(arel_table[field].le("#{$3}-#{$1}-#{$2}".to_date.end_of_day))
+            res = res.where(arel_table[field].gteq("#{$3}-#{$1}-#{$2}".to_date.beginning_of_day))
+            res = res.where(arel_table[field].lteq("#{$3}-#{$1}-#{$2}".to_date.end_of_day))
           else
             res = res.where(arel_table[field].send(op, "#{$3}-#{$1}-#{$2}".to_time))
           end

data/lib/netzke/basepack/version.rb

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

data/test/basepack_test_app/features/grid_filters.feature

@@ -15,46 +15,50 @@ Background:
 
 @javascript
 Scenario: Numeric and text filter
+# Note that it's important to build the scenario so that the filtering results are always changing, showing a different
+# amount of records each time. Otherwise we may not catch a server exception, when the number of records wouldn't change
+# either.
   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
 
-  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
 
+  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
+
   # 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 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 wait for response from server
   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
+  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 "before 12/24/2010"
+  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 "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 2 records
 
   When I clear all filters in the grid